修改bug

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

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

Assets/Art/VFX/Epic Toon FX/Materials/Basics/fx_triangle_soft_ADD.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0
   userData: 
-  assetBundleName: triangle_soft_add
+  assetBundleName: fx_triangle_soft_add
   assetBundleVariant: 

Assets/Art/VFX/Epic Toon FX/Textures/cloud_2x2_soft.png.meta

@@ -1,17 +1,18 @@
 fileFormatVersion: 2
-guid: d91a7ceceb48b6d4eb7da66199435d99
-timeCreated: 1520820265
-licenseType: Store
+guid: W3Me5C3+BigDA6l3jAk1uFxDUR+7+73yANU3LKriK0ykEgGy2zm8TcE=
 TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 2
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -19,39 +20,128 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 7
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 2048
   textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
   alphaIsTransparency: 1
-  textureType: -1
-  buildTargetSettings: []
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    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
+  - serializedVersion: 3
+    buildTarget: Standalone
+    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
+  - serializedVersion: 3
+    buildTarget: Server
+    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
+  - 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: []
     outline: []
-  spritePackingTag: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: cloud_2x2_soft_t3
   assetBundleVariant: 

Assets/Art/VFX/Epic Toon FX/Textures/slash03.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: slash03_t3
+  assetBundleName: slash03_t4
   assetBundleVariant: 

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

@@ -3,5 +3,5 @@ guid: XC8f53/8U3kXVc1ft/gZex5ElMIwMPRupv4aSsqbKNYMNT57IuFqeDE=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero03_sk1_hit
   assetBundleVariant: 

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

@@ -3,5 +3,5 @@ guid: CX9NsCr8B3Pe1Mh3D2uCDuRjmON79oiss1X/6C+lnXq2/Rjm4VUu31A=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero03_sk1_lv4
   assetBundleVariant: 

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

@@ -3,5 +3,5 @@ guid: Wn9N4H/4Ui7MP7CRQZtclnpJSMVxscrVxNo7eWABfW8GAEWg0A2BoKc=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero03_sk1_lv4_hit
   assetBundleVariant: 

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

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

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

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

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

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

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

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

Assets/Res/CombatHero/GuaiwuBoss01_gpu.prefab.meta

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

Assets/Res/CombatHero/GuaiwuJY01_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: B3lMsSitWynj8qrJw8fQAJWLqffKNb8E+zB7Tbg/1bJtb7Cybm+TCLQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwujy01_gpu
   assetBundleVariant: 

Assets/Res/Config/DropConfig.json.meta

@@ -3,5 +3,5 @@ guid: XS5NtSOqUCrVF8Pwakc7AieTArDKnjPABNp+LJnkiJUNxq+8cqnlql8=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: dropconfig
   assetBundleVariant: 

Assets/Res/Config/DropCountConfig.json.meta

@@ -3,5 +3,5 @@ guid: Xn0b5y2uAnhXg7g5u3YeJfvU7b9uiVF7jxzflUHtuOGvDg/VHRQRYNU=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: dropcountconfig
   assetBundleVariant: 

Assets/Res/Config/DropGroupConfig.json.meta

@@ -3,5 +3,5 @@ guid: DH5LsnutUSllxB6z3EWic/izfq1OyGVjeWNV5Z8F4KI4GkZ6Jpj8ILI=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: dropgroupconfig
   assetBundleVariant: 

Assets/Res/Config/DropItemConfig.json.meta

@@ -3,5 +3,5 @@ guid: CSgdsi77BX4hfFOnpI+I2Z79KPWX1kKwPmBTxdYsn1uqoLTfWlJYnvA=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: dropitemconfig
   assetBundleVariant: 

Assets/Res/Config/GameConstantConfig.json.meta

@@ -3,5 +3,5 @@ guid: Cnwftnj5V3jjtyHZPFZ9zV/ZxCfbQ41Xm2WnVnuF0LQjEr/+FmubbzI=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: gameconstantconfig
   assetBundleVariant: 

Assets/Res/Config/HeroModelConfig.json

@@ -11,10 +11,10 @@
       "rarity": 3,
       "heroType": 1,
       "profession": 1,
-      "hp": 100,
+      "hp": 1000,
       "def": 3,
       "crit": null,
-      "attack": 11,
+      "attack": 30,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
@@ -37,15 +37,15 @@
       "rarity": 3,
       "heroType": 1,
       "profession": 2,
-      "hp": 100,
+      "hp": 1000,
       "def": 2,
       "crit": null,
-      "attack": 10,
+      "attack": 30,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
-      "range_atk": 2,
+      "range_atk": 5,
       "skillID": [
         10011,
         300011
@@ -63,15 +63,15 @@
       "rarity": 3,
       "heroType": 1,
       "profession": 3,
-      "hp": 100,
+      "hp": 1000,
       "def": 2,
       "crit": null,
-      "attack": 10,
+      "attack": 30,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
-      "range_atk": 2,
+      "range_atk": 5,
       "skillID": [
         10011,
         200011
@@ -89,15 +89,15 @@
       "rarity": 3,
       "heroType": 1,
       "profession": 4,
-      "hp": 100,
+      "hp": 1000,
       "def": 2,
       "crit": null,
-      "attack": 10,
+      "attack": 30,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
       "speed_atk": 1.0,
-      "range_atk": 2,
+      "range_atk": 5,
       "skillID": [
         10011,
         400011

Assets/Res/Config/HeroPowerUpConfig.json.meta

@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/UIAssets/TextrueJson/all.txt.meta
 guid: XCwbtCr+BngVl6oU2ha68Hfnl6ax2QGwp+fGMAS49PrY3Ft17x75P7Q=
-========
-guid: DShK436lWnl5wIzYeJ6fNt6Kz/9E7Zp5UfawnYS2D3zG/yEi9WsRN4s=
->>>>>>>> 4cead81bf23013264507bb629de2425d6dfb3a84:Assets/Res/Config/HeroPowerUpConfig.json.meta
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: heropowerupconfig
   assetBundleVariant: 

Assets/Res/Config/LanguageChineseConfig.json.meta

@@ -3,5 +3,5 @@ guid: Cy8ZtX78USp9OoK8n7qXyv+0E9eoeFKDt+/cuetacwP/6GPTNSIijdg=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: languagechineseconfig
   assetBundleVariant: 

Assets/Res/Config/LevelBattleConfig.json.meta

@@ -1,13 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/UIAssets/Button.meta
 guid: Wi5Ksyj4AntF7lF8d83Kp+k39zULrOkfUvg6R/TUqodIa74gc3XM46s=
-folderAsset: yes
-DefaultImporter:
-========
-guid: Xikc4CquUS8nxQd9QZo+m+rf84LoKSgJVCy/w9ndkNJs8wU2p2itJms=
 TextScriptImporter:
->>>>>>>> 4cead81bf23013264507bb629de2425d6dfb3a84:Assets/Res/Config/LevelBattleConfig.json.meta
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: levelbattleconfig
   assetBundleVariant: 

Assets/Res/Config/MonsterGroupConfig.json.meta

@@ -1,13 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/UIAssets/decorate.meta
 guid: B3IX5H+pAnzL9kQDyM0eamb+W3qVApu3B8rG3KzatTH8O4B3146ExGw=
-folderAsset: yes
-DefaultImporter:
-========
-guid: XihMtyikVXmfyR09Hmi/Oatt/O/i9lwqqiYWYaihqQF7kIzL2W7Luew=
 TextScriptImporter:
->>>>>>>> 4cead81bf23013264507bb629de2425d6dfb3a84:Assets/Res/Config/MonsterGroupConfig.json.meta
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: monstergroupconfig
   assetBundleVariant: 

Assets/Res/Config/MonsterWavesConfig.json.meta

@@ -3,5 +3,5 @@ guid: C3hJtyP5VSnrzzuKk2g2mNWvl3Vsm6vgcun/SPZi/JZBMzYv3QUXP0E=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: monsterwavesconfig
   assetBundleVariant: 

Assets/Res/Language/FontSettingConfig.asset.meta

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

Assets/Res/UI/WidgetHero.prefab.meta

@@ -3,5 +3,5 @@ guid: WisetS6rU3Lm5DM+Utc/YsCTzjYQs+QO1aqltXy/ALoatMZff9/TKco=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: widget_hero
+  assetBundleName: widgethero
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -294,70 +294,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1 &406948033
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 406948034}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Pool
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &406948034
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 406948033}
-  serializedVersion: 2
-  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: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &718178675
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 718178676}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Pool
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &718178676
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 718178675}
-  serializedVersion: 2
-  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: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &852523981
 GameObject:
   m_ObjectHideFlags: 0
@@ -562,38 +498,6 @@ Transform:
   - {fileID: 852523982}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!1 &928654028
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 928654029}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Pool
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &928654029
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 928654028}
-  serializedVersion: 2
-  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: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1421949364
 GameObject:
   m_ObjectHideFlags: 0
@@ -806,7 +710,4 @@ SceneRoots:
   - {fileID: 1509080106}
   - {fileID: 376281607}
   - {fileID: 855042511}
-  - {fileID: 718178676}
   - {fileID: 235899921}
-  - {fileID: 928654029}
-  - {fileID: 406948034}

Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -24,12 +24,7 @@ namespace GameLogic.Combat.CombatTool
         public GameObject gameObject;
         public GameTimeLineParticleFactory GameTimeLineParticleFactory;
         public bool isUpdate;
-
-
-        
         
-        
-
         public CombatStateBasic CurrState
         {
             get { return stateControl.CurrIState as CombatStateBasic; }

Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -33,6 +33,53 @@ namespace GameLogic.Combat.CombatTool
         {
             this.combatController = combatController;
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroUpgrade, HeroUpgrade);
+        }
+
+        private void HeroUpgrade(IEventData eventData)
+        {
+            HeroLvUpgradeEventData heroLvUpgradeEventData = eventData as HeroLvUpgradeEventData;
+            int id = heroLvUpgradeEventData.heroModelID;
+            CombatHeroEntity combatHeroEntity = null;
+            for (int i = 0; i < myHero.Count; i++)
+            {
+                if (myHero[i].CurrCombatHeroInfo.modelID == id)
+                {
+                    combatHeroEntity = myHero[i];
+                    break;
+                }
+            }
+
+            if (combatHeroEntity == null)
+            {
+                for (int i = 0; i < heroDie.Count; i++)
+                {
+                    if (heroDie[i].CurrCombatHeroInfo.modelID == id)
+                    {
+                        combatHeroEntity = heroDie[i];
+                        break;
+                    }
+                }
+            }
+
+            CombatHeroInfo combatHeroInfo = PlayerManager.Instance.GetHeroInfo(id);
+            long addHp = combatHeroInfo.hp.Value - combatHeroEntity.MaxCombatHeroInfo.hp.Value;
+            combatHeroEntity.MaxCombatHeroInfo.hp = combatHeroInfo.hp;
+            combatHeroEntity.MaxCombatHeroInfo.defense = combatHeroInfo.defense;
+            combatHeroEntity.MaxCombatHeroInfo.attack = combatHeroInfo.attack;
+            combatHeroEntity.CurrCombatHeroInfo.defense = combatHeroInfo.defense;
+            combatHeroEntity.CurrCombatHeroInfo.attack = combatHeroInfo.attack;
+            if (!combatHeroEntity.isDie)
+            {
+                if (addHp > 0)
+                {
+                    combatHeroEntity.CurrCombatHeroInfo.hp += addHp;
+                }
+                else
+                {
+                    
+                }
+            }
         }
 
         public void RemoveDieHero(CombatHeroEntity combatHeroEntity)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -9,7 +9,7 @@ using UnityEngine.Serialization;
 [System.Serializable]
 public class CombatHeroInfo
 {
-    
+    public int modelID;
     public EncryptionLong hp = new EncryptionLong();
     public EncryptionLong defense = new EncryptionLong();
     public EncryptionLong attack = new EncryptionLong();

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -33,7 +33,7 @@ namespace GameLogic.Hero
             }
         }
 
-        public int modelID;
+      
 
         /// <summary>
         /// 是否为上阵英雄

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -80,7 +80,7 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public HeroInfo GetHeroInfo(int modelID)
+    public CombatHeroInfo GetHeroInfo(int modelID)
     {
         for (int i = 0; i < heroListInLead.Count; i++)
         {

Assets/Scripts/GameUI/GameApplction.cs

@@ -23,7 +23,7 @@ public class GameApplction : MonoBehaviour
 
     private async void Start()
     {
-        ShaderVariantCollection.WarmUp();
+        // ShaderVariantCollection.WarmUp();
         await InitGameApplication();
         Debug.Log("初始化完成");
     }

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

@@ -13,7 +13,7 @@ namespace Fort23.Mono
 
         public static void  OpenCombatShowTextPanel(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-            cTaskAwaitBuffer.AddTask(UIManager.Instance.LoadAndOpenPanel<CombatShowTextPanel>(null));
+            cTaskAwaitBuffer.AddTask(UIManager.Instance.LoadAndOpenPanel<CombatShowTextPanel>(null,UILayer.Middle));
             cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<Font>("hd_0.fontsettings",
                 delegate(AssetHandle handle) { huiFuFont = handle.AssetObject<Font>(); }));
 

Assets/Scripts/GameUI/UI/CombatHPPanel.cs

@@ -8,7 +8,7 @@ namespace Fort23.Mono
     {
         public static async CTask OpenCombatHPPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<CombatHPPanel>(null);
+            await UIManager.Instance.LoadAndOpenPanel<CombatHPPanel>(null,UILayer.Bottom);
         }
 
         private void Init()

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -17,7 +17,7 @@ namespace Fort23.Mono
         public static async CTask OpenShowItemMoveToTargetPanel()
         {
             ShowItemMoveToTargetPanel showItemMoveToTargetPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.LoadAndOpenPanel<ShowItemMoveToTargetPanel>(null, UILayer.Middle, isFocus: false);
         }
 
         public static async void OpenShowItemMoveToTargetPanel(Vector2 startPos, Vector2 target,

Assets/Scripts/GameUI/UI/ShowTextPanel/ShowTextPanel.cs

@@ -10,7 +10,7 @@ namespace Fort23.Mono
         public static async CTask OpenShowTextPanel()
         {
             ShowTextPanel showTextPanel =
-                await UIManager.Instance.LoadAndOpenPanel<ShowTextPanel>(null, UILayer.Top, isFocus: false);
+                await UIManager.Instance.LoadAndOpenPanel<ShowTextPanel>(null, UILayer.Middle, isFocus: false);
         }
 
         private void Init()

Assets/StreamingAssets/Bundle/01lz_fbb1c2b7f9a619e4d0b1edb55a476a95.meta

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

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_8deda843050be69caa03bad2ce90e95e.meta

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

Assets/StreamingAssets/Bundle/09flowmap_smoke_1bf4219a495cb1b9abcf6a819cb4f346.meta

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

Assets/StreamingAssets/Bundle/501_huanrao_qi_2dd5bae3075f4e3baa9d3ff9739d29bf.meta

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

Assets/StreamingAssets/Bundle/add01_4a617a4b85432505c7c59f001d37c2e0.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BykX4HitWnqZ3dH/VkYnyURTM4wWj5zcz2IBwdZXPIvM88z/98tK3iM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_t191_1dae90146a7bf5bbc3bec34c8798c2de.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XihO4X77AC/fYH0FP/oFVqwQtzs5PimrZrD9Ortgc0m7wTY+e4qfea4=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/alpha_bd3_6251581ec759ab63cb2564907601b2e9.meta

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

Assets/StreamingAssets/Bundle/anse04_347b22c842e665b326462f1fc7254e35.meta

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

Assets/StreamingAssets/Bundle/bg_icon_heianqianghualight2__4a52dade8f94650a5f6ecf3f577646cd.meta

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

Assets/StreamingAssets/Bundle/canvas_296748ebefe0bdaa0e7a478b76884ec4.meta

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

Assets/StreamingAssets/Bundle/cloud_2x2_soft_ab_7edef9698bf2eb1a83896c25a958615f.meta

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

Assets/StreamingAssets/Bundle/cloud_2x2_soft_t3_56368115444274cb13b8e83e5749f0f8.meta

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

Assets/StreamingAssets/Bundle/dot02_t1_c817ba1880adfa7bb46b292d1a088cdb.meta

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

Assets/StreamingAssets/Bundle/dropconfig_d4fec425fe867291adfc1ea03c8834ba.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: By4b4Xz4Wni29XnESZMppGty6Yok+v4PILY3+CUrV5edw+oHhhgQ+ZM=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/dropcountconfig_dc4a89f9f044744bb68e6936065bbcc8.meta

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

Assets/StreamingAssets/Bundle/dropgroupconfig_828d1f128efdc2c9243ed8456cd759cb.meta

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

Assets/StreamingAssets/Bundle/dropitemconfig_7dfcba9fc41d2caac0eb3055e7499e23.meta

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

Assets/StreamingAssets/Bundle/fb010shader_eef9c07786530629e34338fb0c48376d.meta

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

Assets/StreamingAssets/Bundle/fm6_c_t165_1340266314db68dc2989b71d340e5101.meta

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

Assets/StreamingAssets/Bundle/fontsettingconfig_d127f4f31c8ac1f0145f670bb5f8a6b1.meta

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

Assets/StreamingAssets/Bundle/forest_ruins_4b0c746c36220683cda42a0d587f39cd.meta

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

Assets/StreamingAssets/Bundle/fx_02gun_weiba_t371_e580287999dea39b9ed9631e8a91178d.meta

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

Assets/StreamingAssets/Bundle/fx_204_sk1_di_ad3141b66d1bd4febd2fc3eb866f4a33.meta

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

Assets/StreamingAssets/Bundle/fx_204_sk1_sf_8f5b4fda9ff1aee8ad9ad45b0867f0d9.meta

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

Assets/StreamingAssets/Bundle/fx_204_sk1_uv1_b8a1e2393faf9580134c0147c91342c8.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: W39OsHyrUS7+71pJOOvR7r+J4rc2ZVQlj3lYaaOEJenJJPG2edUIrp8=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_603_ice_zd_377c2ebe26727655bb2e01eb18d05ba8.meta

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

Assets/StreamingAssets/Bundle/fx_dg02_t180_f1cd70d57468f7f914f2c3d1147b4226.meta

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

Assets/StreamingAssets/Bundle/fx_down_zb_blue_f285dbc5d505b872406b3b1bd0904655.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B3IetXyvUi7YtJ+Iti7Fl9Xv9iKZ+J/y8RYjvFgknbp+QmD/uE++TqQ=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/fx_down_zb_gold_667373e2094ba4ef854011a1d5da93cd.meta

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

Assets/StreamingAssets/Bundle/fx_down_zb_green_b26ed9fd9fc387448fea4ee0b6dc8fcd.meta

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