1

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_勋章.spriteatlas

@@ -85,10 +85,43 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - 49ae77f0715164c47b33f3bb92cec6b5: 21300000
+    - 89facd118d5211748b5af117a4bfe7b7: 21300000
+    - 09417bd1cb5657247b2cfd2cac40149a: 21300000
+    - 22f850a512e37024ebf7ac170d70e7bc: 21300000
+    - 75b01d666f026bf49b657e7a95102c9b: 21300000
+    - 3abf5b09978d92846a47fa939eb81faf: 21300000
+    - 9425123995fe49f4c955e670ca75d536: 21300000
+    - eb39c46a6992e0c468c9e0528ad1141a: 21300000
+    - b4523a6a8261d1045b9086f05ba634b0: 21300000
+    - aa71876d530ed5a49987f64918831456: 21300000
+    - 317f03ce55a5b864ab0236b58931c088: 21300000
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites: []
+  m_PackedSprites:
-  m_PackedSpriteNamesToIndex: []
+  - {fileID: 21300000, guid: 49ae77f0715164c47b33f3bb92cec6b5, type: 3}
+  - {fileID: 21300000, guid: 89facd118d5211748b5af117a4bfe7b7, type: 3}
+  - {fileID: 21300000, guid: 09417bd1cb5657247b2cfd2cac40149a, type: 3}
+  - {fileID: 21300000, guid: 22f850a512e37024ebf7ac170d70e7bc, type: 3}
+  - {fileID: 21300000, guid: 75b01d666f026bf49b657e7a95102c9b, type: 3}
+  - {fileID: 21300000, guid: 3abf5b09978d92846a47fa939eb81faf, type: 3}
+  - {fileID: 21300000, guid: 9425123995fe49f4c955e670ca75d536, type: 3}
+  - {fileID: 21300000, guid: eb39c46a6992e0c468c9e0528ad1141a, type: 3}
+  - {fileID: 21300000, guid: b4523a6a8261d1045b9086f05ba634b0, type: 3}
+  - {fileID: 21300000, guid: aa71876d530ed5a49987f64918831456, type: 3}
+  - {fileID: 21300000, guid: 317f03ce55a5b864ab0236b58931c088, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - by_2
+  - hbs_7
+  - zsj_9
+  - hg_10
+  - hj_3
+  - zs_5
+  - lbs_8
+  - fc_6
+  - "\u6700\u5F3A\u5927\u8111\u4E16\u754C\u6392\u884C2"
+  - bj_4
+  - qt_1
   m_RenderDataMap: {}
   m_Tag: "UIRaw_Atlas_\u52CB\u7AE0"
   m_IsVariant: 0

UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas

@@ -87,10 +87,49 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys: []
+    packedSpriteRenderDataKeys:
+    - e2f0e310f699dd1499e93cb07a0a3198: 21300000
+    - 3b8788a5800321a4498485a85c170fc0: 21300000
+    - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000
+    - c5d12f560ea2ef24b863f3329fe54030: 21300000
+    - e0932649c675784419f71913a849d5f2: 21300000
+    - 2cfbfa89505825949b3cec3b48d323a6: 21300000
+    - 9c5e0e9bd6ee88c4597788568c620662: 21300000
+    - 321bf3fcbdc862a46bc384367d7fbe90: 21300000
+    - 0f15acdd90c87fe47beedadca47e7010: 21300000
+    - d54d40edf100af147a5223de2f881ca3: 21300000
+    - af50fc7eee516a645b09aa8f79017aaa: 21300000
+    - 464e18bfd9c3d5e4b927c13ec9def492: 21300000
+    - d2ee8cbf34c48214688c60c2fadf0e8e: 21300000
   m_MasterAtlas: {fileID: 0}
-  m_PackedSprites: []
+  m_PackedSprites:
-  m_PackedSpriteNamesToIndex: []
+  - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3}
+  - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3}
+  - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3}
+  - {fileID: 21300000, guid: c5d12f560ea2ef24b863f3329fe54030, type: 3}
+  - {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3}
+  - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3}
+  - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3}
+  - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3}
+  - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3}
+  - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3}
+  - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3}
+  - {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3}
+  - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - xs_k
+  - MC
+  - DZ_icon
+  - jinshouzhi
+  - NL_box 2
+  - qz_jr
+  - NL_box_1
+  - gx
+  - LWTC_d_box
+  - TXK
+  - MC_jr
+  - NL_box
+  - NL_box 1
   m_RenderDataMap: {}
   m_Tag: "UIRaw_Atlas_\u5F39\u7A97"
   m_IsVariant: 0

UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab

@@ -78323,7 +78323,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7639078275878196855
 RectTransform:
   m_ObjectHideFlags: 0

UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs

@@ -218,6 +218,11 @@ namespace GameLogic
 
                     DataGameSceneManager.Instance.isLiShiShiJian = false; // 重置
 
+                    // 移除历史事件失败回调
+                    if (m_LishiId != -1)
+                    {
+                        GameModule.Timer.RemoveTimer(m_LishiId);
+                    }
 
 
                     // 触发历史事件条件