修改bug

Assets/Art/ArtHero/Hero01.prefab

@@ -1807,7 +1807,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 7596842400906533007}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Art/ArtHero/Hero02.prefab

@@ -474,7 +474,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 2975475898833867103}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Art/ArtHero/Hero03.prefab

@@ -707,7 +707,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 2409008895403029140}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Art/ArtHero/Hero04.prefab

@@ -673,7 +673,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 2898826248290874776}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Res/CombatHero/Hero01.prefab

@@ -457,7 +457,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 1125192869561846266}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Res/CombatHero/Hero02.prefab

@@ -635,7 +635,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 2915772993344361480}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Res/CombatHero/Hero03.prefab

@@ -1308,7 +1308,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 4121463137137551975}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Res/CombatHero/Hero04.prefab

@@ -1265,7 +1265,7 @@ NavMeshAgent:
   m_GameObject: {fileID: 5436949261233188076}
   m_Enabled: 1
   m_AgentTypeID: 0
-  m_Radius: 0.2
+  m_Radius: 0.5
   m_Speed: 8
   m_Acceleration: 30
   avoidancePriority: 50

Assets/Res/Config/HeroModelConfig.json

@@ -136,7 +136,7 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 75,
+      "hp": 50,
       "def": 25,
       "crit": null,
       "attack": 26,
@@ -217,7 +217,7 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 75,
+      "hp": 50,
       "def": 25,
       "crit": null,
       "attack": 26,
@@ -298,7 +298,7 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 75,
+      "hp": 50,
       "def": 25,
       "crit": null,
       "attack": 26,
@@ -324,7 +324,7 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 75,
+      "hp": 50,
       "def": 25,
       "crit": null,
       "attack": 26,
@@ -350,7 +350,7 @@
       "heroType": 2,
       "profession": 1,
       "itemID": null,
-      "hp": 75,
+      "hp": 50,
       "def": 25,
       "crit": null,
       "attack": 16,
@@ -363,6 +363,34 @@
         1001
       ],
       "heroStory": 70093
+    },
+    {
+      "ID": 9000110,
+      "nickName": -1,
+      "name": 3,
+      "headicon": "icon_tx9000110",
+      "model": "GuaiwuBoss01",
+      "isUseGpu": true,
+      "starGrade": 1,
+      "rarity": 1,
+      "heroType": 4,
+      "profession": 1,
+      "itemID": null,
+      "hp": 3511,
+      "def": 25,
+      "crit": null,
+      "attack": 100,
+      "shanbi": 0,
+      "expGain": null,
+      "move_speed": 3,
+      "speed_atk": 0.5,
+      "range_atk": 3,
+      "skillID": [
+        1001,
+        110001,
+        110002
+      ],
+      "heroStory": 70093
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -282,7 +282,7 @@
     },
     {
       "ID": 71,
-      "txt": "额外提升<color=#7AC180>{0}</color>道[旋风斩]的剑气数量"
+      "txt": "额外释放<color=#7AC180>{0}</color>道[旋风斩]的剑气"
     },
     {
       "ID": 72,

Assets/Res/Config/LevelBattleConfig.json

@@ -8,7 +8,7 @@
         1
       ],
       "monsterLv": 1,
-      "monsterStar": 3,
+      "monsterStar": 1,
       "miniExpAndGold": [
         10
       ],
@@ -21,23 +21,22 @@
         "10005,10012,10014"
       ],
       "BossMonsterWavesId": 0,
-      "bossLv": 4,
-      "bossStar": 3,
-      "bossMonsterId": 9000103,
+      "bossLv": 1,
+      "bossStar": 1,
+      "bossMonsterId": 9000110,
       "bossItem": [
         "10006,10013,10014"
       ],
-      "exp": 100
+      "exp": 60
     },
     {
       "ID": 2,
       "levelName": " 1-2",
       "MonsterWavesConfigId": [
-        4,
-        5,
-        6
+        2,
+        2
       ],
-      "monsterLv": 4,
+      "monsterLv": 1,
       "monsterStar": 3,
       "miniExpAndGold": [
         10
@@ -53,11 +52,11 @@
       "BossMonsterWavesId": 0,
       "bossLv": 8,
       "bossStar": 3,
-      "bossMonsterId": 9000106,
+      "bossMonsterId": 9000110,
       "bossItem": [
         "10006,10013,10014"
       ],
-      "exp": 100
+      "exp": 80
     },
     {
       "ID": 3,

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -63,5 +63,9 @@ namespace Fort23.Core
       /// 显示对话
       /// </summary>
       ShowDialogue,
+      /// <summary>
+      /// 改变战斗英雄
+      /// </summary>
+      AlterCombatHero,
     }
 }

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_GongJiang.cs

@@ -2,108 +2,126 @@ using Common.Utility.CombatEvent;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.CombatType;
+using GameLogic.Combat.Hero;
 using GameLogic.Hero;
 using UnityEngine;
 
 namespace GameLogic.Combat.CombatGuide
 {
-    public class Guide_GongJiang:GuideBasic
+    public class Guide_GongJiang : GuideBasic
     {
         protected bool isTrgger;
-        
+        private AccountFileInfo.HeroData heroData2;
+        private HeroInfo heroInfo;
+        private int state;
+
+        private CombatHeroEntity heroEntity;
         protected override void ProUpdate()
         {
-
+          
             Trigger();
-
         }
 
         protected void Trigger()
         {
-            if (isTrgger)
+            if (state == 0)
             {
-                return;
-            }
+                if (isTrgger)
+                {
+                    return;
+                }
 
-            if (CombatController.currActiveCombat.CombatTypeBasic.dieHeroCount > 20)
-            {
-                isTrgger = true;
-                Guide2();
+                LevelBattleCombatType levelBattleCombatType =
+                    (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
+                if (levelBattleCombatType._levelBattleConfig.ID == 2 && !levelBattleCombatType.isActiveCombat &&
+                    !CombatController.currActiveCombat.isStopAi)
+                {
+                    isTrgger = true;
+                    Guide2_0();
+                }
             }
-        }
-         private async void Guide2()
-        {
-            LevelBattleCombatType levelBattleCombatType =
-                (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
-            int[] monsterId = new int[] { 9000101, 9000107, 9000108 };
-            CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-            CombatHeroEntity combatHeroEntity = allHero[0];
-            Vector3 d = combatHeroEntity.dotPos + combatHeroEntity.faceDir * -10;
-            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-            for (int i = 0; i < 5; i++)
+            else if (state == 1)
             {
-                int monsterIndx = CombatCalculateTool.Instance.GetOdd(0, monsterId.Length);
-                int id = monsterId[monsterIndx];
-                int level = 1;
-                int star = 1;
-                Vector3 pos = d + new Vector3(CombatCalculateTool.Instance.GetOdd(-150, 150) * 0.01f, 0,
-                    CombatCalculateTool.Instance.GetOdd(-150, 150) * 0.01f);
-                levelBattleCombatType.ExtraCreateEnemy(cTaskAwaitBuffer, id, level, star, pos);
+                if (isTrgger)
+                {
+                    return;
+                }
+                CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
+                if (Vector3.Distance(allHero[0].dotPos, heroEntity.dotPos) < 5)
+                {
+                    isTrgger = true;
+                    Guide2_1();
+                }
             }
-
-            await cTaskAwaitBuffer.WaitAll();
-            await TimerComponent.Instance.WaitAsync(1000);
-            Guide2_1();
         }
 
-        private async void Guide2_1()
+        private async void Guide2_0()
         {
-            CombatController.currActiveCombat.isStopAi = true;
-            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-            showDialogueEventData.finish = Guide2_2;
-            showDialogueEventData.dialogueMessaga = new string[] { "怎么办我们后面好像也有敌人~~" };
-            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-        }
-
-        private async void Guide2_2()
-        {
-            AccountFileInfo.HeroData heroData2 = new AccountFileInfo.HeroData
+            heroData2 = new AccountFileInfo.HeroData
             {
                 heroModelId = 116,
-                heroPowerId = 5,
+                heroPowerId = 10,
                 heroPromoteId = 3,
                 isLead = true,
             };
-            HeroInfo heroInfo = new HeroInfo();
+            heroInfo = new HeroInfo();
             heroInfo.InitHero(heroData2);
-            AccountFileInfo.Instance.playerData.HeroListData.Add(heroData2);
-            PlayerManager.Instance.heroController.AddHero(heroInfo);
-            AccountFileInfo.Instance.playerData.combatGuideIndex = 2;
-            AccountFileInfo.Instance.SavePlayerData();
 
-            CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-            CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
+            LevelBattleCombatType levelBattleCombatType =
+                (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
+            heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
             heroEntity.IsEnemy = false;
             heroEntity.number = 1;
-            Vector3 pos = allHero[0].dotPos + allHero[0].faceDir * -2;
+            Vector3 pos = levelBattleCombatType.currBannerHero.dotPos ;
             await heroEntity.Init(new CombatAIBasic(), heroInfo, pos,
                 delegate(CombatHeroEntity entity)
                 {
                     CombatController.currActiveCombat.CombatHeroController.AddHero(entity);
                 });
+
+            // heroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.NullState);
+            CombatController.currActiveCombat.isStopAi = true;
             ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
             showDialogueEventData.finish = delegate
             {
-                heroEntity.CombatHeroSkillControl.AddCommandSkill(
-                    heroEntity.CombatHeroSkillControl.GetSkillBasic(40001));
                 CombatController.currActiveCombat.isStopAi = false;
-                CombatGuideManager.Instance.NextGuide();
+                state = 1;
+                isTrgger = false;
             };
-            showDialogueEventData.dialogueMessaga = new string[] { "后面的事情交给我，看我百步穿杨，百发百中！" };
+            showDialogueEventData.dialogueMessaga = new string[] { "救命呀~", "救命~~~" };
+            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
+            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
+        }
+
+  
+
+        private async void Guide2_1()
+        {
+            CombatController.currActiveCombat.isStopAi = true;
+            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
+            showDialogueEventData.finish = Guide2_2;
+            showDialogueEventData.dialogueMessaga = new string[] { "越往深林深处走怪物越强大了，这里的怪我有点招架不足了，我能不能加入你们一起探险？" };
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
         }
 
+        private async void Guide2_2()
+        {
+            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
+            showDialogueEventData.finish = delegate 
+                {
+                    AccountFileInfo.Instance.playerData.HeroListData.Add(heroData2);
+                    PlayerManager.Instance.heroController.AddHero(heroInfo);
+                    AccountFileInfo.Instance.playerData.combatGuideIndex = 2;
+                    AccountFileInfo.Instance.SavePlayerData();
+                    EventManager.Instance.Dispatch(CustomEventType.AlterCombatHero, null);
+                    CombatController.currActiveCombat.isStopAi = false;
+                    CombatGuideManager.Instance.NextGuide();
+                  };
+            showDialogueEventData.dialogueMessaga = new string[] { "没问题，我们正缺你这样的勇士。","欢迎加入我们的队伍，让我们一起看看深林深处是什么在作怪。" };
+            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
+            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
+            
+        }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_JiaRuFaShi.cs

@@ -109,6 +109,7 @@ namespace GameLogic.Combat.CombatGuide
             showDialogueEventData.dialogueMessaga = new string[] { "太好了艾尔温，感谢你的加入！"};
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
+            EventManager.Instance.Dispatch(CustomEventType.AlterCombatHero, null);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_MuShi.cs

@@ -79,9 +79,10 @@ namespace GameLogic.Combat.CombatGuide
                     heroEntity.CombatHeroSkillControl.GetSkillBasic(20001));
                 CombatController.currActiveCombat.isStopAi = false;
             };
-            showDialogueEventData.dialogueMessaga = new string[] { "我是来自教堂的牧师，我来为你治疗！" };
+            showDialogueEventData.dialogueMessaga = new string[] { "天空中突然闪出一个人影。","我是来自教堂的牧师，我来为你治疗！" };
             showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
             EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
+            EventManager.Instance.Dispatch(CustomEventType.AlterCombatHero, null);
         }
     }
 }

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

@@ -66,50 +66,50 @@ namespace GameLogic.Combat.CombatTool
             if (!isStartShake && !isStop)
             {
                 CombatHeroEntity[] combatHeroEntities = combatController.CombatHeroController.GetHero(false);
-                if (combatHeroEntities == null)
+                if (combatHeroEntities == null||combatHeroEntities.Length<=0)
                 {
                     return;
                 }
 
-                Vector3 p = Vector3.zero;
-                bool isHero = false;
-                if (_followHeroId != -1)
-                {
-                    for (int i = 0; i < combatHeroEntities.Length; i++)
-                    {
-                        if (combatHeroEntities[i].CurrCombatHeroInfo.modelID == _followHeroId)
-                        {
-                            p = combatHeroEntities[i].dotPos;
-                            isHero = true;
-                            break;
-                        }
-                    }
-                }
-
-                if (!isHero)
-                {
-                    int c = 0;
-                    for (int i = 0; i < combatHeroEntities.Length; i++)
-                    {
-                        if (!combatHeroEntities[i].isDie)
-                        {
-                            c++;
-                            p += combatHeroEntities[i].dotPos;
-                        }
-                    }
-
-                    if (c <= 0)
-                    {
-                        return;
-                    }
-
-                    p /= c;
-                }
+                Vector3 p = combatHeroEntities[0].dotPos;
+                // bool isHero = false;
+                // if (_followHeroId != -1)
+                // {
+                //     for (int i = 0; i < combatHeroEntities.Length; i++)
+                //     {
+                //         if (combatHeroEntities[i].CurrCombatHeroInfo.modelID == _followHeroId)
+                //         {
+                //             p = combatHeroEntities[i].dotPos;
+                //             isHero = true;
+                //             break;
+                //         }
+                //     }
+                // }
+                //
+                // if (!isHero)
+                // {
+                //     int c = 0;
+                //     for (int i = 0; i < combatHeroEntities.Length; i++)
+                //     {
+                //         if (!combatHeroEntities[i].isDie)
+                //         {
+                //             c++;
+                //             p += combatHeroEntities[i].dotPos;
+                //         }
+                //     }
+                //
+                //     if (c <= 0)
+                //     {
+                //         return;
+                //     }
+                //
+                //     p /= c;
+                // }
 
                 MainLight.transform.position = new Vector3(p.x, 5.6f, p.z);
 
                 // Vector3 tp = root.TransformVector(new Vector3(0, 0, -20));
-                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y, p.z + 13), 0.1f);
+                root.position = Vector3.Lerp(root.position, new Vector3(p.x, root.position.y, p.z + 13), 0.05f);
             }
         }
 

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

@@ -17,58 +17,59 @@ namespace GameLogic.Combat.CombatTool
 
         public void Update()
         {
-            if (Input.GetMouseButtonDown(0))
-            {
-                Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-                // LayerMask layerMask = LayerMask.NameToLayer("hero");
-                if (Physics.Raycast(ray.origin, ray.direction, out RaycastHit hit))
-                {
-                    HeroEntityMono  mono = hit.transform.gameObject.GetComponent<HeroEntityMono>();
-                    if (mono != null && !mono.combatHeroEntity.IsEnemy)
-                    {
-                        heroEntityMono= mono;
-                        heroEntityMono.combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.PickUp);
-                        CombatHeroEntity[] combatHeroEntities = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-                        if (CombatController.currActiveCombat.CombatCameraControllder.FollowHeroId== heroEntityMono.combatHeroEntity.CurrCombatHeroInfo.modelID||combatHeroEntities!=null&&combatHeroEntities.Length == 1)
-                        {
-                            CombatController.currActiveCombat.CombatCameraControllder.isStop = true;
-                        }
-                    }
-                }
-            }
-
-            if (Input.GetMouseButton(0))
-            {
-                if (heroEntityMono != null && heroEntityMono.combatHeroEntity != null)
-                {
-                    // Vector2 pos = Input.mousePosition;
-                    Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
-                    int layerMask = LayerMask.NameToLayer("hongpei");
-                    int count = Physics.RaycastNonAlloc(ray.origin, ray.direction, hit);
-                    if (count > 0)
-                    {
-                        for (int i = 0; i < count; i++)
-                        {
-                            if (hit[i].transform.gameObject.layer == layerMask)
-                            {
-                                heroEntityMono.gameObject.transform.position =
-                                    hit[i].point;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (Input.GetMouseButtonUp(0))
-            {
-                if (heroEntityMono != null)
-                {
-                    heroEntityMono.combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-                }
-
-                heroEntityMono = null;
-                CombatController.currActiveCombat.CombatCameraControllder.isStop = false;
-            }
+            return;
+            // if (Input.GetMouseButtonDown(0))
+            // {
+            //     Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+            //     // LayerMask layerMask = LayerMask.NameToLayer("hero");
+            //     if (Physics.Raycast(ray.origin, ray.direction, out RaycastHit hit))
+            //     {
+            //         HeroEntityMono  mono = hit.transform.gameObject.GetComponent<HeroEntityMono>();
+            //         if (mono != null && !mono.combatHeroEntity.IsEnemy)
+            //         {
+            //             heroEntityMono= mono;
+            //             heroEntityMono.combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.PickUp);
+            //             CombatHeroEntity[] combatHeroEntities = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
+            //             if (CombatController.currActiveCombat.CombatCameraControllder.FollowHeroId== heroEntityMono.combatHeroEntity.CurrCombatHeroInfo.modelID||combatHeroEntities!=null&&combatHeroEntities.Length == 1)
+            //             {
+            //                 CombatController.currActiveCombat.CombatCameraControllder.isStop = true;
+            //             }
+            //         }
+            //     }
+            // }
+            //
+            // if (Input.GetMouseButton(0))
+            // {
+            //     if (heroEntityMono != null && heroEntityMono.combatHeroEntity != null)
+            //     {
+            //         // Vector2 pos = Input.mousePosition;
+            //         Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
+            //         int layerMask = LayerMask.NameToLayer("hongpei");
+            //         int count = Physics.RaycastNonAlloc(ray.origin, ray.direction, hit);
+            //         if (count > 0)
+            //         {
+            //             for (int i = 0; i < count; i++)
+            //             {
+            //                 if (hit[i].transform.gameObject.layer == layerMask)
+            //                 {
+            //                     heroEntityMono.gameObject.transform.position =
+            //                         hit[i].point;
+            //                 }
+            //             }
+            //         }
+            //     }
+            // }
+            //
+            // if (Input.GetMouseButtonUp(0))
+            // {
+            //     if (heroEntityMono != null)
+            //     {
+            //         heroEntityMono.combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
+            //     }
+            //
+            //     heroEntityMono = null;
+            //     CombatController.currActiveCombat.CombatCameraControllder.isStop = false;
+            // }
         }
     }
 }

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

@@ -26,9 +26,9 @@ namespace GameLogic.Combat.CombatTool
         public Vector3[] followMovePos = new Vector3[]
         {
             new Vector3(0, 0, 0),
-            new Vector3(-1f, 0, -0.5f),
-            new Vector3(1f, 0, -0.5f),
-            new Vector3(0, 0, -2f),
+            new Vector3(-1.5f, 0, -1f),
+            new Vector3(1.5f, 0, -1f),
+            new Vector3(0, 0, -2.5f),
         };
 
         public CombatHeroEntity followTarget;

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

@@ -36,13 +36,14 @@ namespace GameLogic.Combat.CombatType
         private float _currTime;
         // private int _currBoChi;
 
-        protected LevelBattleConfig _levelBattleConfig;
+        public LevelBattleConfig _levelBattleConfig;
         protected MonsterWavesConfig _currWavesConfig;
 
         /// <summary>
         ///  当前节点的波次下标
         /// </summary>
         protected int _currNodeWavesIndex;
+        
 
         public int exp
         {
@@ -499,7 +500,7 @@ namespace GameLogic.Combat.CombatType
             {
                 if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length - 1)
                 {
-                    _currTime += 0.016f;
+                    _currTime +=Time.deltaTime;
                     if (_currTime > _currWavesConfig.wavesDelay)
                     {
                         CreateEnemy(new CTaskAwaitBuffer());

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroActiveState.cs

@@ -13,6 +13,7 @@ namespace GameLogic.Combat.Hero.State
         }
         protected override void ProEnter()
         {
+            combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
                 combatHeroEntity.combatHeroTimeLineControl.TimeLineData
                     .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("jihuo", null);
@@ -21,7 +22,7 @@ namespace GameLogic.Combat.Hero.State
                 timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
                 timeLineEventLogicGroup.TimeLineUpdateEnd = delegate
                 {
-                    combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+                    // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
                     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
                     combatHeroEntity.CombatAIBasic.isAlert = false;
                 };
@@ -29,7 +30,7 @@ namespace GameLogic.Combat.Hero.State
             }
             else
             {
-                combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
+                // combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = false;
                 combatHeroEntity.CombatAIBasic.isAlert = false;
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
             }

Assets/Scripts/GameLogic/Combat/Hero/State/CombatHeroXiuMianState.cs

@@ -53,7 +53,7 @@ namespace GameLogic.Combat.Hero.State
 
         protected void ActiveHero()
         {
-            _timerEntity = TimerComponent.Instance.AddTimer(CombatCalculateTool.Instance.GetOdd(0, 2000),
+            _timerEntity = TimerComponent.Instance.AddTimer(CombatCalculateTool.Instance.GetOdd(0, 300),
                 delegate
                 {
                     combatHeroEntity.GameObject.SetActive(true);

Assets/Scripts/GameLogic/Combat/Skill/S30001.cs

@@ -27,7 +27,6 @@ namespace GameLogic.Combat.Skill
         {
             _harm = SelfSkillConfig.effectValue[0];
             _maxTime = SelfSkillConfig.effectValue[1];
-            
         }
 
         protected override void ProInitSkill()
@@ -35,7 +34,7 @@ namespace GameLogic.Combat.Skill
             SkillBasic skillBasic = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic(30004);
             if (skillBasic != null)
             {
-                _maxTime +=skillBasic.SelfSkillConfig.effectValue[0];
+                _maxTime += skillBasic.SelfSkillConfig.effectValue[0];
             }
         }
         // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
@@ -92,13 +91,18 @@ namespace GameLogic.Combat.Skill
                 return;
             }
 
-            // _allAddJiaoDu += addXuanZhuang;
-            // if (_allAddJiaoDu > 5 || _allAddJiaoDu < -5)
-            // {
-            //     addXuanZhuang *= -1;
-            // }
-            //
-            // CombatHeroEntity.combatHeroGameObject.transform.Rotate(Vector3.up, addXuanZhuang);
+            if (CombatHeroEntity.CombatAIBasic.currFocusTarget != null
+                && !CombatHeroEntity.isDie)
+            {
+                Vector3 nextPos = CombatHeroEntity.CombatAIBasic.currFocusTarget.dotPos;
+                Vector3 p = nextPos - CombatHeroEntity.dotPos;
+                if (p.sqrMagnitude > 0.00001)
+                {
+                    CombatHeroEntity.combatHeroGameObject.rotation = Quaternion.Lerp(
+                        CombatHeroEntity.combatHeroGameObject.rotation, Quaternion.LookRotation(p.normalized), 0.02f);
+                }
+            }
+
             _currTime += time;
             _currAllTime += time;
             if (_currTime > 0.2f)

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -37,6 +37,7 @@ namespace Fort23.Mono
             EventManager.Instance.AddEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
             EventManager.Instance.AddEventListener(CustomEventType.StartBossBattle, StartBossBattle);
             EventManager.Instance.AddEventListener(CustomEventType.ShowDialogue, ShowDialogue);
+            EventManager.Instance.AddEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
         }
 
 
@@ -82,6 +83,7 @@ namespace Fort23.Mono
             CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShowBattleExp, ShowBattleExp);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShowDialogue, ShowDialogue);
+            EventManager.Instance.RemoveEventListener(CustomEventType.AlterCombatHero, AlterCombatHero);
         }
 
         public override void AddButtonEvent()
@@ -107,6 +109,10 @@ namespace Fort23.Mono
             heroBagPanel.InitPanel();
         }
 
+        private void AlterCombatHero(IEventData e)
+        {
+            InitHeroWidget();
+        }
 
         private void OnItemUpdate(IEventData e)
         {
@@ -226,6 +232,11 @@ namespace Fort23.Mono
         private async void InitBattleHeroWidget()
         {
             Button_battleBoss.gameObject.SetActive(false);
+            InitHeroWidget();
+        }
+
+        private async void InitHeroWidget()
+        {
             widgetHeroes.Clear();
             int i = 0;
             foreach (KeyValuePair<int, HeroInfo> keyValuePair in PlayerManager.Instance.heroController.heroDicInLead)

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Hierarchy
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -72,10 +72,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 865
-    width: 888
+    width: 940
     height: 434
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 21}
   m_Panes:
   - {fileID: 21}
@@ -200,7 +200,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 888
+    width: 940
     height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
@@ -222,9 +222,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 888
+    x: 940
     y: 0
-    width: 355
+    width: 303
     height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -302,10 +302,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 888
+    width: 940
     height: 865
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 20}
@@ -335,7 +335,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 887
+    width: 939
     height: 844
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2811,7 +2811,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 938
-    width: 887
+    width: 939
     height: 413
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2843,9 +2843,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 888
+    x: 940
     y: 73
-    width: 353
+    width: 301
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -2862,18 +2862,18 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 84fafffff8a6000028a70000
+      m_ExpandedIDs: 72faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Canvas
-        m_OriginalName: Canvas
+        m_Name: GameStart
+        m_OriginalName: GameStart
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 42792
+        m_UserData: 42762
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -2978,7 +2978,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/UIAssets/bg
+    - Assets/Editor
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2986,16 +2986,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/UIAssets/bg
+  - Assets/Editor
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 76000100
-    m_LastClickedID: 65654
-    m_ExpandedIDs: 000000003ea8000040a8000042a8000044a8000046a8000048a800004aa800004ca800004ea8000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa8000008ab000016ab0000d8ab0000eeab000004ac000034f7000036f7000000ca9a3bffffff7f
+    m_SelectedIDs: 50ab0000
+    m_LastClickedID: 43856
+    m_ExpandedIDs: 0000000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000d2a80000d4a80000d6a80000d8a8000048ab000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -3023,7 +3023,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000003ea8000040a8000042a8000044a8000046a8000048a800004aa800004ca800004ea8000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa80000bca80000
+    m_ExpandedIDs: 0000000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a8000066a8000068a800006aa800006ca800006ea8000070a8000072a8000074a8000076a8000078a800007aa800007ca800007ea8000080a8000082a8000084a8000086a8000088a800008aa800008ca800008ea8000090a8000092a8000094a8000096a8000098a800009aa800009ca800009ea80000a0a80000a2a80000a4a80000a6a80000a8a80000aaa80000aca80000aea80000b0a80000b2a80000b4a80000b6a80000b8a80000baa80000bca80000bea80000c0a80000c2a80000c4a80000c6a80000c8a80000caa80000cca80000cea80000d0a80000d2a80000d4a80000d6a80000d8a80000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -3054,18 +3054,18 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010054a300002435010070d000000c9e00006e180100561b0100fc1a01006ca200008ea00000000000005aa70000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: ArtHero
+      m_OriginalName: ArtHero
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 43812
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
@@ -3474,9 +3474,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.75207627, y: 2.2221353, z: 0.10582106}
+    m_Target: {x: 2.722992, y: 2.1146617, z: -81.8551}
     speed: 2
-    m_Value: {x: 0.75207627, y: 2.2221353, z: 0.10582106}
+    m_Value: {x: 2.722992, y: 2.1146617, z: -81.8551}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -3485,7 +3485,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 0
+    m_AlwaysRefresh: 1
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -3522,13 +3522,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.00006506113, y: -0.9985808, z: -0.0011882774, w: 0.054581307}
+    m_Target: {x: 0.25311688, y: -0.7417929, z: 0.48684675, w: 0.38562837}
     speed: 2
-    m_Value: {x: -0.00006505644, y: -0.9985088, z: -0.0011881917, w: 0.05457737}
+    m_Value: {x: 0.25311005, y: -0.74177295, z: 0.48683363, w: 0.38561797}
   m_Size:
-    m_Target: 890.967
+    m_Target: 69.67365
     speed: 2
-    m_Value: 890.967
+    m_Value: 69.67365
   m_Ortho:
     m_Target: 0
     speed: 2