Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	UserSettings/EditorUserSettings.asset   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/BakedAssets/BakedAssets_GuaiwuBoss01/GuaiwuBoss01_Material_Snake Naga.mat

@@ -125,12 +125,17 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _edgeStrength: 1.89
+    - _injuriedStrength: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _edgeColor: {r: 0.9150943, g: 0, b: 0, a: 0}
+    - _injuriedColor: {r: 1, g: 1, b: 1, a: 0}
     - _mainColor: {r: 1, g: 1, b: 1, a: 1}
+    - _normalColor: {r: 0.764151, g: 0.32944304, b: 0.10453011, a: 0}
   m_BuildTextureStacks: []
 --- !u!114 &2310945979084451667
 MonoBehaviour:

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/UIAssets/decorate/dec_star_2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: WX4bvCj5VCgknC1OyHNy5QzmActT/MCO1rov+UgGgj6Rq/w8N/gdo/8=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  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
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  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: 1
+  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
+    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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  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/Editor/GameRuntimeConfig.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 18b6889e9e2ff420b8f9de8fb48fd8ae, type: 3}
+  m_Name: GameRuntimeConfig
+  m_EditorClassIdentifier: 

Assets/Editor/GameRuntimeConfig.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Cywb4yj7AnM8swYB8kOPX9RjPX/IZXjkDRxy6Tjcln86Yrb5IfYznkg=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Editor/GameRuntimeConfigInspector.cs

@@ -0,0 +1,53 @@
+using Fort23.Common;
+using Fort23.Mono;
+using Fort23.UTool;
+using UnityEditor;
+using UnityEngine;
+
+namespace Fort23.Editor
+{
+    [CustomEditor(typeof(GameRuntimeConfig))]
+    public class GameRuntimeConfigInspector : UnityEditor.Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            // GameRuntimeConfig runtimeConfig = target as GameRuntimeConfig;
+            // runtimeConfig.isUpdateAsset = EditorGUILayout.Toggle("是否开启更新资源", runtimeConfig.isUpdateAsset);
+            // runtimeConfig.version = EditorGUILayout.IntField("当前大版本", runtimeConfig.version);
+            // runtimeConfig.buildVer = EditorGUILayout.IntField("当前小版本", runtimeConfig.buildVer);
+            // runtimeConfig.assetVer = EditorGUILayout.IntField("当前资源版本", runtimeConfig.assetVer);
+            // runtimeConfig.serverVer = EditorGUILayout.IntField("当前服务器版本", runtimeConfig.serverVer);
+            // // runtimeConfig.authen = EditorGUILayout.Toggle("是否开启防沉谜", runtimeConfig.authen);
+            // runtimeConfig.unLockAll = EditorGUILayout.Toggle("是否解锁全部系统", runtimeConfig.unLockAll);
+            //
+            //
+            // EditorGUILayout.Space(20);
+            // EditorGUILayout.LabelField("引导相关");
+            //
+            // runtimeConfig.isSkip = EditorGUILayout.Toggle("是否跳过", runtimeConfig.isSkip);
+            // runtimeConfig.isUnlockAll = EditorGUILayout.Toggle("是否全部解锁", runtimeConfig.isUnlockAll);
+            // runtimeConfig.IsUseServerData = EditorGUILayout.Toggle("是否使用服务器引导数据", runtimeConfig.IsUseServerData);
+            // runtimeConfig.isDebug = EditorGUILayout.Toggle("是否开启调试模式", runtimeConfig.isDebug);
+            //
+            //
+            //
+            // runtimeConfig.debugPhase = EditorGUILayout.Vector4Field("指定调试新手引导", runtimeConfig.debugPhase);
+            //
+            //
+            // runtimeConfig.ClearGuideData = EditorGUILayout.Toggle("是否清除新手引导数据", runtimeConfig.ClearGuideData);
+            //
+            // runtimeConfig.isSaveCombat = EditorGUILayout.Toggle("开始战斗日志保存", runtimeConfig.isSaveCombat);
+            // runtimeConfig.isAllLog = EditorGUILayout.Toggle("开始战斗日志记录", runtimeConfig.isAllLog);
+            
+            if (GUILayout.Button("清理本地储存"))
+            {
+                PlayerPrefs.DeleteAll();
+                PlayerPrefs.Save();
+                LogTool.Log("清理本地储存成功.");
+                AccountFileInfo.Instance.DeleteFile(AccountFileInfo.Instance.persistentDataPath);
+            }
+
+            // EditorUtility.SetDirty(runtimeConfig);
+        }
+    }
+}

Assets/Editor/GameRuntimeConfigInspector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CCgY4SOtAi5Vi1igRJfTMHjTRhj7C80TpB4LByaYiwgZb6qmiHjjllc=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  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

@@ -16,7 +16,9 @@
         115,
         130,
         120
-      ]
+      ],
+      "maxStar": 10,
+      "maxLv": 300
     }
   ]
 }

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

@@ -1092,343 +1092,2213 @@
     {
       "ID": 100,
       "HeroLevel": 100,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.1,
+      "HPFactor": 100.0,
+      "DEFFactor": 10.1,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.1,
+      "levelupExp": 30440,
+      "LevelupBasicPower": 3030
     },
     {
       "ID": 101,
       "HeroLevel": 101,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.2,
+      "HPFactor": 101.0,
+      "DEFFactor": 10.2,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.2,
+      "levelupExp": 31190,
+      "LevelupBasicPower": 3060
     },
     {
       "ID": 102,
       "HeroLevel": 102,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.3,
+      "HPFactor": 102.0,
+      "DEFFactor": 10.3,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.3,
+      "levelupExp": 31950,
+      "LevelupBasicPower": 3090
     },
     {
       "ID": 103,
       "HeroLevel": 103,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.4,
+      "HPFactor": 103.0,
+      "DEFFactor": 10.4,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.4,
+      "levelupExp": 32720,
+      "LevelupBasicPower": 3120
     },
     {
       "ID": 104,
       "HeroLevel": 104,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.5,
+      "HPFactor": 104.0,
+      "DEFFactor": 10.5,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.5,
+      "levelupExp": 33510,
+      "LevelupBasicPower": 3150
     },
     {
       "ID": 105,
       "HeroLevel": 105,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.6,
+      "HPFactor": 105.0,
+      "DEFFactor": 10.6,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.6,
+      "levelupExp": 34300,
+      "LevelupBasicPower": 3180
     },
     {
       "ID": 106,
       "HeroLevel": 106,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.7,
+      "HPFactor": 106.0,
+      "DEFFactor": 10.7,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.7,
+      "levelupExp": 35110,
+      "LevelupBasicPower": 3210
     },
     {
       "ID": 107,
       "HeroLevel": 107,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.8,
+      "HPFactor": 107.0,
+      "DEFFactor": 10.8,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.8,
+      "levelupExp": 35920,
+      "LevelupBasicPower": 3240
     },
     {
       "ID": 108,
       "HeroLevel": 108,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 10.9,
+      "HPFactor": 108.0,
+      "DEFFactor": 10.9,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 10.9,
+      "levelupExp": 36750,
+      "LevelupBasicPower": 3270
     },
     {
       "ID": 109,
       "HeroLevel": 109,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.0,
+      "HPFactor": 109.0,
+      "DEFFactor": 11.0,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.0,
+      "levelupExp": 37590,
+      "LevelupBasicPower": 3300
     },
     {
       "ID": 110,
       "HeroLevel": 110,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.1,
+      "HPFactor": 110.0,
+      "DEFFactor": 11.1,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.1,
+      "levelupExp": 38440,
+      "LevelupBasicPower": 3330
     },
     {
       "ID": 111,
       "HeroLevel": 111,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.2,
+      "HPFactor": 111.0,
+      "DEFFactor": 11.2,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.2,
+      "levelupExp": 39300,
+      "LevelupBasicPower": 3360
     },
     {
       "ID": 112,
       "HeroLevel": 112,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.3,
+      "HPFactor": 112.0,
+      "DEFFactor": 11.3,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.3,
+      "levelupExp": 40180,
+      "LevelupBasicPower": 3390
     },
     {
       "ID": 113,
       "HeroLevel": 113,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.4,
+      "HPFactor": 113.0,
+      "DEFFactor": 11.4,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.4,
+      "levelupExp": 41060,
+      "LevelupBasicPower": 3420
     },
     {
       "ID": 114,
       "HeroLevel": 114,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.5,
+      "HPFactor": 114.0,
+      "DEFFactor": 11.5,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.5,
+      "levelupExp": 41960,
+      "LevelupBasicPower": 3450
     },
     {
       "ID": 115,
       "HeroLevel": 115,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.6,
+      "HPFactor": 115.0,
+      "DEFFactor": 11.6,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.6,
+      "levelupExp": 42870,
+      "LevelupBasicPower": 3480
     },
     {
       "ID": 116,
       "HeroLevel": 116,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.7,
+      "HPFactor": 116.0,
+      "DEFFactor": 11.7,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.7,
+      "levelupExp": 43780,
+      "LevelupBasicPower": 3510
     },
     {
       "ID": 117,
       "HeroLevel": 117,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.8,
+      "HPFactor": 117.0,
+      "DEFFactor": 11.8,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.8,
+      "levelupExp": 44720,
+      "LevelupBasicPower": 3540
     },
     {
       "ID": 118,
       "HeroLevel": 118,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 11.9,
+      "HPFactor": 118.0,
+      "DEFFactor": 11.9,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 11.9,
+      "levelupExp": 45660,
+      "LevelupBasicPower": 3570
     },
     {
       "ID": 119,
       "HeroLevel": 119,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.0,
+      "HPFactor": 119.0,
+      "DEFFactor": 12.0,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.0,
+      "levelupExp": 46610,
+      "LevelupBasicPower": 3600
     },
     {
       "ID": 120,
       "HeroLevel": 120,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.1,
+      "HPFactor": 120.0,
+      "DEFFactor": 12.1,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.1,
+      "levelupExp": 47580,
+      "LevelupBasicPower": 3630
     },
     {
       "ID": 121,
       "HeroLevel": 121,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.2,
+      "HPFactor": 121.0,
+      "DEFFactor": 12.2,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.2,
+      "levelupExp": 48560,
+      "LevelupBasicPower": 3660
     },
     {
       "ID": 122,
       "HeroLevel": 122,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.3,
+      "HPFactor": 122.0,
+      "DEFFactor": 12.3,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.3,
+      "levelupExp": 49550,
+      "LevelupBasicPower": 3690
     },
     {
       "ID": 123,
       "HeroLevel": 123,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.4,
+      "HPFactor": 123.0,
+      "DEFFactor": 12.4,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.4,
+      "levelupExp": 50550,
+      "LevelupBasicPower": 3720
     },
     {
       "ID": 124,
       "HeroLevel": 124,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.5,
+      "HPFactor": 124.0,
+      "DEFFactor": 12.5,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.5,
+      "levelupExp": 51560,
+      "LevelupBasicPower": 3750
     },
     {
       "ID": 125,
       "HeroLevel": 125,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.6,
+      "HPFactor": 125.0,
+      "DEFFactor": 12.6,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.6,
+      "levelupExp": 52590,
+      "LevelupBasicPower": 3780
     },
     {
       "ID": 126,
       "HeroLevel": 126,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.7,
+      "HPFactor": 126.0,
+      "DEFFactor": 12.7,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.7,
+      "levelupExp": 53630,
+      "LevelupBasicPower": 3810
     },
     {
       "ID": 127,
       "HeroLevel": 127,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.8,
+      "HPFactor": 127.0,
+      "DEFFactor": 12.8,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.8,
+      "levelupExp": 54680,
+      "LevelupBasicPower": 3840
     },
     {
       "ID": 128,
       "HeroLevel": 128,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 12.9,
+      "HPFactor": 128.0,
+      "DEFFactor": 12.9,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 12.9,
+      "levelupExp": 55740,
+      "LevelupBasicPower": 3870
     },
     {
       "ID": 129,
       "HeroLevel": 129,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 13.0,
+      "HPFactor": 129.0,
+      "DEFFactor": 13.0,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 13.0,
+      "levelupExp": 56820,
+      "LevelupBasicPower": 3900
     },
     {
       "ID": 130,
       "HeroLevel": 130,
-      "ATKFactor": 9.999979,
-      "HPFactor": 99.99979,
-      "DEFFactor": 9.999979,
+      "ATKFactor": 13.1,
+      "HPFactor": 130.0,
+      "DEFFactor": 13.1,
       "SHANBIFactor": 1.0,
-      "EXPFactor": 9.999979,
-      "levelupExp": 0,
-      "LevelupBasicPower": 3000
+      "EXPFactor": 13.1,
+      "levelupExp": 57900,
+      "LevelupBasicPower": 3930
+    },
+    {
+      "ID": 131,
+      "HeroLevel": 131,
+      "ATKFactor": 13.2,
+      "HPFactor": 131.0,
+      "DEFFactor": 13.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.2,
+      "levelupExp": 59000,
+      "LevelupBasicPower": 3960
+    },
+    {
+      "ID": 132,
+      "HeroLevel": 132,
+      "ATKFactor": 13.3,
+      "HPFactor": 132.0,
+      "DEFFactor": 13.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.3,
+      "levelupExp": 60110,
+      "LevelupBasicPower": 3990
+    },
+    {
+      "ID": 133,
+      "HeroLevel": 133,
+      "ATKFactor": 13.4,
+      "HPFactor": 133.0,
+      "DEFFactor": 13.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.4,
+      "levelupExp": 61240,
+      "LevelupBasicPower": 4020
+    },
+    {
+      "ID": 134,
+      "HeroLevel": 134,
+      "ATKFactor": 13.5,
+      "HPFactor": 134.0,
+      "DEFFactor": 13.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.5,
+      "levelupExp": 62370,
+      "LevelupBasicPower": 4050
+    },
+    {
+      "ID": 135,
+      "HeroLevel": 135,
+      "ATKFactor": 13.6,
+      "HPFactor": 135.0,
+      "DEFFactor": 13.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.6,
+      "levelupExp": 63520,
+      "LevelupBasicPower": 4080
+    },
+    {
+      "ID": 136,
+      "HeroLevel": 136,
+      "ATKFactor": 13.7,
+      "HPFactor": 136.0,
+      "DEFFactor": 13.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.7,
+      "levelupExp": 64680,
+      "LevelupBasicPower": 4110
+    },
+    {
+      "ID": 137,
+      "HeroLevel": 137,
+      "ATKFactor": 13.8,
+      "HPFactor": 137.0,
+      "DEFFactor": 13.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.8,
+      "levelupExp": 65860,
+      "LevelupBasicPower": 4140
+    },
+    {
+      "ID": 138,
+      "HeroLevel": 138,
+      "ATKFactor": 13.9,
+      "HPFactor": 138.0,
+      "DEFFactor": 13.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 13.9,
+      "levelupExp": 67040,
+      "LevelupBasicPower": 4170
+    },
+    {
+      "ID": 139,
+      "HeroLevel": 139,
+      "ATKFactor": 14.0,
+      "HPFactor": 139.0,
+      "DEFFactor": 14.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.0,
+      "levelupExp": 68240,
+      "LevelupBasicPower": 4200
+    },
+    {
+      "ID": 140,
+      "HeroLevel": 140,
+      "ATKFactor": 14.1,
+      "HPFactor": 140.0,
+      "DEFFactor": 14.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.1,
+      "levelupExp": 69450,
+      "LevelupBasicPower": 4230
+    },
+    {
+      "ID": 141,
+      "HeroLevel": 141,
+      "ATKFactor": 14.2,
+      "HPFactor": 141.0,
+      "DEFFactor": 14.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.2,
+      "levelupExp": 70680,
+      "LevelupBasicPower": 4260
+    },
+    {
+      "ID": 142,
+      "HeroLevel": 142,
+      "ATKFactor": 14.3,
+      "HPFactor": 142.0,
+      "DEFFactor": 14.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.3,
+      "levelupExp": 71920,
+      "LevelupBasicPower": 4290
+    },
+    {
+      "ID": 143,
+      "HeroLevel": 143,
+      "ATKFactor": 14.4,
+      "HPFactor": 143.0,
+      "DEFFactor": 14.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.4,
+      "levelupExp": 73170,
+      "LevelupBasicPower": 4320
+    },
+    {
+      "ID": 144,
+      "HeroLevel": 144,
+      "ATKFactor": 14.5,
+      "HPFactor": 144.0,
+      "DEFFactor": 14.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.5,
+      "levelupExp": 74430,
+      "LevelupBasicPower": 4350
+    },
+    {
+      "ID": 145,
+      "HeroLevel": 145,
+      "ATKFactor": 14.6,
+      "HPFactor": 145.0,
+      "DEFFactor": 14.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.6,
+      "levelupExp": 75700,
+      "LevelupBasicPower": 4380
+    },
+    {
+      "ID": 146,
+      "HeroLevel": 146,
+      "ATKFactor": 14.7,
+      "HPFactor": 146.0,
+      "DEFFactor": 14.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.7,
+      "levelupExp": 76990,
+      "LevelupBasicPower": 4410
+    },
+    {
+      "ID": 147,
+      "HeroLevel": 147,
+      "ATKFactor": 14.8,
+      "HPFactor": 147.0,
+      "DEFFactor": 14.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.8,
+      "levelupExp": 78290,
+      "LevelupBasicPower": 4440
+    },
+    {
+      "ID": 148,
+      "HeroLevel": 148,
+      "ATKFactor": 14.9,
+      "HPFactor": 148.0,
+      "DEFFactor": 14.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 14.9,
+      "levelupExp": 79610,
+      "LevelupBasicPower": 4470
+    },
+    {
+      "ID": 149,
+      "HeroLevel": 149,
+      "ATKFactor": 15.0,
+      "HPFactor": 149.0,
+      "DEFFactor": 15.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.0,
+      "levelupExp": 80940,
+      "LevelupBasicPower": 4500
+    },
+    {
+      "ID": 150,
+      "HeroLevel": 150,
+      "ATKFactor": 15.1,
+      "HPFactor": 150.0,
+      "DEFFactor": 15.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.1,
+      "levelupExp": 82280,
+      "LevelupBasicPower": 4530
+    },
+    {
+      "ID": 151,
+      "HeroLevel": 151,
+      "ATKFactor": 15.2,
+      "HPFactor": 151.0,
+      "DEFFactor": 15.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.2,
+      "levelupExp": 83630,
+      "LevelupBasicPower": 4560
+    },
+    {
+      "ID": 152,
+      "HeroLevel": 152,
+      "ATKFactor": 15.3,
+      "HPFactor": 152.0,
+      "DEFFactor": 15.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.3,
+      "levelupExp": 85000,
+      "LevelupBasicPower": 4590
+    },
+    {
+      "ID": 153,
+      "HeroLevel": 153,
+      "ATKFactor": 15.4,
+      "HPFactor": 153.0,
+      "DEFFactor": 15.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.4,
+      "levelupExp": 86380,
+      "LevelupBasicPower": 4620
+    },
+    {
+      "ID": 154,
+      "HeroLevel": 154,
+      "ATKFactor": 15.5,
+      "HPFactor": 154.0,
+      "DEFFactor": 15.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.5,
+      "levelupExp": 87770,
+      "LevelupBasicPower": 4650
+    },
+    {
+      "ID": 155,
+      "HeroLevel": 155,
+      "ATKFactor": 15.6,
+      "HPFactor": 155.0,
+      "DEFFactor": 15.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.6,
+      "levelupExp": 89180,
+      "LevelupBasicPower": 4680
+    },
+    {
+      "ID": 156,
+      "HeroLevel": 156,
+      "ATKFactor": 15.7,
+      "HPFactor": 156.0,
+      "DEFFactor": 15.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.7,
+      "levelupExp": 90600,
+      "LevelupBasicPower": 4710
+    },
+    {
+      "ID": 157,
+      "HeroLevel": 157,
+      "ATKFactor": 15.8,
+      "HPFactor": 157.0,
+      "DEFFactor": 15.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.8,
+      "levelupExp": 92030,
+      "LevelupBasicPower": 4740
+    },
+    {
+      "ID": 158,
+      "HeroLevel": 158,
+      "ATKFactor": 15.9,
+      "HPFactor": 158.0,
+      "DEFFactor": 15.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 15.9,
+      "levelupExp": 93480,
+      "LevelupBasicPower": 4770
+    },
+    {
+      "ID": 159,
+      "HeroLevel": 159,
+      "ATKFactor": 16.0,
+      "HPFactor": 159.0,
+      "DEFFactor": 16.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.0,
+      "levelupExp": 94940,
+      "LevelupBasicPower": 4800
+    },
+    {
+      "ID": 160,
+      "HeroLevel": 160,
+      "ATKFactor": 16.1,
+      "HPFactor": 160.0,
+      "DEFFactor": 16.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.1,
+      "levelupExp": 96410,
+      "LevelupBasicPower": 4830
+    },
+    {
+      "ID": 161,
+      "HeroLevel": 161,
+      "ATKFactor": 16.2,
+      "HPFactor": 161.0,
+      "DEFFactor": 16.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.2,
+      "levelupExp": 97900,
+      "LevelupBasicPower": 4860
+    },
+    {
+      "ID": 162,
+      "HeroLevel": 162,
+      "ATKFactor": 16.3,
+      "HPFactor": 162.0,
+      "DEFFactor": 16.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.3,
+      "levelupExp": 99400,
+      "LevelupBasicPower": 4890
+    },
+    {
+      "ID": 163,
+      "HeroLevel": 163,
+      "ATKFactor": 16.4,
+      "HPFactor": 163.0,
+      "DEFFactor": 16.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.4,
+      "levelupExp": 100920,
+      "LevelupBasicPower": 4920
+    },
+    {
+      "ID": 164,
+      "HeroLevel": 164,
+      "ATKFactor": 16.5,
+      "HPFactor": 164.0,
+      "DEFFactor": 16.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.5,
+      "levelupExp": 102450,
+      "LevelupBasicPower": 4950
+    },
+    {
+      "ID": 165,
+      "HeroLevel": 165,
+      "ATKFactor": 16.6,
+      "HPFactor": 165.0,
+      "DEFFactor": 16.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.6,
+      "levelupExp": 103990,
+      "LevelupBasicPower": 4980
+    },
+    {
+      "ID": 166,
+      "HeroLevel": 166,
+      "ATKFactor": 16.7,
+      "HPFactor": 166.0,
+      "DEFFactor": 16.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.7,
+      "levelupExp": 105540,
+      "LevelupBasicPower": 5010
+    },
+    {
+      "ID": 167,
+      "HeroLevel": 167,
+      "ATKFactor": 16.8,
+      "HPFactor": 167.0,
+      "DEFFactor": 16.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.8,
+      "levelupExp": 107110,
+      "LevelupBasicPower": 5040
+    },
+    {
+      "ID": 168,
+      "HeroLevel": 168,
+      "ATKFactor": 16.9,
+      "HPFactor": 168.0,
+      "DEFFactor": 16.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 16.9,
+      "levelupExp": 108700,
+      "LevelupBasicPower": 5070
+    },
+    {
+      "ID": 169,
+      "HeroLevel": 169,
+      "ATKFactor": 17.0,
+      "HPFactor": 169.0,
+      "DEFFactor": 17.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.0,
+      "levelupExp": 110290,
+      "LevelupBasicPower": 5100
+    },
+    {
+      "ID": 170,
+      "HeroLevel": 170,
+      "ATKFactor": 17.1,
+      "HPFactor": 170.0,
+      "DEFFactor": 17.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.1,
+      "levelupExp": 111910,
+      "LevelupBasicPower": 5130
+    },
+    {
+      "ID": 171,
+      "HeroLevel": 171,
+      "ATKFactor": 17.2,
+      "HPFactor": 171.0,
+      "DEFFactor": 17.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.2,
+      "levelupExp": 113530,
+      "LevelupBasicPower": 5160
+    },
+    {
+      "ID": 172,
+      "HeroLevel": 172,
+      "ATKFactor": 17.3,
+      "HPFactor": 172.0,
+      "DEFFactor": 17.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.3,
+      "levelupExp": 115170,
+      "LevelupBasicPower": 5190
+    },
+    {
+      "ID": 173,
+      "HeroLevel": 173,
+      "ATKFactor": 17.4,
+      "HPFactor": 173.0,
+      "DEFFactor": 17.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.4,
+      "levelupExp": 116820,
+      "LevelupBasicPower": 5220
+    },
+    {
+      "ID": 174,
+      "HeroLevel": 174,
+      "ATKFactor": 17.5,
+      "HPFactor": 174.0,
+      "DEFFactor": 17.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.5,
+      "levelupExp": 118490,
+      "LevelupBasicPower": 5250
+    },
+    {
+      "ID": 175,
+      "HeroLevel": 175,
+      "ATKFactor": 17.6,
+      "HPFactor": 175.0,
+      "DEFFactor": 17.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.6,
+      "levelupExp": 120170,
+      "LevelupBasicPower": 5280
+    },
+    {
+      "ID": 176,
+      "HeroLevel": 176,
+      "ATKFactor": 17.7,
+      "HPFactor": 176.0,
+      "DEFFactor": 17.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.7,
+      "levelupExp": 121870,
+      "LevelupBasicPower": 5310
+    },
+    {
+      "ID": 177,
+      "HeroLevel": 177,
+      "ATKFactor": 17.8,
+      "HPFactor": 177.0,
+      "DEFFactor": 17.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.8,
+      "levelupExp": 123580,
+      "LevelupBasicPower": 5340
+    },
+    {
+      "ID": 178,
+      "HeroLevel": 178,
+      "ATKFactor": 17.9,
+      "HPFactor": 178.0,
+      "DEFFactor": 17.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 17.9,
+      "levelupExp": 125300,
+      "LevelupBasicPower": 5370
+    },
+    {
+      "ID": 179,
+      "HeroLevel": 179,
+      "ATKFactor": 18.0,
+      "HPFactor": 179.0,
+      "DEFFactor": 18.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.0,
+      "levelupExp": 127040,
+      "LevelupBasicPower": 5400
+    },
+    {
+      "ID": 180,
+      "HeroLevel": 180,
+      "ATKFactor": 18.1,
+      "HPFactor": 180.0,
+      "DEFFactor": 18.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.1,
+      "levelupExp": 128790,
+      "LevelupBasicPower": 5430
+    },
+    {
+      "ID": 181,
+      "HeroLevel": 181,
+      "ATKFactor": 18.2,
+      "HPFactor": 181.0,
+      "DEFFactor": 18.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.2,
+      "levelupExp": 130560,
+      "LevelupBasicPower": 5460
+    },
+    {
+      "ID": 182,
+      "HeroLevel": 182,
+      "ATKFactor": 18.3,
+      "HPFactor": 182.0,
+      "DEFFactor": 18.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.3,
+      "levelupExp": 132340,
+      "LevelupBasicPower": 5490
+    },
+    {
+      "ID": 183,
+      "HeroLevel": 183,
+      "ATKFactor": 18.4,
+      "HPFactor": 183.0,
+      "DEFFactor": 18.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.4,
+      "levelupExp": 134130,
+      "LevelupBasicPower": 5520
+    },
+    {
+      "ID": 184,
+      "HeroLevel": 184,
+      "ATKFactor": 18.5,
+      "HPFactor": 184.0,
+      "DEFFactor": 18.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.5,
+      "levelupExp": 135940,
+      "LevelupBasicPower": 5550
+    },
+    {
+      "ID": 185,
+      "HeroLevel": 185,
+      "ATKFactor": 18.6,
+      "HPFactor": 185.0,
+      "DEFFactor": 18.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.6,
+      "levelupExp": 137770,
+      "LevelupBasicPower": 5580
+    },
+    {
+      "ID": 186,
+      "HeroLevel": 186,
+      "ATKFactor": 18.7,
+      "HPFactor": 186.0,
+      "DEFFactor": 18.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.7,
+      "levelupExp": 139610,
+      "LevelupBasicPower": 5610
+    },
+    {
+      "ID": 187,
+      "HeroLevel": 187,
+      "ATKFactor": 18.8,
+      "HPFactor": 187.0,
+      "DEFFactor": 18.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.8,
+      "levelupExp": 141460,
+      "LevelupBasicPower": 5640
+    },
+    {
+      "ID": 188,
+      "HeroLevel": 188,
+      "ATKFactor": 18.9,
+      "HPFactor": 188.0,
+      "DEFFactor": 18.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 18.9,
+      "levelupExp": 143330,
+      "LevelupBasicPower": 5670
+    },
+    {
+      "ID": 189,
+      "HeroLevel": 189,
+      "ATKFactor": 19.0,
+      "HPFactor": 189.0,
+      "DEFFactor": 19.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.0,
+      "levelupExp": 145210,
+      "LevelupBasicPower": 5700
+    },
+    {
+      "ID": 190,
+      "HeroLevel": 190,
+      "ATKFactor": 19.1,
+      "HPFactor": 190.0,
+      "DEFFactor": 19.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.1,
+      "levelupExp": 147110,
+      "LevelupBasicPower": 5730
+    },
+    {
+      "ID": 191,
+      "HeroLevel": 191,
+      "ATKFactor": 19.2,
+      "HPFactor": 191.0,
+      "DEFFactor": 19.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.2,
+      "levelupExp": 149020,
+      "LevelupBasicPower": 5760
+    },
+    {
+      "ID": 192,
+      "HeroLevel": 192,
+      "ATKFactor": 19.3,
+      "HPFactor": 192.0,
+      "DEFFactor": 19.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.3,
+      "levelupExp": 150950,
+      "LevelupBasicPower": 5790
+    },
+    {
+      "ID": 193,
+      "HeroLevel": 193,
+      "ATKFactor": 19.4,
+      "HPFactor": 193.0,
+      "DEFFactor": 19.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.4,
+      "levelupExp": 152890,
+      "LevelupBasicPower": 5820
+    },
+    {
+      "ID": 194,
+      "HeroLevel": 194,
+      "ATKFactor": 19.5,
+      "HPFactor": 194.0,
+      "DEFFactor": 19.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.5,
+      "levelupExp": 154840,
+      "LevelupBasicPower": 5850
+    },
+    {
+      "ID": 195,
+      "HeroLevel": 195,
+      "ATKFactor": 19.6,
+      "HPFactor": 195.0,
+      "DEFFactor": 19.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.6,
+      "levelupExp": 156810,
+      "LevelupBasicPower": 5880
+    },
+    {
+      "ID": 196,
+      "HeroLevel": 196,
+      "ATKFactor": 19.7,
+      "HPFactor": 196.0,
+      "DEFFactor": 19.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.7,
+      "levelupExp": 158800,
+      "LevelupBasicPower": 5910
+    },
+    {
+      "ID": 197,
+      "HeroLevel": 197,
+      "ATKFactor": 19.8,
+      "HPFactor": 197.0,
+      "DEFFactor": 19.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.8,
+      "levelupExp": 160800,
+      "LevelupBasicPower": 5940
+    },
+    {
+      "ID": 198,
+      "HeroLevel": 198,
+      "ATKFactor": 19.9,
+      "HPFactor": 198.0,
+      "DEFFactor": 19.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 19.9,
+      "levelupExp": 162820,
+      "LevelupBasicPower": 5970
+    },
+    {
+      "ID": 199,
+      "HeroLevel": 199,
+      "ATKFactor": 20.0,
+      "HPFactor": 199.0,
+      "DEFFactor": 20.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.0,
+      "levelupExp": 164850,
+      "LevelupBasicPower": 6000
+    },
+    {
+      "ID": 200,
+      "HeroLevel": 200,
+      "ATKFactor": 20.1,
+      "HPFactor": 200.0,
+      "DEFFactor": 20.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.1,
+      "levelupExp": 166890,
+      "LevelupBasicPower": 6030
+    },
+    {
+      "ID": 201,
+      "HeroLevel": 201,
+      "ATKFactor": 20.2,
+      "HPFactor": 201.0,
+      "DEFFactor": 20.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.2,
+      "levelupExp": 168950,
+      "LevelupBasicPower": 6060
+    },
+    {
+      "ID": 202,
+      "HeroLevel": 202,
+      "ATKFactor": 20.3,
+      "HPFactor": 202.0,
+      "DEFFactor": 20.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.3,
+      "levelupExp": 171030,
+      "LevelupBasicPower": 6090
+    },
+    {
+      "ID": 203,
+      "HeroLevel": 203,
+      "ATKFactor": 20.4,
+      "HPFactor": 203.0,
+      "DEFFactor": 20.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.4,
+      "levelupExp": 173120,
+      "LevelupBasicPower": 6120
+    },
+    {
+      "ID": 204,
+      "HeroLevel": 204,
+      "ATKFactor": 20.5,
+      "HPFactor": 204.0,
+      "DEFFactor": 20.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.5,
+      "levelupExp": 175230,
+      "LevelupBasicPower": 6150
+    },
+    {
+      "ID": 205,
+      "HeroLevel": 205,
+      "ATKFactor": 20.6,
+      "HPFactor": 205.0,
+      "DEFFactor": 20.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.6,
+      "levelupExp": 177350,
+      "LevelupBasicPower": 6180
+    },
+    {
+      "ID": 206,
+      "HeroLevel": 206,
+      "ATKFactor": 20.7,
+      "HPFactor": 206.0,
+      "DEFFactor": 20.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.7,
+      "levelupExp": 179480,
+      "LevelupBasicPower": 6210
+    },
+    {
+      "ID": 207,
+      "HeroLevel": 207,
+      "ATKFactor": 20.8,
+      "HPFactor": 207.0,
+      "DEFFactor": 20.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.8,
+      "levelupExp": 181640,
+      "LevelupBasicPower": 6240
+    },
+    {
+      "ID": 208,
+      "HeroLevel": 208,
+      "ATKFactor": 20.9,
+      "HPFactor": 208.0,
+      "DEFFactor": 20.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 20.9,
+      "levelupExp": 183800,
+      "LevelupBasicPower": 6270
+    },
+    {
+      "ID": 209,
+      "HeroLevel": 209,
+      "ATKFactor": 21.0,
+      "HPFactor": 209.0,
+      "DEFFactor": 21.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.0,
+      "levelupExp": 185990,
+      "LevelupBasicPower": 6300
+    },
+    {
+      "ID": 210,
+      "HeroLevel": 210,
+      "ATKFactor": 21.1,
+      "HPFactor": 210.0,
+      "DEFFactor": 21.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.1,
+      "levelupExp": 188180,
+      "LevelupBasicPower": 6330
+    },
+    {
+      "ID": 211,
+      "HeroLevel": 211,
+      "ATKFactor": 21.2,
+      "HPFactor": 211.0,
+      "DEFFactor": 21.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.2,
+      "levelupExp": 190400,
+      "LevelupBasicPower": 6360
+    },
+    {
+      "ID": 212,
+      "HeroLevel": 212,
+      "ATKFactor": 21.3,
+      "HPFactor": 212.0,
+      "DEFFactor": 21.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.3,
+      "levelupExp": 192620,
+      "LevelupBasicPower": 6390
+    },
+    {
+      "ID": 213,
+      "HeroLevel": 213,
+      "ATKFactor": 21.4,
+      "HPFactor": 213.0,
+      "DEFFactor": 21.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.4,
+      "levelupExp": 194870,
+      "LevelupBasicPower": 6420
+    },
+    {
+      "ID": 214,
+      "HeroLevel": 214,
+      "ATKFactor": 21.5,
+      "HPFactor": 214.0,
+      "DEFFactor": 21.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.5,
+      "levelupExp": 197130,
+      "LevelupBasicPower": 6450
+    },
+    {
+      "ID": 215,
+      "HeroLevel": 215,
+      "ATKFactor": 21.6,
+      "HPFactor": 215.0,
+      "DEFFactor": 21.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.6,
+      "levelupExp": 199400,
+      "LevelupBasicPower": 6480
+    },
+    {
+      "ID": 216,
+      "HeroLevel": 216,
+      "ATKFactor": 21.7,
+      "HPFactor": 216.0,
+      "DEFFactor": 21.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.7,
+      "levelupExp": 201690,
+      "LevelupBasicPower": 6510
+    },
+    {
+      "ID": 217,
+      "HeroLevel": 217,
+      "ATKFactor": 21.8,
+      "HPFactor": 217.0,
+      "DEFFactor": 21.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.8,
+      "levelupExp": 204000,
+      "LevelupBasicPower": 6540
+    },
+    {
+      "ID": 218,
+      "HeroLevel": 218,
+      "ATKFactor": 21.9,
+      "HPFactor": 218.0,
+      "DEFFactor": 21.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 21.9,
+      "levelupExp": 206320,
+      "LevelupBasicPower": 6570
+    },
+    {
+      "ID": 219,
+      "HeroLevel": 219,
+      "ATKFactor": 22.0,
+      "HPFactor": 219.0,
+      "DEFFactor": 22.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.0,
+      "levelupExp": 208660,
+      "LevelupBasicPower": 6600
+    },
+    {
+      "ID": 220,
+      "HeroLevel": 220,
+      "ATKFactor": 22.1,
+      "HPFactor": 220.0,
+      "DEFFactor": 22.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.1,
+      "levelupExp": 211010,
+      "LevelupBasicPower": 6630
+    },
+    {
+      "ID": 221,
+      "HeroLevel": 221,
+      "ATKFactor": 22.2,
+      "HPFactor": 221.0,
+      "DEFFactor": 22.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.2,
+      "levelupExp": 213380,
+      "LevelupBasicPower": 6660
+    },
+    {
+      "ID": 222,
+      "HeroLevel": 222,
+      "ATKFactor": 22.3,
+      "HPFactor": 222.0,
+      "DEFFactor": 22.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.3,
+      "levelupExp": 215760,
+      "LevelupBasicPower": 6690
+    },
+    {
+      "ID": 223,
+      "HeroLevel": 223,
+      "ATKFactor": 22.4,
+      "HPFactor": 223.0,
+      "DEFFactor": 22.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.4,
+      "levelupExp": 218170,
+      "LevelupBasicPower": 6720
+    },
+    {
+      "ID": 224,
+      "HeroLevel": 224,
+      "ATKFactor": 22.5,
+      "HPFactor": 224.0,
+      "DEFFactor": 22.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.5,
+      "levelupExp": 220580,
+      "LevelupBasicPower": 6750
+    },
+    {
+      "ID": 225,
+      "HeroLevel": 225,
+      "ATKFactor": 22.6,
+      "HPFactor": 225.0,
+      "DEFFactor": 22.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.6,
+      "levelupExp": 223010,
+      "LevelupBasicPower": 6780
+    },
+    {
+      "ID": 226,
+      "HeroLevel": 226,
+      "ATKFactor": 22.7,
+      "HPFactor": 226.0,
+      "DEFFactor": 22.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.7,
+      "levelupExp": 225460,
+      "LevelupBasicPower": 6810
+    },
+    {
+      "ID": 227,
+      "HeroLevel": 227,
+      "ATKFactor": 22.8,
+      "HPFactor": 227.0,
+      "DEFFactor": 22.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.8,
+      "levelupExp": 227930,
+      "LevelupBasicPower": 6840
+    },
+    {
+      "ID": 228,
+      "HeroLevel": 228,
+      "ATKFactor": 22.9,
+      "HPFactor": 228.0,
+      "DEFFactor": 22.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 22.9,
+      "levelupExp": 230410,
+      "LevelupBasicPower": 6870
+    },
+    {
+      "ID": 229,
+      "HeroLevel": 229,
+      "ATKFactor": 23.0,
+      "HPFactor": 229.0,
+      "DEFFactor": 23.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.0,
+      "levelupExp": 232900,
+      "LevelupBasicPower": 6900
+    },
+    {
+      "ID": 230,
+      "HeroLevel": 230,
+      "ATKFactor": 23.1,
+      "HPFactor": 230.0,
+      "DEFFactor": 23.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.1,
+      "levelupExp": 235410,
+      "LevelupBasicPower": 6930
+    },
+    {
+      "ID": 231,
+      "HeroLevel": 231,
+      "ATKFactor": 23.2,
+      "HPFactor": 231.0,
+      "DEFFactor": 23.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.2,
+      "levelupExp": 237940,
+      "LevelupBasicPower": 6960
+    },
+    {
+      "ID": 232,
+      "HeroLevel": 232,
+      "ATKFactor": 23.3,
+      "HPFactor": 232.0,
+      "DEFFactor": 23.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.3,
+      "levelupExp": 240490,
+      "LevelupBasicPower": 6990
+    },
+    {
+      "ID": 233,
+      "HeroLevel": 233,
+      "ATKFactor": 23.4,
+      "HPFactor": 233.0,
+      "DEFFactor": 23.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.4,
+      "levelupExp": 243050,
+      "LevelupBasicPower": 7020
+    },
+    {
+      "ID": 234,
+      "HeroLevel": 234,
+      "ATKFactor": 23.5,
+      "HPFactor": 234.0,
+      "DEFFactor": 23.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.5,
+      "levelupExp": 245620,
+      "LevelupBasicPower": 7050
+    },
+    {
+      "ID": 235,
+      "HeroLevel": 235,
+      "ATKFactor": 23.6,
+      "HPFactor": 235.0,
+      "DEFFactor": 23.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.6,
+      "levelupExp": 248210,
+      "LevelupBasicPower": 7080
+    },
+    {
+      "ID": 236,
+      "HeroLevel": 236,
+      "ATKFactor": 23.7,
+      "HPFactor": 236.0,
+      "DEFFactor": 23.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.7,
+      "levelupExp": 250820,
+      "LevelupBasicPower": 7110
+    },
+    {
+      "ID": 237,
+      "HeroLevel": 237,
+      "ATKFactor": 23.8,
+      "HPFactor": 237.0,
+      "DEFFactor": 23.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.8,
+      "levelupExp": 253450,
+      "LevelupBasicPower": 7140
+    },
+    {
+      "ID": 238,
+      "HeroLevel": 238,
+      "ATKFactor": 23.9,
+      "HPFactor": 238.0,
+      "DEFFactor": 23.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 23.9,
+      "levelupExp": 256090,
+      "LevelupBasicPower": 7170
+    },
+    {
+      "ID": 239,
+      "HeroLevel": 239,
+      "ATKFactor": 24.0,
+      "HPFactor": 239.0,
+      "DEFFactor": 24.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.0,
+      "levelupExp": 258750,
+      "LevelupBasicPower": 7200
+    },
+    {
+      "ID": 240,
+      "HeroLevel": 240,
+      "ATKFactor": 24.1,
+      "HPFactor": 240.0,
+      "DEFFactor": 24.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.1,
+      "levelupExp": 261420,
+      "LevelupBasicPower": 7230
+    },
+    {
+      "ID": 241,
+      "HeroLevel": 241,
+      "ATKFactor": 24.2,
+      "HPFactor": 241.0,
+      "DEFFactor": 24.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.2,
+      "levelupExp": 264110,
+      "LevelupBasicPower": 7260
+    },
+    {
+      "ID": 242,
+      "HeroLevel": 242,
+      "ATKFactor": 24.3,
+      "HPFactor": 242.0,
+      "DEFFactor": 24.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.3,
+      "levelupExp": 266820,
+      "LevelupBasicPower": 7290
+    },
+    {
+      "ID": 243,
+      "HeroLevel": 243,
+      "ATKFactor": 24.4,
+      "HPFactor": 243.0,
+      "DEFFactor": 24.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.4,
+      "levelupExp": 269540,
+      "LevelupBasicPower": 7320
+    },
+    {
+      "ID": 244,
+      "HeroLevel": 244,
+      "ATKFactor": 24.5,
+      "HPFactor": 244.0,
+      "DEFFactor": 24.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.5,
+      "levelupExp": 272280,
+      "LevelupBasicPower": 7350
+    },
+    {
+      "ID": 245,
+      "HeroLevel": 245,
+      "ATKFactor": 24.6,
+      "HPFactor": 245.0,
+      "DEFFactor": 24.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.6,
+      "levelupExp": 275040,
+      "LevelupBasicPower": 7380
+    },
+    {
+      "ID": 246,
+      "HeroLevel": 246,
+      "ATKFactor": 24.7,
+      "HPFactor": 246.0,
+      "DEFFactor": 24.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.7,
+      "levelupExp": 277810,
+      "LevelupBasicPower": 7410
+    },
+    {
+      "ID": 247,
+      "HeroLevel": 247,
+      "ATKFactor": 24.8,
+      "HPFactor": 247.0,
+      "DEFFactor": 24.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.8,
+      "levelupExp": 280600,
+      "LevelupBasicPower": 7440
+    },
+    {
+      "ID": 248,
+      "HeroLevel": 248,
+      "ATKFactor": 24.9,
+      "HPFactor": 248.0,
+      "DEFFactor": 24.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 24.9,
+      "levelupExp": 283410,
+      "LevelupBasicPower": 7470
+    },
+    {
+      "ID": 249,
+      "HeroLevel": 249,
+      "ATKFactor": 25.0,
+      "HPFactor": 249.0,
+      "DEFFactor": 25.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.0,
+      "levelupExp": 286230,
+      "LevelupBasicPower": 7500
+    },
+    {
+      "ID": 250,
+      "HeroLevel": 250,
+      "ATKFactor": 25.1,
+      "HPFactor": 250.0,
+      "DEFFactor": 25.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.1,
+      "levelupExp": 289070,
+      "LevelupBasicPower": 7530
+    },
+    {
+      "ID": 251,
+      "HeroLevel": 251,
+      "ATKFactor": 25.2,
+      "HPFactor": 251.0,
+      "DEFFactor": 25.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.2,
+      "levelupExp": 291920,
+      "LevelupBasicPower": 7560
+    },
+    {
+      "ID": 252,
+      "HeroLevel": 252,
+      "ATKFactor": 25.3,
+      "HPFactor": 252.0,
+      "DEFFactor": 25.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.3,
+      "levelupExp": 294800,
+      "LevelupBasicPower": 7590
+    },
+    {
+      "ID": 253,
+      "HeroLevel": 253,
+      "ATKFactor": 25.4,
+      "HPFactor": 253.0,
+      "DEFFactor": 25.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.4,
+      "levelupExp": 297690,
+      "LevelupBasicPower": 7620
+    },
+    {
+      "ID": 254,
+      "HeroLevel": 254,
+      "ATKFactor": 25.5,
+      "HPFactor": 254.0,
+      "DEFFactor": 25.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.5,
+      "levelupExp": 300590,
+      "LevelupBasicPower": 7650
+    },
+    {
+      "ID": 255,
+      "HeroLevel": 255,
+      "ATKFactor": 25.6,
+      "HPFactor": 255.0,
+      "DEFFactor": 25.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.6,
+      "levelupExp": 303520,
+      "LevelupBasicPower": 7680
+    },
+    {
+      "ID": 256,
+      "HeroLevel": 256,
+      "ATKFactor": 25.7,
+      "HPFactor": 256.0,
+      "DEFFactor": 25.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.7,
+      "levelupExp": 306460,
+      "LevelupBasicPower": 7710
+    },
+    {
+      "ID": 257,
+      "HeroLevel": 257,
+      "ATKFactor": 25.8,
+      "HPFactor": 257.0,
+      "DEFFactor": 25.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.8,
+      "levelupExp": 309410,
+      "LevelupBasicPower": 7740
+    },
+    {
+      "ID": 258,
+      "HeroLevel": 258,
+      "ATKFactor": 25.9,
+      "HPFactor": 258.0,
+      "DEFFactor": 25.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 25.9,
+      "levelupExp": 312390,
+      "LevelupBasicPower": 7770
+    },
+    {
+      "ID": 259,
+      "HeroLevel": 259,
+      "ATKFactor": 26.0,
+      "HPFactor": 259.0,
+      "DEFFactor": 26.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.0,
+      "levelupExp": 315380,
+      "LevelupBasicPower": 7800
+    },
+    {
+      "ID": 260,
+      "HeroLevel": 260,
+      "ATKFactor": 26.1,
+      "HPFactor": 260.0,
+      "DEFFactor": 26.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.1,
+      "levelupExp": 318390,
+      "LevelupBasicPower": 7830
+    },
+    {
+      "ID": 261,
+      "HeroLevel": 261,
+      "ATKFactor": 26.2,
+      "HPFactor": 261.0,
+      "DEFFactor": 26.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.2,
+      "levelupExp": 321410,
+      "LevelupBasicPower": 7860
+    },
+    {
+      "ID": 262,
+      "HeroLevel": 262,
+      "ATKFactor": 26.3,
+      "HPFactor": 262.0,
+      "DEFFactor": 26.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.3,
+      "levelupExp": 324450,
+      "LevelupBasicPower": 7890
+    },
+    {
+      "ID": 263,
+      "HeroLevel": 263,
+      "ATKFactor": 26.4,
+      "HPFactor": 263.0,
+      "DEFFactor": 26.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.4,
+      "levelupExp": 327510,
+      "LevelupBasicPower": 7920
+    },
+    {
+      "ID": 264,
+      "HeroLevel": 264,
+      "ATKFactor": 26.5,
+      "HPFactor": 264.0,
+      "DEFFactor": 26.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.5,
+      "levelupExp": 330590,
+      "LevelupBasicPower": 7950
+    },
+    {
+      "ID": 265,
+      "HeroLevel": 265,
+      "ATKFactor": 26.6,
+      "HPFactor": 265.0,
+      "DEFFactor": 26.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.6,
+      "levelupExp": 333680,
+      "LevelupBasicPower": 7980
+    },
+    {
+      "ID": 266,
+      "HeroLevel": 266,
+      "ATKFactor": 26.7,
+      "HPFactor": 266.0,
+      "DEFFactor": 26.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.7,
+      "levelupExp": 336790,
+      "LevelupBasicPower": 8010
+    },
+    {
+      "ID": 267,
+      "HeroLevel": 267,
+      "ATKFactor": 26.8,
+      "HPFactor": 267.0,
+      "DEFFactor": 26.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.8,
+      "levelupExp": 339920,
+      "LevelupBasicPower": 8040
+    },
+    {
+      "ID": 268,
+      "HeroLevel": 268,
+      "ATKFactor": 26.9,
+      "HPFactor": 268.0,
+      "DEFFactor": 26.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 26.9,
+      "levelupExp": 343070,
+      "LevelupBasicPower": 8070
+    },
+    {
+      "ID": 269,
+      "HeroLevel": 269,
+      "ATKFactor": 27.0,
+      "HPFactor": 269.0,
+      "DEFFactor": 27.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.0,
+      "levelupExp": 346230,
+      "LevelupBasicPower": 8100
+    },
+    {
+      "ID": 270,
+      "HeroLevel": 270,
+      "ATKFactor": 27.1,
+      "HPFactor": 270.0,
+      "DEFFactor": 27.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.1,
+      "levelupExp": 349410,
+      "LevelupBasicPower": 8130
+    },
+    {
+      "ID": 271,
+      "HeroLevel": 271,
+      "ATKFactor": 27.2,
+      "HPFactor": 271.0,
+      "DEFFactor": 27.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.2,
+      "levelupExp": 352600,
+      "LevelupBasicPower": 8160
+    },
+    {
+      "ID": 272,
+      "HeroLevel": 272,
+      "ATKFactor": 27.3,
+      "HPFactor": 272.0,
+      "DEFFactor": 27.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.3,
+      "levelupExp": 355820,
+      "LevelupBasicPower": 8190
+    },
+    {
+      "ID": 273,
+      "HeroLevel": 273,
+      "ATKFactor": 27.4,
+      "HPFactor": 273.0,
+      "DEFFactor": 27.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.4,
+      "levelupExp": 359050,
+      "LevelupBasicPower": 8220
+    },
+    {
+      "ID": 274,
+      "HeroLevel": 274,
+      "ATKFactor": 27.5,
+      "HPFactor": 274.0,
+      "DEFFactor": 27.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.5,
+      "levelupExp": 362300,
+      "LevelupBasicPower": 8250
+    },
+    {
+      "ID": 275,
+      "HeroLevel": 275,
+      "ATKFactor": 27.6,
+      "HPFactor": 275.0,
+      "DEFFactor": 27.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.6,
+      "levelupExp": 365570,
+      "LevelupBasicPower": 8280
+    },
+    {
+      "ID": 276,
+      "HeroLevel": 276,
+      "ATKFactor": 27.7,
+      "HPFactor": 276.0,
+      "DEFFactor": 27.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.7,
+      "levelupExp": 368850,
+      "LevelupBasicPower": 8310
+    },
+    {
+      "ID": 277,
+      "HeroLevel": 277,
+      "ATKFactor": 27.8,
+      "HPFactor": 277.0,
+      "DEFFactor": 27.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.8,
+      "levelupExp": 372150,
+      "LevelupBasicPower": 8340
+    },
+    {
+      "ID": 278,
+      "HeroLevel": 278,
+      "ATKFactor": 27.9,
+      "HPFactor": 278.0,
+      "DEFFactor": 27.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 27.9,
+      "levelupExp": 375470,
+      "LevelupBasicPower": 8370
+    },
+    {
+      "ID": 279,
+      "HeroLevel": 279,
+      "ATKFactor": 28.0,
+      "HPFactor": 279.0,
+      "DEFFactor": 28.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.0,
+      "levelupExp": 378810,
+      "LevelupBasicPower": 8400
+    },
+    {
+      "ID": 280,
+      "HeroLevel": 280,
+      "ATKFactor": 28.1,
+      "HPFactor": 280.0,
+      "DEFFactor": 28.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.1,
+      "levelupExp": 382160,
+      "LevelupBasicPower": 8430
+    },
+    {
+      "ID": 281,
+      "HeroLevel": 281,
+      "ATKFactor": 28.2,
+      "HPFactor": 281.0,
+      "DEFFactor": 28.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.2,
+      "levelupExp": 385530,
+      "LevelupBasicPower": 8460
+    },
+    {
+      "ID": 282,
+      "HeroLevel": 282,
+      "ATKFactor": 28.3,
+      "HPFactor": 282.0,
+      "DEFFactor": 28.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.3,
+      "levelupExp": 388920,
+      "LevelupBasicPower": 8490
+    },
+    {
+      "ID": 283,
+      "HeroLevel": 283,
+      "ATKFactor": 28.4,
+      "HPFactor": 283.0,
+      "DEFFactor": 28.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.4,
+      "levelupExp": 392330,
+      "LevelupBasicPower": 8520
+    },
+    {
+      "ID": 284,
+      "HeroLevel": 284,
+      "ATKFactor": 28.5,
+      "HPFactor": 284.0,
+      "DEFFactor": 28.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.5,
+      "levelupExp": 395750,
+      "LevelupBasicPower": 8550
+    },
+    {
+      "ID": 285,
+      "HeroLevel": 285,
+      "ATKFactor": 28.6,
+      "HPFactor": 285.0,
+      "DEFFactor": 28.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.6,
+      "levelupExp": 399200,
+      "LevelupBasicPower": 8580
+    },
+    {
+      "ID": 286,
+      "HeroLevel": 286,
+      "ATKFactor": 28.7,
+      "HPFactor": 286.0,
+      "DEFFactor": 28.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.7,
+      "levelupExp": 402660,
+      "LevelupBasicPower": 8610
+    },
+    {
+      "ID": 287,
+      "HeroLevel": 287,
+      "ATKFactor": 28.8,
+      "HPFactor": 287.0,
+      "DEFFactor": 28.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.8,
+      "levelupExp": 406130,
+      "LevelupBasicPower": 8640
+    },
+    {
+      "ID": 288,
+      "HeroLevel": 288,
+      "ATKFactor": 28.9,
+      "HPFactor": 288.0,
+      "DEFFactor": 28.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 28.9,
+      "levelupExp": 409630,
+      "LevelupBasicPower": 8670
+    },
+    {
+      "ID": 289,
+      "HeroLevel": 289,
+      "ATKFactor": 29.0,
+      "HPFactor": 289.0,
+      "DEFFactor": 29.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.0,
+      "levelupExp": 413140,
+      "LevelupBasicPower": 8700
+    },
+    {
+      "ID": 290,
+      "HeroLevel": 290,
+      "ATKFactor": 29.1,
+      "HPFactor": 290.0,
+      "DEFFactor": 29.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.1,
+      "levelupExp": 416680,
+      "LevelupBasicPower": 8730
+    },
+    {
+      "ID": 291,
+      "HeroLevel": 291,
+      "ATKFactor": 29.2,
+      "HPFactor": 291.0,
+      "DEFFactor": 29.2,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.2,
+      "levelupExp": 420220,
+      "LevelupBasicPower": 8760
+    },
+    {
+      "ID": 292,
+      "HeroLevel": 292,
+      "ATKFactor": 29.3,
+      "HPFactor": 292.0,
+      "DEFFactor": 29.3,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.3,
+      "levelupExp": 423790,
+      "LevelupBasicPower": 8790
+    },
+    {
+      "ID": 293,
+      "HeroLevel": 293,
+      "ATKFactor": 29.4,
+      "HPFactor": 293.0,
+      "DEFFactor": 29.4,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.4,
+      "levelupExp": 427380,
+      "LevelupBasicPower": 8820
+    },
+    {
+      "ID": 294,
+      "HeroLevel": 294,
+      "ATKFactor": 29.5,
+      "HPFactor": 294.0,
+      "DEFFactor": 29.5,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.5,
+      "levelupExp": 430980,
+      "LevelupBasicPower": 8850
+    },
+    {
+      "ID": 295,
+      "HeroLevel": 295,
+      "ATKFactor": 29.6,
+      "HPFactor": 295.0,
+      "DEFFactor": 29.6,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.6,
+      "levelupExp": 434600,
+      "LevelupBasicPower": 8880
+    },
+    {
+      "ID": 296,
+      "HeroLevel": 296,
+      "ATKFactor": 29.7,
+      "HPFactor": 296.0,
+      "DEFFactor": 29.7,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.7,
+      "levelupExp": 438240,
+      "LevelupBasicPower": 8910
+    },
+    {
+      "ID": 297,
+      "HeroLevel": 297,
+      "ATKFactor": 29.8,
+      "HPFactor": 297.0,
+      "DEFFactor": 29.8,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.8,
+      "levelupExp": 441900,
+      "LevelupBasicPower": 8940
+    },
+    {
+      "ID": 298,
+      "HeroLevel": 298,
+      "ATKFactor": 29.9,
+      "HPFactor": 298.0,
+      "DEFFactor": 29.9,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 29.9,
+      "levelupExp": 445580,
+      "LevelupBasicPower": 8970
+    },
+    {
+      "ID": 299,
+      "HeroLevel": 299,
+      "ATKFactor": 30.0,
+      "HPFactor": 299.0,
+      "DEFFactor": 30.0,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 30.0,
+      "levelupExp": 449270,
+      "LevelupBasicPower": 9000
+    },
+    {
+      "ID": 300,
+      "HeroLevel": 300,
+      "ATKFactor": 30.1,
+      "HPFactor": 300.0,
+      "DEFFactor": 30.1,
+      "SHANBIFactor": 1.0,
+      "EXPFactor": 30.1,
+      "levelupExp": -1,
+      "LevelupBasicPower": 9030
     }
   ]
 }

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/HeroPromoteConfig.json

@@ -4,17 +4,29 @@
       "ID": 1,
       "starGrade": 1,
       "star_Power": 100,
-      "heroCost1_type": -1,
-      "heroCost1_count": -1,
-      "itemCostCount": -1
+      "heroCost1_type": 1,
+      "heroCost1_count": 1,
+      "itemCostCount": 0,
+      "skillLv": [
+        "1",
+        "1",
+        "0",
+        "0"
+      ]
     },
     {
       "ID": 2,
       "starGrade": 2,
       "star_Power": 100,
-      "heroCost1_type": -1,
-      "heroCost1_count": -1,
-      "itemCostCount": -1
+      "heroCost1_type": 1,
+      "heroCost1_count": 1,
+      "itemCostCount": 0,
+      "skillLv": [
+        "1",
+        "1",
+        "0",
+        "0"
+      ]
     },
     {
       "ID": 3,
@@ -118,76 +130,6 @@
       "ID": 10,
       "starGrade": 10,
       "star_Power": 180,
-      "heroCost1_type": 1,
-      "heroCost1_count": 4,
-      "itemCostCount": 0,
-      "skillLv": [
-        "3",
-        "2",
-        "2",
-        "2"
-      ]
-    },
-    {
-      "ID": 11,
-      "starGrade": 11,
-      "star_Power": 190,
-      "heroCost1_type": 1,
-      "heroCost1_count": 5,
-      "itemCostCount": 0,
-      "skillLv": [
-        "3",
-        "2",
-        "2",
-        "2"
-      ]
-    },
-    {
-      "ID": 12,
-      "starGrade": 12,
-      "star_Power": 200,
-      "heroCost1_type": 1,
-      "heroCost1_count": 6,
-      "itemCostCount": 0,
-      "skillLv": [
-        "3",
-        "2",
-        "2",
-        "2"
-      ]
-    },
-    {
-      "ID": 13,
-      "starGrade": 13,
-      "star_Power": 210,
-      "heroCost1_type": 1,
-      "heroCost1_count": 7,
-      "itemCostCount": 0,
-      "skillLv": [
-        "3",
-        "2",
-        "2",
-        "2"
-      ]
-    },
-    {
-      "ID": 14,
-      "starGrade": 14,
-      "star_Power": 220,
-      "heroCost1_type": 1,
-      "heroCost1_count": 8,
-      "itemCostCount": 0,
-      "skillLv": [
-        "3",
-        "2",
-        "2",
-        "2"
-      ]
-    },
-    {
-      "ID": 15,
-      "starGrade": 15,
-      "star_Power": 230,
       "heroCost1_type": -1,
       "heroCost1_count": -1,
       "itemCostCount": 0,

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/Res/UIAtlas/all.spriteatlasv2

@@ -11,54 +11,7 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
     - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
     - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
@@ -151,6 +104,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
     - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
@@ -197,7 +151,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
     - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
@@ -236,65 +189,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
     - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
-    - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
-    - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
-    - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
-    - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
-    - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
-    - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
-    - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
-    - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
     - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
     - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
@@ -346,6 +240,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
     - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
     - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
     - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
     - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0

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/Core/Event/Event/CustomEventType.cs

@@ -13,12 +13,27 @@ namespace Fort23.Core
       /// </summary>
       Combat_EquipFall,
       /// <summary>
+      /// 英雄提升（升级、升星、装备等）
+      /// </summary>
+      HeroPowerUp,
+      /// <summary>
       /// 英雄升级
       /// </summary>
-      HeroUpgrade,
+      HeroLvUp,
       /// <summary>
       /// 英雄升星
       /// </summary>
       HeroPromote,
+      /// <summary>
+      /// 英雄穿装备
+      /// </summary>
+      HeroEquip,
+      /// <summary>
+      /// 英雄特殊装备
+      /// </summary>
+      HeroSpecialEquip,
+      /// 点击到英雄的UI部件
+      /// </summary>
+      HeroClick,
     }
 }

Assets/Scripts/Core/Event/Event/EventDataBasic.cs

@@ -52,7 +52,12 @@ namespace Core.Utility.Event
 
         public void Dispose()
         {
+            ProDispose();
             Recycle(this as T);
         }
+        protected virtual void ProDispose()
+        {
+           
+        }
     }
 }

Assets/Scripts/Core/UI/UTool/Enum.cs

@@ -1,5 +1,18 @@
 namespace Fort23.UTool
 {
+
+
+    /// <summary>
+    /// 英雄属性提升的类型
+    /// </summary>
+    public enum HeroUpType
+    {
+        Level,
+        Promote,
+        BasicEquip,
+        SpecialEquip,
+    }
+
     /// <summary>
     /// 探索系统中用到的生成UV坐标类型
     /// </summary>

Assets/Scripts/Core/Utility/GameRuntimeConfig.cs

@@ -0,0 +1,172 @@
+using System;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace Fort23.Mono
+{
+    [CreateAssetMenu(fileName = "Assets/GameRuntimeConfig", menuName = "GameRuntimeConfig", order = 0)]
+    public class GameRuntimeConfig : ScriptableObject
+    {
+        // // 大版本号
+        // public int version;
+        //
+        // // 发布版本号
+        // public int buildVer;
+        //
+        // // 资源版本号
+        // public int assetVer;
+        //
+        // // 服务器版本号
+        // public int serverVer;
+        //
+        // // 发送给服务器的资源版本号，与服务器对比，用于客户端资源强更
+        // public int sendAssetVer;
+        //
+        // /// <summary>
+        // /// 解锁所有系统
+        // /// </summary>
+        // public bool unLockAll;
+        //
+        // public bool isUpdateAsset;
+        //
+        //
+        // public bool isSkip;
+        //
+        // public bool isUnlockAll;
+        //
+        // public bool isDebug;
+        //
+        // public bool IsUseServerData;
+        //
+        // public Vector4 debugPhase;
+        //
+        // public bool ClearGuideData;
+        //
+        //
+        // public Area area;
+        // public CDN cdn;
+        // public LoginServer loginServer;
+        // public bool isSaveCombat = false;
+        // public bool isAllLog = false;
+        //
+        // public string AppVer
+        // {
+        //     get { return version + "." + buildVer; }
+        // }
+    }
+
+
+    // [Flags]
+    // public enum Area
+    // {
+    //     [EnumLabel("无", "")] None = 0,
+    //     [EnumLabel("国际", "AREA_ABROAD")] Abroad = 2,
+    //     [EnumLabel("越南", "AREA_VIETNAM")] Vietnam = 4,
+    //     [EnumLabel("韩国", "AREA_KOREA")] Korea = 8,
+    //     [EnumLabel("国内", "AREA_CHINA")] China = 16,
+    //     [EnumLabel("香港", "AREA_HK")] HongKang = 32,
+    // }
+    //
+    // public enum CDN
+    // {
+    //     [EnumLabel("华为云(备用)", "http://121.36.145.47/TestAsset/")]
+    //     HuaWei,
+    //
+    //     [EnumLabel("国际正式", "http://autoheros.test.233i.com/data/007asset/")]
+    //     HaiWai,
+    //
+    //     [EnumLabel("国际测试", "http://121.36.145.47/GuoJi/")]
+    //     HaiWaiTest,
+    //
+    //     [EnumLabel("国内正式", "http://cn-autoheros.233i.com/data/007asset/")]
+    //     GuoNei,
+    //
+    //     [EnumLabel("国内测试", "http://121.36.145.47/GuoNei/")]
+    //     GuoNeiTest,
+    //
+    //     [EnumLabel("韩国正式", "http://autoheros.test.233i.com/data/007asset/fort23Test/")]
+    //     HanGuo,
+    //
+    //     [EnumLabel("韩国测试", "http://121.36.145.47/HanGuo/")]
+    //     HanGuoTest,
+    //
+    //     [EnumLabel("越南正式", "http://121.36.145.47/TestAsset/")]
+    //     YueNan,
+    //
+    //     [EnumLabel("越南测试", "http://121.36.145.47/YueNan/")]
+    //     YueNanTest,
+    //
+    //     [EnumLabel("港澳台正式", "http://121.36.145.47/GAT/")]
+    //     HK,
+    //
+    //     [EnumLabel("港澳台测试", "http://121.36.145.47/YueNan/")]
+    //     KHTest,
+    //
+    //     [EnumLabel("本地(192.168.123.xxx:8080)", "http://192.168.123.216:8080/res/")]
+    //     Other,
+    // }
+    //
+    // public enum LoginServer
+    // {
+    //     [EnumLabel("国际测试(华为)", data: "http://121.36.145.47:998")]
+    //     HuaWei,
+    //
+    //     [EnumLabel("国际正式(腾讯)", "http://autoheros.login.233i.com:1000")]
+    //     HaiWai,
+    //
+    //     [EnumLabel("国内正式", "http://cn-autoheros.login.233i.com:999")]
+    //     GuoNei,
+    //
+    //     [EnumLabel("国内审核测试", "http://autoheros_cn_test.login.233i.com:1000")]
+    //     GuoNeiTest,
+    //
+    //     [EnumLabel("韩国", "http://101.33.66.62:1000")]
+    //     HanGuo,
+    //
+    //     [EnumLabel("越南", "http://103.124.94.73:1000")]
+    //     YueNan,
+    //
+    //     [EnumLabel("港澳台", "http://175.97.134.167:10001")]
+    //     HK,
+    //
+    //     [EnumLabel("海外测试(华为997)", data: "http://121.36.145.47:997")]
+    //     HuaWei_997,
+    //
+    //     //[EnumLabel("其他(192.168.123.xxx:1000)", "http://192.168.123.216:1000")]
+    //     [EnumLabel("其他(192.168.123.xxx:1000)", "http://127.0.0.1:1000")]
+    //     Other
+    // }
+    //
+    // public enum AnaroidPackNameServer
+    // {
+    //     [EnumLabel("海外", data = "com.axe233i.autoheroes.oversea.andriod")]
+    //     A_Google,
+    //
+    //     [EnumLabel("国内", data = "com.shiguangniuniu.autoheroes.domestic.android")]
+    //     A_GuoNei,
+    //
+    //     [EnumLabel("韩国", data = "com.youloft.autoheroes")]
+    //     A_HaiGuo,
+    //
+    //     [EnumLabel("越南", data = "com.mobileevosaigon.starvearena")] // com.misaigon.starvearena
+    //     A_YueNan,
+    //
+    //     [EnumLabel("港澳台", data = "com.luckyfun.aedzj")]
+    //     A_GangAoTai,
+    // }
+    //
+    // public enum IosPackNameServer
+    // {
+    //     [EnumLabel("海外", data = "com.axe233i.autoheroes.oversea.ios")]
+    //     iOS_haiwai,
+    //
+    //     [EnumLabel("国内", data = "com.shiguangniuniu.autoheroes.domestic.ios")]
+    //     iOS_GuoNei,
+    //
+    //     [EnumLabel("越南", data = "com.mobileevosaigon.starvearena.ios")]
+    //     iOS_YueNan,
+    //
+    //     [EnumLabel("港澳台", data = "com.cyh.aedzj")]
+    //     ioS_GangAoTai,
+    // }
+}

Assets/Scripts/Core/Utility/GameRuntimeConfig.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DnJNsyKlWi6AcCrpXzevhZ8StBgzn664gnvILQvirqcPkvJYD9VhOFM=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -50,6 +50,18 @@ public int[] heroRarityAttributeFactor;
 public int[] monsterRarityAttributeFactor;
 
 
+		/// <summary>
+		///最大星级
+		/// </summary>
+public int maxStar;
+
+
+		/// <summary>
+		///最大等级
+		/// </summary>
+public int maxLv;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatEventType.cs

@@ -6,6 +6,7 @@
 
         HeroDie,
         HeroHpUpdate,
+        ClearHeroHp,
         HarmUpdate,
         RecoverUpdate,
         CameraShake,
@@ -14,6 +15,10 @@
         /// </summary>
         AlertTrigger,
         /// <summary>
+        /// 目标改变
+        /// </summary>
+        TargetAlter,
+        /// <summary>
         /// 使用技能
         /// </summary>
         UseSkill,

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatHeroTargetAlterEventData.cs

@@ -0,0 +1,18 @@
+using Core.Utility.Event;
+using GameLogic.Combat.Hero;
+
+namespace Common.Utility.CombatEvent
+{
+    public class CombatHeroTargetAlterEventData: EventDataBasic<CombatHeroTargetAlterEventData>
+    {
+      public CombatHeroEntity combatHeroEntity;
+      public IHero targetCombatHeroEntity;
+      public IHero lasetCombatHeroEntity;
+      protected override void ProDispose()
+      {
+          combatHeroEntity = null;
+          targetCombatHeroEntity = null;
+          lasetCombatHeroEntity = null;
+      }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/CombatHeroTargetAlterEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 921b026a7147496a81bf9804224db8a1
+timeCreated: 1732771927

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroClickEventData.cs

@@ -0,0 +1,10 @@
+using Core.Utility.Event;
+
+namespace Common.Utility.CombatEvent
+{
+    public class HeroClickEventData : EventDataBasic<HeroClickEventData>
+
+    {
+        public int heroId;
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroClickEventData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4cbf8974ca864eb59d1feeba75d62a06
+timeCreated: 1732778608

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroLvUpgradeEventData.cs

@@ -1,9 +0,0 @@
-using Core.Utility.Event;
-
-namespace Common.Utility.CombatEvent
-{
-    public class HeroLvUpgradeEventData : EventDataBasic<HeroLvUpgradeEventData>
-    {
-        public int heroModelID;
-    }
-}

Assets/Scripts/GameLogic/Combat/CombatEvent/HeroPowerUpEventData.cs

@@ -0,0 +1,14 @@
+using Core.Utility.Event;
+using Fort23.UTool;
+
+namespace Common.Utility.CombatEvent
+{
+    public class HeroPowerUpEventData : EventDataBasic<HeroPowerUpEventData>
+    {
+        public int heroModelID;
+        /// <summary>
+        /// 英雄提升类型
+        /// </summary>
+        public HeroUpType upType;
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatEvent/ShowTextEventData.cs

@@ -5,8 +5,14 @@ namespace Common.Utility.CombatEvent
 {
     public class ShowTextEventData : EventDataBasic<ShowTextEventData>
     {
+      
         public Vector3 worldPos;
         public string text;
         public Color Color;
+
+        protected override void ProDispose()
+        {
+          
+        }
     }
 }

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

@@ -16,6 +16,8 @@ namespace GameLogic.Combat.CombatTool
 
         private bool isStartShake;
 
+        private int _followHeroId=-1;
+
         public void Init(CombatController combatController, Camera camera)
         {
             this.combatController = combatController;
@@ -23,9 +25,25 @@ namespace GameLogic.Combat.CombatTool
             root = Camera.transform.parent;
             StressReceiver = camera.transform.GetComponentInParent<StressReceiver>();
             TimeLineSingletonEventManager.Instance.AddTimeLineBasic(this);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroClick, HeroClick);
+            // EventManager.Instance.AddEventListener(CustomEventType.HeroClick, HeroClick);
         }
 
 
+        protected void HeroClick(IEventData eventData)
+        {
+            HeroClickEventData heroClickEventData = eventData as HeroClickEventData;
+            int heroId = heroClickEventData.heroId;
+            if (_followHeroId == heroId)
+            {
+                _followHeroId = -1;
+            }
+            else
+            {
+                _followHeroId = heroId;
+            }
+        }
+
         private void ShakeFinish()
         {
             isStartShake = false;
@@ -42,19 +60,36 @@ namespace GameLogic.Combat.CombatTool
                 }
 
                 Vector3 p = Vector3.zero;
-                for (int i = 0; i < combatHeroEntities.Length; i++)
+                if (_followHeroId != -1)
+                {
+                    for (int i = 0; i < combatHeroEntities.Length; i++)
+                    {
+                        if (combatHeroEntities[i].CurrCombatHeroInfo.modelID == _followHeroId)
+                        {
+                            p = combatHeroEntities[i].dotPos;
+                            break;
+                        }
+                    }
+                }
+                else
                 {
-                    p += combatHeroEntities[i].dotPos;
+                    for (int i = 0; i < combatHeroEntities.Length; i++)
+                    {
+                        p += combatHeroEntities[i].dotPos;
+                    }
+
+                    p /= combatHeroEntities.Length;
                 }
 
-                p /= combatHeroEntities.Length;
+
                 // Vector3 tp = root.TransformVector(new Vector3(0, 0, -20));
-                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y,  p.z+13), 0.1f);
+                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y, p.z + 13), 0.1f);
             }
         }
 
         public void Dispose()
         {
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroClick, HeroClick);
         }
 
         public void Shaking(CameraShakingSerializtion cameraShakingSerializtion)

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

@@ -1,6 +1,7 @@
 using System;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
+using Fort23.UTool;
 using GameLogic.Combat.Hero;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
@@ -33,6 +34,54 @@ namespace GameLogic.Combat.CombatTool
         {
             this.combatController = combatController;
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroLvUp, HeroUpgrade);
+        }
+
+        private void HeroUpgrade(IEventData eventData)
+        {
+            HeroPowerUpEventData heroPowerUpEventData = eventData as HeroPowerUpEventData;
+            
+            int id = heroPowerUpEventData.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/CombatAIBasic.cs

@@ -26,8 +26,21 @@ public class CombatAIBasic : IDisposable
     /// <summary>
     /// 当前聚焦的目标
     /// </summary>
-    public IHero currFocusTarget;
+    public IHero currFocusTarget
+    {
+        get { return _currFocusTarget; }
+        set
+        {
+            CombatHeroTargetAlterEventData combatHeroTargetAlterEventData = CombatHeroTargetAlterEventData.Create();
+            combatHeroTargetAlterEventData.combatHeroEntity = _combatHeroEntity;
+            combatHeroTargetAlterEventData.targetCombatHeroEntity = value;
+            combatHeroTargetAlterEventData.lasetCombatHeroEntity = _currFocusTarget;
+            CombatEventManager.Instance.Dispatch(CombatEventType.TargetAlter, combatHeroTargetAlterEventData);
+            _currFocusTarget = value;
+        }
+    }
 
+    private IHero _currFocusTarget;
 
     private BetterList<GameObject> _areaList = new BetterList<GameObject>();
 
@@ -159,7 +172,8 @@ public class CombatAIBasic : IDisposable
         {
             CombatHeroEntity[] allHero =
                 CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
-            FindMinDixtance(allHero, out currFocusTarget);
+            IHero minDistanceHero = FindMinDixtance(allHero);
+            currFocusTarget = minDistanceHero;
             if (!_combatHeroEntity.IsEnemy && currFocusTarget == null)
             {
                 currFocusTarget = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero;
@@ -192,12 +206,12 @@ public class CombatAIBasic : IDisposable
     {
     }
 
-    protected void FindMinDixtance(CombatHeroEntity[] allHero, out IHero minDistanceHero)
+    protected IHero FindMinDixtance(CombatHeroEntity[] allHero)
     {
-        minDistanceHero = null;
+        IHero minDistanceHero = null;
         if (allHero == null)
         {
-            return;
+            return null;
         }
 
         float minDistance = float.MaxValue;
@@ -220,6 +234,9 @@ public class CombatAIBasic : IDisposable
                 }
             }
         }
+
+        return minDistanceHero;
+        
     }
 
     public void Dispose()

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

@@ -7,6 +7,7 @@ using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using GameLogic.Combat.Hero.HeroGPU;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.Rendering;
@@ -18,6 +19,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     /// 死亡时的节点ID
     /// </summary>
     public int heroDieNodeId;
+
     public bool IsEnemy { get; set; }
     public bool isDie { get; set; }
     public int number;
@@ -31,6 +33,12 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
 
     public bool isFollowState;
     public BetterList<CombatParticleSystemPool> heroLoopParticle = new BetterList<CombatParticleSystemPool>();
+    private float _lasetShowHarmTime;
+
+
+    private float _injuriedShowTime;
+    private bool _isAddinjuriedShow;
+    private float _addInjuiedValue = (1.0f / 0.2f) *1f;
 
     public Vector3 dotPos
     {
@@ -62,6 +70,8 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
             modelName += "_gpu";
         }
 
+        CurrCombatHeroInfo = combatHeroInfo.Copy();
+        MaxCombatHeroInfo = combatHeroInfo.Copy();
         // GameTimeLineParticleFactory
         GameObjectPool poolInterface =
             await GObjectPool.Instance.FetchAsync<GameObjectPool>(modelName + ".prefab", null);
@@ -75,15 +85,16 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         AssetHandle assetHandle =
             await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<TextAsset>(combatHeroInfo.modelName + "_TD.txt");
         TextAsset textAsset = assetHandle.AssetObject<TextAsset>();
+        combatHeroGameObject = new CombatHeroGameObject();
+        combatHeroGameObject.Init(this, poolInterface);
 
         TimeLienData timeLienData = JsonManager.FromJson<TimeLienData>(textAsset.text);
         timeLienData.DeserializeData();
         assetHandle.Release();
         combatHeroTimeLineControl = new CombatHeroTimeLineControl();
-        combatHeroTimeLineControl.Init(this,timeLienData);
+        combatHeroTimeLineControl.Init(this, timeLienData);
+
 
-        combatHeroGameObject = new CombatHeroGameObject();
-        combatHeroGameObject.Init(this, poolInterface);
         NavMeshAgent navMeshAgent = poolInterface.own.GetComponent<NavMeshAgent>();
         if (combatAIBasic == null)
         {
@@ -100,8 +111,6 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         CombatAIBasic = combatAIBasic;
         CombatAIBasic.Init(this, navMeshAgent);
 
-        CurrCombatHeroInfo = combatHeroInfo.Copy();
-        MaxCombatHeroInfo = combatHeroInfo.Copy();
 
         CombatHeroSkillControl = new CombatHeroSkillControl();
         CombatHeroSkillControl.Init(this);
@@ -119,9 +128,13 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
 
         combatHeroAnimtion.Init(this);
         CombatAIBasic.ChangeState(CombatHeroStateType.XiuMian);
-        CreateHeroHpEventData createHeroHpEventData = CreateHeroHpEventData.Create();
-        createHeroHpEventData.combatHeroEntity = this;
-        EventManager.Instance.Dispatch(CustomEventType.CreateHeroHp, createHeroHpEventData);
+        if (!IsEnemy)
+        {
+            CreateHeroHpEventData createHeroHpEventData = CreateHeroHpEventData.Create();
+            createHeroHpEventData.combatHeroEntity = this;
+            EventManager.Instance.Dispatch(CustomEventType.CreateHeroHp, createHeroHpEventData);
+        }
+
         poolInterface.own.SetActive(true);
         callBack?.Invoke(this);
 #endif
@@ -135,6 +148,29 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         CombatHeroSkillControl.Update(t);
         combatHeroTimeLineControl.Update(t);
         combatHeroAnimtion.Update(t);
+        if (combatHeroGameObject.HeroGPUMono != null)
+        {
+            if (_injuriedShowTime > 0)
+            {
+                _injuriedShowTime -= t;
+                if (_isAddinjuriedShow)
+                {
+                    combatHeroGameObject.HeroGPUMono.injuriedStrength += t * (_addInjuiedValue);
+                    if (combatHeroGameObject.HeroGPUMono.injuriedStrength >= 1f)
+                    {
+                        _isAddinjuriedShow = false;
+                    }
+                }
+                else
+                {
+                    combatHeroGameObject.HeroGPUMono.injuriedStrength -= t * (_addInjuiedValue);
+                }
+            }
+            else
+            {
+                combatHeroGameObject.HeroGPUMono.injuriedStrength = 0;
+            }
+        }
     }
 
     public T This<T>()
@@ -167,6 +203,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     {
         return CombatHeroSkillControl.NormalAttSpeedScale;
     }
+
     public void HeroResurrection()
     {
         isDie = false;
@@ -175,6 +212,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         heroHpUpdateEventData.combatHeroEntity = this;
         CombatEventManager.Instance.Dispatch(CombatEventType.HeroHpUpdate, heroHpUpdateEventData);
     }
+
     public void HeroDie(HarmReturnInfo harmReturnInfo)
     {
         heroDieNodeId = CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount;
@@ -191,9 +229,13 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
     public void HeroHurt(HarmReturnInfo harmReturnInfo)
     {
         CurrCombatHeroInfo.hp -= harmReturnInfo.att;
-        HarmUpdateEventData harmUpdateEventData = HarmUpdateEventData.Create();
-        harmUpdateEventData.HarmReturnInfo = harmReturnInfo;
-        CombatEventManager.Instance.Dispatch(CombatEventType.HarmUpdate, harmUpdateEventData);
+        UpdateHarmText(harmReturnInfo);
+        if (combatHeroGameObject.HeroGPUMono != null)
+        {
+            _injuriedShowTime = 0.4f;
+            combatHeroGameObject.HeroGPUMono.injuriedStrength = 0;
+            _isAddinjuriedShow = true;
+        }
 
         HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
         heroHpUpdateEventData.combatHeroEntity = this;
@@ -204,6 +246,20 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         }
     }
 
+    private void UpdateHarmText(HarmReturnInfo harmReturnInfo)
+    {
+        float currTime = Time.time;
+        if (currTime - _lasetShowHarmTime < 0.1f)
+        {
+            return;
+        }
+
+        _lasetShowHarmTime = currTime;
+        HarmUpdateEventData harmUpdateEventData = HarmUpdateEventData.Create();
+        harmUpdateEventData.HarmReturnInfo = harmReturnInfo;
+        CombatEventManager.Instance.Dispatch(CombatEventType.HarmUpdate, harmUpdateEventData);
+    }
+
     public void Recover(HarmReturnInfo harmReturnInfo)
     {
         CurrCombatHeroInfo.hp += harmReturnInfo.att;

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

@@ -5,6 +5,7 @@ using Core.Triiger;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using GameLogic.Combat.Hero.HeroGPU;
 using GameTimeLine.CustomizeTimeLogic;
 using UnityEngine;
 using Utility;
@@ -13,6 +14,7 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 public class CombatHeroGameObject : IDisposable
 {
     public GameObjectPool GameObjectPool;
+    public HeroGPUMono HeroGPUMono;
 
     public Transform transform
     {
@@ -50,6 +52,25 @@ public class CombatHeroGameObject : IDisposable
             hpTransform = GameObjectPool.own.transform;
         }
 
+        HeroGPUMono = GameObjectPool.own.GetComponent<HeroGPUMono>();
+        if (HeroGPUMono != null)
+        {
+            if (_combatHeroEntity.CurrCombatHeroInfo.heroType == 3)
+            {
+                HeroGPUMono.edgeStength = 3;
+                HeroGPUMono.edgecolor = new Color(0.8f, 0.44f, 0.02f);
+            }
+            else if (_combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
+            {
+                HeroGPUMono.edgeStength = 3;
+                HeroGPUMono.edgecolor = new Color(0.8f, 0.16f, 0f);
+            }
+            else
+            {
+                HeroGPUMono.edgeStength = 0;
+            }
+        }
+
         GameObjectPool = gameObjectPool;
         HitPointMono hitPointMonos = GameObjectPool.own.GetComponentInChildren<HitPointMono>(true);
         HitPointMono hitPointMono = hitPointMonos;

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/Combat/Hero/HeroAanimtion/CombatHeroGPUAnimtion.cs

@@ -19,7 +19,7 @@ namespace GameLogic.Combat.Hero
             GPUAnimtion = new GPUAnimtion();
             GPUAnimtion.Init(GpuEcsAnimatorBehaviour);
             _heroPlayStateInfoBasic = new HeroGPUAnimtionStateInfo();
-            _heroGPUMono = combatHeroEntity.GameObject.GetComponent<HeroGPUMono>();
+            _heroGPUMono = combatHeroEntity.combatHeroGameObject.HeroGPUMono;
         }
 
         protected override void ProUpdate(float t)

Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPUMono.cs

@@ -13,7 +13,9 @@ namespace GameLogic.Combat.Hero.HeroGPU
 
         public Transform rootTrans;
         public float4x4 animtionState= float4x4.identity;
-        
+        public Color edgecolor;
+        public float edgeStength;
+        public float injuriedStrength;
         private void OnEnable()
         {
             HeroGPURenderManager.Instance.AddHeroGpuRender(this);

Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPURenderManager.cs

@@ -7,8 +7,11 @@ namespace GameLogic.Combat.Hero.HeroGPU
     {
         protected Map<string, BetterList<HeroGPUMono>> gpuRenderMap = new Map<string, BetterList<HeroGPUMono>>();
 
-        int enableShaderId = Shader.PropertyToID("_EnableAnimation");
-        int animtionStateId = Shader.PropertyToID("_AnimationState");
+        readonly int enableShaderId = Shader.PropertyToID("_EnableAnimation");
+        readonly int animtionStateId = Shader.PropertyToID("_AnimationState");
+        readonly int edgeColor = Shader.PropertyToID("_edgeColor");
+        readonly int edgeStrength = Shader.PropertyToID("_edgeStrength");
+        readonly int injuriedStrength = Shader.PropertyToID("_injuriedStrength");
 
         public HeroGPURenderManager()
         {
@@ -50,21 +53,30 @@ namespace GameLogic.Combat.Hero.HeroGPU
                 MaterialPropertyBlock _materialPropertyBlock = new MaterialPropertyBlock();
                 RenderParams rp = new RenderParams(gpuRenderMap.Value[0].Material);
                 rp.matProps = _materialPropertyBlock;
-                rp.shadowCastingMode= UnityEngine.Rendering.ShadowCastingMode.On;
+                rp.shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.On;
                 rp.receiveShadows = false;
                 Matrix4x4[] instData = new Matrix4x4[count];
                 Matrix4x4[] animtionStata = new Matrix4x4[count];
                 float[] enableAnimations = new float[count];
+                Vector4[] edgeColor = new Vector4[count];
+                float[] edgeStrength = new float[count];
+                float[] injuriedStrength = new float[count];
                 for (int i = 0; i < count; i++)
                 {
                     HeroGPUMono heroGPUMono = gpuRenderMap.Value[i];
                     instData[i] = heroGPUMono.rootTrans.localToWorldMatrix;
                     animtionStata[i] = heroGPUMono.animtionState;
+                    edgeColor[i] = heroGPUMono.edgecolor;
+                    edgeStrength[i] = heroGPUMono.edgeStength;
+                    injuriedStrength[i] = heroGPUMono.injuriedStrength;
                     enableAnimations[i] = 1;
                 }
 
                 _materialPropertyBlock.SetFloatArray(enableShaderId, enableAnimations);
                 _materialPropertyBlock.SetMatrixArray(animtionStateId, animtionStata);
+                _materialPropertyBlock.SetVectorArray(this.edgeColor, edgeColor);
+                _materialPropertyBlock.SetFloatArray(this.edgeStrength, edgeStrength);
+                _materialPropertyBlock.SetFloatArray(this.injuriedStrength, injuriedStrength);
                 Graphics.RenderMeshInstanced(rp, gpuRenderMap.Value[0].Mesh, 0, instData);
             }
         }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -33,7 +33,7 @@ namespace GameLogic.Hero
             }
         }
 
-        public int modelID;
+      
 
         /// <summary>
         /// 是否为上阵英雄
@@ -61,13 +61,15 @@ namespace GameLogic.Hero
             return this;
         }
 
-        public void Promote()
+        public HeroInfo Promote()
         {
             star.Value++;
             promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star.Value);
             CalFactor();
             CalBasicAttribute();
             PlayerManager.Instance.SaveHeroData(this);
+            
+            return this;
         }
 
         public AccountFileInfo.HeroData ToHeroData()

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -8,7 +8,7 @@ using Utility;
 public class AccountFileInfo : Singleton<AccountFileInfo>
 {
     
-    private string persistentDataPath = Application.persistentDataPath + "/playerData.txt";
+    public string persistentDataPath = Application.persistentDataPath + "/playerData.txt";
     public PlayerData playerData = new PlayerData();
     
     [System.Serializable]
@@ -57,6 +57,19 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             File.WriteAllText(persistentDataPath, playerSettingJson);
         }
     }
+    
+    public void DeleteFile(string filePath)
+    {
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath); // 删除文件
+            LogTool.Log($"文件已删除：{filePath}");
+        }
+        else
+        {
+            LogTool.Log($"文件不存在：{filePath}");
+        }
+    }
 
     /// <summary>
     /// 不要服务器的话，这里初始化玩家的起始数据

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -15,6 +15,8 @@ public class PlayerManager : Singleton<PlayerManager>
     public List<HeroInfo> heroListInLead = new List<HeroInfo>();
 
     public GameConstantConfig gameConstantConfig;
+    
+    public HeroInfo lastHeroInfo;
 
     public void Init()
     {
@@ -80,8 +82,13 @@ public class PlayerManager : Singleton<PlayerManager>
         }
     }
 
-    public HeroInfo GetHeroInfo(int modelID)
+    public CombatHeroInfo GetHeroInfo(int modelID)
     {
+        if (lastHeroInfo != null && lastHeroInfo.modelID == modelID)
+        {
+            return lastHeroInfo;
+        }
+        
         for (int i = 0; i < heroListInLead.Count; i++)
         {
             HeroInfo info = heroListInLead[i];
@@ -132,6 +139,7 @@ public class PlayerManager : Singleton<PlayerManager>
                     AccountFileInfo.Instance.playerData.HeroListInLeadDatas[i] = heroInfo.ToHeroData();
                     //存下来，用于快速查找
                     leadHeroIdx = i;
+                    AccountFileInfo.Instance.SavePlayerData();
                     return;
                 }
             }

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("初始化完成");
     }
@@ -53,7 +53,7 @@ public class GameApplction : MonoBehaviour
         CustomTweenManager.Init();
 
         PlayerManager.Instance.Init();
-        PlayerManager.Instance.InitTestHero();
+        // PlayerManager.Instance.InitTestHero();
         //主UI加载
         MainSceneController.Instance.Init();
 

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

@@ -2,6 +2,7 @@ using Common.Utility.CombatEvent;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
+using Utility;
 
 namespace Fort23.Mono
 {
@@ -11,9 +12,10 @@ namespace Fort23.Mono
         public static Font huiFuFont;
         public static Font shangHai;
 
+     
         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

@@ -1,14 +1,18 @@
 using Common.Utility.CombatEvent;
 using Fort23.Core;
+using GameLogic.Combat.Hero;
+using Utility;
 
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "CombatHPPanel")]
     public partial class CombatHPPanel : UIPanel
     {
+        private Map<IHero, int> currTargetHeroHp = new Map<IHero, int>();
+
         public static async CTask OpenCombatHPPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<CombatHPPanel>(null);
+            await UIManager.Instance.LoadAndOpenPanel<CombatHPPanel>(null, UILayer.Bottom);
         }
 
         private void Init()
@@ -18,10 +22,12 @@ namespace Fort23.Mono
         protected override void AddEvent()
         {
             EventManager.Instance.AddEventListener(CustomEventType.CreateHeroHp, CreateHeroHp);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.TargetAlter, TargetAlter);
         }
 
         protected override void DelEvent()
         {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.TargetAlter, TargetAlter);
             EventManager.Instance.RemoveEventListener(CustomEventType.CreateHeroHp, CreateHeroHp);
         }
 
@@ -29,14 +35,76 @@ namespace Fort23.Mono
         {
         }
 
-        private async void CreateHeroHp(IEventData iEventData)
+        private async void TargetAlter(IEventData iEventData)
         {
-            CreateHeroHpEventData createHeroHpEventData = iEventData as CreateHeroHpEventData;
-            CombatHeroEntity combatHeroEntity = createHeroHpEventData.combatHeroEntity;
+            CombatHeroTargetAlterEventData combatHeroTargetAlterEventData =
+                iEventData as CombatHeroTargetAlterEventData;
+            if (combatHeroTargetAlterEventData.combatHeroEntity.IsEnemy)
+            {
+                return;
+            }
+
+            if (combatHeroTargetAlterEventData.targetCombatHeroEntity != null)
+            {
+                CombatHeroEntity t = combatHeroTargetAlterEventData.targetCombatHeroEntity as CombatHeroEntity;
+                if (t != null)
+                {
+                    if (!currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.targetCombatHeroEntity,
+                            out int count))
+                    {
+                    }
+
+                    if (count <= 0)
+                    {
+                        CreateHpUI(t);
+                    }
+
+                    count++;
+                    currTargetHeroHp[t] = count;
+                }
+            }
+
+            if (combatHeroTargetAlterEventData.lasetCombatHeroEntity != null)
+            {
+                CombatHeroEntity t = combatHeroTargetAlterEventData.lasetCombatHeroEntity as CombatHeroEntity;
+                if (t != null)
+                {
+                    if (currTargetHeroHp.TryGetValue(combatHeroTargetAlterEventData.lasetCombatHeroEntity,
+                            out int count))
+                    {
+                        count--;
+                        if (count <= 0)
+                        {
+                            currTargetHeroHp.Remove(combatHeroTargetAlterEventData.lasetCombatHeroEntity);
+                            HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
+                            heroHpUpdateEventData.combatHeroEntity = t;
+                            CombatEventManager.Instance.Dispatch(CombatEventType.ClearHeroHp, heroHpUpdateEventData);
+                        }
+                        else
+                        {
+                            currTargetHeroHp[t] = count;
+                        }
+
+                       
+                    }
+                }
+            }
+        }
+
+        private async void CreateHpUI(CombatHeroEntity combatHeroEntity)
+        {
+            // CombatHeroEntity combatHeroEntity = createHeroHpEventData.combatHeroEntity;
             HeroHpWidget heroHpWidget =
                 await UIManager.Instance.CreateGComponentForObject<HeroHpWidget>(HeroHpWidget, null, transform,
                     isInstance: true);
             heroHpWidget.Init(combatHeroEntity);
         }
+
+        private async void CreateHeroHp(IEventData iEventData)
+        {
+            CreateHeroHpEventData createHeroHpEventData = iEventData as CreateHeroHpEventData;
+            CombatHeroEntity combatHeroEntity = createHeroHpEventData.combatHeroEntity;
+            CreateHpUI(combatHeroEntity);
+        }
     }
 }

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -34,17 +34,54 @@ namespace Fort23.Mono
 
         private void OnClickPromote()
         {
+            if (PlayerManager.Instance.gameConstantConfig.maxStar <= heroInfo.star.Value)
+            {
+                LogTool.Log("已到达最高星级:" + PlayerManager.Instance.gameConstantConfig.maxStar);
+                return;
+            }
             
+            heroInfo.Promote();
+            UpdateAttributeUI();
+            HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+            SendEvent(HeroUpType.Promote);
         }
         
         private void OnClickUpgrade()
         {
-            heroInfo = heroInfo.Upgrade();
+            if (PlayerManager.Instance.gameConstantConfig.maxLv <= heroInfo.level.Value)
+            {
+                LogTool.Log("已到达最高等级:" + PlayerManager.Instance.gameConstantConfig.maxLv);
+                return;
+            }
+            
+            heroInfo.Upgrade();
             UpdateAttributeUI();
-            HeroLvUpgradeEventData data = new HeroLvUpgradeEventData();
+            SendEvent(HeroUpType.Level);
+        }
+
+        /// <summary>
+        /// 发送英雄提升的事件
+        /// </summary>
+        /// <param name="upType">提升类型：升级、升星等.</param>
+        private void SendEvent(HeroUpType upType)
+        {
+            HeroPowerUpEventData data = new HeroPowerUpEventData();
             data.heroModelID = heroInfo.modelID;
-            EventManager.Instance.Dispatch(CustomEventType.HeroUpgrade, data);
+            data.upType = upType;
+            
+            PlayerManager.Instance.lastHeroInfo = heroInfo;
+            EventManager.Instance.Dispatch(CustomEventType.HeroPowerUp, data);
+            if (upType == HeroUpType.Level)
+            {
+                EventManager.Instance.Dispatch(CustomEventType.HeroLvUp, data);
+            }
+            else if (upType == HeroUpType.Promote)
+            {
+                EventManager.Instance.Dispatch(CustomEventType.HeroPromote, data);
+            }
+            
         }
+        
         private void OnClickClose()
         {
             UIManager.Instance.HideUIUIPanel(this);

Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -18,13 +19,14 @@ namespace Fort23.Mono
 
             // 计算 当前星级 应该用什么星星的表现
             int group = (starGrade - 1) / maxShowStar;
-            
+
             int i = 1;
+            int showCount = (starGrade - 1) % maxShowStar + 1;
             foreach (GameObject star in stars)
             {
                 SetStarImg(group, star);
                 // 根据星级显示星星
-                if (starGrade >= i)
+                if (showCount >= i)
                 {
                     star.SetActive(true);
                 }
@@ -46,10 +48,11 @@ namespace Fort23.Mono
                     image.icon_name = "dec_star";
                     break;
                 case 1: // n = 6~10
-                    image.icon_name = "dec_star";    
+                    image.icon_name = "dec_star_2";    
                     break;
                 default: // 其他情况
-                    image.icon_name = "dec_star";
+                    LogTool.Error("超出设计表现");
+                    //image.icon_name = "dec_star";
                     break;
             }
         }

Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -1,4 +1,6 @@
 using System.Threading.Tasks;
+using Common.Utility.CombatEvent;
+using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
@@ -27,6 +29,9 @@ namespace Fort23.Mono
         private async void OnHeroClick()
         {
             LogTool.Log("点击英雄");
+            HeroClickEventData heroClickEventData = HeroClickEventData.Create();
+            heroClickEventData.heroId = heroInfo.modelID;
+            EventManager.Instance.Dispatch(CustomEventType.HeroClick, heroClickEventData);
             await OpenHeroDetailPanel();
         }
 
@@ -37,7 +42,7 @@ namespace Fort23.Mono
             // {
             //     heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
             // }
-            HeroDetailPanel heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
+            HeroDetailPanel heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback,UILayer.Top);
             heroDetailPanel.InitHeroDetailPanel(heroInfo);
         }
 
@@ -47,7 +52,7 @@ namespace Fort23.Mono
         }
 
 
-        private HeroInfo heroInfo;
+        public HeroInfo heroInfo;
         
         /// <summary>
         /// 
@@ -56,14 +61,25 @@ namespace Fort23.Mono
         public void InitHero(HeroInfo heroInfo)
         {
             this.heroInfo = heroInfo;
-            lv.text = heroInfo.level.Value.ToString();
+            // lv.text = heroInfo.level.Value.ToString();
             iconHero.icon_name = heroInfo.modelConfig.headicon;
             iconHero.SetNativeSize();
             iconZhiYe.icon_name = heroInfo.iconZhiYe;
             
+            // HeroUITools.SetStarShow(stars, heroInfo.star.Value);
+            SetDynamicData();
+        }
+
+        public void UpdateWidgetUI(HeroInfo heroInfo)
+        {
+            this.heroInfo = heroInfo;
+            SetDynamicData();
+        }
+
+        public void SetDynamicData()
+        {
+            lv.text = heroInfo.level.Value.ToString();
             HeroUITools.SetStarShow(stars, heroInfo.star.Value);
-            
-            
         }
         
     }

Assets/Scripts/GameUI/UI/HeroHpWidget.cs

@@ -31,7 +31,7 @@ namespace Fort23.Mono
         public override void DormancyObj()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
-            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroDie, HeroDie);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.ClearHeroHp, ClearHeroHp);
             StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
             base.DormancyObj();
         }
@@ -58,10 +58,10 @@ namespace Fort23.Mono
             hp.rectTransform.sizeDelta = new Vector2(v * 60, hp.rectTransform.sizeDelta.y);
         }
 
-        private void HeroDie(IEventData iEventData)
+        private void ClearHeroHp(IEventData iEventData)
         {
-            HeroDieEventData heroDieEventData = iEventData as HeroDieEventData;
-            if (heroDieEventData.combatHeroEntity == combatHeroEntity&&combatHeroEntity.IsEnemy)
+            HeroHpUpdateEventData heroHpUpdateEventData = iEventData as HeroHpUpdateEventData;
+            if (heroHpUpdateEventData.combatHeroEntity == combatHeroEntity)
             {
                 GObjectPool.Instance.Recycle(this);
             }
@@ -71,7 +71,7 @@ namespace Fort23.Mono
         {
             this.combatHeroEntity = combatHeroEntity;
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
-            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDie);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.ClearHeroHp, ClearHeroHp);
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
             hpTransform = combatHeroEntity.combatHeroGameObject.hpTransform;
 

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Common.Utility.CombatEvent;
 using Fort23.Core;
@@ -13,17 +14,20 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            
             InitBattleHero();
         }
 
         protected override void AddEvent()
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
+            EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, OnHeroUpgrade);
         }
 
         protected override void DelEvent()
         {
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.CombatExpAlter, CombatExpAlter);
+            EventManager.Instance.RemoveEventListener(CustomEventType.HeroPowerUp, OnHeroUpgrade);
         }
 
         public override void AddButtonEvent()
@@ -49,14 +53,35 @@ namespace Fort23.Mono
             TextExp.text = levelBattleCombatType.exp + "/" + levelBattleCombatType.CurrMaxExp;
         }
 
+        private void OnHeroUpgrade(IEventData eventData) 
+        {
+            HeroPowerUpEventData data = eventData as HeroPowerUpEventData;
+            HeroInfo heroInfo = (HeroInfo)PlayerManager.Instance.GetHeroInfo(data.heroModelID);
+
+            foreach (WidgetHero widgetHero in widgetHeroes)
+            {
+                if (widgetHero.heroInfo.modelID == heroInfo.modelID)
+                {
+                    widgetHero.UpdateWidgetUI(heroInfo);
+                    break;
+                }
+            }
+        }
+
+        
+        private List<WidgetHero> widgetHeroes = new List<WidgetHero>(); 
+            
         private async void InitBattleHero()
         {
+            widgetHeroes.Clear();
             for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)
             {
                 RectTransform rectTransform = hero_battle[i] as RectTransform;
                 WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                     poolName: "WidgetHero", root: rectTransform);
                 itemHero.InitHero(PlayerManager.Instance.heroListInLead[i]);
+                
+                widgetHeroes.Add(itemHero);
             }
         }
     }

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: