修改bug

Assets/Art/UIAssets/bg/bg_Chest05.png.meta

@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50

Assets/Art/UIAssets/bg/dec_topber_bg_top.png.meta

@@ -143,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: dec_topber_bg_top
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw03_big.prefab.meta

@@ -3,5 +3,5 @@ guid: DnpK4Xn4W3/qWD3LcaTcoRN8L7Fc7L1MFRp4cNtGvHUZAklc2Y8To3E=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw03_big
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_shouDong.prefab.meta

@@ -3,5 +3,5 @@ guid: CC5NvCmoB3ionfYxyy+fajYWpOsBICI75gboH34BPeIH8JEpBh4STXg=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shoudong
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi.prefab.meta

@@ -3,5 +3,5 @@ guid: Cn1KvSP7VHvL2vC8D+hUTODXewcp/a5p9WuFuSMyS1gREDRzKbRrmvk=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_skill_yunshi
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi_hit.prefab.meta

@@ -3,5 +3,5 @@ guid: WShOsX75UHsNkymgUgg8hfyLLPW6sBNExQ3k3Dk5POSM2iKRRHHgpMM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_skill_yunshi_hit
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_dian1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_dian1
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1_ad.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1_ad
   assetBundleVariant: 

Assets/Art/VFX/Materials/fx_shikuai1_al.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai1_al
   assetBundleVariant: 

Assets/Art/VFX/Textures/Sheet/fx_explosion_sharp_flat_3x3.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_explosion_sharp_flat_3x3
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/lz_Trail08.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: lz_trail08
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_dilie1.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_dilie1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai1.png.meta

@@ -157,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_gw05_jc
+  assetBundleName: fx_shikuai1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai2.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    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: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai2
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta

@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/ArtHero/General.prefab.meta
 guid: XS5LtCKlBi6NiJbPoGnOCyeV8ULq5zWkiaN/K2CJGgI5RmbXdb8dQGs=
-========
-guid: DnkX5yirUXlj0kz6v8UOe148Nok5dfz8Aot+8cmXcFhJS9CnbufBRQI=
->>>>>>>> 5954d4ef30ea76e9037f4c7f4a5c53208a432430:Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_click
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_coin.prefab.meta

@@ -3,5 +3,5 @@ guid: CisWti2tB3/yj2Fk9FI8yw0zR59G/ZdWpD/cE/Pj1wiND0StpDxE3YU=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_coin
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_exp.prefab.meta

@@ -3,5 +3,5 @@ guid: CCwa5CP+Wiql8NvIB6k+7J1GGtqN80RWi5GzxcecgNbOz5vgIkqz/E4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_exp
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_star.prefab.meta

@@ -3,5 +3,5 @@ guid: C3sZ5yn5UHJypJ7h68TQXXfaYkFr9xL7tPojE508nb3Y17lJB3bW1uw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_star
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_upgrade.prefab.meta

@@ -3,5 +3,5 @@ guid: CH5MtX6oVn0XTyr8nc8F0xX+rUlk+5IiY1JjIuYPTFx3YsuAJ40W6hw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_upgrade
   assetBundleVariant: 

Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: jingbi
   assetBundleVariant: 

Assets/Res/Aduio/UI/openui.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: openui
   assetBundleVariant: 

Assets/Res/Aduio/UI/shibai.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: shibai
   assetBundleVariant: 

Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: zhuangbei
   assetBundleVariant: 

Assets/Res/Config/OpenBoxConfig.json.meta

@@ -3,5 +3,5 @@ guid: CShNs3z+Vn8HpxMS7vKOYWPAffLFKFBhBGbvRuH4fvyEh9as+tWNckA=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: openboxconfig
   assetBundleVariant: 

Assets/Res/Font/wryh.ttf.meta

@@ -9,8 +9,9 @@ TrueTypeFontImporter:
   characterPadding: 1
   includeFontData: 1
   fontNames:
-  - Arial
-  fallbackFontReferences: []
+  - BigYoungBoldGB2.0
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
   customCharacters: 
   fontRenderingMode: 0
   ascentCalculationMode: 1

Assets/Res/TimeLineAssets/General_TD.txt.meta

@@ -3,5 +3,5 @@ guid: DClNsXz8Wy9mmBD8eDY53UIFzl65u5bdeFT9JYf7nEjCbf2Sz8fhPKc=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: general_td
   assetBundleVariant: 

Assets/Res/UI/BoxPanel.prefab

@@ -588,7 +588,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 22
     m_FontStyle: 0
     m_BestFit: 0
@@ -685,7 +685,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0
@@ -876,7 +876,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
@@ -957,7 +957,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
     m_FontStyle: 0
     m_BestFit: 0

Assets/Res/UI/BoxPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Cnoa4yj7B3mzjUPg5EJqojQZGrzhV+VUc1ZadxKxrGZz/tzW7YD1kNQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: boxpanel
   assetBundleVariant: 

Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -466,7 +466,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
@@ -548,7 +548,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 63
     m_FontStyle: 1
     m_BestFit: 0
@@ -863,9 +863,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 55

Assets/Res/UI/CombatHeroDiePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: BnsXvH+lBi/eCcyuhrkqmZUhzkluiobzvPZIeKFxz7hONDQCa/ONZ8Q=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: combatherodiepanel
   assetBundleVariant: 

Assets/Res/UI/EqRecyclePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: WX4Wtyn8V31WBe37O5/bUzojw/3NppVriSaUOfUv0H7g4yacCt8G0o0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: eqrecyclepanel
   assetBundleVariant: 

Assets/Res/UI/ItemPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: B3lJt3ypU3PViYXshGzrEJCLHc0jxZNzbY1YmePeKrw0Xe3ied+P68w=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: itempanel
   assetBundleVariant: 

Assets/Res/UI/RewardsPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Dnkcty/8BXJf2gohrhgRljXW95MNP9EZrpSpI8nCOUWhYIpX062ebWo=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: rewardspanel
   assetBundleVariant: 

Assets/Res/UI/TipMessagePanel.prefab

@@ -384,7 +384,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0

Assets/Res/UI/TipMessagePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: DitK5iv7AC9NczJs0wLiXBWvQKlvGK6hp9wJEmDbxF8TtJLf4xkbDEE=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: tipmessagepanel
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoButton_huiQiu.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfobutton_huiqiu
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoTop.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfotop
   assetBundleVariant: 

Assets/Res/UIAtlas/bg.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: bg
   assetBundleVariant: 

Assets/Res/UIAtlas/box.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: box
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1201,67 +1201,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1001 &5342889083889272969
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_Name
-      value: fx_shouDong
-      objectReference: {fileID: 0}
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -21.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.48
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1270,4 +1209,3 @@ SceneRoots:
   - {fileID: 111679908}
   - {fileID: 235899921}
   - {fileID: 123020045}
-  - {fileID: 5342889083889272969}

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -154,11 +154,14 @@ namespace GameLogic.Combat.CombatType
             HarmReturnInfo newharm = new HarmReturnInfo();
             newharm.harmType = HarmType.SystemKo;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-            heroEntities.AddRange(allHero);
-            for (int i = 0; i < heroEntities.Count; i++)
+            if (allHero != null)
             {
-                heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+                heroEntities.AddRange(allHero);
+                for (int i = 0; i < heroEntities.Count; i++)
+                {
+                    heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                }
             }
 
             Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs

@@ -9,9 +9,12 @@ namespace Fort23.Mono
     public partial class CombatHeroDiePanel : UIPanel
     {
         private int time;
+        private TimerEntity _timerEntity;
+
         public static async void OpenCombatHeroDiePanel()
         {
-            CombatHeroDiePanel combatHeroDiePanel= await     UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
+            CombatHeroDiePanel combatHeroDiePanel =
+                await UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
             combatHeroDiePanel.ShowCombatHeroDiePanel();
         }
 
@@ -34,10 +37,12 @@ namespace Fort23.Mono
 
         private void Button_ok_onClick()
         {
-            LevelBattleCombatType levelBattleCombatType=    CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            LevelBattleCombatType levelBattleCombatType =
+                CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
             levelBattleCombatType.Resume();
+            TimerComponent.Instance.Remove(_timerEntity);
+            _timerEntity = null;
             UIManager.Instance.HideUIUIPanel(this);
-            
         }
 
         public void ShowCombatHeroDiePanel()
@@ -46,17 +51,23 @@ namespace Fort23.Mono
             AudioManager.Instance.PlayAudio("shibai.wav");
             time = 30;
             clickTime.text = time.ToString();
-            TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
+            _timerEntity = TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
             {
+                if (_timerEntity == null)
+                {
+                    return;
+                }
+
                 time--;
                 clickTime.text = time.ToString();
                 if (time <= 0)
                 {
                     Button_ok_onClick();
                 }
+
+                TimerComponent.Instance.Remove(_timerEntity);
+                _timerEntity = null;
             });
         }
-        
-
     }
 }

Assets/Settings/rpAsset.asset

@@ -84,7 +84,7 @@ MonoBehaviour:
     bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
   m_PrefilteringModeMainLightShadows: 3
   m_PrefilteringModeAdditionalLight: 3
-  m_PrefilteringModeAdditionalLightShadows: 0
+  m_PrefilteringModeAdditionalLightShadows: 2
   m_PrefilterXRKeywords: 1
   m_PrefilteringModeForwardPlus: 0
   m_PrefilteringModeDeferredRendering: 0

Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CytL5iKqVnn9yxTqFu2UMxn5Hd47z2grAEnonCg6itTx7Ps91Aa48Qs=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHsbs3urW3kg2D+byDG8rtVTHQEsxfMQz21YDbR4vL4qlejXdDEpG8U=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: D39LtyOlAip0cRP5I20p3M2Gh+AdtXzMxpHTRCxB6PN2LqYGuD6ihoY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XStOsSysB3letrCMNjjs38UhxqB62xVpP4fanqiqA50SZ54qCbkcxFA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_ad81a93067643f49c016e2f84ee7ca42.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnlKtCL/B37IV1+yE26Ngch0K5+H1EoNgIqgUwzN0GPf9azgM7iB5Bs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS5MvC+vUXqqu5+euZQgSVEypQpx4fDE9KzCU3+lUZepaIXJKPfNLM8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXMa5H6rVHiX7EmBQxjSR8mpljYpcjz+kv/11NEVhlR3CwbmYbcj1EA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XChOsCL/An5/JH90PivXP9EElIAZO+fozGMTZtBBqUTDlYFgQIiOtzo=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B30f5H78B3kB7muTpw+jnTLHCRfh8d6jPM3jDASs5wz5ZOZcG8cmmxk=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnJJsyqpViiLC+ZWtEGASwVXhqudhPdC7udSLhAKQk0O/GWltQXB2Dk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Biwc5CL/BS3pmLPI1BWICrSAuLmSGBqmb3hl0pHSkc9vR5fp269rk70=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3wfsCmrVn9B3nODhpvI9figRuVVKJ7xdi78y5igcUcxDy546TbqZKE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXtNsyL8UCns9En/w+14X2HU9n3S6PRaETORR6La2k8ZEdWtw//MeN8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Bi8d5CitVC68L3lKBnaSQAGjvQo1s1t28qoVK/NQSAD6Lj7s/NctklU=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hong_474c99f16bde1c577aa4747d3ce9ed1f.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DStKsC//AX7AFgyBmzd3BlGu8ec5/WdkcUKnYdnz/YD6e1ZMA1hva18=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hong_9bd2e12516a7abea25edf98ed69ac0c6.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XHgdti2qVHLmi2fXZrAQrzxAmkifoQuOdva8usn43rmHYo7MIXen2Uk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/albedo_t1_da6bad6106d0eaf209f083590fa8614e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3xJ53//VXytDDwAbyv8bqWj/Xr+1NR9DydOARrGZNDNcnxTkdgKHB4=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/albedo_t1_f704f945b6b3826db33d9bc1ae0215eb.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XngW5imkBXLvOGFqju2LbsHeq+1uxmNrGgjh/8s7sxtG61ns5xBguZg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/all_a0c270db4d90fb62215ba1ce9438fabc.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XS8fsyOlVHMMvAPwV+qV54LfKwgH3l1JPVrfIKebwX8Sl4X2JOVjnBA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/all_a64b3c0556608471848a3c1eab9ccb1f.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CygavH78AXu+Leh/TQpneGrU5RuWE++ymZR+mFQLYhDzZe5bcXB+ybw=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/alpha_bd3_76b4f1db80a60d825c30103739ee7a36.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wy8ctCqvVnxx9N6r+JYx5HYb9hV0Hj3u4bETOInZVXGR4trhuhxUUNI=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXxMt3j7AnMI7I5NUV+HV1mEzNPUjmCiSjRR7lzp029DaZflaHUNc0M=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/ancient_pillar_01_3b543ee24b9f717bea2694940a1b449e.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WStM5nz4UnKZilfayXfs3pA1wPjNBCRh5C71kwZmszVdM0BC5FCq/3o=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XitJvCr5UyqPMkPznf4oRx3o4CKOuuNwKU/SD0HFHJB90YJQvud2350=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BnlOsyysBXlKOQSaWcc/rr5BEQlAM2V1XZONvBNMRySciufkdysLuus=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_01_f1aaf2556958b772c69faa01de204dba.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DHIatiKoUHPYM+WcRDzdK3aPztflKxNbsJdHQvGgkM5smT//c9Vpmys=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DHIdty+sAi5Tta71tC7twIlOUfg8Gjp3NDiybh9mgKWUBS3zolyKBcY=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/arch_gate_02_da88788ca1e5bab790bab1a6b5cb360f.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Cy5Lty+qAS/wewwAudXX0veq7CjdmmRA8LvNJDqdyqY05jaUkucm/Nk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: