添加levelbattle标

Assets/Art/GuaiWuTimeline/Guaiwu01.playable

@@ -230,6 +230,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
+  - {fileID: 2599405129806242392}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -249,6 +250,18 @@ MonoBehaviour:
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 0}
+--- !u!114 &-4006118953529710751
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-3798375387370889261
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -814,6 +827,99 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &2599405129806242392
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -4006118953529710751}
+    m_Duration: 0.016666666666666666
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 2599405129806242392}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &3504051212001476799
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Res/Config/HeroModelConfig.json

@@ -6,22 +6,20 @@
       "name": 1,
       "headicon": "icon_tx101",
       "model": "101",
+      "isUseGpu": false,
       "rarity": 3,
       "profession": 1,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70011,
-      "skillID_1": 2001,
-      "skillID_2": 2002,
-      "skillID_3": 2003,
-      "skillID_4": 2004,
-      "skillID_5": -1,
-      "skillID_6": -1,
-      "skillID_7": -1,
-      "heroStory": 70091,
-      "showSize": 1.0,
-      "showIdleName": "idle"
+      "hp": 100,
+      "def": 2,
+      "crit": null,
+      "attack": 10,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 2,
+      "skillID": [
+        70011
+      ],
+      "heroStory": 70091
     },
     {
       "ID": 102,
@@ -29,22 +27,20 @@
       "name": 2,
       "headicon": "icon_tx102",
       "model": "102",
+      "isUseGpu": false,
       "rarity": 3,
       "profession": 1,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70012,
-      "skillID_1": 2002,
-      "skillID_2": 2003,
-      "skillID_3": 2004,
-      "skillID_4": 2005,
-      "skillID_5": 0,
-      "skillID_6": 0,
-      "skillID_7": 0,
-      "heroStory": 70092,
-      "showSize": 2.0,
-      "showIdleName": "idle"
+      "hp": 100,
+      "def": 3,
+      "crit": null,
+      "attack": 11,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "skillID": [
+        70012
+      ],
+      "heroStory": 70092
     },
     {
       "ID": 103,
@@ -52,413 +48,86 @@
       "name": 3,
       "headicon": "icon_tx103",
       "model": "103",
+      "isUseGpu": false,
       "rarity": 3,
       "profession": 1,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70013,
-      "skillID_1": 2003,
-      "skillID_2": 2004,
-      "skillID_3": 2005,
-      "skillID_4": 2006,
-      "skillID_5": 1,
-      "skillID_6": 1,
-      "skillID_7": 1,
-      "heroStory": 70093,
-      "showSize": 3.0,
-      "showIdleName": "idle"
+      "hp": 100,
+      "def": 4,
+      "crit": null,
+      "attack": 12,
+      "move_speed": 8,
+      "speed_atk": 1.0,
+      "range_atk": 4,
+      "skillID": [
+        70013
+      ],
+      "heroStory": 70093
     },
     {
-      "ID": 104,
+      "ID": 9000101,
       "nickName": -1,
-      "name": 4,
-      "headicon": "icon_tx104",
-      "model": "104",
-      "rarity": 3,
+      "name": 3,
+      "headicon": "icon_tx9000101",
+      "model": "Guaiwu01",
+      "isUseGpu": true,
+      "rarity": 1,
       "profession": 1,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70014,
-      "skillID_1": 2004,
-      "skillID_2": 2005,
-      "skillID_3": 2006,
-      "skillID_4": 2007,
-      "skillID_5": 2,
-      "skillID_6": 2,
-      "skillID_7": 2,
-      "heroStory": 70094,
-      "showSize": 4.0,
-      "showIdleName": "idle"
+      "hp": 100,
+      "def": 5,
+      "crit": null,
+      "attack": 13,
+      "move_speed": 3,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "skillID": [
+        10011
+      ],
+      "heroStory": 70093
     },
     {
-      "ID": 105,
+      "ID": 9000102,
       "nickName": -1,
-      "name": 5,
-      "headicon": "icon_tx105",
-      "model": "105",
-      "rarity": 3,
+      "name": 3,
+      "headicon": "icon_tx9000102",
+      "model": "GuaiwuJY01",
+      "isUseGpu": true,
+      "rarity": 1,
       "profession": 1,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70015,
-      "skillID_1": 2005,
-      "skillID_2": 2006,
-      "skillID_3": 2007,
-      "skillID_4": 2008,
-      "skillID_5": 3,
-      "skillID_6": 3,
-      "skillID_7": 3,
-      "heroStory": 70095,
-      "showSize": 5.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 106,
+      "hp": 300,
+      "def": 6,
+      "crit": null,
+      "attack": 14,
+      "move_speed": 3,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "skillID": [
+        10011,
+        1100011,
+        1100021
+      ],
+      "heroStory": 70093
+    },
+    {
+      "ID": 9000103,
       "nickName": -1,
-      "name": 6,
-      "headicon": "icon_tx106",
-      "model": "106",
-      "rarity": 3,
-      "profession": 2,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70016,
-      "skillID_1": 2006,
-      "skillID_2": 2007,
-      "skillID_3": 2008,
-      "skillID_4": 2009,
-      "skillID_5": 4,
-      "skillID_6": 4,
-      "skillID_7": 4,
-      "heroStory": 70096,
-      "showSize": 6.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 107,
-      "nickName": -1,
-      "name": 7,
-      "headicon": "icon_tx107",
-      "model": "107",
-      "rarity": 3,
-      "profession": 2,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70017,
-      "skillID_1": 2007,
-      "skillID_2": 2008,
-      "skillID_3": 2009,
-      "skillID_4": 2010,
-      "skillID_5": 5,
-      "skillID_6": 5,
-      "skillID_7": 5,
-      "heroStory": 70097,
-      "showSize": 7.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 108,
-      "nickName": -1,
-      "name": 8,
-      "headicon": "icon_tx108",
-      "model": "108",
-      "rarity": 3,
-      "profession": 2,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70018,
-      "skillID_1": 2008,
-      "skillID_2": 2009,
-      "skillID_3": 2010,
-      "skillID_4": 2011,
-      "skillID_5": 6,
-      "skillID_6": 6,
-      "skillID_7": 6,
-      "heroStory": 70098,
-      "showSize": 8.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 109,
-      "nickName": -1,
-      "name": 9,
-      "headicon": "icon_tx109",
-      "model": "109",
-      "rarity": 3,
-      "profession": 2,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70019,
-      "skillID_1": 2009,
-      "skillID_2": 2010,
-      "skillID_3": 2011,
-      "skillID_4": 2012,
-      "skillID_5": 7,
-      "skillID_6": 7,
-      "skillID_7": 7,
-      "heroStory": 70099,
-      "showSize": 9.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 110,
-      "nickName": -1,
-      "name": 10,
-      "headicon": "icon_tx110",
-      "model": "110",
-      "rarity": 3,
-      "profession": 2,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70020,
-      "skillID_1": 2010,
-      "skillID_2": 2011,
-      "skillID_3": 2012,
-      "skillID_4": 2013,
-      "skillID_5": 8,
-      "skillID_6": 8,
-      "skillID_7": 8,
-      "heroStory": 70100,
-      "showSize": 10.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 111,
-      "nickName": -1,
-      "name": 11,
-      "headicon": "icon_tx111",
-      "model": "111",
-      "rarity": 3,
-      "profession": 3,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70021,
-      "skillID_1": 2011,
-      "skillID_2": 2012,
-      "skillID_3": 2013,
-      "skillID_4": 2014,
-      "skillID_5": 9,
-      "skillID_6": 9,
-      "skillID_7": 9,
-      "heroStory": 70101,
-      "showSize": 11.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 112,
-      "nickName": -1,
-      "name": 12,
-      "headicon": "icon_tx112",
-      "model": "112",
-      "rarity": 3,
-      "profession": 3,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70022,
-      "skillID_1": 2012,
-      "skillID_2": 2013,
-      "skillID_3": 2014,
-      "skillID_4": 2015,
-      "skillID_5": 10,
-      "skillID_6": 10,
-      "skillID_7": 10,
-      "heroStory": 70102,
-      "showSize": 12.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 113,
-      "nickName": -1,
-      "name": 13,
-      "headicon": "icon_tx113",
-      "model": "113",
-      "rarity": 3,
-      "profession": 3,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70023,
-      "skillID_1": 2013,
-      "skillID_2": 2014,
-      "skillID_3": 2015,
-      "skillID_4": 2016,
-      "skillID_5": 11,
-      "skillID_6": 11,
-      "skillID_7": 11,
-      "heroStory": 70103,
-      "showSize": 13.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 114,
-      "nickName": -1,
-      "name": 14,
-      "headicon": "icon_tx114",
-      "model": "114",
-      "rarity": 3,
-      "profession": 3,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70024,
-      "skillID_1": 2014,
-      "skillID_2": 2015,
-      "skillID_3": 2016,
-      "skillID_4": 2017,
-      "skillID_5": 12,
-      "skillID_6": 12,
-      "skillID_7": 12,
-      "heroStory": 70104,
-      "showSize": 14.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 115,
-      "nickName": -1,
-      "name": 15,
-      "headicon": "icon_tx115",
-      "model": "115",
-      "rarity": 3,
-      "profession": 3,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70025,
-      "skillID_1": 2015,
-      "skillID_2": 2016,
-      "skillID_3": 2017,
-      "skillID_4": 2018,
-      "skillID_5": 13,
-      "skillID_6": 13,
-      "skillID_7": 13,
-      "heroStory": 70105,
-      "showSize": 15.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 116,
-      "nickName": -1,
-      "name": 16,
-      "headicon": "icon_tx116",
-      "model": "116",
-      "rarity": 3,
-      "profession": 4,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70026,
-      "skillID_1": 2016,
-      "skillID_2": 2017,
-      "skillID_3": 2018,
-      "skillID_4": 2019,
-      "skillID_5": 14,
-      "skillID_6": 14,
-      "skillID_7": 14,
-      "heroStory": 70106,
-      "showSize": 16.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 117,
-      "nickName": -1,
-      "name": 17,
-      "headicon": "icon_tx117",
-      "model": "117",
-      "rarity": 3,
-      "profession": 4,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70027,
-      "skillID_1": 2017,
-      "skillID_2": 2018,
-      "skillID_3": 2019,
-      "skillID_4": 2020,
-      "skillID_5": 15,
-      "skillID_6": 15,
-      "skillID_7": 15,
-      "heroStory": 70107,
-      "showSize": 17.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 118,
-      "nickName": -1,
-      "name": 18,
-      "headicon": "icon_tx118",
-      "model": "118",
-      "rarity": 3,
-      "profession": 4,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70028,
-      "skillID_1": 2018,
-      "skillID_2": 2019,
-      "skillID_3": 2020,
-      "skillID_4": 2021,
-      "skillID_5": 16,
-      "skillID_6": 16,
-      "skillID_7": 16,
-      "heroStory": 70108,
-      "showSize": 18.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 119,
-      "nickName": -1,
-      "name": 19,
-      "headicon": "icon_tx119",
-      "model": "119",
-      "rarity": 3,
-      "profession": 4,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70029,
-      "skillID_1": 2019,
-      "skillID_2": 2020,
-      "skillID_3": 2021,
-      "skillID_4": 2022,
-      "skillID_5": 17,
-      "skillID_6": 17,
-      "skillID_7": 17,
-      "heroStory": 70109,
-      "showSize": 19.0,
-      "showIdleName": "idle"
-    },
-    {
-      "ID": 120,
-      "nickName": -1,
-      "name": 20,
-      "headicon": "icon_tx120",
-      "model": "120",
-      "rarity": 3,
-      "profession": 4,
-      "move_speed": 100,
-      "speed_atk": 100.0,
-      "range_atk": 100,
-      "skillID_0": 70029,
-      "skillID_1": 2019,
-      "skillID_2": 2020,
-      "skillID_3": 2021,
-      "skillID_4": 2022,
-      "skillID_5": 17,
-      "skillID_6": 17,
-      "skillID_7": 17,
-      "heroStory": 70109,
-      "showSize": 19.0,
-      "showIdleName": "idle"
+      "name": 3,
+      "headicon": "icon_tx9000103",
+      "model": "GuaiwuBoss01",
+      "isUseGpu": true,
+      "rarity": 1,
+      "profession": 1,
+      "hp": 1000,
+      "def": 7,
+      "crit": null,
+      "attack": 15,
+      "move_speed": 3,
+      "speed_atk": 1.0,
+      "range_atk": 3,
+      "skillID": [
+        10011,
+        1200011
+      ],
+      "heroStory": 70093
     }
   ]
 }

Assets/Res/Config/HeroPowerUpConfig.json

@@ -0,0 +1,1304 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "HeroLevel": 1,
+      "ATKFactor": 1.0,
+      "HPFactor": 10.0,
+      "DEFFactor": 1.0,
+      "ShieldFactor": 0.0,
+      "levelupExp": 100,
+      "LevelupBasicPower": 300
+    },
+    {
+      "ID": 2,
+      "HeroLevel": 2,
+      "ATKFactor": 1.023531,
+      "HPFactor": 10.23531,
+      "DEFFactor": 1.023531,
+      "ShieldFactor": 0.0,
+      "levelupExp": 110,
+      "LevelupBasicPower": 307
+    },
+    {
+      "ID": 3,
+      "HeroLevel": 3,
+      "ATKFactor": 1.04761577,
+      "HPFactor": 10.4761572,
+      "DEFFactor": 1.04761577,
+      "ShieldFactor": 0.0,
+      "levelupExp": 110,
+      "LevelupBasicPower": 314
+    },
+    {
+      "ID": 4,
+      "HeroLevel": 4,
+      "ATKFactor": 1.07226717,
+      "HPFactor": 10.7226715,
+      "DEFFactor": 1.07226717,
+      "ShieldFactor": 0.0,
+      "levelupExp": 120,
+      "LevelupBasicPower": 322
+    },
+    {
+      "ID": 5,
+      "HeroLevel": 5,
+      "ATKFactor": 1.09749866,
+      "HPFactor": 10.974987,
+      "DEFFactor": 1.09749866,
+      "ShieldFactor": 0.0,
+      "levelupExp": 130,
+      "LevelupBasicPower": 329
+    },
+    {
+      "ID": 6,
+      "HeroLevel": 6,
+      "ATKFactor": 1.12332392,
+      "HPFactor": 11.2332392,
+      "DEFFactor": 1.12332392,
+      "ShieldFactor": 0.0,
+      "levelupExp": 130,
+      "LevelupBasicPower": 337
+    },
+    {
+      "ID": 7,
+      "HeroLevel": 7,
+      "ATKFactor": 1.14975679,
+      "HPFactor": 11.4975681,
+      "DEFFactor": 1.14975679,
+      "ShieldFactor": 0.0,
+      "levelupExp": 140,
+      "LevelupBasicPower": 345
+    },
+    {
+      "ID": 8,
+      "HeroLevel": 8,
+      "ATKFactor": 1.17681181,
+      "HPFactor": 11.7681179,
+      "DEFFactor": 1.17681181,
+      "ShieldFactor": 0.0,
+      "levelupExp": 150,
+      "LevelupBasicPower": 353
+    },
+    {
+      "ID": 9,
+      "HeroLevel": 9,
+      "ATKFactor": 1.2045033,
+      "HPFactor": 12.0450335,
+      "DEFFactor": 1.2045033,
+      "ShieldFactor": 0.0,
+      "levelupExp": 160,
+      "LevelupBasicPower": 361
+    },
+    {
+      "ID": 10,
+      "HeroLevel": 10,
+      "ATKFactor": 1.2328465,
+      "HPFactor": 12.3284655,
+      "DEFFactor": 1.2328465,
+      "ShieldFactor": 0.0,
+      "levelupExp": 170,
+      "LevelupBasicPower": 370
+    },
+    {
+      "ID": 11,
+      "HeroLevel": 11,
+      "ATKFactor": 1.26185656,
+      "HPFactor": 12.6185665,
+      "DEFFactor": 1.26185656,
+      "ShieldFactor": 0.0,
+      "levelupExp": 180,
+      "LevelupBasicPower": 379
+    },
+    {
+      "ID": 12,
+      "HeroLevel": 12,
+      "ATKFactor": 1.29154932,
+      "HPFactor": 12.915494,
+      "DEFFactor": 1.29154932,
+      "ShieldFactor": 0.0,
+      "levelupExp": 190,
+      "LevelupBasicPower": 387
+    },
+    {
+      "ID": 13,
+      "HeroLevel": 13,
+      "ATKFactor": 1.32194078,
+      "HPFactor": 13.219408,
+      "DEFFactor": 1.32194078,
+      "ShieldFactor": 0.0,
+      "levelupExp": 200,
+      "LevelupBasicPower": 397
+    },
+    {
+      "ID": 14,
+      "HeroLevel": 14,
+      "ATKFactor": 1.35304737,
+      "HPFactor": 13.5304737,
+      "DEFFactor": 1.35304737,
+      "ShieldFactor": 0.0,
+      "levelupExp": 210,
+      "LevelupBasicPower": 406
+    },
+    {
+      "ID": 15,
+      "HeroLevel": 15,
+      "ATKFactor": 1.38488591,
+      "HPFactor": 13.84886,
+      "DEFFactor": 1.38488591,
+      "ShieldFactor": 0.0,
+      "levelupExp": 220,
+      "LevelupBasicPower": 415
+    },
+    {
+      "ID": 16,
+      "HeroLevel": 16,
+      "ATKFactor": 1.41747367,
+      "HPFactor": 14.174737,
+      "DEFFactor": 1.41747367,
+      "ShieldFactor": 0.0,
+      "levelupExp": 240,
+      "LevelupBasicPower": 425
+    },
+    {
+      "ID": 17,
+      "HeroLevel": 17,
+      "ATKFactor": 1.45082831,
+      "HPFactor": 14.5082827,
+      "DEFFactor": 1.45082831,
+      "ShieldFactor": 0.0,
+      "levelupExp": 250,
+      "LevelupBasicPower": 435
+    },
+    {
+      "ID": 18,
+      "HeroLevel": 18,
+      "ATKFactor": 1.48496771,
+      "HPFactor": 14.8496771,
+      "DEFFactor": 1.48496771,
+      "ShieldFactor": 0.0,
+      "levelupExp": 270,
+      "LevelupBasicPower": 445
+    },
+    {
+      "ID": 19,
+      "HeroLevel": 19,
+      "ATKFactor": 1.51991045,
+      "HPFactor": 15.1991053,
+      "DEFFactor": 1.51991045,
+      "ShieldFactor": 0.0,
+      "levelupExp": 280,
+      "LevelupBasicPower": 456
+    },
+    {
+      "ID": 20,
+      "HeroLevel": 20,
+      "ATKFactor": 1.55567551,
+      "HPFactor": 15.5567551,
+      "DEFFactor": 1.55567551,
+      "ShieldFactor": 0.0,
+      "levelupExp": 300,
+      "LevelupBasicPower": 467
+    },
+    {
+      "ID": 21,
+      "HeroLevel": 21,
+      "ATKFactor": 1.592282,
+      "HPFactor": 15.922821,
+      "DEFFactor": 1.592282,
+      "ShieldFactor": 0.0,
+      "levelupExp": 320,
+      "LevelupBasicPower": 478
+    },
+    {
+      "ID": 22,
+      "HeroLevel": 22,
+      "ATKFactor": 1.62975013,
+      "HPFactor": 16.2975,
+      "DEFFactor": 1.62975013,
+      "ShieldFactor": 0.0,
+      "levelupExp": 330,
+      "LevelupBasicPower": 489
+    },
+    {
+      "ID": 23,
+      "HeroLevel": 23,
+      "ATKFactor": 1.66809976,
+      "HPFactor": 16.6809978,
+      "DEFFactor": 1.66809976,
+      "ShieldFactor": 0.0,
+      "levelupExp": 350,
+      "LevelupBasicPower": 500
+    },
+    {
+      "ID": 24,
+      "HeroLevel": 24,
+      "ATKFactor": 1.7073518,
+      "HPFactor": 17.0735188,
+      "DEFFactor": 1.7073518,
+      "ShieldFactor": 0.0,
+      "levelupExp": 380,
+      "LevelupBasicPower": 512
+    },
+    {
+      "ID": 25,
+      "HeroLevel": 25,
+      "ATKFactor": 1.74752748,
+      "HPFactor": 17.475275,
+      "DEFFactor": 1.74752748,
+      "ShieldFactor": 0.0,
+      "levelupExp": 400,
+      "LevelupBasicPower": 524
+    },
+    {
+      "ID": 26,
+      "HeroLevel": 26,
+      "ATKFactor": 1.78864861,
+      "HPFactor": 17.8864861,
+      "DEFFactor": 1.78864861,
+      "ShieldFactor": 0.0,
+      "levelupExp": 420,
+      "LevelupBasicPower": 537
+    },
+    {
+      "ID": 27,
+      "HeroLevel": 27,
+      "ATKFactor": 1.83073723,
+      "HPFactor": 18.307373,
+      "DEFFactor": 1.83073723,
+      "ShieldFactor": 0.0,
+      "levelupExp": 450,
+      "LevelupBasicPower": 549
+    },
+    {
+      "ID": 28,
+      "HeroLevel": 28,
+      "ATKFactor": 1.87381637,
+      "HPFactor": 18.738163,
+      "DEFFactor": 1.87381637,
+      "ShieldFactor": 0.0,
+      "levelupExp": 470,
+      "LevelupBasicPower": 562
+    },
+    {
+      "ID": 29,
+      "HeroLevel": 29,
+      "ATKFactor": 1.91790915,
+      "HPFactor": 19.17909,
+      "DEFFactor": 1.91790915,
+      "ShieldFactor": 0.0,
+      "levelupExp": 500,
+      "LevelupBasicPower": 575
+    },
+    {
+      "ID": 30,
+      "HeroLevel": 30,
+      "ATKFactor": 1.9630394,
+      "HPFactor": 19.630394,
+      "DEFFactor": 1.9630394,
+      "ShieldFactor": 0.0,
+      "levelupExp": 530,
+      "LevelupBasicPower": 589
+    },
+    {
+      "ID": 31,
+      "HeroLevel": 31,
+      "ATKFactor": 2.00923181,
+      "HPFactor": 20.0923176,
+      "DEFFactor": 2.00923181,
+      "ShieldFactor": 0.0,
+      "levelupExp": 560,
+      "LevelupBasicPower": 603
+    },
+    {
+      "ID": 32,
+      "HeroLevel": 32,
+      "ATKFactor": 2.056511,
+      "HPFactor": 20.56511,
+      "DEFFactor": 2.056511,
+      "ShieldFactor": 0.0,
+      "levelupExp": 590,
+      "LevelupBasicPower": 617
+    },
+    {
+      "ID": 33,
+      "HeroLevel": 33,
+      "ATKFactor": 2.10490274,
+      "HPFactor": 21.0490265,
+      "DEFFactor": 2.10490274,
+      "ShieldFactor": 0.0,
+      "levelupExp": 630,
+      "LevelupBasicPower": 631
+    },
+    {
+      "ID": 34,
+      "HeroLevel": 34,
+      "ATKFactor": 2.15443325,
+      "HPFactor": 21.5443325,
+      "DEFFactor": 2.15443325,
+      "ShieldFactor": 0.0,
+      "levelupExp": 670,
+      "LevelupBasicPower": 646
+    },
+    {
+      "ID": 35,
+      "HeroLevel": 35,
+      "ATKFactor": 2.20512915,
+      "HPFactor": 22.05129,
+      "DEFFactor": 2.20512915,
+      "ShieldFactor": 0.0,
+      "levelupExp": 710,
+      "LevelupBasicPower": 662
+    },
+    {
+      "ID": 36,
+      "HeroLevel": 36,
+      "ATKFactor": 2.257018,
+      "HPFactor": 22.57018,
+      "DEFFactor": 2.257018,
+      "ShieldFactor": 0.0,
+      "levelupExp": 750,
+      "LevelupBasicPower": 677
+    },
+    {
+      "ID": 37,
+      "HeroLevel": 37,
+      "ATKFactor": 2.310128,
+      "HPFactor": 23.1012783,
+      "DEFFactor": 2.310128,
+      "ShieldFactor": 0.0,
+      "levelupExp": 790,
+      "LevelupBasicPower": 693
+    },
+    {
+      "ID": 38,
+      "HeroLevel": 38,
+      "ATKFactor": 2.36448765,
+      "HPFactor": 23.6448746,
+      "DEFFactor": 2.36448765,
+      "ShieldFactor": 0.0,
+      "levelupExp": 840,
+      "LevelupBasicPower": 709
+    },
+    {
+      "ID": 39,
+      "HeroLevel": 39,
+      "ATKFactor": 2.4201262,
+      "HPFactor": 24.2012634,
+      "DEFFactor": 2.4201262,
+      "ShieldFactor": 0.0,
+      "levelupExp": 890,
+      "LevelupBasicPower": 726
+    },
+    {
+      "ID": 40,
+      "HeroLevel": 40,
+      "ATKFactor": 2.47707438,
+      "HPFactor": 24.7707424,
+      "DEFFactor": 2.47707438,
+      "ShieldFactor": 0.0,
+      "levelupExp": 940,
+      "LevelupBasicPower": 743
+    },
+    {
+      "ID": 41,
+      "HeroLevel": 41,
+      "ATKFactor": 2.53536224,
+      "HPFactor": 25.3536224,
+      "DEFFactor": 2.53536224,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1000,
+      "LevelupBasicPower": 761
+    },
+    {
+      "ID": 42,
+      "HeroLevel": 42,
+      "ATKFactor": 2.595022,
+      "HPFactor": 25.95022,
+      "DEFFactor": 2.595022,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1060,
+      "LevelupBasicPower": 779
+    },
+    {
+      "ID": 43,
+      "HeroLevel": 43,
+      "ATKFactor": 2.65608549,
+      "HPFactor": 26.560854,
+      "DEFFactor": 2.65608549,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1120,
+      "LevelupBasicPower": 797
+    },
+    {
+      "ID": 44,
+      "HeroLevel": 44,
+      "ATKFactor": 2.71858573,
+      "HPFactor": 27.1858578,
+      "DEFFactor": 2.71858573,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1190,
+      "LevelupBasicPower": 816
+    },
+    {
+      "ID": 45,
+      "HeroLevel": 45,
+      "ATKFactor": 2.78255677,
+      "HPFactor": 27.8255672,
+      "DEFFactor": 2.78255677,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1260,
+      "LevelupBasicPower": 835
+    },
+    {
+      "ID": 46,
+      "HeroLevel": 46,
+      "ATKFactor": 2.84803319,
+      "HPFactor": 28.4803314,
+      "DEFFactor": 2.84803319,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1330,
+      "LevelupBasicPower": 854
+    },
+    {
+      "ID": 47,
+      "HeroLevel": 47,
+      "ATKFactor": 2.91505027,
+      "HPFactor": 29.1505013,
+      "DEFFactor": 2.91505027,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1410,
+      "LevelupBasicPower": 875
+    },
+    {
+      "ID": 48,
+      "HeroLevel": 48,
+      "ATKFactor": 2.98364425,
+      "HPFactor": 29.8364429,
+      "DEFFactor": 2.98364425,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1490,
+      "LevelupBasicPower": 895
+    },
+    {
+      "ID": 49,
+      "HeroLevel": 49,
+      "ATKFactor": 3.05385232,
+      "HPFactor": 30.5385246,
+      "DEFFactor": 3.05385232,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1580,
+      "LevelupBasicPower": 916
+    },
+    {
+      "ID": 50,
+      "HeroLevel": 50,
+      "ATKFactor": 3.12571263,
+      "HPFactor": 31.2571259,
+      "DEFFactor": 3.12571263,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1670,
+      "LevelupBasicPower": 938
+    },
+    {
+      "ID": 51,
+      "HeroLevel": 51,
+      "ATKFactor": 3.19926381,
+      "HPFactor": 31.9926376,
+      "DEFFactor": 3.19926381,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1770,
+      "LevelupBasicPower": 960
+    },
+    {
+      "ID": 52,
+      "HeroLevel": 52,
+      "ATKFactor": 3.27454567,
+      "HPFactor": 32.7454567,
+      "DEFFactor": 3.27454567,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1880,
+      "LevelupBasicPower": 982
+    },
+    {
+      "ID": 53,
+      "HeroLevel": 53,
+      "ATKFactor": 3.351599,
+      "HPFactor": 33.5159874,
+      "DEFFactor": 3.351599,
+      "ShieldFactor": 0.0,
+      "levelupExp": 1990,
+      "LevelupBasicPower": 1005
+    },
+    {
+      "ID": 54,
+      "HeroLevel": 54,
+      "ATKFactor": 3.43046546,
+      "HPFactor": 34.3046532,
+      "DEFFactor": 3.43046546,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2110,
+      "LevelupBasicPower": 1029
+    },
+    {
+      "ID": 55,
+      "HeroLevel": 55,
+      "ATKFactor": 3.51118779,
+      "HPFactor": 35.1118774,
+      "DEFFactor": 3.51118779,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2230,
+      "LevelupBasicPower": 1053
+    },
+    {
+      "ID": 56,
+      "HeroLevel": 56,
+      "ATKFactor": 3.59380937,
+      "HPFactor": 35.9380951,
+      "DEFFactor": 3.59380937,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2360,
+      "LevelupBasicPower": 1078
+    },
+    {
+      "ID": 57,
+      "HeroLevel": 57,
+      "ATKFactor": 3.67837548,
+      "HPFactor": 36.7837524,
+      "DEFFactor": 3.67837548,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2500,
+      "LevelupBasicPower": 1104
+    },
+    {
+      "ID": 58,
+      "HeroLevel": 58,
+      "ATKFactor": 3.7649312,
+      "HPFactor": 37.64931,
+      "DEFFactor": 3.7649312,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2650,
+      "LevelupBasicPower": 1129
+    },
+    {
+      "ID": 59,
+      "HeroLevel": 59,
+      "ATKFactor": 3.85352373,
+      "HPFactor": 38.5352364,
+      "DEFFactor": 3.85352373,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2810,
+      "LevelupBasicPower": 1156
+    },
+    {
+      "ID": 60,
+      "HeroLevel": 60,
+      "ATKFactor": 3.944201,
+      "HPFactor": 39.44201,
+      "DEFFactor": 3.944201,
+      "ShieldFactor": 0.0,
+      "levelupExp": 2980,
+      "LevelupBasicPower": 1183
+    },
+    {
+      "ID": 61,
+      "HeroLevel": 61,
+      "ATKFactor": 4.037012,
+      "HPFactor": 40.37012,
+      "DEFFactor": 4.037012,
+      "ShieldFactor": 0.0,
+      "levelupExp": 3150,
+      "LevelupBasicPower": 1211
+    },
+    {
+      "ID": 62,
+      "HeroLevel": 62,
+      "ATKFactor": 4.132007,
+      "HPFactor": 41.32007,
+      "DEFFactor": 4.132007,
+      "ShieldFactor": 0.0,
+      "levelupExp": 3340,
+      "LevelupBasicPower": 1240
+    },
+    {
+      "ID": 63,
+      "HeroLevel": 63,
+      "ATKFactor": 4.229237,
+      "HPFactor": 42.2923737,
+      "DEFFactor": 4.229237,
+      "ShieldFactor": 0.0,
+      "levelupExp": 3540,
+      "LevelupBasicPower": 1269
+    },
+    {
+      "ID": 64,
+      "HeroLevel": 64,
+      "ATKFactor": 4.32875538,
+      "HPFactor": 43.2875557,
+      "DEFFactor": 4.32875538,
+      "ShieldFactor": 0.0,
+      "levelupExp": 3750,
+      "LevelupBasicPower": 1299
+    },
+    {
+      "ID": 65,
+      "HeroLevel": 65,
+      "ATKFactor": 4.43061543,
+      "HPFactor": 44.3061523,
+      "DEFFactor": 4.43061543,
+      "ShieldFactor": 0.0,
+      "levelupExp": 3970,
+      "LevelupBasicPower": 1329
+    },
+    {
+      "ID": 66,
+      "HeroLevel": 66,
+      "ATKFactor": 4.534872,
+      "HPFactor": 45.34872,
+      "DEFFactor": 4.534872,
+      "ShieldFactor": 0.0,
+      "levelupExp": 4200,
+      "LevelupBasicPower": 1360
+    },
+    {
+      "ID": 67,
+      "HeroLevel": 67,
+      "ATKFactor": 4.64158249,
+      "HPFactor": 46.41582,
+      "DEFFactor": 4.64158249,
+      "ShieldFactor": 0.0,
+      "levelupExp": 4450,
+      "LevelupBasicPower": 1392
+    },
+    {
+      "ID": 68,
+      "HeroLevel": 68,
+      "ATKFactor": 4.75080347,
+      "HPFactor": 47.5080338,
+      "DEFFactor": 4.75080347,
+      "ShieldFactor": 0.0,
+      "levelupExp": 4710,
+      "LevelupBasicPower": 1425
+    },
+    {
+      "ID": 69,
+      "HeroLevel": 69,
+      "ATKFactor": 4.8625946,
+      "HPFactor": 48.625946,
+      "DEFFactor": 4.8625946,
+      "ShieldFactor": 0.0,
+      "levelupExp": 4990,
+      "LevelupBasicPower": 1459
+    },
+    {
+      "ID": 70,
+      "HeroLevel": 70,
+      "ATKFactor": 4.97701645,
+      "HPFactor": 49.77016,
+      "DEFFactor": 4.97701645,
+      "ShieldFactor": 0.0,
+      "levelupExp": 5290,
+      "LevelupBasicPower": 1493
+    },
+    {
+      "ID": 71,
+      "HeroLevel": 71,
+      "ATKFactor": 5.09413052,
+      "HPFactor": 50.9413033,
+      "DEFFactor": 5.09413052,
+      "ShieldFactor": 0.0,
+      "levelupExp": 5600,
+      "LevelupBasicPower": 1528
+    },
+    {
+      "ID": 72,
+      "HeroLevel": 72,
+      "ATKFactor": 5.214,
+      "HPFactor": 52.1400032,
+      "DEFFactor": 5.214,
+      "ShieldFactor": 0.0,
+      "levelupExp": 5930,
+      "LevelupBasicPower": 1564
+    },
+    {
+      "ID": 73,
+      "HeroLevel": 73,
+      "ATKFactor": 5.336691,
+      "HPFactor": 53.36691,
+      "DEFFactor": 5.336691,
+      "ShieldFactor": 0.0,
+      "levelupExp": 6290,
+      "LevelupBasicPower": 1601
+    },
+    {
+      "ID": 74,
+      "HeroLevel": 74,
+      "ATKFactor": 5.462269,
+      "HPFactor": 54.62269,
+      "DEFFactor": 5.462269,
+      "ShieldFactor": 0.0,
+      "levelupExp": 6660,
+      "LevelupBasicPower": 1639
+    },
+    {
+      "ID": 75,
+      "HeroLevel": 75,
+      "ATKFactor": 5.59080124,
+      "HPFactor": 55.9080124,
+      "DEFFactor": 5.59080124,
+      "ShieldFactor": 0.0,
+      "levelupExp": 7050,
+      "LevelupBasicPower": 1677
+    },
+    {
+      "ID": 76,
+      "HeroLevel": 76,
+      "ATKFactor": 5.7223587,
+      "HPFactor": 57.2235832,
+      "DEFFactor": 5.7223587,
+      "ShieldFactor": 0.0,
+      "levelupExp": 7470,
+      "LevelupBasicPower": 1717
+    },
+    {
+      "ID": 77,
+      "HeroLevel": 77,
+      "ATKFactor": 5.85701132,
+      "HPFactor": 58.5701141,
+      "DEFFactor": 5.85701132,
+      "ShieldFactor": 0.0,
+      "levelupExp": 7910,
+      "LevelupBasicPower": 1757
+    },
+    {
+      "ID": 78,
+      "HeroLevel": 78,
+      "ATKFactor": 5.99483252,
+      "HPFactor": 59.9483261,
+      "DEFFactor": 5.99483252,
+      "ShieldFactor": 0.0,
+      "levelupExp": 8380,
+      "LevelupBasicPower": 1798
+    },
+    {
+      "ID": 79,
+      "HeroLevel": 79,
+      "ATKFactor": 6.135897,
+      "HPFactor": 61.35897,
+      "DEFFactor": 6.135897,
+      "ShieldFactor": 0.0,
+      "levelupExp": 8880,
+      "LevelupBasicPower": 1841
+    },
+    {
+      "ID": 80,
+      "HeroLevel": 80,
+      "ATKFactor": 6.28028059,
+      "HPFactor": 62.8028069,
+      "DEFFactor": 6.28028059,
+      "ShieldFactor": 0.0,
+      "levelupExp": 9400,
+      "LevelupBasicPower": 1884
+    },
+    {
+      "ID": 81,
+      "HeroLevel": 81,
+      "ATKFactor": 6.428062,
+      "HPFactor": 64.2806244,
+      "DEFFactor": 6.428062,
+      "ShieldFactor": 0.0,
+      "levelupExp": 9960,
+      "LevelupBasicPower": 1928
+    },
+    {
+      "ID": 82,
+      "HeroLevel": 82,
+      "ATKFactor": 6.579321,
+      "HPFactor": 65.7932053,
+      "DEFFactor": 6.579321,
+      "ShieldFactor": 0.0,
+      "levelupExp": 10550,
+      "LevelupBasicPower": 1974
+    },
+    {
+      "ID": 83,
+      "HeroLevel": 83,
+      "ATKFactor": 6.734139,
+      "HPFactor": 67.3413849,
+      "DEFFactor": 6.734139,
+      "ShieldFactor": 0.0,
+      "levelupExp": 11170,
+      "LevelupBasicPower": 2020
+    },
+    {
+      "ID": 84,
+      "HeroLevel": 84,
+      "ATKFactor": 6.8926,
+      "HPFactor": 68.9259949,
+      "DEFFactor": 6.8926,
+      "ShieldFactor": 0.0,
+      "levelupExp": 11830,
+      "LevelupBasicPower": 2068
+    },
+    {
+      "ID": 85,
+      "HeroLevel": 85,
+      "ATKFactor": 7.05478954,
+      "HPFactor": 70.5479,
+      "DEFFactor": 7.05478954,
+      "ShieldFactor": 0.0,
+      "levelupExp": 12530,
+      "LevelupBasicPower": 2116
+    },
+    {
+      "ID": 86,
+      "HeroLevel": 86,
+      "ATKFactor": 7.220796,
+      "HPFactor": 72.20796,
+      "DEFFactor": 7.220796,
+      "ShieldFactor": 0.0,
+      "levelupExp": 13280,
+      "LevelupBasicPower": 2166
+    },
+    {
+      "ID": 87,
+      "HeroLevel": 87,
+      "ATKFactor": 7.39070845,
+      "HPFactor": 73.90708,
+      "DEFFactor": 7.39070845,
+      "ShieldFactor": 0.0,
+      "levelupExp": 14060,
+      "LevelupBasicPower": 2217
+    },
+    {
+      "ID": 88,
+      "HeroLevel": 88,
+      "ATKFactor": 7.564619,
+      "HPFactor": 75.6461945,
+      "DEFFactor": 7.564619,
+      "ShieldFactor": 0.0,
+      "levelupExp": 14890,
+      "LevelupBasicPower": 2269
+    },
+    {
+      "ID": 89,
+      "HeroLevel": 89,
+      "ATKFactor": 7.74262238,
+      "HPFactor": 77.42622,
+      "DEFFactor": 7.74262238,
+      "ShieldFactor": 0.0,
+      "levelupExp": 15780,
+      "LevelupBasicPower": 2323
+    },
+    {
+      "ID": 90,
+      "HeroLevel": 90,
+      "ATKFactor": 7.92481375,
+      "HPFactor": 79.24814,
+      "DEFFactor": 7.92481375,
+      "ShieldFactor": 0.0,
+      "levelupExp": 16710,
+      "LevelupBasicPower": 2377
+    },
+    {
+      "ID": 91,
+      "HeroLevel": 91,
+      "ATKFactor": 8.111293,
+      "HPFactor": 81.11293,
+      "DEFFactor": 8.111293,
+      "ShieldFactor": 0.0,
+      "levelupExp": 17700,
+      "LevelupBasicPower": 2433
+    },
+    {
+      "ID": 92,
+      "HeroLevel": 92,
+      "ATKFactor": 8.302159,
+      "HPFactor": 83.0216,
+      "DEFFactor": 8.302159,
+      "ShieldFactor": 0.0,
+      "levelupExp": 18750,
+      "LevelupBasicPower": 2491
+    },
+    {
+      "ID": 93,
+      "HeroLevel": 93,
+      "ATKFactor": 8.497518,
+      "HPFactor": 84.975174,
+      "DEFFactor": 8.497518,
+      "ShieldFactor": 0.0,
+      "levelupExp": 19860,
+      "LevelupBasicPower": 2549
+    },
+    {
+      "ID": 94,
+      "HeroLevel": 94,
+      "ATKFactor": 8.697473,
+      "HPFactor": 86.9747238,
+      "DEFFactor": 8.697473,
+      "ShieldFactor": 0.0,
+      "levelupExp": 21030,
+      "LevelupBasicPower": 2609
+    },
+    {
+      "ID": 95,
+      "HeroLevel": 95,
+      "ATKFactor": 8.902133,
+      "HPFactor": 89.02133,
+      "DEFFactor": 8.902133,
+      "ShieldFactor": 0.0,
+      "levelupExp": 22280,
+      "LevelupBasicPower": 2671
+    },
+    {
+      "ID": 96,
+      "HeroLevel": 96,
+      "ATKFactor": 9.111609,
+      "HPFactor": 91.11609,
+      "DEFFactor": 9.111609,
+      "ShieldFactor": 0.0,
+      "levelupExp": 23590,
+      "LevelupBasicPower": 2733
+    },
+    {
+      "ID": 97,
+      "HeroLevel": 97,
+      "ATKFactor": 9.32601452,
+      "HPFactor": 93.26014,
+      "DEFFactor": 9.32601452,
+      "ShieldFactor": 0.0,
+      "levelupExp": 24990,
+      "LevelupBasicPower": 2798
+    },
+    {
+      "ID": 98,
+      "HeroLevel": 98,
+      "ATKFactor": 9.54546452,
+      "HPFactor": 95.45465,
+      "DEFFactor": 9.54546452,
+      "ShieldFactor": 0.0,
+      "levelupExp": 26470,
+      "LevelupBasicPower": 2864
+    },
+    {
+      "ID": 99,
+      "HeroLevel": 99,
+      "ATKFactor": 9.770079,
+      "HPFactor": 97.70079,
+      "DEFFactor": 9.770079,
+      "ShieldFactor": 0.0,
+      "levelupExp": 28040,
+      "LevelupBasicPower": 2931
+    },
+    {
+      "ID": 100,
+      "HeroLevel": 100,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 101,
+      "HeroLevel": 101,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 102,
+      "HeroLevel": 102,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 103,
+      "HeroLevel": 103,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 104,
+      "HeroLevel": 104,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 105,
+      "HeroLevel": 105,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 106,
+      "HeroLevel": 106,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 107,
+      "HeroLevel": 107,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 108,
+      "HeroLevel": 108,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 109,
+      "HeroLevel": 109,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 110,
+      "HeroLevel": 110,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 111,
+      "HeroLevel": 111,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 112,
+      "HeroLevel": 112,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 113,
+      "HeroLevel": 113,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 114,
+      "HeroLevel": 114,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 115,
+      "HeroLevel": 115,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 116,
+      "HeroLevel": 116,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 117,
+      "HeroLevel": 117,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 118,
+      "HeroLevel": 118,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 119,
+      "HeroLevel": 119,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 120,
+      "HeroLevel": 120,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 121,
+      "HeroLevel": 121,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 122,
+      "HeroLevel": 122,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 123,
+      "HeroLevel": 123,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 124,
+      "HeroLevel": 124,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 125,
+      "HeroLevel": 125,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 126,
+      "HeroLevel": 126,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 127,
+      "HeroLevel": 127,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 128,
+      "HeroLevel": 128,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 129,
+      "HeroLevel": 129,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    },
+    {
+      "ID": 130,
+      "HeroLevel": 130,
+      "ATKFactor": 9.999979,
+      "HPFactor": 99.99979,
+      "DEFFactor": 9.999979,
+      "ShieldFactor": 0.0,
+      "levelupExp": 0,
+      "LevelupBasicPower": 3000
+    }
+  ]
+}

Assets/Res/Config/HeroPowerUpConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DShK436lWnl5wIzYeJ6fNt6Kz/9E7Zp5UfawnYS2D3zG/yEi9WsRN4s=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/LevelBattleConfig.json

@@ -0,0 +1,30 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "MonsterWavesConfigId": [
+        1,
+        2,
+        3
+      ],
+      "monsterLv": 1,
+      "BossMonsterWavesId": 1,
+      "bossLv": 3,
+      "bossMonsterId": 9000103,
+      "exp": 100
+    },
+    {
+      "ID": 2,
+      "MonsterWavesConfigId": [
+        1,
+        2,
+        3
+      ],
+      "monsterLv": 5,
+      "BossMonsterWavesId": 1,
+      "bossLv": 8,
+      "bossMonsterId": 9000103,
+      "exp": 100
+    }
+  ]
+}

Assets/Res/Config/LevelBattleConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Xikc4CquUS8nxQd9QZo+m+rf84LoKSgJVCy/w9ndkNJs8wU2p2itJms=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/MonsterGroupConfig.json

@@ -0,0 +1,19 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "miniMonsterId": [
+        9000101
+      ]
+    },
+    {
+      "ID": 2,
+      "miniMonsterId": [
+        9000101
+      ],
+      "eliteMonsterId": [
+        9000102
+      ]
+    }
+  ]
+}

Assets/Res/Config/MonsterGroupConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XihMtyikVXmfyR09Hmi/Oatt/O/i9lwqqiYWYaihqQF7kIzL2W7Luew=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/MonsterWavesConfig.json

@@ -0,0 +1,42 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "wavesDelay": 3,
+      "monsterGroupConfigId": [
+        1,
+        1,
+        2
+      ],
+      "miniMonsterCount": [
+        10,
+        10,
+        20
+      ],
+      "eliteMonsterCount": [
+        0,
+        0,
+        1
+      ]
+    },
+    {
+      "ID": 2,
+      "wavesDelay": 3,
+      "monsterGroupConfigId": [
+        1,
+        2,
+        2
+      ],
+      "miniMonsterCount": [
+        10,
+        10,
+        20
+      ],
+      "eliteMonsterCount": [
+        0,
+        1,
+        3
+      ]
+    }
+  ]
+}

Assets/Res/Config/MonsterWavesConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3hJtyP5VSnrzzuKk2g2mNWvl3Vsm6vgcun/SPZi/JZBMzYv3QUXP0E=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -513,6 +513,8 @@ MonoBehaviour:
   ShaderVariantCollection: {fileID: 20000000, guid: 0456cfcc19cfc704784e3e24885b4321, type: 2}
   BundleLoadType: 0
   h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
+  isTest: 0
+  levelBattleId: 1
 --- !u!4 &1421949366
 Transform:
   m_ObjectHideFlags: 0

Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -45,81 +45,69 @@ public string model;
 
 
 		/// <summary>
-		///星级
-		/// </summary>
-public int rarity;
-
-
-		/// <summary>
-		///职业 1.战士 2.法师 3.牧师 4.游侠
-		/// </summary>
-public int profession;
-
-
-		/// <summary>
-		///移动速度
+		///
 		/// </summary>
-public int move_speed;
+public bool isUseGpu;
 
 
 		/// <summary>
-		///攻击速度
+		///星级
 		/// </summary>
-public float speed_atk;
+public int rarity;
 
 
 		/// <summary>
-		///攻击范围
+		///职业 1.战士 2.法师 3.牧师 4.游侠
 		/// </summary>
-public int range_atk;
+public int profession;
 
 
 		/// <summary>
-		///普攻ID
+		///生命值
 		/// </summary>
-public int skillID_0;
+public int hp;
 
 
 		/// <summary>
-		///技能1ID
+		///防御力
 		/// </summary>
-public int skillID_1;
+public int def;
 
 
 		/// <summary>
-		///技能2ID
+		///暴击率
 		/// </summary>
-public int skillID_2;
+public int crit;
 
 
 		/// <summary>
-		///技能3ID
+		///攻击力
 		/// </summary>
-public int skillID_3;
+public int attack;
 
 
 		/// <summary>
-		///技能4ID
+		///移动速度
 		/// </summary>
-public int skillID_4;
+public int move_speed;
 
 
 		/// <summary>
-		///技能5ID
+		///攻击速度
 		/// </summary>
-public int skillID_5;
+public float speed_atk;
 
 
 		/// <summary>
-		///技能6ID
+		///攻击范围
 		/// </summary>
-public int skillID_6;
+public int range_atk;
 
 
 		/// <summary>
-		///技能7ID
+		///技能ID
 		/// </summary>
-public int skillID_7;
+public int[] skillID;
 
 
 		/// <summary>
@@ -128,18 +116,6 @@ public int skillID_7;
 public int heroStory;
 
 
-		/// <summary>
-		///显示大小
-		/// </summary>
-public float showSize;
-
-
-		/// <summary>
-		///显示时候播放的idleName
-		/// </summary>
-public string showIdleName;
-
-
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs

@@ -0,0 +1,68 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\HeroPowerUp.xlsx. SheetName: HeroPowerUpConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "HeroPowerUpConfig.json")]
+	public partial class HeroPowerUpConfigHolder : ConfigHolder<HeroPowerUpConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct HeroPowerUpConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///英雄等级
+		/// </summary>
+public int HeroLevel;
+
+
+		/// <summary>
+		///攻击力倍率
+		/// </summary>
+public float ATKFactor;
+
+
+		/// <summary>
+		///生命倍率
+		/// </summary>
+public float HPFactor;
+
+
+		/// <summary>
+		///防御倍率
+		/// </summary>
+public float DEFFactor;
+
+
+		/// <summary>
+		///护盾倍率
+		/// </summary>
+public float ShieldFactor;
+
+
+		/// <summary>
+		///升级所需经验值 （0代表最大等级)
+		/// </summary>
+public int levelupExp;
+
+
+		/// <summary>
+		///等级提升提供的评分A1
+		/// </summary>
+public int LevelupBasicPower;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/HeroPowerUpConfig.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs

@@ -0,0 +1,80 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\LevelBattle.xlsx. SheetName: LevelBattleConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "LevelBattleConfig.json")]
+	public partial class LevelBattleConfigHolder : ConfigHolder<LevelBattleConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct LevelBattleConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///这个节点内可以刷的怪物组
+		/// </summary>
+public int[] MonsterWavesConfigId;
+
+
+		/// <summary>
+		///等级
+		/// </summary>
+public int monsterLv;
+
+
+		/// <summary>
+		///打死小怪可以获得的奖励
+		/// </summary>
+public int[] miniMonsterItem;
+
+
+		/// <summary>
+		///杀死精英怪可以获得的奖励
+		/// </summary>
+public int[] eliteMonsterItem;
+
+
+		/// <summary>
+		///大boss的时候使用的波ID 
+		/// </summary>
+public int BossMonsterWavesId;
+
+
+		/// <summary>
+		///boss等级
+		/// </summary>
+public int bossLv;
+
+
+		/// <summary>
+		///boss怪物ID
+		/// </summary>
+public int bossMonsterId;
+
+
+		/// <summary>
+		///打死boss可以获得的奖励
+		/// </summary>
+public int[] bossItem;
+
+
+		/// <summary>
+		///获得多少经验杀boss
+		/// </summary>
+public int exp;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/MonsterGroupConfig.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\LevelBattle.xlsx. SheetName: MonsterGroupConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "MonsterGroupConfig.json")]
+	public partial class MonsterGroupConfigHolder : ConfigHolder<MonsterGroupConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct MonsterGroupConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///全部可以刷的小怪怪物组
+		/// </summary>
+public int[] miniMonsterId;
+
+
+		/// <summary>
+		///全部可以耍的精英怪组
+		/// </summary>
+public int[] eliteMonsterId;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/MonsterGroupConfig.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/MonsterWavesConfig.cs

@@ -0,0 +1,50 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\LevelBattle.xlsx. SheetName: MonsterWavesConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "MonsterWavesConfig.json")]
+	public partial class MonsterWavesConfigHolder : ConfigHolder<MonsterWavesConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct MonsterWavesConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///物品表的ID 掉落道具
+		/// </summary>
+public int wavesDelay;
+
+
+		/// <summary>
+		///每一波可以刷出来的怪物组
+		/// </summary>
+public int[] monsterGroupConfigId;
+
+
+		/// <summary>
+		///每一波可以耍的小怪数量
+		/// </summary>
+public int[] miniMonsterCount;
+
+
+		/// <summary>
+		///每一波可以耍的精英怪数量
+		/// </summary>
+public int[] eliteMonsterCount;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/MonsterWavesConfig.cs.meta

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

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

@@ -31,7 +31,7 @@ namespace GameLogic.Combat.CombatTool
             get { return stateControl.CurrIState as CombatStateBasic; }
         }
 
-        public async CTask InitCombat()
+        public async CTask InitCombat(StartCombatInfo startCombatInfo)
         {
             TimeLineSingletonEventManager.Instance.AddTimeLineBasic(this);
             GameTimeLineParticleFactory = new GameTimeLineParticleFactory();
@@ -53,8 +53,17 @@ namespace GameLogic.Combat.CombatTool
 
             CombatHeroController = new CombatHeroController();
             CombatHeroController.Init(this);
-            CombatTypeBasic = new TestCombatType();
-            CombatTypeBasic.Init(this);
+            switch (startCombatInfo.CombatType)
+            {
+                case CombatType.CombatType.TestCombat:
+                    CombatTypeBasic = new TestCombatType();
+                    break;
+                case CombatType.CombatType.LevelBattle:
+                    CombatTypeBasic = new LevelBattleCombatType();
+                    break;
+            }
+          
+            CombatTypeBasic.Init(this,startCombatInfo);
             await CombatTypeBasic.StartGame();
             ChangeState("update");
             isUpdate = true;

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

@@ -11,5 +11,6 @@ namespace GameLogic.Combat.CombatTool
         public AttType attType;
         public TriggerData triggerData;
         public HarmType harmType = HarmType.Default;
+         
     }
 }

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

@@ -4,5 +4,9 @@
     {
         Null,
         Default,
+        /// <summary>
+        /// 系统杀死 不掉落和统计
+        /// </summary>
+        SystemKo,
     }
 }

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

@@ -0,0 +1,8 @@
+namespace GameLogic.Combat.CombatType
+{
+    public enum CombatType
+    {
+        TestCombat,
+        LevelBattle,
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b03e5e167d434822989fa5e291df18b8
+timeCreated: 1732615940

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

@@ -21,10 +21,12 @@ namespace GameLogic.Combat.CombatType
         public bool isActiveCombat = false;
 
         protected IUnRegister _unRegister;
-        public void Init(CombatController combatController)
+        protected StartCombatInfo _startCombatInfo;
+        public void Init(CombatController combatController,StartCombatInfo startCombatInfo)
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDieEventData);
             this.combatController = combatController;
+            this._startCombatInfo= startCombatInfo;
             _combatScenesConfig = combatController.gameObject.GetComponent<CombatScenesConfig>();
             FindNextConfig();
             ProInit();

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

@@ -0,0 +1,256 @@
+using System.Collections.Generic;
+using Common.Utility.CombatEvent;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Combat.CombatTool;
+using GameLogic.CombatScenesTool;
+using UnityEngine;
+
+namespace GameLogic.Combat.CombatType
+{
+    public class LevelBattleCombatType : CombatTypeBasic
+    {
+        private TestCombatHeroConfig testCombatHeroConfig;
+        // protected TestCombatHeroConfig.EnemyGroup currEnemyGroup;
+        /// <summary>
+        /// 当前关卡战斗的波次节点
+        /// </summary>
+        protected int _currLevelBattleNodeIndex;
+
+        private float _currTime;
+        // private int _currBoChi;
+
+        protected LevelBattleConfig _levelBattleConfig;
+        protected MonsterWavesConfig _currWavesConfig;
+
+        /// <summary>
+        ///  当前节点的波次下标
+        /// </summary>
+        protected int _currNodeWavesIndex;
+
+        public int exp;
+        public bool isBossCombat;
+
+        protected List<string> equipName = new List<string>()
+        {
+            "fx_down_zb_blue",
+            "fx_down_zb_gold",
+            "fx_down_zb_green",
+            "fx_down_zb_orange",
+            "fx_down_zb_purple",
+        };
+
+        protected override void ProInit()
+        {
+            _levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(_startCombatInfo.levelBattleId);
+            _currLevelBattleNodeIndex = 0;
+        }
+
+        protected override void ProHeroDie(CombatHeroEntity combatHeroEntity)
+        {
+            if (!isBossCombat)
+            {
+                MiniMonsterDie(combatHeroEntity);
+            }
+            else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
+            {
+                isBossCombat = false;
+                _levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(_levelBattleConfig.ID + 1);
+                _currLevelBattleNodeIndex = 0;
+                InitNewMonsterConfig();
+            }
+        }
+
+
+        private void MiniMonsterDie(CombatHeroEntity combatHeroEntity)
+        {
+            if (isBossCombat)
+            {
+                return;
+            }
+
+            CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
+            combatItemShowEventData.count = Random.Range(3, 5);
+            combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
+            EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
+            List<string> allEquip = new List<string>();
+            for (int i = 0; i < 1; i++)
+            {
+                int odds = CombatCalculateTool.Instance.GetOdd();
+                if (odds < 10)
+                {
+                    allEquip.Add(equipName[CombatCalculateTool.Instance.GetOdd(0, equipName.Count)]);
+                }
+            }
+
+            Combat_EquipFallEventData combatEquipFallEventData = Combat_EquipFallEventData.Create();
+            combatEquipFallEventData.fallEquip = allEquip.ToArray();
+            combatEquipFallEventData.startPos_WorldPos = combatItemShowEventData.startPos_WorldPos;
+            EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
+
+            ShowTextEventData showTextEventData = ShowTextEventData.Create();
+            showTextEventData.text = "+金币 20";
+            showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
+            showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
+            EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
+
+            exp += 1;
+            if (exp >= _levelBattleConfig.exp) // 到达目标值，开始打boss
+            {
+                StartBossCombat();
+            }
+            else
+            {
+                CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
+                if (allHero == null || allHero.Length <= 0)
+                {
+                    if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length)
+                    {
+                        CreateEnemy(new CTaskAwaitBuffer());
+                    }
+                    else
+                    {
+                        InitNewMonsterConfig();
+                    }
+                }
+            }
+        }
+
+        private void InitNewMonsterConfig()
+        {
+            _currNodeWavesIndex = 0;
+            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
+            FindNextConfig();
+            InitTestCombatBoChi();
+            CreateEnemy(new CTaskAwaitBuffer());
+        }
+
+        protected override async CTask ProStartGame()
+        {
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            TestCombat(cTaskAwaitBuffer);
+            InitTestCombatBoChi();
+            CreateEnemy(cTaskAwaitBuffer);
+            await cTaskAwaitBuffer.WaitAll();
+            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
+        }
+
+
+        protected void StartBossCombat()
+        {
+            isBossCombat = true;
+            HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
+            harmReturnInfo.harmType = HarmType.SystemKo;
+            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
+            for (int i = 0; i < allHero.Length; i++)
+            {
+                allHero[i].HeroDie(harmReturnInfo);
+            }
+
+            _currWavesConfig =
+                ConfigComponent.Instance.Get<MonsterWavesConfig>(
+                    _levelBattleConfig.BossMonsterWavesId);
+            _currNodeWavesIndex = -1;
+            CreateEnemy(new CTaskAwaitBuffer());
+        }
+
+
+        protected void InitTestCombatBoChi()
+        {
+            _currLevelBattleNodeIndex %= _levelBattleConfig.MonsterWavesConfigId.Length;
+            _currWavesConfig =
+                ConfigComponent.Instance.Get<MonsterWavesConfig>(
+                    _levelBattleConfig.MonsterWavesConfigId[_currLevelBattleNodeIndex]);
+            _currLevelBattleNodeIndex++;
+            _currNodeWavesIndex = -1;
+        }
+
+
+        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            _currNodeWavesIndex++;
+            _currNodeWavesIndex %= _currWavesConfig.monsterGroupConfigId.Length;
+            int miniCount = _currWavesConfig.miniMonsterCount[_currNodeWavesIndex];
+            MonsterGroupConfig monsterGroupConfig =
+                ConfigComponent.Instance.Get<MonsterGroupConfig>(
+                    _currWavesConfig.monsterGroupConfigId[_currNodeWavesIndex]);
+            // count = 500;
+            for (int i = 0; i < miniCount; i++)
+            {
+                int index = i;
+                int monsterIndex = Random.Range(0, monsterGroupConfig.miniMonsterId.Length);
+                int monsterId = monsterGroupConfig.miniMonsterId[monsterIndex];
+                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, index);
+            }
+
+            int eliteCount = _currWavesConfig.eliteMonsterCount[_currNodeWavesIndex];
+            for (int i = 0; i < eliteCount; i++)
+            {
+                int index = i;
+                int monsterIndex = Random.Range(0, monsterGroupConfig.eliteMonsterId.Length);
+                int monsterId = monsterGroupConfig.eliteMonsterId[monsterIndex];
+                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, index);
+            }
+        }
+
+        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int index)
+        {
+            CombatHeroEntity heroEntity = new CombatHeroEntity();
+            heroEntity.IsEnemy = true;
+            CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
+            combatHeroInfo.InitMonster(monsterId, _levelBattleConfig.monsterLv);
+            cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo,
+                delegate(CombatHeroEntity entity)
+                {
+                    combatController.CombatHeroController.AddHero(entity);
+                    index %= nextConfig.monsterPoint.Length;
+                    Vector3 pos = nextConfig.monsterPoint[index].position + new Vector3(
+                        CombatCalculateTool.Instance.GetOdd(-4, 4), 0, CombatCalculateTool.Instance.GetOdd(-4, 4));
+                    heroEntity.combatHeroGameObject.SetPosition(pos);
+                }));
+        }
+
+        protected override void ProUpdate(float t)
+        {
+            if (!isActiveCombat)
+            {
+                return;
+            }
+
+            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length)
+            {
+                _currTime += 0.016f;
+                if (_currTime > _currWavesConfig.wavesDelay)
+                {
+                    CreateEnemy(new CTaskAwaitBuffer());
+                    _currTime = 0;
+                }
+            }
+        }
+
+        private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
+            if (testCombatHeroConfig != null)
+            {
+                for (int i = 0; i < testCombatHeroConfig.myHeroInfo.Length; i++)
+                {
+                    int index = i;
+                    TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[i];
+                    CombatHeroEntity heroEntity = new CombatHeroEntity();
+                    heroEntity.IsEnemy = false;
+                    heroEntity.number = i;
+                    CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
+                    testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
+                    cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo,
+                        delegate(CombatHeroEntity entity)
+                        {
+                            combatController.CombatHeroController.AddHero(entity);
+                            heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
+                        }));
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9ec64edbbc3849df8087aad4df66f8aa
+timeCreated: 1732611875

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

@@ -0,0 +1,8 @@
+namespace GameLogic.Combat.CombatType
+{
+    public class StartCombatInfo
+    {
+        public int levelBattleId;
+        public CombatType CombatType;
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatType/StartCombatInfo.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 4567cf37684c47daa79f991a1042a1b5
+timeCreated: 1732615792

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

@@ -2,6 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Core.Utility;
 using Excel2Json;
+using Fort23.UTool;
 using UnityEngine;
 using UnityEngine.Serialization;
 
@@ -22,12 +23,33 @@ public class CombatHeroInfo
     
     public HeroModelConfig modelConfig;
 
+    /// <summary>
+    /// 1=英雄 2=小怪 3=精英怪 4=boss
+    /// </summary>
+    public int heroType;
 
     public string modelName;
     public float maxDis=2;
     public float maxDisTo=2*2;
     public int[] skillId;
     public bool isGpu;
+
+    public void InitMonster(int id,int level)
+    {
+        HeroModelConfig heroModelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(id);
+        HeroPowerUpConfig heroPowerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
+        hp=(EncryptionLong)(heroModelConfig.hp*heroPowerUpConfig.HPFactor);
+        defense=(EncryptionLong)(heroModelConfig.def*heroPowerUpConfig.DEFFactor);
+        attack=(EncryptionLong)(heroModelConfig.attack*heroPowerUpConfig.ATKFactor);
+        attSpeed=(EncryptionFloat)heroModelConfig.speed_atk;
+        crit=(EncryptionFloat)heroModelConfig.crit;
+        skillId = heroModelConfig.skillID;
+        modelName = heroModelConfig.model;
+        isGpu = heroModelConfig.isUseGpu;
+        maxDis=heroModelConfig.range_atk;
+        maxDisTo = maxDis * maxDis;
+    }
+
     public CombatHeroInfo Copy()
     {
         CombatHeroInfo combatHeroInfo = (CombatHeroInfo)MemberwiseClone();

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -2,6 +2,7 @@
 using Fort23.Core;
 using Fort23.Mono;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
 using Utility;
@@ -12,7 +13,12 @@ namespace GameLogic.Combat
     {
         public CombatController CombatController;
 
-        public async CTask AddCombatController(CombatController combatController)
+        public  void AddCombatController(CombatController combatController)
+        {
+            this.CombatController = combatController;
+        }
+
+        public async CTask StartCombat(StartCombatInfo startCombatInfo)
         {
             CombatEquipFallManager.Instance.Dispose();
             CombatEquipFallManager.Instance.Init();
@@ -22,8 +28,8 @@ namespace GameLogic.Combat
             CombatShowTextPanel.OpenCombatShowTextPanel(cTaskAwaitBuffer);
             cTaskAwaitBuffer.AddTask(ShowItemMoveToTargetPanel.OpenShowItemMoveToTargetPanel());
             await cTaskAwaitBuffer.WaitAll();
-            this.CombatController = combatController;
-            await CombatController.InitCombat();
+
+            await CombatController.InitCombat(startCombatInfo);
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 

Assets/Scripts/GameUI/GameApplction.cs

@@ -5,6 +5,7 @@ using Fort23.Mono;
 using Fort23.UTool;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
 using UnityEngine;
 using UnityEngine.UI;
 using Utility.CTween;
@@ -17,6 +18,8 @@ public class GameApplction : MonoBehaviour
     public string h5Url;
     private Entity _root;
     private Entity _scene;
+    public bool isTest;
+    public int levelBattleId;
 
     private async void Start()
     {
@@ -53,7 +56,11 @@ public class GameApplction : MonoBehaviour
         //主UI加载
         MainSceneController.Instance.Init();
 
-        await CombatDrive.Instance.AddCombatController(new CombatController());
+        StartCombatInfo startCombatInfo = new StartCombatInfo();
+        startCombatInfo.CombatType = isTest ? CombatType.TestCombat : CombatType.LevelBattle;
+        startCombatInfo.levelBattleId = levelBattleId;
+        CombatDrive.Instance.AddCombatController(new CombatController());
+        await CombatDrive.Instance.StartCombat(startCombatInfo);
     }
 
     public void Update()

UserSettings/EditorUserSettings.asset

@@ -21,46 +21,28 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 0255025200575009595a087740735d44464f1b792e7a2761792b1e37e3b93769
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 520706035554580a0c590e204220064443161c7e7c2b71602f784a64bbb8636f
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 5b0255535d0c510e5e565e7249250f4413154d2b787e76317f2c1e63b1e26568
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
-      flags: 0
-    RecentlyUsedSceneGuid-4:
-      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
-      flags: 0
-    RecentlyUsedSceneGuid-5:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
-      flags: 0
-    RecentlyUsedSceneGuid-6:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
-      flags: 0
-    RecentlyUsedSceneGuid-7:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
-      flags: 0
-    RecentlyUsedSceneGuid-8:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
-      flags: 0
-    RecentlyUsedSceneGuid-9:
       value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b2968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af9f9aaffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9198978797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 20}
   - {fileID: 22}
+  - {fileID: 24}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -47,10 +47,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 405
-    y: 73
-    width: 888
-    height: 1060
+    x: 361
+    y: 81
+    width: 634
+    height: 873
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -105,23 +105,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 888
-      height: 1039
-    m_Scale: {x: 0.6397783, y: 0.6397783}
-    m_Translation: {x: 443.99997, y: 519.5}
+      width: 634
+      height: 852
+    m_Scale: {x: 0.52463055, y: 0.52463055}
+    m_Translation: {x: 317, y: 426}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -693.99036
+      x: -604.23474
       y: -812
-      width: 1387.9807
+      width: 1208.4695
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.6397783
-  m_LastWindowPixelSize: {x: 888, y: 1060}
+  m_defaultScale: 0.52463055
+  m_LastWindowPixelSize: {x: 634, y: 873}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -141,12 +141,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 4}
-  - {fileID: 18}
+  - {fileID: 20}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1742
+    width: 1534
     height: 1299
   m_MinSize: {x: 300, y: 150}
   m_MaxSize: {x: 24288, y: 24288}
@@ -172,8 +172,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1742
-    height: 1081
+    width: 1534
+    height: 987
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
@@ -196,8 +196,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 405
-    height: 1081
+    width: 356
+    height: 987
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 6}
@@ -225,10 +225,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 404
-    height: 1060
+    x: 5
+    y: 81
+    width: 355
+    height: 966
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -242,9 +242,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 5254e4ff
       m_LastClickedID: 0
-      m_ExpandedIDs: 8edeeeffbcdeeefff6f3eeff24f4eefffe2defffc02eefff022fefff102fefff48adefff4eadefff70adefff7eadefff12e0effff616f0ff6e1bf0ff741bf0ff961bf0ffa41bf0ffce34f4ffae56f4ff42a0fcffd2a2fcffd6a2fcffe4a2fcffc4faffffaa9d0000b49d000070ec0000
+      m_ExpandedIDs: 0c55e4ff8a4f0200d04f0200
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -282,19 +282,45 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 8}
-  - {fileID: 11}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
-    x: 405
+    x: 356
     y: 0
-    width: 1337
-    height: 1081
+    width: 1178
+    height: 987
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
   controlID: -1
   draggingID: 0
 --- !u!114 &8
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 9}
+  - {fileID: 11}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 636
+    height: 987
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: -1
+  draggingID: 0
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -311,18 +337,17 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 890
-    height: 1081
+    width: 636
+    height: 894
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 2}
-  - {fileID: 9}
   - {fileID: 10}
   m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &9
+  m_LastSelected: 1
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -342,10 +367,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 806
+    x: 356
     y: 73
-    width: 683
-    height: 837
+    width: 634
+    height: 800
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -359,6 +384,9 @@ MonoBehaviour:
   m_ViewTransforms:
     m_KeySerializationHelper:
     - {fileID: 1107970526213483986, guid: be15068affc04af41b54896da4d4feb7, type: 2}
+    - {fileID: 7813710424225025242, guid: 965d15d735575274896b1aca47c37250, type: 2}
+    - {fileID: 7813710424225025242, guid: 7a8c4cfa8d5dae4419b1eb31cff60e83, type: 2}
+    - {fileID: 7813710424225025242, guid: 1843f38245744dd438c9f0aed405cb60, type: 2}
     m_ValueSerializationHelper:
     - e00: 1.2392083
       e01: 0
@@ -376,10 +404,58 @@ MonoBehaviour:
       e31: 0
       e32: 0
       e33: 1
+    - e00: 0.5378947
+      e01: 0
+      e02: 0
+      e03: -11.894745
+      e10: 0
+      e11: 0.5378947
+      e12: 0
+      e13: 164.61325
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 0.5378947
+      e01: 0
+      e02: 0
+      e03: -11.894745
+      e10: 0
+      e11: 0.5378947
+      e12: 0
+      e13: 219.24683
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 1.0575557
+      e01: 0
+      e02: 0
+      e03: -332.50568
+      e10: 0
+      e11: 1.0575557
+      e12: 0
+      e13: -66.55417
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
   m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: be15068affc04af41b54896da4d4feb7, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: 1843f38245744dd438c9f0aed405cb60, type: 2}
   m_BreadCrumbs:
-  - m_Target: {fileID: 1107970526213483986, guid: be15068affc04af41b54896da4d4feb7, type: 2}
+  - m_Target: {fileID: 7813710424225025242, guid: 1843f38245744dd438c9f0aed405cb60, type: 2}
     m_ScrollPosition: {x: 0, y: 0}
   stateMachineGraph: {fileID: 0}
   stateMachineGraphGUI: {fileID: 0}
@@ -392,7 +468,33 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &10
+--- !u!114 &11
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: TransitionLibraryWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 894
+    width: 636
+    height: 93
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 12}
+  m_Panes:
+  - {fileID: 12}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -412,10 +514,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 776
-    y: 73
-    width: 792
-    height: 614
+    x: 361
+    y: 975
+    width: 634
+    height: 72
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -466,7 +568,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -479,20 +581,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 16}
+  - {fileID: 14}
+  - {fileID: 18}
   m_Position:
     serializedVersion: 2
-    x: 890
+    x: 636
     y: 0
-    width: 447
-    height: 1081
+    width: 542
+    height: 987
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 19214
+  controlID: 104006
   draggingID: 0
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -509,18 +611,18 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 447
-    height: 719
+    width: 542
+    height: 299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 15}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 14}
   - {fileID: 15}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -540,10 +642,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1295
-    y: 73
-    width: 445
-    height: 698
+    x: 997
+    y: 81
+    width: 540
+    height: 278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -598,7 +700,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -636,9 +738,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -125.5, y: 86}
+      snapOffset: {x: -125.5, y: -168}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 1
+      snapCorner: 3
       id: Orientation
       index: 0
       layout: 4
@@ -650,7 +752,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 1
@@ -676,7 +778,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -689,7 +791,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -741,7 +843,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -754,7 +856,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -767,7 +869,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -896,8 +998,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -216, y: -344}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: -216, y: -254}
+      snapOffsetDelta: {x: 0, y: 26}
       snapCorner: 3
       id: AINavigationOverlay
       index: 12
@@ -907,17 +1009,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 0
-  m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_OverrideSceneCullingMask: 0
+  m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.44946077, y: 0.03279972, z: 23.477993}
+    m_Target: {x: -1.93, y: 0.82263917, z: -0.8507079}
     speed: 2
-    m_Value: {x: 0.44946077, y: 0.03279972, z: 23.477993}
+    m_Value: {x: -1.93, y: 0.82263917, z: -0.8507079}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -928,7 +1030,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -963,13 +1065,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.12272236, y: 0.06718975, z: -0.008506374, w: -0.9902695}
+    m_Target: {x: 0.012960349, y: -0.98583513, z: 0.09076714, w: 0.1408682}
     speed: 2
-    m_Value: {x: -0.122705095, y: 0.067180306, z: -0.008505178, w: -0.9901302}
+    m_Value: {x: 0.012959563, y: -0.9857753, z: 0.09076163, w: 0.14085965}
   m_Size:
-    m_Target: 21.499727
+    m_Target: 1.5109574
     speed: 2
-    m_Value: 21.499727
+    m_Value: 1.5109574
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -996,7 +1098,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1527,7 +1629,7 @@ MonoBehaviour:
     \"z\": 0.0\n    },\n    \"m_Labels\": []\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2256,7 +2358,7 @@ MonoBehaviour:
     ],\n    \"m_Dropdowns\": [],\n    \"m_DropdownSelectedEntries\": []\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2272,17 +2374,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 719
-    width: 447
-    height: 362
+    y: 299
+    width: 542
+    height: 688
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &17
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2302,10 +2404,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1295
-    y: 792
-    width: 445
-    height: 341
+    x: 997
+    y: 380
+    width: 540
+    height: 667
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2323,9 +2425,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_SequenceHierarchy: {fileID: 0}
   m_SequencePath:
-    m_SelectionRoot: 0
+    m_SelectionRoot: 151504
     m_SubElements: []
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2341,17 +2443,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1081
-    width: 1742
-    height: 218
+    y: 987
+    width: 1534
+    height: 312
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2371,10 +2473,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 1154
-    width: 1741
-    height: 197
+    x: 5
+    y: 1068
+    width: 1533
+    height: 291
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2385,7 +2487,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &20
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2400,18 +2502,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1742
+    x: 1534
     y: 0
-    width: 212
+    width: 550
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &21
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2431,9 +2533,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1742
-    y: 73
-    width: 210
+    x: 1539
+    y: 81
+    width: 548
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2456,7 +2558,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/ShowItemMoveTarget
+    - Assets/Art/ArtHero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2464,16 +2566,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/ShowItemMoveTarget
+  - Assets/Art/ArtHero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 134}
-    m_SelectedIDs: 2eff0000
-    m_LastClickedID: 65326
-    m_ExpandedIDs: 000000008a9e00008c9e00008e9e0000909e0000929e0000949e0000969e0000989e00009a9e0000b0a00000b2a00000b4a00000b8a0000078ed000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 68a00000
+    m_LastClickedID: 41064
+    m_ExpandedIDs: 000000008a9e00008c9e00008e9e0000909e0000929e0000949e0000969e0000989e00009a9e00009c9e00006aa0000084a00000b0a00000b2a00000b4a00000b8a0000040ce000078ed000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2489,7 +2591,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 20}
+      m_ClientGUIView: {fileID: 22}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -2501,7 +2603,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000008a9e00008c9e00008e9e0000909e0000929e0000949e0000969e0000989e00009a9e0000b0a00000b2a00000b4a0000000ca9a3bffffff7f
+    m_ExpandedIDs: 000000008a9e00008c9e00008e9e0000909e0000929e0000949e0000969e0000989e00009a9e00009c9e00006aa0000084a00000b0a00000b2a00000b4a00000b8a0000078ed000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2526,10 +2628,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: 5254e4ff
+    m_LastClickedInstanceID: -1813422
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c623000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f05000ce80000fa380100563901006a3a01000e3a0100da360100363701009e380100c63a0100d2b700007cb800004ab90000e2b80000b0b9000016ba0000e4ba000000000000
+    m_ExpandedInstanceIDs: c623000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f05000ce80000fa380100563901006a3a01000e3a0100da360100363701009e380100c63a0100d2b700007cb800004ab90000e2b80000b0b9000016ba0000e4ba000000000000489c0000705601009a5a0100aa5b0100505b01007e580100d85801003e5a0100045c0100f49e01005e9f0100c49f010090a00100f6a00100c4a101002aa00100f89f0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2545,7 +2647,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 20}
+      m_ClientGUIView: {fileID: 22}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -2556,8 +2658,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 111
---- !u!114 &22
+  m_DirectoriesAreaWidth: 295
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2572,18 +2674,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1954
+    x: 2084
     y: 0
-    width: 606
+    width: 476
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 23}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 25}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &23
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2603,9 +2705,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1954
-    y: 73
-    width: 605
+    x: 2089
+    y: 81
+    width: 475
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0