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

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

Assets/Res/Config/MonsterGroupConfig.json

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

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
+      ]
     }
   ]
 }

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
       ]
     }
   ]

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>

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);

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)

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

@@ -152,11 +152,11 @@ 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;
-            combatItemShowEventData.addValue = 5;
+            combatItemShowEventData.addValue =2;
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
 
 
@@ -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;

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

@@ -49,7 +49,7 @@ public class CombatAIBasic : IDisposable
     private IHero _currFocusTarget;
 
     private BetterList<GameObject> _areaList = new BetterList<GameObject>();
-
+    private BetterList<GameObject> _HindAreaList = new BetterList<GameObject>();
     private float _t;
 
     public void Init(CombatHeroEntity combatHeroEntity, NavMeshAgent navMeshAgent)
@@ -125,6 +125,7 @@ public class CombatAIBasic : IDisposable
             else if (!alertTriggerEventData.isTrigger)
             {
                 _areaList.Remove(alertTriggerEventData.triggerObject);
+                _HindAreaList.Remove(alertTriggerEventData.triggerObject);
             }
         }
     }
@@ -156,7 +157,9 @@ public class CombatAIBasic : IDisposable
         {
             if (!_areaList[i].activeSelf)
             {
+                _HindAreaList.Remove(_areaList[i]);
                 _areaList.RemoveAt(i);
+
                 i--;
             }
         }
@@ -207,8 +210,23 @@ public class CombatAIBasic : IDisposable
 
     private void AreaUpdate()
     {
-        GameObject[] b = _combatHeroEntity.CombatAIBasic.AreaList;
-        if (b != null && b.Length > 0)
+        GameObject[] b = AreaList;
+        if (b == null)
+        {
+            return;
+        }
+
+        BetterList<GameObject> currArea = new BetterList<GameObject>();
+        for (int i = 0; i < b.Length; i++)
+        {
+            if (!_HindAreaList.Contains(AreaList[i]))
+            {
+                currArea.Add(AreaList[i]);
+                _HindAreaList.Add(AreaList[i]);
+            }
+        }
+
+        if (currArea != null && currArea.Count > 0)
         {
             float dodge = _combatHeroEntity.CurrCombatHeroInfo.dodge;
             int odds = CombatCalculateTool.Instance.GetOdd();

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();

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;

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);
+            
             }
         }
 

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);

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);
                     }
                 }
             }

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);
         }

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;
                     }

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);

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.
                         }
                     }

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