DESKTOP-FB72PO8\Administrator 5 mesiacov pred
rodič
commit
4345160d82
32 zmenil súbory, kde vykonal 3406 pridanie a 684 odobranie
  1. 47 47
      Assets/Res/Config/HeroModelConfig.json
  2. 283 283
      Assets/Res/Config/HeroPowerUpConfig.json
  3. 314 188
      Assets/Res/Config/LevelBattleConfig.json
  4. 4 0
      Assets/Res/Config/MonsterGroupConfig.json
  5. 2404 0
      Assets/Res/Config/MonsterPowerUpConfig.json
  6. 7 0
      Assets/Res/Config/MonsterPowerUpConfig.json.meta
  7. 44 6
      Assets/Res/Config/MonsterWavesConfig.json
  8. 48 48
      Assets/Res/Config/SkillConfig.json
  9. 18 0
      Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs
  10. 56 0
      Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs
  11. 11 0
      Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs.meta
  12. 5 0
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs
  13. 29 2
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs
  14. 27 8
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  15. 1 1
      Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs
  16. 38 8
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs
  17. 1 1
      Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroDieState.cs
  18. 4 30
      Assets/Scripts/GameLogic/Combat/Hero/State/CombatResurrectionState.cs
  19. 1 1
      Assets/Scripts/GameLogic/Combat/Skill/S10001.cs
  20. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S140003.cs
  21. 1 1
      Assets/Scripts/GameLogic/Combat/Skill/S40001.cs
  22. 4 4
      Assets/Scripts/GameLogic/Hero/HeroController.cs
  23. 3 3
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  24. 1 1
      Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs
  25. 0 0
      Assets/StreamingAssets/assetConfig.txt
  26. BIN
      Excel2Json/CombatMonetary.xlsx
  27. BIN
      Excel2Json/Excel/HeroModel.xlsx
  28. BIN
      Excel2Json/Excel/HeroPowerUp.xlsx
  29. BIN
      Excel2Json/Excel/LevelBattle.xlsx
  30. BIN
      Excel2Json/Excel/MonsterPowerUp.xlsx
  31. BIN
      Excel2Json/Excel/skill.xlsx
  32. 52 52
      UserSettings/Layouts/default-2022.dwlt

+ 47 - 47
Assets/Res/Config/HeroModelConfig.json

@@ -12,10 +12,10 @@
       "heroType": 1,
       "profession": 1,
       "itemID": 1004,
-      "hp": 500,
-      "def": 10,
+      "hp": 1000,
+      "def": 5,
       "crit": null,
-      "attack": 15,
+      "attack": 45,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
@@ -43,10 +43,10 @@
       "heroType": 1,
       "profession": 2,
       "itemID": 1005,
-      "hp": 300,
-      "def": 6,
+      "hp": 500,
+      "def": 5,
       "crit": null,
-      "attack": 25,
+      "attack": 75,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
@@ -74,10 +74,10 @@
       "heroType": 1,
       "profession": 3,
       "itemID": 1006,
-      "hp": 400,
-      "def": 7,
+      "hp": 600,
+      "def": 5,
       "crit": null,
-      "attack": 20,
+      "attack": 35,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
@@ -105,10 +105,10 @@
       "heroType": 1,
       "profession": 4,
       "itemID": 1007,
-      "hp": 300,
-      "def": 6,
+      "hp": 500,
+      "def": 5,
       "crit": null,
-      "attack": 25,
+      "attack": 75,
       "shanbi": 10,
       "expGain": 100,
       "move_speed": 8,
@@ -136,14 +136,14 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 20,
-      "def": 10,
+      "hp": 95,
+      "def": 5,
       "crit": null,
-      "attack": 5,
+      "attack": 18,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001
@@ -162,14 +162,14 @@
       "heroType": 3,
       "profession": 1,
       "itemID": null,
-      "hp": 1100,
-      "def": 10,
+      "hp": 954,
+      "def": 5,
       "crit": null,
-      "attack": 15,
+      "attack": 73,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001,
@@ -189,14 +189,14 @@
       "heroType": 4,
       "profession": 1,
       "itemID": null,
-      "hp": 10000,
-      "def": 10,
+      "hp": 6202,
+      "def": 5,
       "crit": null,
-      "attack": 20,
+      "attack": 140,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001,
@@ -217,14 +217,14 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 20,
-      "def": 10,
+      "hp": 95,
+      "def": 5,
       "crit": null,
       "attack": 5,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001
@@ -243,14 +243,14 @@
       "heroType": 3,
       "profession": 1,
       "itemID": null,
-      "hp": 1100,
-      "def": 10,
+      "hp": 954,
+      "def": 5,
       "crit": null,
-      "attack": 15,
+      "attack": 73,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001,
@@ -270,14 +270,14 @@
       "heroType": 4,
       "profession": 1,
       "itemID": null,
-      "hp": 10000,
-      "def": 10,
+      "hp": 6202,
+      "def": 5,
       "crit": null,
-      "attack": 20,
+      "attack": 140,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001,
@@ -298,14 +298,14 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 20,
-      "def": 10,
+      "hp": 95,
+      "def": 5,
       "crit": null,
-      "attack": 5,
+      "attack": 18,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001
@@ -324,14 +324,14 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 20,
-      "def": 10,
+      "hp": 95,
+      "def": 5,
       "crit": null,
-      "attack": 5,
+      "attack": 18,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 3,
       "skillID": [
         1001
@@ -350,14 +350,14 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 20,
-      "def": 10,
+      "hp": 95,
+      "def": 5,
       "crit": null,
-      "attack": 5,
+      "attack": 18,
       "shanbi": 0,
       "expGain": null,
       "move_speed": 3,
-      "speed_atk": 1.0,
+      "speed_atk": 0.5,
       "range_atk": 7,
       "skillID": [
         1001

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 283 - 283
Assets/Res/Config/HeroPowerUpConfig.json


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 314 - 188
Assets/Res/Config/LevelBattleConfig.json


+ 4 - 0
Assets/Res/Config/MonsterGroupConfig.json

@@ -18,6 +18,8 @@
         9000109
       ],
       "eliteMonsterId": [
+        9000102,
+        9000105,
         9000102
       ]
     },
@@ -39,6 +41,8 @@
         9000109
       ],
       "eliteMonsterId": [
+        9000102,
+        9000105,
         9000105
       ]
     }

+ 2404 - 0
Assets/Res/Config/MonsterPowerUpConfig.json

@@ -0,0 +1,2404 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "HeroLevel": 1,
+      "ATKFactor": 1.078534,
+      "HPFactor": 1.05555558,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 2,
+      "HeroLevel": 2,
+      "ATKFactor": 1.16753924,
+      "HPFactor": 1.11111116,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 3,
+      "HeroLevel": 3,
+      "ATKFactor": 1.25130892,
+      "HPFactor": 1.16666663,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 4,
+      "HeroLevel": 4,
+      "ATKFactor": 1.34031415,
+      "HPFactor": 1.22222221,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 5,
+      "HeroLevel": 5,
+      "ATKFactor": 1.43455493,
+      "HPFactor": 1.27777779,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 6,
+      "HeroLevel": 6,
+      "ATKFactor": 1.53403139,
+      "HPFactor": 1.33333337,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 7,
+      "HeroLevel": 7,
+      "ATKFactor": 1.63350785,
+      "HPFactor": 1.38888884,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 8,
+      "HeroLevel": 8,
+      "ATKFactor": 1.75916231,
+      "HPFactor": 1.44444442,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 9,
+      "HeroLevel": 9,
+      "ATKFactor": 1.89005232,
+      "HPFactor": 1.55555558,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 10,
+      "HeroLevel": 10,
+      "ATKFactor": 2.02617812,
+      "HPFactor": 1.61111116,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 11,
+      "HeroLevel": 11,
+      "ATKFactor": 2.16753936,
+      "HPFactor": 1.66666663,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 12,
+      "HeroLevel": 12,
+      "ATKFactor": 2.30890059,
+      "HPFactor": 1.77777779,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 13,
+      "HeroLevel": 13,
+      "ATKFactor": 2.48167539,
+      "HPFactor": 1.83333337,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 14,
+      "HeroLevel": 14,
+      "ATKFactor": 2.65968585,
+      "HPFactor": 1.94444442,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 15,
+      "HeroLevel": 15,
+      "ATKFactor": 2.84816766,
+      "HPFactor": 2.05555558,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 16,
+      "HeroLevel": 16,
+      "ATKFactor": 3.041885,
+      "HPFactor": 2.11111116,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 17,
+      "HeroLevel": 17,
+      "ATKFactor": 3.2670157,
+      "HPFactor": 2.22222233,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 18,
+      "HeroLevel": 18,
+      "ATKFactor": 3.50261784,
+      "HPFactor": 2.33333325,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 19,
+      "HeroLevel": 19,
+      "ATKFactor": 3.74345541,
+      "HPFactor": 2.44444442,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 20,
+      "HeroLevel": 20,
+      "ATKFactor": 3.989529,
+      "HPFactor": 2.55555558,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 21,
+      "HeroLevel": 21,
+      "ATKFactor": 4.277487,
+      "HPFactor": 2.66666675,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 22,
+      "HeroLevel": 22,
+      "ATKFactor": 4.57068062,
+      "HPFactor": 2.77777767,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 23,
+      "HeroLevel": 23,
+      "ATKFactor": 4.874346,
+      "HPFactor": 2.94444442,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 24,
+      "HeroLevel": 24,
+      "ATKFactor": 5.21989536,
+      "HPFactor": 3.05555558,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 25,
+      "HeroLevel": 25,
+      "ATKFactor": 5.57591629,
+      "HPFactor": 3.22222233,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 26,
+      "HeroLevel": 26,
+      "ATKFactor": 5.979058,
+      "HPFactor": 3.33333325,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 27,
+      "HeroLevel": 27,
+      "ATKFactor": 6.39267,
+      "HPFactor": 3.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 28,
+      "HeroLevel": 28,
+      "ATKFactor": 6.853403,
+      "HPFactor": 3.66666675,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 29,
+      "HeroLevel": 29,
+      "ATKFactor": 7.329843,
+      "HPFactor": 3.83333325,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 30,
+      "HeroLevel": 30,
+      "ATKFactor": 7.853403,
+      "HPFactor": 4.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 31,
+      "HeroLevel": 31,
+      "ATKFactor": 8.387435,
+      "HPFactor": 4.22222233,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 32,
+      "HeroLevel": 32,
+      "ATKFactor": 8.984293,
+      "HPFactor": 4.388889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 33,
+      "HeroLevel": 33,
+      "ATKFactor": 9.602095,
+      "HPFactor": 4.611111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 34,
+      "HeroLevel": 34,
+      "ATKFactor": 10.2722511,
+      "HPFactor": 4.83333349,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 35,
+      "HeroLevel": 35,
+      "ATKFactor": 10.9633512,
+      "HPFactor": 5.05555534,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 36,
+      "HeroLevel": 36,
+      "ATKFactor": 11.7120419,
+      "HPFactor": 5.27777767,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 37,
+      "HeroLevel": 37,
+      "ATKFactor": 12.5235605,
+      "HPFactor": 5.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 38,
+      "HeroLevel": 38,
+      "ATKFactor": 13.3979053,
+      "HPFactor": 5.77777767,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 39,
+      "HeroLevel": 39,
+      "ATKFactor": 14.3089008,
+      "HPFactor": 6.05555534,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 40,
+      "HeroLevel": 40,
+      "ATKFactor": 15.2879581,
+      "HPFactor": 6.33333349,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 41,
+      "HeroLevel": 41,
+      "ATKFactor": 16.3403149,
+      "HPFactor": 6.611111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 42,
+      "HeroLevel": 42,
+      "ATKFactor": 17.4607334,
+      "HPFactor": 6.888889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 43,
+      "HeroLevel": 43,
+      "ATKFactor": 18.6596851,
+      "HPFactor": 7.22222233,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 44,
+      "HeroLevel": 44,
+      "ATKFactor": 19.9371719,
+      "HPFactor": 7.55555534,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 45,
+      "HeroLevel": 45,
+      "ATKFactor": 21.29843,
+      "HPFactor": 7.888889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 46,
+      "HeroLevel": 46,
+      "ATKFactor": 22.7591629,
+      "HPFactor": 8.277778,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 47,
+      "HeroLevel": 47,
+      "ATKFactor": 24.3089,
+      "HPFactor": 8.611111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 48,
+      "HeroLevel": 48,
+      "ATKFactor": 25.9476433,
+      "HPFactor": 9.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 49,
+      "HeroLevel": 49,
+      "ATKFactor": 27.7329845,
+      "HPFactor": 9.444445,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 50,
+      "HeroLevel": 50,
+      "ATKFactor": 29.6230373,
+      "HPFactor": 9.888889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 51,
+      "HeroLevel": 51,
+      "ATKFactor": 31.60733,
+      "HPFactor": 10.333333,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 52,
+      "HeroLevel": 52,
+      "ATKFactor": 33.774868,
+      "HPFactor": 10.7777777,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 53,
+      "HeroLevel": 53,
+      "ATKFactor": 36.05759,
+      "HPFactor": 11.2777777,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 54,
+      "HeroLevel": 54,
+      "ATKFactor": 38.5078545,
+      "HPFactor": 11.7777777,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 55,
+      "HeroLevel": 55,
+      "ATKFactor": 41.1361275,
+      "HPFactor": 12.333333,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 56,
+      "HeroLevel": 56,
+      "ATKFactor": 43.8952866,
+      "HPFactor": 12.8888893,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 57,
+      "HeroLevel": 57,
+      "ATKFactor": 46.8376961,
+      "HPFactor": 13.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 58,
+      "HeroLevel": 58,
+      "ATKFactor": 50.0052338,
+      "HPFactor": 14.0555553,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 59,
+      "HeroLevel": 59,
+      "ATKFactor": 53.3769646,
+      "HPFactor": 14.7222223,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 60,
+      "HeroLevel": 60,
+      "ATKFactor": 56.9581146,
+      "HPFactor": 15.3888893,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 61,
+      "HeroLevel": 61,
+      "ATKFactor": 60.8167534,
+      "HPFactor": 16.0555553,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 62,
+      "HeroLevel": 62,
+      "ATKFactor": 64.90052,
+      "HPFactor": 16.833334,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 63,
+      "HeroLevel": 63,
+      "ATKFactor": 69.32461,
+      "HPFactor": 17.5555553,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 64,
+      "HeroLevel": 64,
+      "ATKFactor": 73.99477,
+      "HPFactor": 18.333334,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 65,
+      "HeroLevel": 65,
+      "ATKFactor": 78.98429,
+      "HPFactor": 19.166666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 66,
+      "HeroLevel": 66,
+      "ATKFactor": 84.3036652,
+      "HPFactor": 20.0555553,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 67,
+      "HeroLevel": 67,
+      "ATKFactor": 89.96335,
+      "HPFactor": 20.9444447,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 68,
+      "HeroLevel": 68,
+      "ATKFactor": 95.97906,
+      "HPFactor": 21.88889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 69,
+      "HeroLevel": 69,
+      "ATKFactor": 102.481674,
+      "HPFactor": 22.88889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 70,
+      "HeroLevel": 70,
+      "ATKFactor": 109.366493,
+      "HPFactor": 23.88889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 71,
+      "HeroLevel": 71,
+      "ATKFactor": 116.722511,
+      "HPFactor": 25.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 72,
+      "HeroLevel": 72,
+      "ATKFactor": 124.560211,
+      "HPFactor": 26.11111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 73,
+      "HeroLevel": 73,
+      "ATKFactor": 132.8953,
+      "HPFactor": 27.2777786,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 74,
+      "HeroLevel": 74,
+      "ATKFactor": 141.821991,
+      "HPFactor": 28.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 75,
+      "HeroLevel": 75,
+      "ATKFactor": 151.361252,
+      "HPFactor": 29.7777786,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 76,
+      "HeroLevel": 76,
+      "ATKFactor": 161.460739,
+      "HPFactor": 31.11111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 77,
+      "HeroLevel": 77,
+      "ATKFactor": 172.209427,
+      "HPFactor": 32.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 78,
+      "HeroLevel": 78,
+      "ATKFactor": 183.638748,
+      "HPFactor": 34.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 79,
+      "HeroLevel": 79,
+      "ATKFactor": 195.942413,
+      "HPFactor": 35.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 80,
+      "HeroLevel": 80,
+      "ATKFactor": 209.057587,
+      "HPFactor": 37.0555573,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 81,
+      "HeroLevel": 81,
+      "ATKFactor": 223.020935,
+      "HPFactor": 38.72222,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 82,
+      "HeroLevel": 82,
+      "ATKFactor": 237.842926,
+      "HPFactor": 40.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 83,
+      "HeroLevel": 83,
+      "ATKFactor": 253.774872,
+      "HPFactor": 42.27778,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 84,
+      "HeroLevel": 84,
+      "ATKFactor": 270.727753,
+      "HPFactor": 44.1666679,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 85,
+      "HeroLevel": 85,
+      "ATKFactor": 288.743469,
+      "HPFactor": 46.11111,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 86,
+      "HeroLevel": 86,
+      "ATKFactor": 307.9424,
+      "HPFactor": 48.1666679,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 87,
+      "HeroLevel": 87,
+      "ATKFactor": 328.5131,
+      "HPFactor": 50.3333321,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 88,
+      "HeroLevel": 88,
+      "ATKFactor": 350.356018,
+      "HPFactor": 52.5555573,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 89,
+      "HeroLevel": 89,
+      "ATKFactor": 373.612579,
+      "HPFactor": 54.88889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 90,
+      "HeroLevel": 90,
+      "ATKFactor": 398.424072,
+      "HPFactor": 57.3333321,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 91,
+      "HeroLevel": 91,
+      "ATKFactor": 424.73822,
+      "HPFactor": 59.88889,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 92,
+      "HeroLevel": 92,
+      "ATKFactor": 452.994751,
+      "HPFactor": 62.5555573,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 93,
+      "HeroLevel": 93,
+      "ATKFactor": 483.083771,
+      "HPFactor": 65.3333359,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 94,
+      "HeroLevel": 94,
+      "ATKFactor": 515.0576,
+      "HPFactor": 68.22222,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 95,
+      "HeroLevel": 95,
+      "ATKFactor": 549.078552,
+      "HPFactor": 71.27778,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 96,
+      "HeroLevel": 96,
+      "ATKFactor": 585.555,
+      "HPFactor": 74.44444,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 97,
+      "HeroLevel": 97,
+      "ATKFactor": 624.350769,
+      "HPFactor": 77.72222,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 98,
+      "HeroLevel": 98,
+      "ATKFactor": 665.638733,
+      "HPFactor": 81.1666641,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 99,
+      "HeroLevel": 99,
+      "ATKFactor": 709.5026,
+      "HPFactor": 84.77778,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 100,
+      "HeroLevel": 100,
+      "ATKFactor": 756.4293,
+      "HPFactor": 88.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 101,
+      "HeroLevel": 101,
+      "ATKFactor": 806.356,
+      "HPFactor": 92.44444,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 102,
+      "HeroLevel": 102,
+      "ATKFactor": 859.4817,
+      "HPFactor": 96.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 103,
+      "HeroLevel": 103,
+      "ATKFactor": 916.387451,
+      "HPFactor": 100.777779,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 104,
+      "HeroLevel": 104,
+      "ATKFactor": 976.8639,
+      "HPFactor": 105.222221,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 105,
+      "HeroLevel": 105,
+      "ATKFactor": 11.4,
+      "HPFactor": 12.54,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 106,
+      "HeroLevel": 106,
+      "ATKFactor": 11.5,
+      "HPFactor": 12.686,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 107,
+      "HeroLevel": 107,
+      "ATKFactor": 11.6,
+      "HPFactor": 12.76,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 108,
+      "HeroLevel": 108,
+      "ATKFactor": 11.7,
+      "HPFactor": 12.906,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 109,
+      "HeroLevel": 109,
+      "ATKFactor": 11.8,
+      "HPFactor": 12.98,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 110,
+      "HeroLevel": 110,
+      "ATKFactor": 11.9,
+      "HPFactor": 13.126,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 111,
+      "HeroLevel": 111,
+      "ATKFactor": 12.0,
+      "HPFactor": 13.2,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 112,
+      "HeroLevel": 112,
+      "ATKFactor": 12.1,
+      "HPFactor": 13.346,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 113,
+      "HeroLevel": 113,
+      "ATKFactor": 12.2,
+      "HPFactor": 13.42,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 114,
+      "HeroLevel": 114,
+      "ATKFactor": 12.3,
+      "HPFactor": 13.566,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 115,
+      "HeroLevel": 115,
+      "ATKFactor": 12.4,
+      "HPFactor": 13.64,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 116,
+      "HeroLevel": 116,
+      "ATKFactor": 12.5,
+      "HPFactor": 13.786,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 117,
+      "HeroLevel": 117,
+      "ATKFactor": 12.6,
+      "HPFactor": 13.86,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 118,
+      "HeroLevel": 118,
+      "ATKFactor": 12.7,
+      "HPFactor": 14.006,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 119,
+      "HeroLevel": 119,
+      "ATKFactor": 12.8,
+      "HPFactor": 14.08,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 120,
+      "HeroLevel": 120,
+      "ATKFactor": 12.9,
+      "HPFactor": 14.226,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 121,
+      "HeroLevel": 121,
+      "ATKFactor": 13.0,
+      "HPFactor": 14.3,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 122,
+      "HeroLevel": 122,
+      "ATKFactor": 13.1,
+      "HPFactor": 14.446,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 123,
+      "HeroLevel": 123,
+      "ATKFactor": 13.2,
+      "HPFactor": 14.52,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 124,
+      "HeroLevel": 124,
+      "ATKFactor": 13.3,
+      "HPFactor": 14.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 125,
+      "HeroLevel": 125,
+      "ATKFactor": 13.4,
+      "HPFactor": 14.74,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 126,
+      "HeroLevel": 126,
+      "ATKFactor": 13.5,
+      "HPFactor": 14.886,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 127,
+      "HeroLevel": 127,
+      "ATKFactor": 13.6,
+      "HPFactor": 14.96,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 128,
+      "HeroLevel": 128,
+      "ATKFactor": 13.7,
+      "HPFactor": 15.106,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 129,
+      "HeroLevel": 129,
+      "ATKFactor": 13.8,
+      "HPFactor": 15.18,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 130,
+      "HeroLevel": 130,
+      "ATKFactor": 13.9,
+      "HPFactor": 15.326,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 131,
+      "HeroLevel": 131,
+      "ATKFactor": 14.0,
+      "HPFactor": 15.4,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 132,
+      "HeroLevel": 132,
+      "ATKFactor": 14.1,
+      "HPFactor": 15.546,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 133,
+      "HeroLevel": 133,
+      "ATKFactor": 14.2,
+      "HPFactor": 15.62,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 134,
+      "HeroLevel": 134,
+      "ATKFactor": 14.3,
+      "HPFactor": 15.766,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 135,
+      "HeroLevel": 135,
+      "ATKFactor": 14.4,
+      "HPFactor": 15.84,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 136,
+      "HeroLevel": 136,
+      "ATKFactor": 14.5,
+      "HPFactor": 15.986,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 137,
+      "HeroLevel": 137,
+      "ATKFactor": 14.6,
+      "HPFactor": 16.06,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 138,
+      "HeroLevel": 138,
+      "ATKFactor": 14.7,
+      "HPFactor": 16.206,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 139,
+      "HeroLevel": 139,
+      "ATKFactor": 14.8,
+      "HPFactor": 16.28,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 140,
+      "HeroLevel": 140,
+      "ATKFactor": 14.9,
+      "HPFactor": 16.426,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 141,
+      "HeroLevel": 141,
+      "ATKFactor": 15.0,
+      "HPFactor": 16.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 142,
+      "HeroLevel": 142,
+      "ATKFactor": 15.1,
+      "HPFactor": 16.646,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 143,
+      "HeroLevel": 143,
+      "ATKFactor": 15.2,
+      "HPFactor": 16.72,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 144,
+      "HeroLevel": 144,
+      "ATKFactor": 15.3,
+      "HPFactor": 16.866,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 145,
+      "HeroLevel": 145,
+      "ATKFactor": 15.4,
+      "HPFactor": 16.94,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 146,
+      "HeroLevel": 146,
+      "ATKFactor": 15.5,
+      "HPFactor": 17.086,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 147,
+      "HeroLevel": 147,
+      "ATKFactor": 15.6,
+      "HPFactor": 17.16,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 148,
+      "HeroLevel": 148,
+      "ATKFactor": 15.7,
+      "HPFactor": 17.306,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 149,
+      "HeroLevel": 149,
+      "ATKFactor": 15.8,
+      "HPFactor": 17.38,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 150,
+      "HeroLevel": 150,
+      "ATKFactor": 15.9,
+      "HPFactor": 18.324,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 151,
+      "HeroLevel": 151,
+      "ATKFactor": 16.0,
+      "HPFactor": 18.4,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 152,
+      "HeroLevel": 152,
+      "ATKFactor": 16.1,
+      "HPFactor": 18.554,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 153,
+      "HeroLevel": 153,
+      "ATKFactor": 16.2,
+      "HPFactor": 18.63,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 154,
+      "HeroLevel": 154,
+      "ATKFactor": 16.3,
+      "HPFactor": 18.784,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 155,
+      "HeroLevel": 155,
+      "ATKFactor": 16.4,
+      "HPFactor": 18.86,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 156,
+      "HeroLevel": 156,
+      "ATKFactor": 16.5,
+      "HPFactor": 19.014,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 157,
+      "HeroLevel": 157,
+      "ATKFactor": 16.6,
+      "HPFactor": 19.09,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 158,
+      "HeroLevel": 158,
+      "ATKFactor": 16.7,
+      "HPFactor": 19.244,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 159,
+      "HeroLevel": 159,
+      "ATKFactor": 16.8,
+      "HPFactor": 19.32,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 160,
+      "HeroLevel": 160,
+      "ATKFactor": 16.9,
+      "HPFactor": 19.474,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 161,
+      "HeroLevel": 161,
+      "ATKFactor": 17.0,
+      "HPFactor": 19.55,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 162,
+      "HeroLevel": 162,
+      "ATKFactor": 17.1,
+      "HPFactor": 19.704,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 163,
+      "HeroLevel": 163,
+      "ATKFactor": 17.2,
+      "HPFactor": 19.78,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 164,
+      "HeroLevel": 164,
+      "ATKFactor": 17.3,
+      "HPFactor": 19.934,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 165,
+      "HeroLevel": 165,
+      "ATKFactor": 17.4,
+      "HPFactor": 20.01,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 166,
+      "HeroLevel": 166,
+      "ATKFactor": 17.5,
+      "HPFactor": 20.164,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 167,
+      "HeroLevel": 167,
+      "ATKFactor": 17.6,
+      "HPFactor": 20.24,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 168,
+      "HeroLevel": 168,
+      "ATKFactor": 17.7,
+      "HPFactor": 20.394,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 169,
+      "HeroLevel": 169,
+      "ATKFactor": 17.8,
+      "HPFactor": 20.47,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 170,
+      "HeroLevel": 170,
+      "ATKFactor": 17.9,
+      "HPFactor": 20.624,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 171,
+      "HeroLevel": 171,
+      "ATKFactor": 18.0,
+      "HPFactor": 20.7,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 172,
+      "HeroLevel": 172,
+      "ATKFactor": 18.1,
+      "HPFactor": 20.854,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 173,
+      "HeroLevel": 173,
+      "ATKFactor": 18.2,
+      "HPFactor": 20.93,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 174,
+      "HeroLevel": 174,
+      "ATKFactor": 18.3,
+      "HPFactor": 21.084,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 175,
+      "HeroLevel": 175,
+      "ATKFactor": 18.4,
+      "HPFactor": 21.16,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 176,
+      "HeroLevel": 176,
+      "ATKFactor": 18.5,
+      "HPFactor": 21.314,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 177,
+      "HeroLevel": 177,
+      "ATKFactor": 18.6,
+      "HPFactor": 21.39,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 178,
+      "HeroLevel": 178,
+      "ATKFactor": 18.7,
+      "HPFactor": 21.544,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 179,
+      "HeroLevel": 179,
+      "ATKFactor": 18.8,
+      "HPFactor": 21.62,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 180,
+      "HeroLevel": 180,
+      "ATKFactor": 18.9,
+      "HPFactor": 21.774,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 181,
+      "HeroLevel": 181,
+      "ATKFactor": 19.0,
+      "HPFactor": 21.85,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 182,
+      "HeroLevel": 182,
+      "ATKFactor": 19.1,
+      "HPFactor": 22.004,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 183,
+      "HeroLevel": 183,
+      "ATKFactor": 19.2,
+      "HPFactor": 22.08,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 184,
+      "HeroLevel": 184,
+      "ATKFactor": 19.3,
+      "HPFactor": 22.234,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 185,
+      "HeroLevel": 185,
+      "ATKFactor": 19.4,
+      "HPFactor": 22.31,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 186,
+      "HeroLevel": 186,
+      "ATKFactor": 19.5,
+      "HPFactor": 22.464,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 187,
+      "HeroLevel": 187,
+      "ATKFactor": 19.6,
+      "HPFactor": 22.54,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 188,
+      "HeroLevel": 188,
+      "ATKFactor": 19.7,
+      "HPFactor": 22.694,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 189,
+      "HeroLevel": 189,
+      "ATKFactor": 19.8,
+      "HPFactor": 22.77,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 190,
+      "HeroLevel": 190,
+      "ATKFactor": 19.9,
+      "HPFactor": 22.924,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 191,
+      "HeroLevel": 191,
+      "ATKFactor": 20.0,
+      "HPFactor": 23.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 192,
+      "HeroLevel": 192,
+      "ATKFactor": 20.1,
+      "HPFactor": 23.154,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 193,
+      "HeroLevel": 193,
+      "ATKFactor": 20.2,
+      "HPFactor": 23.23,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 194,
+      "HeroLevel": 194,
+      "ATKFactor": 20.3,
+      "HPFactor": 23.384,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 195,
+      "HeroLevel": 195,
+      "ATKFactor": 20.4,
+      "HPFactor": 23.46,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 196,
+      "HeroLevel": 196,
+      "ATKFactor": 20.5,
+      "HPFactor": 23.614,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 197,
+      "HeroLevel": 197,
+      "ATKFactor": 20.6,
+      "HPFactor": 23.69,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 198,
+      "HeroLevel": 198,
+      "ATKFactor": 20.7,
+      "HPFactor": 23.844,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 199,
+      "HeroLevel": 199,
+      "ATKFactor": 20.8,
+      "HPFactor": 23.92,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 200,
+      "HeroLevel": 200,
+      "ATKFactor": 20.9,
+      "HPFactor": 25.12,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 201,
+      "HeroLevel": 201,
+      "ATKFactor": 21.0,
+      "HPFactor": 25.2,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 202,
+      "HeroLevel": 202,
+      "ATKFactor": 21.1,
+      "HPFactor": 25.36,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 203,
+      "HeroLevel": 203,
+      "ATKFactor": 21.2,
+      "HPFactor": 25.44,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 204,
+      "HeroLevel": 204,
+      "ATKFactor": 21.3,
+      "HPFactor": 25.6,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 205,
+      "HeroLevel": 205,
+      "ATKFactor": 21.4,
+      "HPFactor": 25.68,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 206,
+      "HeroLevel": 206,
+      "ATKFactor": 21.5,
+      "HPFactor": 25.84,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 207,
+      "HeroLevel": 207,
+      "ATKFactor": 21.6,
+      "HPFactor": 25.92,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 208,
+      "HeroLevel": 208,
+      "ATKFactor": 21.7,
+      "HPFactor": 26.08,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 209,
+      "HeroLevel": 209,
+      "ATKFactor": 21.8,
+      "HPFactor": 26.16,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 210,
+      "HeroLevel": 210,
+      "ATKFactor": 21.9,
+      "HPFactor": 26.32,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 211,
+      "HeroLevel": 211,
+      "ATKFactor": 22.0,
+      "HPFactor": 26.4,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 212,
+      "HeroLevel": 212,
+      "ATKFactor": 22.1,
+      "HPFactor": 26.56,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 213,
+      "HeroLevel": 213,
+      "ATKFactor": 22.2,
+      "HPFactor": 26.64,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 214,
+      "HeroLevel": 214,
+      "ATKFactor": 22.3,
+      "HPFactor": 26.8,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 215,
+      "HeroLevel": 215,
+      "ATKFactor": 22.4,
+      "HPFactor": 26.88,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 216,
+      "HeroLevel": 216,
+      "ATKFactor": 22.5,
+      "HPFactor": 27.04,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 217,
+      "HeroLevel": 217,
+      "ATKFactor": 22.6,
+      "HPFactor": 27.12,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 218,
+      "HeroLevel": 218,
+      "ATKFactor": 22.7,
+      "HPFactor": 27.28,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 219,
+      "HeroLevel": 219,
+      "ATKFactor": 22.8,
+      "HPFactor": 27.36,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 220,
+      "HeroLevel": 220,
+      "ATKFactor": 22.9,
+      "HPFactor": 27.52,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 221,
+      "HeroLevel": 221,
+      "ATKFactor": 23.0,
+      "HPFactor": 27.6,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 222,
+      "HeroLevel": 222,
+      "ATKFactor": 23.1,
+      "HPFactor": 27.76,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 223,
+      "HeroLevel": 223,
+      "ATKFactor": 23.2,
+      "HPFactor": 27.84,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 224,
+      "HeroLevel": 224,
+      "ATKFactor": 23.3,
+      "HPFactor": 28.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 225,
+      "HeroLevel": 225,
+      "ATKFactor": 23.4,
+      "HPFactor": 28.08,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 226,
+      "HeroLevel": 226,
+      "ATKFactor": 23.5,
+      "HPFactor": 28.24,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 227,
+      "HeroLevel": 227,
+      "ATKFactor": 23.6,
+      "HPFactor": 28.32,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 228,
+      "HeroLevel": 228,
+      "ATKFactor": 23.7,
+      "HPFactor": 28.48,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 229,
+      "HeroLevel": 229,
+      "ATKFactor": 23.8,
+      "HPFactor": 28.56,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 230,
+      "HeroLevel": 230,
+      "ATKFactor": 23.9,
+      "HPFactor": 28.72,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 231,
+      "HeroLevel": 231,
+      "ATKFactor": 24.0,
+      "HPFactor": 28.8,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 232,
+      "HeroLevel": 232,
+      "ATKFactor": 24.1,
+      "HPFactor": 28.96,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 233,
+      "HeroLevel": 233,
+      "ATKFactor": 24.2,
+      "HPFactor": 29.04,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 234,
+      "HeroLevel": 234,
+      "ATKFactor": 24.3,
+      "HPFactor": 29.2,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 235,
+      "HeroLevel": 235,
+      "ATKFactor": 24.4,
+      "HPFactor": 29.28,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 236,
+      "HeroLevel": 236,
+      "ATKFactor": 24.5,
+      "HPFactor": 29.44,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 237,
+      "HeroLevel": 237,
+      "ATKFactor": 24.6,
+      "HPFactor": 29.52,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 238,
+      "HeroLevel": 238,
+      "ATKFactor": 24.7,
+      "HPFactor": 29.68,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 239,
+      "HeroLevel": 239,
+      "ATKFactor": 24.8,
+      "HPFactor": 29.76,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 240,
+      "HeroLevel": 240,
+      "ATKFactor": 24.9,
+      "HPFactor": 29.92,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 241,
+      "HeroLevel": 241,
+      "ATKFactor": 25.0,
+      "HPFactor": 30.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 242,
+      "HeroLevel": 242,
+      "ATKFactor": 25.1,
+      "HPFactor": 30.16,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 243,
+      "HeroLevel": 243,
+      "ATKFactor": 25.2,
+      "HPFactor": 30.24,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 244,
+      "HeroLevel": 244,
+      "ATKFactor": 25.3,
+      "HPFactor": 30.4,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 245,
+      "HeroLevel": 245,
+      "ATKFactor": 25.4,
+      "HPFactor": 30.48,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 246,
+      "HeroLevel": 246,
+      "ATKFactor": 25.5,
+      "HPFactor": 30.64,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 247,
+      "HeroLevel": 247,
+      "ATKFactor": 25.6,
+      "HPFactor": 30.72,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 248,
+      "HeroLevel": 248,
+      "ATKFactor": 25.7,
+      "HPFactor": 30.88,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 249,
+      "HeroLevel": 249,
+      "ATKFactor": 25.8,
+      "HPFactor": 30.96,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 250,
+      "HeroLevel": 250,
+      "ATKFactor": 25.9,
+      "HPFactor": 32.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 251,
+      "HeroLevel": 251,
+      "ATKFactor": 26.0,
+      "HPFactor": 32.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 252,
+      "HeroLevel": 252,
+      "ATKFactor": 26.1,
+      "HPFactor": 32.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 253,
+      "HeroLevel": 253,
+      "ATKFactor": 26.2,
+      "HPFactor": 32.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 254,
+      "HeroLevel": 254,
+      "ATKFactor": 26.3,
+      "HPFactor": 32.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 255,
+      "HeroLevel": 255,
+      "ATKFactor": 26.4,
+      "HPFactor": 33.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 256,
+      "HeroLevel": 256,
+      "ATKFactor": 26.5,
+      "HPFactor": 33.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 257,
+      "HeroLevel": 257,
+      "ATKFactor": 26.6,
+      "HPFactor": 33.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 258,
+      "HeroLevel": 258,
+      "ATKFactor": 26.7,
+      "HPFactor": 33.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 259,
+      "HeroLevel": 259,
+      "ATKFactor": 26.8,
+      "HPFactor": 33.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 260,
+      "HeroLevel": 260,
+      "ATKFactor": 26.9,
+      "HPFactor": 33.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 261,
+      "HeroLevel": 261,
+      "ATKFactor": 27.0,
+      "HPFactor": 33.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 262,
+      "HeroLevel": 262,
+      "ATKFactor": 27.1,
+      "HPFactor": 33.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 263,
+      "HeroLevel": 263,
+      "ATKFactor": 27.2,
+      "HPFactor": 34.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 264,
+      "HeroLevel": 264,
+      "ATKFactor": 27.3,
+      "HPFactor": 34.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 265,
+      "HeroLevel": 265,
+      "ATKFactor": 27.4,
+      "HPFactor": 34.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 266,
+      "HeroLevel": 266,
+      "ATKFactor": 27.5,
+      "HPFactor": 34.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 267,
+      "HeroLevel": 267,
+      "ATKFactor": 27.6,
+      "HPFactor": 34.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 268,
+      "HeroLevel": 268,
+      "ATKFactor": 27.7,
+      "HPFactor": 34.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 269,
+      "HeroLevel": 269,
+      "ATKFactor": 27.8,
+      "HPFactor": 34.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 270,
+      "HeroLevel": 270,
+      "ATKFactor": 27.9,
+      "HPFactor": 34.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 271,
+      "HeroLevel": 271,
+      "ATKFactor": 28.0,
+      "HPFactor": 35.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 272,
+      "HeroLevel": 272,
+      "ATKFactor": 28.1,
+      "HPFactor": 35.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 273,
+      "HeroLevel": 273,
+      "ATKFactor": 28.2,
+      "HPFactor": 35.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 274,
+      "HeroLevel": 274,
+      "ATKFactor": 28.3,
+      "HPFactor": 35.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 275,
+      "HeroLevel": 275,
+      "ATKFactor": 28.4,
+      "HPFactor": 35.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 276,
+      "HeroLevel": 276,
+      "ATKFactor": 28.5,
+      "HPFactor": 35.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 277,
+      "HeroLevel": 277,
+      "ATKFactor": 28.6,
+      "HPFactor": 35.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 278,
+      "HeroLevel": 278,
+      "ATKFactor": 28.7,
+      "HPFactor": 35.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 279,
+      "HeroLevel": 279,
+      "ATKFactor": 28.8,
+      "HPFactor": 36.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 280,
+      "HeroLevel": 280,
+      "ATKFactor": 28.9,
+      "HPFactor": 36.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 281,
+      "HeroLevel": 281,
+      "ATKFactor": 29.0,
+      "HPFactor": 36.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 282,
+      "HeroLevel": 282,
+      "ATKFactor": 29.1,
+      "HPFactor": 36.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 283,
+      "HeroLevel": 283,
+      "ATKFactor": 29.2,
+      "HPFactor": 36.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 284,
+      "HeroLevel": 284,
+      "ATKFactor": 29.3,
+      "HPFactor": 36.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 285,
+      "HeroLevel": 285,
+      "ATKFactor": 29.4,
+      "HPFactor": 36.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 286,
+      "HeroLevel": 286,
+      "ATKFactor": 29.5,
+      "HPFactor": 36.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 287,
+      "HeroLevel": 287,
+      "ATKFactor": 29.6,
+      "HPFactor": 37.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 288,
+      "HeroLevel": 288,
+      "ATKFactor": 29.7,
+      "HPFactor": 37.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 289,
+      "HeroLevel": 289,
+      "ATKFactor": 29.8,
+      "HPFactor": 37.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 290,
+      "HeroLevel": 290,
+      "ATKFactor": 29.9,
+      "HPFactor": 37.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 291,
+      "HeroLevel": 291,
+      "ATKFactor": 30.0,
+      "HPFactor": 37.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 292,
+      "HeroLevel": 292,
+      "ATKFactor": 30.1,
+      "HPFactor": 37.666,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 293,
+      "HeroLevel": 293,
+      "ATKFactor": 30.2,
+      "HPFactor": 37.75,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 294,
+      "HeroLevel": 294,
+      "ATKFactor": 30.3,
+      "HPFactor": 37.916,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 295,
+      "HeroLevel": 295,
+      "ATKFactor": 30.4,
+      "HPFactor": 38.0,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 296,
+      "HeroLevel": 296,
+      "ATKFactor": 30.5,
+      "HPFactor": 38.166,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 297,
+      "HeroLevel": 297,
+      "ATKFactor": 30.6,
+      "HPFactor": 38.25,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 298,
+      "HeroLevel": 298,
+      "ATKFactor": 30.7,
+      "HPFactor": 38.416,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 299,
+      "HeroLevel": 299,
+      "ATKFactor": 30.8,
+      "HPFactor": 38.5,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    },
+    {
+      "ID": 300,
+      "HeroLevel": 300,
+      "ATKFactor": 30.9,
+      "HPFactor": 40.214,
+      "DEFFactor": 1.0,
+      "SHANBIFactor": 1.0
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/MonsterPowerUpConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: B34WtHj8AX/c3rs53HnWt/+sTngozInlaCocU1vSABhcDDoGKgrq4MU=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 44 - 6
Assets/Res/Config/MonsterWavesConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         1,
         1,
@@ -21,7 +21,7 @@
     },
     {
       "ID": 2,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         1,
         2,
@@ -40,7 +40,7 @@
     },
     {
       "ID": 3,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         1,
         2,
@@ -59,7 +59,7 @@
     },
     {
       "ID": 4,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         3,
         4,
@@ -78,7 +78,7 @@
     },
     {
       "ID": 5,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         3,
         4,
@@ -97,7 +97,7 @@
     },
     {
       "ID": 6,
-      "wavesDelay": 3,
+      "wavesDelay": 5,
       "monsterGroupConfigId": [
         3,
         4,
@@ -113,6 +113,44 @@
         1,
         3
       ]
+    },
+    {
+      "ID": 90000,
+      "wavesDelay": 5,
+      "monsterGroupConfigId": [
+        1,
+        1,
+        1
+      ],
+      "miniMonsterCount": [
+        5,
+        10,
+        15
+      ],
+      "eliteMonsterCount": [
+        0,
+        0,
+        0
+      ]
+    },
+    {
+      "ID": 91000,
+      "wavesDelay": 5,
+      "monsterGroupConfigId": [
+        3,
+        3,
+        3
+      ],
+      "miniMonsterCount": [
+        5,
+        10,
+        15
+      ],
+      "eliteMonsterCount": [
+        0,
+        0,
+        0
+      ]
     }
   ]
 }

+ 48 - 48
Assets/Res/Config/SkillConfig.json

@@ -19,13 +19,13 @@
       "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
-      "cd": 4,
+      "cd": 6,
       "SkillType": 2,
       "level": 1,
       "name": 45,
       "desc": 33,
       "effectValue": [
-        400.0
+        200.0
       ]
     },
     {
@@ -33,13 +33,13 @@
       "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
-      "cd": 4,
+      "cd": 6,
       "SkillType": 2,
       "level": 2,
       "name": 45,
       "desc": 34,
       "effectValue": [
-        440.0
+        260.0
       ]
     },
     {
@@ -47,13 +47,13 @@
       "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
-      "cd": 4,
+      "cd": 6,
       "SkillType": 2,
       "level": 3,
       "name": 45,
       "desc": 35,
       "effectValue": [
-        480.0
+        320.0
       ]
     },
     {
@@ -61,13 +61,13 @@
       "icon": "icon_skill_10001",
       "scriptName": "S10001",
       "IDGroup": 10001,
-      "cd": 4,
+      "cd": 6,
       "SkillType": 2,
       "level": 4,
       "name": 45,
       "desc": 36,
       "effectValue": [
-        520.0
+        480.0
       ]
     },
     {
@@ -631,13 +631,13 @@
       "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
-      "cd": 5,
+      "cd": 6,
       "SkillType": 2,
       "level": 1,
       "name": 55,
       "desc": 51,
       "effectValue": [
-        650.0
+        800.0
       ]
     },
     {
@@ -645,13 +645,13 @@
       "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
-      "cd": 5,
+      "cd": 6,
       "SkillType": 2,
       "level": 2,
       "name": 55,
       "desc": 52,
       "effectValue": [
-        715.0
+        900.0
       ]
     },
     {
@@ -659,13 +659,13 @@
       "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
-      "cd": 5,
+      "cd": 6,
       "SkillType": 2,
       "level": 3,
       "name": 55,
       "desc": 53,
       "effectValue": [
-        780.0
+        1100.0
       ]
     },
     {
@@ -673,13 +673,13 @@
       "icon": "icon_skill_20001",
       "scriptName": "S20001",
       "IDGroup": 20001,
-      "cd": 5,
+      "cd": 6,
       "SkillType": 2,
       "level": 4,
       "name": 55,
       "desc": 54,
       "effectValue": [
-        845.0
+        1200.0
       ]
     },
     {
@@ -939,13 +939,13 @@
       "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
-      "cd": 10,
+      "cd": 6,
       "SkillType": 2,
       "level": 1,
       "name": 60,
       "desc": 56,
       "effectValue": [
-        66.6666641
+        100.0
       ]
     },
     {
@@ -953,13 +953,13 @@
       "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
-      "cd": 10,
+      "cd": 6,
       "SkillType": 2,
       "level": 2,
       "name": 60,
       "desc": 57,
       "effectValue": [
-        73.3333359
+        120.0
       ]
     },
     {
@@ -967,13 +967,13 @@
       "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
-      "cd": 10,
+      "cd": 6,
       "SkillType": 2,
       "level": 3,
       "name": 60,
       "desc": 58,
       "effectValue": [
-        80.0
+        140.0
       ]
     },
     {
@@ -981,13 +981,13 @@
       "icon": "icon_skill_40001",
       "scriptName": "S40001",
       "IDGroup": 40001,
-      "cd": 10,
+      "cd": 6,
       "SkillType": 2,
       "level": 4,
       "name": 60,
       "desc": 59,
       "effectValue": [
-        86.6666641
+        180.0
       ]
     },
     {
@@ -1253,7 +1253,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        500.0
+        150.0
       ]
     },
     {
@@ -1267,7 +1267,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        550.0
+        170.0
       ]
     },
     {
@@ -1281,7 +1281,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        600.0
+        180.0
       ]
     },
     {
@@ -1295,7 +1295,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        650.0
+        200.0
       ]
     },
     {
@@ -1309,7 +1309,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        250.0
+        40.0
       ]
     },
     {
@@ -1323,7 +1323,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        275.0
+        50.0
       ]
     },
     {
@@ -1337,7 +1337,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        300.0
+        60.0
       ]
     },
     {
@@ -1351,7 +1351,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        325.0
+        70.0
       ]
     },
     {
@@ -1365,7 +1365,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        400.0
+        150.0
       ]
     },
     {
@@ -1379,7 +1379,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        440.0
+        170.0
       ]
     },
     {
@@ -1393,7 +1393,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        480.0
+        180.0
       ]
     },
     {
@@ -1407,7 +1407,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        520.0
+        200.0
       ]
     },
     {
@@ -1421,7 +1421,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        500.0
+        150.0
       ]
     },
     {
@@ -1435,7 +1435,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        550.0
+        170.0
       ]
     },
     {
@@ -1449,7 +1449,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        600.0
+        180.0
       ]
     },
     {
@@ -1463,7 +1463,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        650.0
+        200.0
       ]
     },
     {
@@ -1477,7 +1477,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        300.0
+        150.0
       ]
     },
     {
@@ -1491,7 +1491,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        330.0
+        170.0
       ]
     },
     {
@@ -1505,7 +1505,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        360.0
+        180.0
       ]
     },
     {
@@ -1519,7 +1519,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        390.0
+        200.0
       ]
     },
     {
@@ -1533,7 +1533,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        800.0
+        150.0
       ]
     },
     {
@@ -1547,7 +1547,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        880.0
+        170.0
       ]
     },
     {
@@ -1561,7 +1561,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        960.0
+        180.0
       ]
     },
     {
@@ -1575,7 +1575,7 @@
       "name": 405077,
       "desc": null,
       "effectValue": [
-        1040.0
+        200.0
       ]
     }
   ]

+ 18 - 0
Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs

@@ -44,6 +44,24 @@ public int monsterLv;
 public int monsterStar;
 
 
+		/// <summary>
+		///小怪经验和金币产出
+		/// </summary>
+public int[] miniExpAndGold;
+
+
+		/// <summary>
+		///精英经验和金币产出
+		/// </summary>
+public int eliteExpAndGold;
+
+
+		/// <summary>
+		///boss经验和金币产出
+		/// </summary>
+public int bossExpAndGold;
+
+
 		/// <summary>
 		///打死小怪可以获得的奖励
 		/// </summary>

+ 56 - 0
Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs

@@ -0,0 +1,56 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\MonsterPowerUp.xlsx. SheetName: MonsterPowerUpConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "MonsterPowerUpConfig.json")]
+	public partial class MonsterPowerUpConfigHolder : ConfigHolder<MonsterPowerUpConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct MonsterPowerUpConfig : 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 SHANBIFactor;
+
+
+	}
+
+}
+// End of Auto Generated Code

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/MonsterPowerUpConfig.cs.meta

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

+ 5 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -108,6 +108,11 @@ namespace GameLogic.Combat.CombatTool
 
         public ILifetCycleHitPoint[] GetMinHpHero(ILifetCycleHitPoint[] allLifetCycleHitPoints, int count)
         {
+            if (allLifetCycleHitPoints == null)
+            {
+                return null;
+            }
+
             BetterList<ILifetCycleHitPoint> findHero = new BetterList<ILifetCycleHitPoint>();
             findHero.AddRange(allLifetCycleHitPoints);
             int currCount = Math.Min(allLifetCycleHitPoints.Length, count);

+ 29 - 2
Assets/Scripts/GameLogic/Combat/CombatTool/CombatHeroController.cs

@@ -84,8 +84,8 @@ namespace GameLogic.Combat.CombatTool
             combatHeroEntity.MaxCombatHeroInfo.attack = combatHeroInfo.attack;
             combatHeroEntity.CurrCombatHeroInfo.defense = combatHeroInfo.defense;
             combatHeroEntity.CurrCombatHeroInfo.attack = combatHeroInfo.attack;
-            combatHeroEntity.CurrCombatHeroInfo.unLockSkills=combatHeroInfo.unLockSkills;
-            combatHeroEntity.MaxCombatHeroInfo.unLockSkills=combatHeroInfo.unLockSkills;
+            combatHeroEntity.CurrCombatHeroInfo.unLockSkills = combatHeroInfo.unLockSkills;
+            combatHeroEntity.MaxCombatHeroInfo.unLockSkills = combatHeroInfo.unLockSkills;
             if (!combatHeroEntity.isDie)
             {
                 if (addHp > 0)
@@ -119,6 +119,27 @@ namespace GameLogic.Combat.CombatTool
         /// </summary>
         public void ResurrectionDieHero(CombatHeroEntity combatHeroEntity)
         {
+            if (!combatHeroEntity.isDie)
+            {
+                return;
+            }
+
+            combatHeroEntity.CombatAIBasic.NavMeshAgent.enabled = true;
+            if (combatHeroEntity.heroDieNodeId !=
+                CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount)
+            {
+                Vector3 pos = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero.dotPos;
+                if (CombatController.currActiveCombat.CombatHeroController.followTarget != null)
+                {
+                    pos = CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos +
+                          new Vector3(1, 0, 0);
+                }
+
+                combatHeroEntity.combatHeroGameObject.SetPosition(pos);
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(pos);
+            }
+
+
             heroDie.Remove(combatHeroEntity);
             combatHeroEntity.CurrCombatHeroInfo.hp = combatHeroEntity.MaxCombatHeroInfo.hp;
             AddHero(combatHeroEntity);
@@ -301,6 +322,12 @@ namespace GameLogic.Combat.CombatTool
             }
         }
 
+        public CombatHeroEntity[] GetDieHero()
+        {
+            return heroDie.ToArray();
+        }
+
+
         public ILifetCycleHitPoint[] GetHeroHitPoint(bool isEnemy)
         {
             if (isEnemy)

+ 27 - 8
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -152,7 +152,7 @@ namespace GameLogic.Combat.CombatType
             }
 
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
-            combatItemShowEventData.count =1;
+            combatItemShowEventData.count = 1;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
             combatItemShowEventData.showName = "icon_Coin";
             combatItemShowEventData.isExp = false;
@@ -247,7 +247,7 @@ namespace GameLogic.Combat.CombatType
             }
 
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
-            combatItemShowEventData.count =20;
+            combatItemShowEventData.count = 20;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
             combatItemShowEventData.showName = "icon_Coin";
             combatItemShowEventData.isExp = false;
@@ -275,8 +275,18 @@ namespace GameLogic.Combat.CombatType
             CombatController.currActiveCombat.isStopAi = true;
             TimerComponent.Instance.AddTimer(2000, delegate
             {
-               PlayBgm();
+                PlayBgm();
                 CombatController.currActiveCombat.isStopAi = false;
+                CombatHeroEntity[] allMyHero = combatController.CombatHeroController.GetDieHero();
+                for (int i = 0; i < allMyHero.Length; i++)
+                {
+                    CombatHeroEntity dieHero = allMyHero[i];
+                    if (!dieHero.IsEnemy&&dieHero.isDie)
+                    {
+                        CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(dieHero);
+                    }
+                }
+
                 Time.timeScale = 1f;
                 // CombatController.currActiveCombat.speed = 1;
             });
@@ -339,6 +349,11 @@ namespace GameLogic.Combat.CombatType
 
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
+            if (_currWavesConfig.ID <= 0)
+            {
+                return;
+            }
+
             _currNodeWavesIndex++;
             int nodeIndex = _currNodeWavesIndex % _currWavesConfig.monsterGroupConfigId.Length;
             int miniCount = _currWavesConfig.miniMonsterCount[nodeIndex];
@@ -402,17 +417,21 @@ namespace GameLogic.Combat.CombatType
                 return;
             }
 
-            if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length - 1)
+            if (_currWavesConfig.ID > 0)
             {
-                _currTime += 0.016f;
-                if (_currTime > _currWavesConfig.wavesDelay)
+                if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length - 1)
                 {
-                    CreateEnemy(new CTaskAwaitBuffer());
-                    _currTime = 0;
+                    _currTime += 0.016f;
+                    if (_currTime > _currWavesConfig.wavesDelay)
+                    {
+                        CreateEnemy(new CTaskAwaitBuffer());
+                        _currTime = 0;
+                    }
                 }
             }
         }
 
+
         private void InitPlayerHero(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             int i = 0;

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Hero/CombatAIBasic.cs

@@ -212,7 +212,7 @@ public class CombatAIBasic : IDisposable
         {
             float dodge = _combatHeroEntity.CurrCombatHeroInfo.dodge;
             int odds = CombatCalculateTool.Instance.GetOdd();
-            if (odds < dodge)
+            if (odds<dodge)
             {
                 CombatHeroRollingState.RollingStateData rollingStateData =
                     CObjectPool.Instance.Fetch<CombatHeroRollingState.RollingStateData>();

+ 38 - 8
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -46,6 +46,7 @@ public class CombatHeroInfo
     public HeroModelConfig modelConfig;
 
     public HeroPowerUpConfig powerUpConfig;
+    public MonsterPowerUpConfig MonsterPowerUpConfig;
     public HeroPromoteConfig promoteConfig;
     public HeroBasicEquipConfig basicEquipConfig;
 
@@ -67,7 +68,7 @@ public class CombatHeroInfo
     /// <summary>
     /// 闪避 默认10%的几率
     /// </summary>
-    public float dodge = 10;
+    public float dodge = 5;
 
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
@@ -79,6 +80,8 @@ public class CombatHeroInfo
 
     public float maxDisTo = 2 * 2;
 
+    public bool isMonster;
+
     // public int[] skillId;
     // public List<SkillConfig> skillConfigs;
     /// <summary>
@@ -136,11 +139,23 @@ public class CombatHeroInfo
     protected void CalBasicAttribute()
     {
         _AttributeCacheValue.Clear();
-        hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
-        defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
-        attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
-        shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor * factor);
-        expGain = (EncryptionLong)(modelConfig.expGain * powerUpConfig.EXPFactor * factor);
+        if (isMonster)
+        {
+            hp = (EncryptionLong)(modelConfig.hp * MonsterPowerUpConfig.HPFactor * factor);
+            defense = (EncryptionLong)(modelConfig.def * MonsterPowerUpConfig.DEFFactor * factor);
+            attack = (EncryptionLong)(modelConfig.attack * MonsterPowerUpConfig.ATKFactor * factor);
+            shanbi = (EncryptionInt)(modelConfig.shanbi * MonsterPowerUpConfig.SHANBIFactor * factor);
+            // expGain = (EncryptionLong)(modelConfig.expGain * MonsterPowerUpConfig.EXPFactor * factor);
+        }
+        else
+        {
+            hp = (EncryptionLong)(modelConfig.hp * powerUpConfig.HPFactor * factor);
+            defense = (EncryptionLong)(modelConfig.def * powerUpConfig.DEFFactor * factor);
+            attack = (EncryptionLong)(modelConfig.attack * powerUpConfig.ATKFactor * factor);
+            shanbi = (EncryptionInt)(modelConfig.shanbi * powerUpConfig.SHANBIFactor * factor);
+            expGain = (EncryptionLong)(modelConfig.expGain * powerUpConfig.EXPFactor * factor);
+        }
+
 
         CalUnLockSkill();
 
@@ -206,7 +221,13 @@ public class CombatHeroInfo
         {
             SkillConfig skillConfig =
                 PlayerManager.Instance.heroController.GetHighestLevelOr1(modelConfig.skillID[i], level.Value,
-                    star.Value, true);
+                    star.Value, true, isMonster);
+
+            if (isMonster && skillConfig.ID <= 0)
+            {
+                skillConfig = ConfigComponent.Instance.Get<SkillConfig>(modelConfig.skillID[i] * 10 + 1);
+            }
+
             if (skillConfig.ID > 0)
             {
                 unLockSkills.Add(skillConfig.ID);
@@ -244,7 +265,15 @@ public class CombatHeroInfo
     protected void SetDataConfig(int modelID, int level, int star)
     {
         modelConfig = ConfigComponent.Instance.Get<HeroModelConfig>(modelID);
-        powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
+        if (isMonster)
+        {
+            MonsterPowerUpConfig = ConfigComponent.Instance.Get<MonsterPowerUpConfig>(level);
+        }
+        else
+        {
+            powerUpConfig = ConfigComponent.Instance.Get<HeroPowerUpConfig>(level);
+        }
+
         promoteConfig = ConfigComponent.Instance.Get<HeroPromoteConfig>(star);
         this.level = (EncryptionInt)level;
         this.star = (EncryptionInt)star;
@@ -253,6 +282,7 @@ public class CombatHeroInfo
 
     public void InitMonster(int modelID, int level, int star = 1)
     {
+        isMonster = true;
         SetDataConfig(modelID, level, star);
         CalFactor();
         CalAttribute();

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroDieState.cs

@@ -68,7 +68,7 @@ namespace GameLogic.Combat.Hero.State
             if (isStartResurrection)
             {
                 resurrectionTime += t;
-                if (resurrectionTime > 10)
+                if (resurrectionTime > 60)
                 {
                     isSwitch = true;
                     isStartResurrection = false;

+ 4 - 30
Assets/Scripts/GameLogic/Combat/Hero/State/CombatResurrectionState.cs

@@ -24,44 +24,18 @@ namespace GameLogic.Combat.Hero.State
             {
                 timeLineEventLogicGroupBasic.TimeLineUpdateEnd = delegate
                 {
-                    combatHeroEntity.CombatAIBasic.NavMeshAgent.enabled = true;
-                    if (combatHeroEntity.heroDieNodeId !=
-                        CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount)
-                    {
-                        Vector3 pos = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero.dotPos;
-                        if (CombatController.currActiveCombat.CombatHeroController.followTarget != null)
-                        {
-                            pos = CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos +
-                                  new Vector3(1, 0, 0);
-                        }
-
-                        combatHeroEntity.combatHeroGameObject.SetPosition(pos);
-                        combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(pos);
-                    }
+                  
 
                     CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(combatHeroEntity);
-                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+                   
                 };
             }
             else
             {
-                combatHeroEntity.CombatAIBasic.NavMeshAgent.enabled = true;
-                if (combatHeroEntity.heroDieNodeId !=
-                    CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount)
-                {
-                    Vector3 pos = CombatController.currActiveCombat.CombatTypeBasic.currBannerHero.dotPos;
-                    if (CombatController.currActiveCombat.CombatHeroController.followTarget != null)
-                    {
-                        pos = CombatController.currActiveCombat.CombatHeroController.followTarget.dotPos +
-                              new Vector3(1, 0, 0);
-                    }
-
-                    combatHeroEntity.combatHeroGameObject.SetPosition(pos);
-                    combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(pos);
-                }
+ 
 
                 CombatController.currActiveCombat.CombatHeroController.ResurrectionDieHero(combatHeroEntity);
-                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            
             }
         }
 

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Skill/S10001.cs

@@ -64,7 +64,7 @@ namespace GameLogic.Combat.Skill
                 int angle = 360 / count;
                 for (int i = 0; i < count; i++)
                 {
-                    eulerAngles.y = i * angle;
+                    eulerAngles.y += i * angle;
                     // Quaternion quaternion = Quaternion.AngleAxis(i * 90, Vector3.up);
                     // quaternion = quaternion + CombatHeroEntity.combatHeroGameObject.transform.rotation;
                     // Vector3 newAngle = new Vector3(eulerAngles.x, eulerAngles.y + i * 15+180, eulerAngles.z);

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S140003.cs

@@ -3,6 +3,7 @@ using Core.Utility;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
+using GameLogic.Combat.Hero.SubStatus;
 using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
@@ -71,6 +72,8 @@ namespace GameLogic.Combat.Skill
                         CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
                         HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, combatHeroHitPoint,
                             v, AttType.Skill, triggerData);
+                        RepelledStatusState repelledStatusState = new RepelledStatusState(_enterAlertTarget[i].faceDir*-1, 2, 10, null);
+                        _enterAlertTarget[i].CombatAIBasic.AddSubStatus(repelledStatusState);
                     }
                 }
             }

+ 1 - 1
Assets/Scripts/GameLogic/Combat/Skill/S40001.cs

@@ -23,7 +23,7 @@ namespace GameLogic.Combat.Skill
         protected override void ProInitSkillConfig()
         {
             _harm = SelfSkillConfig.effectValue[0];
-            _count = 3;
+            _count = 1;
             _gongJianCount = 5;
             AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
         }

+ 4 - 4
Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -305,7 +305,7 @@ namespace GameLogic.Hero
         /// <param name="star">英雄星级</param>
         /// <param name="onlyUnLock">ture=只返回解锁的</param>
         /// <returns></returns>
-        public SkillConfig GetHighestLevelOr1(int groupID, int level, int star, bool onlyUnLock = false)
+        public SkillConfig GetHighestLevelOr1(int groupID, int level, int star, bool onlyUnLock = false,bool isMonster=false)
         {
             SkillConfig skillConfig = new SkillConfig();
             
@@ -320,7 +320,7 @@ namespace GameLogic.Hero
                 }
                 
                 // if (config.isUnLock && config.skillConfig.level > lv)
-                if(IsUnLockSkill(level, star, config.ID) && config.level > lv)
+                if(IsUnLockSkill(level, star, config.ID,isMonster) && config.level > lv)
                 {
                     lv = config.level;
                     skillConfig = config;
@@ -336,7 +336,7 @@ namespace GameLogic.Hero
         /// <param name="star">英雄星级</param>
         /// <param name="skillID">技能id</param>
         /// <returns></returns>
-        public bool IsUnLockSkill(int level, int star, int skillID)
+        public bool IsUnLockSkill(int level, int star, int skillID,bool isMonster=false)
         {
             bool isUnLock = false;
             if (skillID == GlobalParam.Normal_Attack_Skill_Group_ID)
@@ -385,7 +385,7 @@ namespace GameLogic.Hero
                 //星级解锁
                 else if (upConfig.upType == 2)
                 {
-                    if (star >= upConfig.upValue)
+                    if (star >= upConfig.upValue||isMonster)
                     {
                         isUnLock = true;
                     }

+ 3 - 3
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -148,19 +148,19 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         ItemData coin = new ItemData()
         {
             itemId = GlobalParam.Item_Coin_ID,
-            itemCount = 100,
+            itemCount = 0,
         };
 
         ItemData diamond = new ItemData()
         {
             itemId = GlobalParam.Item_Diamond_ID,
-            itemCount = 1000,
+            itemCount = 0,
         };
 
         ItemData heroExp = new ItemData()
         {
             itemId = GlobalParam.Item_HeroExp_ID,
-            itemCount = 99000000,
+            itemCount = 0,
         };
 
         playerData.ItemListData.Add(coin);

+ 1 - 1
Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -116,7 +116,7 @@ namespace Fort23.Mono
                             particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
                             particleSystemPool.transform.localPosition = Vector3.zero;
                             particleSystemPool.transform.localScale = Vector3.one;
-                            BagController.Instance.AddCoin(currAddValue);
+                            BagController.Instance.AddHeroExp(currAddValue);
                             // particleSystemPool.transform.
                         }
                     }

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/CombatMonetary.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/LevelBattle.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/skill.xlsx


+ 52 - 52
UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Game
+  m_Title: Scene
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -42,9 +42,9 @@ MonoBehaviour:
     x: 611
     y: 0
     width: 444
-    height: 983
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+    height: 1000
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -70,11 +70,11 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1055
-    height: 983
+    height: 1000
   m_MinSize: {x: 200, y: 50}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 35
+  controlID: 41
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -92,9 +92,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 983
+    y: 1000
     width: 1055
-    height: 316
+    height: 299
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
@@ -178,7 +178,7 @@ MonoBehaviour:
   m_MinSize: {x: 500, y: 100}
   m_MaxSize: {x: 40480, y: 16192}
   vertical: 0
-  controlID: 184
+  controlID: 218
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -225,7 +225,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 34
+  controlID: 40
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -246,8 +246,8 @@ MonoBehaviour:
     y: 0
     width: 385
     height: 1299
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -298,8 +298,8 @@ MonoBehaviour:
     y: 0
     width: 373
     height: 1299
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 19}
   m_Panes:
   - {fileID: 19}
@@ -315,7 +315,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
+  m_Name: SceneView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -323,17 +323,17 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 611
-    height: 983
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
+    height: 1000
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 22}
   m_Panes:
   - {fileID: 22}
   - {fileID: 16}
   - {fileID: 15}
   - {fileID: 14}
-  m_Selected: 3
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 3
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -666,9 +666,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 1056
+    y: 1073
     width: 1054
-    height: 295
+    height: 278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -718,18 +718,18 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 84faffffe8a2000018a30000
+      m_ExpandedIDs: 84fafffff2a2000022a30000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Directional Light
-        m_OriginalName: Directional Light
+        m_Name: LoadSlider
+        m_OriginalName: LoadSlider
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 41736
+        m_UserData: 41794
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -824,7 +824,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: S10001
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -834,24 +834,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Res/UIPlayable
+    - Assets/Editor
     m_Globs: []
-    m_OriginalText: S10001
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Res/UIPlayable
+  - Assets/Editor
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 831}
-    m_SelectedIDs: a0f70000
-    m_LastClickedID: 63392
-    m_ExpandedIDs: 0000000024a4000026a4000028a400002aa400002ca400002ea4000030a4000032a4000034a4000036a4000038a400003aa400003ca400003ea4000040a4000042a4000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a400005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a4000062a6000076a6000026a70000d8f7000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 02a70000
+    m_LastClickedID: 42754
+    m_ExpandedIDs: 000000002ea4000030a4000032a4000034a4000036a4000038a400003aa400003ca400003ea4000040a4000042a4000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a400005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a4000084a4000086a4000088a400008aa400008ca4000090a400001ea7000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -879,7 +879,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000024a4000026a4000028a400002aa400002ca400002ea4000030a4000032a4000034a4000036a4000038a400003aa400003ca400003ea4000040a4000042a4000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a400005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a40000
+    m_ExpandedIDs: 000000002ea4000030a4000032a4000034a4000036a4000038a400003aa400003ca400003ea4000040a4000042a4000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a400005aa400005ca400005ea4000060a4000062a4000064a4000066a4000068a400006aa400006ca400006ea4000070a4000072a4000074a4000076a4000078a400007aa400007ca400007ea4000080a4000082a4000084a4000086a4000088a400008aa400008ca400008ea4000090a40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -907,7 +907,7 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e0100
+    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a30000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -958,7 +958,7 @@ MonoBehaviour:
     x: 611
     y: 73
     width: 442
-    height: 962
+    height: 979
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1012,22 +1012,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 442
-      height: 941
-    m_Scale: {x: 0.5794335, y: 0.5794335}
-    m_Translation: {x: 221, y: 470.5}
+      height: 958
+    m_Scale: {x: 0.58933336, y: 0.58933336}
+    m_Translation: {x: 221.00002, y: 479}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -381.407
-      y: -812
-      width: 762.814
-      height: 1624
+      x: -375
+      y: -812.7828
+      width: 750
+      height: 1625.5656
     m_MinimalGUI: 1
-  m_defaultScale: 0.5794335
-  m_LastWindowPixelSize: {x: 442, y: 962}
+  m_defaultScale: 0.58933336
+  m_LastWindowPixelSize: {x: 442, y: 979}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1056,7 +1056,7 @@ MonoBehaviour:
     x: 0
     y: 73
     width: 610
-    height: 962
+    height: 979
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1428,9 +1428,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1.7965183, y: 0.78333306, z: 4.9703875}
+    m_Target: {x: 375, y: 127, z: 0}
     speed: 2
-    m_Value: {x: 1.7965183, y: 0.78333306, z: 4.9703875}
+    m_Value: {x: 375, y: 127, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1480,9 +1480,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0.21580222, y: -0.75617456, z: 0.30317488, w: 0.5382514}
   m_Size:
-    m_Target: 1.2144759
+    m_Target: 335.71613
     speed: 2
-    m_Value: 1.2144759
+    m_Value: 335.71613
   m_Ortho:
     m_Target: 0
     speed: 2

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov