This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-06-17 16:12:08 +08:00
parent 33fb653264
commit fd16fcf420
10 changed files with 211 additions and 129 deletions

View File

@ -122,10 +122,154 @@ SpriteAtlas:
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- e4908990e907ced44b86a625dabaa27f: 21300000
- f56dc9b0b57169c47b65bf2403c8bf2e: 21300000
- c14201f0f80ab264aaf08debeeec779e: 21300000
- 8f433d11c6175fd47afb4f0e7be73dbd: 21300000
- 78030231b2c6742438c2f67622ca1262: 21300000
- e9e76581f169d5040ab2eaecb0263be8: 21300000
- 5494df622d8fe1d46af0d456b5a3bcff: 21300000
- 2e561772f31519b48a0ab15323747436: 21300000
- 2ab004925fe05ea4189139d6634fc89c: 21300000
- c23c25c21a0ab48448d8fbcd9846a1d6: 21300000
- 684eeb03823cc3e49b6a5887bb31be70: 21300000
- 70020d8362827f941ae2e250d3e10259: 21300000
- 06e748b355806d3408600b9d9cd6a61e: 21300000
- 3e973bb3aca50a6449a749680c2db168: 21300000
- 66af95f3209b0f94f9361954481784e2: 21300000
- a8f87634550bf8b40ba1fc4133eeecc3: 21300000
- 98ee06a4f7f7e7e488584f6872038044: 21300000
- 46934845d7fd2c143978d576382f49bf: 21300000
- a21b8f45d1e48df47a6314b580422e3d: 21300000
- b474057522933f44bb99a5141e4de92e: 21300000
- 5bcf2eb5f17a97444ab3555c10d9a69f: 21300000
- 6e658336532116a4db63aef49f6faef9: 21300000
- b93ebe46c9fef6e44b88936aa9f06d1a: 21300000
- f59bc6e6dc3b25b4889863bab125663b: 21300000
- cd9dc1a764f3fa24593ccabe1b048983: 21300000
- b8ba25f72aad3364c9cf90b708dcf73d: 21300000
- d559bf28f7212cc48ac0d1a5b6a6949f: 21300000
- ee26808848eb8da4e883cfceb4626125: 21300000
- d80d4a1948948f443a3c52846ee6eefe: 21300000
- a7f80929c0671db4098dd6c85e15840a: 21300000
- cfd2f569a0b350d41be563c8c0c3c8dc: 21300000
- e4d38f79aca053c41808a2f8a98c2cf0: 21300000
- 3d760d89198d8284e9b3901a6e13c27c: 21300000
- f602b4f90c80ffb42b32186d8075f24d: 21300000
- 7bb55d6ab10161a4e8ebf0033432909a: 21300000
- 8d10d57a9612abc4d8186cdc0eb7647a: 21300000
- 280312aa89342d240a9aae00ee6542b8: 21300000
- 13c28b9bef016f149aa882bc73c50ce7: 21300000
- 6ce9cf9bf19c0904db471d9c65874892: 21300000
- 30f8a8fd10da84a42acb2d23aad7d118: 21300000
- 516d8abe3c2c1bc42b6390c10af872bf: 21300000
- 481fe1de817043646ad49730f16ffd48: 21300000
- 522e3dde7cf719543b71871534ba6a67: 21300000
- b0d2ceee9a5cb21449f8eadfe72a61cb: 21300000
- 5bb6ac3fd15a1fc49a747143026a28ee: 21300000
- 2d5c694fc8d2bed46996062763ed3b36: 21300000
- dc1fef4f2611ecf4e88e5869cfbea019: 21300000
- 438111afefc9e664287061861c1e98f1: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: e4908990e907ced44b86a625dabaa27f, type: 3}
- {fileID: 21300000, guid: f56dc9b0b57169c47b65bf2403c8bf2e, type: 3}
- {fileID: 21300000, guid: c14201f0f80ab264aaf08debeeec779e, type: 3}
- {fileID: 21300000, guid: 8f433d11c6175fd47afb4f0e7be73dbd, type: 3}
- {fileID: 21300000, guid: 78030231b2c6742438c2f67622ca1262, type: 3}
- {fileID: 21300000, guid: e9e76581f169d5040ab2eaecb0263be8, type: 3}
- {fileID: 21300000, guid: 5494df622d8fe1d46af0d456b5a3bcff, type: 3}
- {fileID: 21300000, guid: 2e561772f31519b48a0ab15323747436, type: 3}
- {fileID: 21300000, guid: 2ab004925fe05ea4189139d6634fc89c, type: 3}
- {fileID: 21300000, guid: c23c25c21a0ab48448d8fbcd9846a1d6, type: 3}
- {fileID: 21300000, guid: 684eeb03823cc3e49b6a5887bb31be70, type: 3}
- {fileID: 21300000, guid: 70020d8362827f941ae2e250d3e10259, type: 3}
- {fileID: 21300000, guid: 06e748b355806d3408600b9d9cd6a61e, type: 3}
- {fileID: 21300000, guid: 3e973bb3aca50a6449a749680c2db168, type: 3}
- {fileID: 21300000, guid: 66af95f3209b0f94f9361954481784e2, type: 3}
- {fileID: 21300000, guid: a8f87634550bf8b40ba1fc4133eeecc3, type: 3}
- {fileID: 21300000, guid: 98ee06a4f7f7e7e488584f6872038044, type: 3}
- {fileID: 21300000, guid: 46934845d7fd2c143978d576382f49bf, type: 3}
- {fileID: 21300000, guid: a21b8f45d1e48df47a6314b580422e3d, type: 3}
- {fileID: 21300000, guid: b474057522933f44bb99a5141e4de92e, type: 3}
- {fileID: 21300000, guid: 5bcf2eb5f17a97444ab3555c10d9a69f, type: 3}
- {fileID: 21300000, guid: 6e658336532116a4db63aef49f6faef9, type: 3}
- {fileID: 21300000, guid: b93ebe46c9fef6e44b88936aa9f06d1a, type: 3}
- {fileID: 21300000, guid: f59bc6e6dc3b25b4889863bab125663b, type: 3}
- {fileID: 21300000, guid: cd9dc1a764f3fa24593ccabe1b048983, type: 3}
- {fileID: 21300000, guid: b8ba25f72aad3364c9cf90b708dcf73d, type: 3}
- {fileID: 21300000, guid: d559bf28f7212cc48ac0d1a5b6a6949f, type: 3}
- {fileID: 21300000, guid: ee26808848eb8da4e883cfceb4626125, type: 3}
- {fileID: 21300000, guid: d80d4a1948948f443a3c52846ee6eefe, type: 3}
- {fileID: 21300000, guid: a7f80929c0671db4098dd6c85e15840a, type: 3}
- {fileID: 21300000, guid: cfd2f569a0b350d41be563c8c0c3c8dc, type: 3}
- {fileID: 21300000, guid: e4d38f79aca053c41808a2f8a98c2cf0, type: 3}
- {fileID: 21300000, guid: 3d760d89198d8284e9b3901a6e13c27c, type: 3}
- {fileID: 21300000, guid: f602b4f90c80ffb42b32186d8075f24d, type: 3}
- {fileID: 21300000, guid: 7bb55d6ab10161a4e8ebf0033432909a, type: 3}
- {fileID: 21300000, guid: 8d10d57a9612abc4d8186cdc0eb7647a, type: 3}
- {fileID: 21300000, guid: 280312aa89342d240a9aae00ee6542b8, type: 3}
- {fileID: 21300000, guid: 13c28b9bef016f149aa882bc73c50ce7, type: 3}
- {fileID: 21300000, guid: 6ce9cf9bf19c0904db471d9c65874892, type: 3}
- {fileID: 21300000, guid: 30f8a8fd10da84a42acb2d23aad7d118, type: 3}
- {fileID: 21300000, guid: 516d8abe3c2c1bc42b6390c10af872bf, type: 3}
- {fileID: 21300000, guid: 481fe1de817043646ad49730f16ffd48, type: 3}
- {fileID: 21300000, guid: 522e3dde7cf719543b71871534ba6a67, type: 3}
- {fileID: 21300000, guid: b0d2ceee9a5cb21449f8eadfe72a61cb, type: 3}
- {fileID: 21300000, guid: 5bb6ac3fd15a1fc49a747143026a28ee, type: 3}
- {fileID: 21300000, guid: 2d5c694fc8d2bed46996062763ed3b36, type: 3}
- {fileID: 21300000, guid: dc1fef4f2611ecf4e88e5869cfbea019, type: 3}
- {fileID: 21300000, guid: 438111afefc9e664287061861c1e98f1, type: 3}
m_PackedSpriteNamesToIndex:
- zjm_YS_DT5
- zjm_YS_DT2
- zjm_mz_3
- zjm_gz_txzz_6
- zjm_YS_DT9
- ece6a1de44e637f8bf2d279015e2a72
- zjm_mz_1
- zjm_YS_DT7
- zjm_jdt_1
- zjm_YS_DT1
- zjm_mz_7
- zjm_gz_kk
- zjm_jdt_10
- zjm_mz_5
- zjm_mz_4
- zjm_mz_6
- zjm_LCJDT_lcd
- zjm_mz_8
- zjm_jdt_8
- zjm_mz_10
- zjm_jdt_5
- zjm_YS_X_BJ
- zjm_jdt_6
- zjm_jdt_2
- zjm_bt_sz
- zjm_xd_sjsj
- zjm_jdt_7
- zjm_mz_2
- zjm_lwb
- zjm_gz_txkbzz
- zjm_mz_9
- zjm_YS_DT8
- zjm_jdt_9
- zjm_1_BT
- zjm_LCJDT
- zjm_1_sjsj
- zjm_bt_zqdn
- zjm_cj_BJ
- zjm_jdt_4
- zjm_YS_DT4
- zjm_YS_DT10
- zjm_YS_DT3
- zjm_gz_txk
- zjm_jdt_3
- zjm_YS_DT6
- zjm_lwb_Old
- zjm_xx_BT
- zjm_bt_ph
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u4E3B\u754C\u9762"
m_IsVariant: 0

View File

@ -75,10 +75,13 @@ SpriteAtlas:
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- a5dc0541a4ac46543ae07af2e2c69953: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: a5dc0541a4ac46543ae07af2e2c69953, type: 3}
m_PackedSpriteNamesToIndex:
- zjm_hdwxwm
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u5916\u661F\u788E\u7247"
m_IsVariant: 0

View File

@ -71,17 +71,25 @@ SpriteAtlas:
secondaryTextureSettings: {}
variantMultiplier: 1
packables:
- {fileID: 21300000, guid: ec9ae6c212a5c7447a91eb6bf4788311, type: 3}
- {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3}
- {fileID: 21300000, guid: 38a120ecc4a4c964fa5d4e7b77e63619, type: 3}
- {fileID: 21300000, guid: 0a4f5c692f81d4d4f955f18051647cb9, type: 3}
bindAsDefault: 1
isAtlasV2: 0
cachedData: {fileID: 0}
packedSpriteRenderDataKeys: []
packedSpriteRenderDataKeys:
- 86ab5d2474d50d448a735fb340c904b4: 21300000
- 0a4f5c692f81d4d4f955f18051647cb9: 21300000
- 38a120ecc4a4c964fa5d4e7b77e63619: 21300000
m_MasterAtlas: {fileID: 0}
m_PackedSprites: []
m_PackedSpriteNamesToIndex: []
m_PackedSprites:
- {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3}
- {fileID: 21300000, guid: 0a4f5c692f81d4d4f955f18051647cb9, type: 3}
- {fileID: 21300000, guid: 38a120ecc4a4c964fa5d4e7b77e63619, type: 3}
m_PackedSpriteNamesToIndex:
- zjm_tc_wmsp
- "\u53C2\u8003\u56FE"
- zjm_wxwmjsq
m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u65B0\u589E\u5185\u5BB9"
m_IsVariant: 0

View File

@ -11370,6 +11370,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5414042312798935206}
- {fileID: 688984147342290442}
m_Father: {fileID: 8086681985000168470}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -77849,7 +77850,6 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 5414042312798935206}
- {fileID: 5645085182591318069}
- {fileID: 8010860323348911180}
- {fileID: 4670639706423021333}
@ -78240,16 +78240,16 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7420827004652020049}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 688984147342290442}
m_Father: {fileID: 1814839733780877975}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -119.3666, y: -19.4686}
m_AnchoredPosition: {x: -128.36664, y: -0.9686413}
m_SizeDelta: {x: 170.8668, y: 52.3371}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8303606859977642798

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

View File

@ -1,114 +0,0 @@
fileFormatVersion: 2
guid: ec9ae6c212a5c7447a91eb6bf4788311
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -14,6 +14,8 @@ namespace GameLogic
public static int InitPower = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).InitPower; // 初始推力
public static float PlayerScale = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).PlayerScale; // 初始推力
public static string GmPass = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).GmPassworld; // Gm解锁密码
public static float WaiXingScale = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).WaiXingScale;
public static float WaiXingBeiLv = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).WaiXingBeiLv;
public static bool isGmPass = false; // 是否解锁
public const int isZoneTimerBuffId = 6;// 特殊Buff
public const int isAllPowerBuffId = 7;// 永久增加Buff

View File

@ -729,6 +729,33 @@ namespace GameLogic
// 抽奖
float randomValue = UnityEngine.Random.Range(0f, 1f);
if (randomValue < EventConts.WaiXingBeiLv)
{
Log.Debug("抽奖成功");
// 添加减速Buff给到
var eGo = GameModule.Resource.LoadGameObject("WXSP");
eGo.transform.position = actor.GetRect().transform.position;
eGo.transform.localPosition = new Vector3(1500, 0, 0);
eGo.transform.localScale = Vector3.one;
// 移动特效
eGo.transform.DOLocalMoveX(0, 5f).OnComplete(async () =>
{
GameObject.Destroy(eGo);
var eGo1 = GameModule.Resource.LoadGameObject("WXSP_Birth");
eGo1.transform.position = actor.GetRect().transform.position;
eGo1.transform.localPosition = new Vector3(0, 0, 0);
eGo1.transform.localScale = Vector3.one;
await UniTask.Delay(1500); // 延时1秒
GameObject.Destroy(eGo1);
});
}
List<ActorHItem> m_TempList = new List<ActorHItem>();

View File

@ -23,6 +23,8 @@ public sealed partial class SystemConfig : Luban.BeanBase
InitPower = _buf.ReadInt();
YongJiuPower = _buf.ReadInt();
PlayerScale = _buf.ReadFloat();
WaiXingScale = _buf.ReadFloat();
WaiXingBeiLv = _buf.ReadFloat();
GmPassworld = _buf.ReadString();
}
@ -60,6 +62,14 @@ public sealed partial class SystemConfig : Luban.BeanBase
/// </summary>
public readonly float PlayerScale;
/// <summary>
/// 外星推力系数
/// </summary>
public readonly float WaiXingScale;
/// <summary>
/// 外星概率
/// </summary>
public readonly float WaiXingBeiLv;
/// <summary>
/// Gm解锁密码
/// </summary>
public readonly string GmPassworld;
@ -81,6 +91,8 @@ public sealed partial class SystemConfig : Luban.BeanBase
+ "InitPower:" + InitPower + ","
+ "YongJiuPower:" + YongJiuPower + ","
+ "PlayerScale:" + PlayerScale + ","
+ "WaiXingScale:" + WaiXingScale + ","
+ "WaiXingBeiLv:" + WaiXingBeiLv + ","
+ "GmPassworld:" + GmPassworld + ","
+ "}";
}