diff --git a/Configs/GameConfig/Datas/SystemConfig.xlsx b/Configs/GameConfig/Datas/SystemConfig.xlsx index 1e456995..fa4b57a7 100644 Binary files a/Configs/GameConfig/Datas/SystemConfig.xlsx and b/Configs/GameConfig/Datas/SystemConfig.xlsx differ diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas index f888c693..b0b00962 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_主界面.spriteatlas @@ -105,6 +105,7 @@ SpriteAtlas: - {fileID: 21300000, guid: d559bf28f7212cc48ac0d1a5b6a6949f, type: 3} - {fileID: 21300000, guid: a21b8f45d1e48df47a6314b580422e3d, type: 3} - {fileID: 21300000, guid: 3d760d89198d8284e9b3901a6e13c27c, type: 3} + - {fileID: 21300000, guid: d80d4a1948948f443a3c52846ee6eefe, type: 3} - {fileID: 21300000, guid: 2d5c694fc8d2bed46996062763ed3b36, type: 3} - {fileID: 21300000, guid: 5494df622d8fe1d46af0d456b5a3bcff, type: 3} - {fileID: 21300000, guid: b474057522933f44bb99a5141e4de92e, type: 3} @@ -121,151 +122,10 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - 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 - - 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 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - 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: 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_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_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u4E3B\u754C\u9762" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas index 6f8559d7..9f170c5d 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas @@ -72,7 +72,7 @@ SpriteAtlas: variantMultiplier: 1 packables: - {fileID: 21300000, guid: ec9ae6c212a5c7447a91eb6bf4788311, type: 3} - - {fileID: 21300000, guid: dd45158e450f68f42a0c9c08ab4064c7, type: 3} + - {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3} - {fileID: 21300000, guid: 38a120ecc4a4c964fa5d4e7b77e63619, type: 3} - {fileID: 21300000, guid: 0a4f5c692f81d4d4f955f18051647cb9, type: 3} bindAsDefault: 1 diff --git a/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 BlackLine.asset b/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 BlackLine.asset index 8282bca1..e21ab041 100644 --- a/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 BlackLine.asset +++ b/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 BlackLine.asset @@ -132,8 +132,8 @@ Material: - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 + - _StencilReadMask: 1 + - _StencilWriteMask: 0 - _TextureHeight: 1024 - _TextureWidth: 1024 - _UnderlayDilate: 0 @@ -2566,7 +2566,8 @@ MonoBehaviour: m_FontFeatureTable: m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] - m_FallbackFontAssetTable: [] + m_FallbackFontAssetTable: + - {fileID: 11400000, guid: 9fdd0257e5b073e4cba7baa3cdc637cb, type: 2} m_CreationSettings: sourceFontFileName: sourceFontFileGUID: 9a3b1b26302dc70428dabbfa552301af diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_lwb.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_lwb.png index 427af62b..44e775da 100644 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_lwb.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/主界面/zjm_lwb.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png deleted file mode 100644 index 44e775da..00000000 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png and /dev/null differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png new file mode 100644 index 00000000..6b74b4f4 Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png.meta similarity index 98% rename from UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png.meta rename to UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png.meta index 8d232c3f..d7eaab44 100644 --- a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_lwb.png.meta +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/新增内容/zjm_tc_wmsp.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd45158e450f68f42a0c9c08ab4064c7 +guid: 86ab5d2474d50d448a735fb340c904b4 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 1ee798c7..57ad7952 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -727,6 +727,10 @@ namespace GameLogic unitPlayerData.m_AtkCount++; + + // 抽奖 + + List m_TempList = new List(); foreach (var item in m_DicTeamList) @@ -780,41 +784,6 @@ namespace GameLogic } - //int count = 3; // 最多给的Buff数量 - - //// 生成台风 - //foreach (var item in m_DicTeamList) - //{ - // if (item.Value != actor && count > 0) - // { - // count--; - - // // 添加减速Buff - // Buff m_Buff1 = new Buff(); - // m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num); - // item.Value.AddBuff(m_Buff1, unitPlayerData, giftConfig); - - - // for (int i = 0; i < 5; i++) - // { - // // 添加减速Buff给到 - // var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName); - // eGo.transform.SetParent(item.Value.GetRect().transform); - // //eGo.transform.position = actor.GetRect().transform.position; - // eGo.transform.localPosition = new Vector3(1500, 0, 0); - // eGo.transform.localScale = Vector3.one * 20; - // m_Buff1.m_EffectGo = eGo; - - // // 移动特效 - // eGo.transform.DOLocalMoveX(-2000, 16f).OnComplete(async () => - // { - // GameObject.Destroy(eGo); - // }); - - // await UniTask.Delay(500); // 延时1秒 - // } - // } - //} } ///