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

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,
@@ -144,7 +144,7 @@
       "expGain": null,
       "move_speed": 4,
       "speed_atk": 0.5,
-      "range_atk": 1,
+      "range_atk": 2,
       "skillID": [
         1001
       ],
@@ -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,
@@ -332,7 +332,7 @@
       "expGain": null,
       "move_speed": 3,
       "speed_atk": 0.5,
-      "range_atk": 1,
+      "range_atk": 2,
       "skillID": [
         1001
       ],
@@ -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/MonsterGroupConfig.json

@@ -11,6 +11,11 @@
         9000107,
         9000101,
         9000107
+      ],
+      "eliteMonsterId": [
+        9000102,
+        9000105,
+        9000102
       ]
     },
     {
@@ -42,6 +47,11 @@
         9000107,
         9000101,
         9000107
+      ],
+      "eliteMonsterId": [
+        9000102,
+        9000105,
+        9000102
       ]
     },
     {

Assets/Res/UI/MainUIPanel.prefab

@@ -1054,8 +1054,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 3872687123469740126}
+  m_Children: []
   m_Father: {fileID: 6372682890431576924}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4369,6 +4368,15 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_HeroExp
+    gameObject: {fileID: 2002673787439862528}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4792,7 +4800,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3872687123469740126}
   m_Father: {fileID: 1722181438945693490}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -5076,8 +5085,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   maxDuration: 1
-  isUpdate: 1
-  currTime: 79.7119
+  isUpdate: 0
+  currTime: 80.045235
   GrpupInfos:
   - Foldout: 1
     isActive: 1
@@ -5825,7 +5834,7 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 5433286787357854352}
+    m_TransformParent: {fileID: 6989071283435105637}
     m_Modifications:
     - target: {fileID: 5652462218939348953, guid: 5a9370d4ffd86274dadb8069eddb828e, type: 3}
       propertyPath: m_Pivot.x

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

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

Assets/Scripts/GameLogic/Combat/Buff.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: be32e5e0b56e4ae2a3c2685d6bb00c8e
+timeCreated: 1734686847

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

@@ -31,9 +31,13 @@ namespace GameLogic.Combat.CombatGuide
                     currGuide = new Guide_JiaRuFaShi();
                     break;
                 case 1:
-                    currGuide = new Guide_GongJiang();
+                    currGuide = new Guide_Boss();
                     break;
+                    
                 case 2:
+                    currGuide = new Guide_GongJiang();
+                    break;
+                case 3:
                     currGuide = new Guide_MuShi();
                     break;
             }

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

@@ -0,0 +1,45 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.CombatType;
+
+namespace GameLogic.Combat.CombatGuide
+{
+    public class Guide_Boss : GuideBasic
+    {
+        protected bool isTrgger;
+
+        protected override void ProUpdate()
+        {
+            Trigger();
+        }
+
+        protected void Trigger()
+        {
+            if (isTrgger)
+            {
+                return;
+            }
+            LevelBattleCombatType levelBattleCombatType =
+                (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
+            if (levelBattleCombatType.isBossCombat && !CombatController.currActiveCombat.isStopAi)
+            {
+                isTrgger = true;
+               
+                CombatController.currActiveCombat.isStopAi = true;
+                ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
+                showDialogueEventData.finish = delegate
+                {
+                    CombatController.currActiveCombat.isStopAi = false;
+                    AccountFileInfo.Instance.playerData.combatGuideIndex = 2;
+                    AccountFileInfo.Instance.SavePlayerData();
+                    CombatGuideManager.Instance.NextGuide();
+                   
+                };
+                showDialogueEventData.dialogueMessaga = new string[] {".....", "发生了什么事....","前方好像出现了超强怪物，大家做好准备。" };
+                showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
+                EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
+            }
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/CombatGuide/Guide_Boss.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e03e86baac654f54a0c9ebe596938948
+timeCreated: 1734682756

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 =3;
+                    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

@@ -83,11 +83,11 @@ namespace GameLogic.Combat.CombatGuide
                 delegate(CombatHeroEntity entity)
                 {
                     CombatController.currActiveCombat.CombatHeroController.AddHero(entity);
-                    entity.GameObject.SetActive(false);
+                    // entity.GameObject.SetActive(false);
                 });
             CombatController.currActiveCombat.CombatCameraControllder.Shaking(0.2f);
-            await TimerComponent.Instance.WaitAsync(1000);
-            heroEntity.GameObject.SetActive(true);
+            // await TimerComponent.Instance.WaitAsync(1000);
+            // heroEntity.GameObject.SetActive(true);
             ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
             showDialogueEventData.finish = Guide1_2;
             showDialogueEventData.dialogueMessaga = new string[] { "我名艾尔温。这里充满了黑暗的气息，我无法袖手旁观.","让它们常常我的火焰~"};
@@ -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

@@ -78,10 +78,13 @@ namespace GameLogic.Combat.CombatGuide
                 heroEntity.CombatHeroSkillControl.AddCommandSkill(
                     heroEntity.CombatHeroSkillControl.GetSkillBasic(20001));
                 CombatController.currActiveCombat.isStopAi = false;
+                AccountFileInfo.Instance.playerData.combatGuideIndex =4;
+                AccountFileInfo.Instance.SavePlayerData();
             };
-            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
         {
@@ -206,7 +207,7 @@ namespace GameLogic.Combat.CombatType
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = 1;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
-            combatItemShowEventData.showName = "icon_Coin";
+            combatItemShowEventData.showName = "icon_res_upgrade_1";
             combatItemShowEventData.isExp = false;
             combatItemShowEventData.addValue = _levelBattleConfig.miniExpAndGold[0];
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
@@ -303,7 +304,7 @@ namespace GameLogic.Combat.CombatType
             CombatItemShowEventData combatItemShowEventData = CombatItemShowEventData.Create();
             combatItemShowEventData.count = 20;
             combatItemShowEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
-            combatItemShowEventData.showName = "icon_Coin";
+            combatItemShowEventData.showName = "icon_res_upgrade_1";
             combatItemShowEventData.isExp = false;
             combatItemShowEventData.addValue = _levelBattleConfig.bossExpAndGold;
             EventManager.Instance.Dispatch(CustomEventType.Combat_ItemShow, combatItemShowEventData);
@@ -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/CombatHeroIdleState.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.AI;
 
 namespace GameLogic.Combat.Hero.State
 {
@@ -11,6 +12,15 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProEnter()
         {
             combatHeroEntity.combatHeroAnimtion.Play("idle");
+            if (!combatHeroEntity.IsEnemy)
+            {
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType=ObstacleAvoidanceType.HighQualityObstacleAvoidance;
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 100;
+            }
+            else
+            {
+                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+            }
         }
 
         protected override void ProUpdate(float t)

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

@@ -69,7 +69,7 @@ namespace GameLogic.Combat.Hero.State
             EventManager.Instance.RemoveEventListener(CustomEventType.RefreshFull,RefreshFull);
             combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+        
             // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 0;
         }
 

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/S10001.cs

@@ -1,4 +1,5 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using System;
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Excel2Json;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -20,7 +21,7 @@ namespace GameLogic.Combat.Skill
         {
             count = 1;
             _harm = SelfSkillConfig.effectValue[0];
-           
+
 
             // if(
             AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
@@ -29,16 +30,15 @@ namespace GameLogic.Combat.Skill
         protected override void ProInitSkill()
         {
             SkillConfig skillBasic = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(10004);
-            if (skillBasic.ID>0)
+            if (skillBasic.ID > 0)
             {
-                count +=(int)skillBasic.effectValue[0];
+                count += (int)skillBasic.effectValue[0];
             }
         }
 
 
         protected override void ProUseSkill()
         {
-           
             ActivationTimeLineData("sk1");
         }
 
@@ -61,15 +61,26 @@ namespace GameLogic.Combat.Skill
                 Vector3 forward = new Vector3(0, 0, 1);
                 Vector3 eulerAngles = CombatHeroEntity.combatHeroGameObject.transform.eulerAngles;
                 Vector3 zdPos = CombatHeroEntity.GetSpecialDotInfo("zdpos").GetWorlPos();
-                int angle = 360 / count;
+                int angle = 90 / count;
+
                 for (int i = 0; i < count; i++)
                 {
-                    eulerAngles.y += i * angle;
+                    int c = 0;
+                    if (i % 2 == 0)
+                    {
+                        c = (i / 2);
+                    }
+                    else
+                    {
+                        c = (-(i + 1) / 2);
+                    }
+
+                    Vector3 currEulerAngles = eulerAngles + new Vector3(0, c * angle, 0);
                     // 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);
                     // Quaternion quaternion = Quaternion.Euler(newAngle);
-                    Quaternion quaternion = Quaternion.Euler(eulerAngles);
+                    Quaternion quaternion = Quaternion.Euler(currEulerAngles);
                     Vector3 newForward = quaternion * forward;
                     Vector3 targetPos = zdPos + newForward;
                     ActivationTimeLineData("sk1_fashe", null, new Vector3[] { targetPos });

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/GameStart/GameStart.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.Playables;
@@ -10,6 +11,12 @@ public class GameStart : MonoBehaviour
 
     private GameStartUIPanel _gameStartUIPanel;
 
+    [ContextMenu("asdada")]
+    public void Test()
+    {
+       
+    }
+
     public void Start()
     {
         ShaderVariantCollection.WarmUp();
@@ -24,7 +31,7 @@ public class GameStart : MonoBehaviour
         {
             Assembly assembly = Assembly.Load("Fort23.Mono");
 
-          
+
             System.Type type = assembly.GetType(typeName);
             IGameStart iGameStart = System.Activator.CreateInstance(type) as IGameStart;
             iGameStart.StartGame(LoadType, h5Url, _gameStartUIPanel, delegate { gameObject.SetActive(false); });

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

@@ -0,0 +1,75 @@
+using Fort23.Core;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    /// <summary>
+    /// 数字变化
+    /// </summary>
+    public class AnimateNumber
+    {
+        private Text targetTxt;
+        private TextMeshProUGUI targetTextPro;
+        private long startValue;
+        private long endValue;
+        private float time;
+        private float timeElapsed;
+        
+        public AnimateNumber(Text targetTxt = null, TextMeshProUGUI targetTextPro = null)
+        {
+            this.targetTxt = targetTxt;
+            this.targetTextPro = targetTextPro;
+        }
+        
+        public void Start(long startValue, long endValue, float time = 0.3f)
+        {
+            this.startValue = startValue;
+            this.endValue = endValue;
+            this.time = time;
+            
+            timeElapsed = 0f; // 已经过的时间
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Animate);
+            StaticUpdater.Instance.AddRenderUpdateCallBack(Animate);
+        }
+
+        public async void Reset()
+        {
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Animate);
+            await TimerComponent.Instance.WaitAsync(1);
+        }
+        
+        private void Animate()
+        {
+            if (timeElapsed < time)
+            {
+                // 计算当前数字（插值）
+                float currentValue = Mathf.Lerp(startValue, endValue, timeElapsed / time);
+                // 将当前数字四舍五入并设置到目标文本
+                SetText(Mathf.RoundToInt(currentValue).ToString());
+        
+                timeElapsed += Time.deltaTime; // 增加经过的时间
+            }
+            else
+            {
+                // 确保最终值精确设置
+                SetText(endValue.ToString());
+                StaticUpdater.Instance.RemoveRenderUpdateCallBack(Animate);
+            }
+        }
+
+        private void SetText(string text)
+        {
+            if (targetTxt != null)
+            {
+                targetTxt.text = text;
+            }
+
+            if (targetTextPro != null)
+            {
+                targetTextPro.text = text;
+            }
+        }
+    }
+}

Assets/Scripts/GameUI/UI/Hero/AnimateNumber.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 615040bc3e0e4cad97751d82d90e0134
+timeCreated: 1734662533

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

@@ -348,57 +348,77 @@ namespace Fort23.Mono
                     break;
             }
 
+            AnimateNumber animTxtHp = new AnimateNumber(targetTextPro:txtHP);
+            AnimateNumber animTxtAtk = new AnimateNumber(targetTextPro:txtATK);
+            AnimateNumber animTxtDef = new AnimateNumber(targetTextPro:txtDEF);
+            AnimateNumber animTxtShanBi = new AnimateNumber(targetTextPro:txtSHANBI);
+            
+            animateNumberList = new List<AnimateNumber>();
+            animateNumberList.Add(animTxtHp);
+            animateNumberList.Add(animTxtAtk);
+            animateNumberList.Add(animTxtDef);
+            animateNumberList.Add(animTxtShanBi);
+            
             UpdateAttributeUI(true);
         }
 
+        private List<AnimateNumber> animateNumberList;
+        
         private long curHeroCount;
         private long costHeroCount;
         public async void UpdateAttributeUI(bool isInit = false)
         {
             StarsObj.SetActive(true);
-            if (txtHP.text != heroInfo.hp.Value.ToStringEx())
-            {
-                long old = long.Parse(txtHP.text);
-                txtHP.text = heroInfo.hp.Value.ToStringEx();
-                if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-                        {
-                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.hp.Value - old).ToStringEx();
-                        }, 
-                        poolName: "HeroUpTxtEft", root: eftNumPos[0] as RectTransform);
-            }
-
-            if (txtATK.text != heroInfo.attack.Value.ToStringEx())
-            {
-                long old = long.Parse(txtATK.text);
-                txtATK.text = heroInfo.attack.Value.ToStringEx();
-                if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-                        {
-                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.attack.Value - old).ToStringEx();
-                        },
-                        poolName: "HeroUpTxtEft", root: eftNumPos[1] as RectTransform);
-            }
+            
+            PlayEft(isInit, txtHP, heroInfo.hp.Value.ToStringEx(), 0);
+            
+            // if (txtHP.text != heroInfo.hp.Value.ToStringEx())
+            // {
+            //     long old = long.Parse(txtHP.text);
+            //     txtHP.text = heroInfo.hp.Value.ToStringEx();
+            //     if(!isInit)
+            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+            //             {
+            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.hp.Value - old).ToStringEx();
+            //             }, 
+            //             poolName: "HeroUpTxtEft", root: eftNumPos[0] as RectTransform);
+            // }
 
-            if (txtDEF.text != heroInfo.defense.Value.ToStringEx())
-            {
-                long old = long.Parse(txtDEF.text);
-                txtDEF.text = heroInfo.defense.Value.ToStringEx();
-                if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
-                        {
-                            heroUpTxtEft.txtEft.text = "+" + (heroInfo.defense.Value - old).ToStringEx();
-                        },
-                        poolName: "HeroUpTxtEft", root: eftNumPos[2] as RectTransform);
-            }
+            PlayEft(isInit, txtATK, heroInfo.attack.Value.ToStringEx(), 1);
+            
+            // if (txtATK.text != heroInfo.attack.Value.ToStringEx())
+            // {
+            //     long old = long.Parse(txtATK.text);
+            //     txtATK.text = heroInfo.attack.Value.ToStringEx();
+            //     if(!isInit)
+            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+            //             {
+            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.attack.Value - old).ToStringEx();
+            //             },
+            //             poolName: "HeroUpTxtEft", root: eftNumPos[1] as RectTransform);
+            // }
+            
+            PlayEft(isInit, txtDEF, heroInfo.defense.Value.ToStringEx(), 2);
+            // if (txtDEF.text != heroInfo.defense.Value.ToStringEx())
+            // {
+            //     long old = long.Parse(txtDEF.text);
+            //     txtDEF.text = heroInfo.defense.Value.ToStringEx();
+            //     if(!isInit)
+            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(delegate(HeroUpTxtEft heroUpTxtEft)
+            //             {
+            //                 heroUpTxtEft.txtEft.text = "+" + (heroInfo.defense.Value - old).ToStringEx();
+            //             },
+            //             poolName: "HeroUpTxtEft", root: eftNumPos[2] as RectTransform);
+            // }
 
-            if (txtSHANBI.text != heroInfo.shanbi.Value.ToStringEx())
-            {
-                txtSHANBI.text = heroInfo.shanbi.Value.ToStringEx();
-                if(!isInit)
-                    await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
-                        poolName: "HeroUpTxtEft", root: eftNumPos[3] as RectTransform);
-            }
+            PlayEft(isInit, txtSHANBI, heroInfo.shanbi.Value.ToStringEx(), 3);
+            // if (txtSHANBI.text != heroInfo.shanbi.Value.ToStringEx())
+            // {
+            //     txtSHANBI.text = heroInfo.shanbi.Value.ToStringEx();
+            //     if(!isInit)
+            //         await UIManager.Instance.CreateGComponent<HeroUpTxtEft>(null,
+            //             poolName: "HeroUpTxtEft", root: eftNumPos[3] as RectTransform);
+            // }
             
             
             txtLv.text = heroInfo.level.Value.ToStringEx();
@@ -460,5 +480,33 @@ namespace Fort23.Mono
             }
         }
 
+        /// <summary>
+        /// 当基础属性改变时，做一些表现
+        /// </summary>
+        /// <param name="isInit">是否为首次(初始), 首次不做动画处理</param>
+        /// <param name="txtOld">当前(旧的)</param>
+        /// <param name="txtNew"></param>
+        /// <param name="eftRoot"></param>
+        private async void PlayEft(bool isInit, TextMeshProUGUI txtOld, string txtNew, int idx)
+        {
+            if (txtOld.text != txtNew)
+            {
+                long old = long.Parse(txtOld.text);
+                long newV = long.Parse(txtNew);
+                txtOld.text = txtNew;
+                if (!isInit)
+                {
+                    animateNumberList[idx].Start(old, newV);
+                    
+                    await UIManager.Instance.CreateGComponent(delegate(HeroUpTxtEft heroUpTxtEft)
+                        {
+                            heroUpTxtEft.txtEft.text = "+" + (newV - old).ToStringEx();
+                        }, 
+                        poolName: "HeroUpTxtEft", root: eftNumPos[idx] as RectTransform);
+                }
+                    
+            }
+        }
+
     }
 }

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

@@ -13,6 +13,15 @@ namespace Fort23.Mono
      
         
         
+        
+
+        
+        
+        /// <summary>
+        /// 获取技能参数
+        /// </summary>
+        /// <param name="skillConfig"></param>
+        /// <returns></returns>
         public static object[] GetSkillParam(SkillConfig skillConfig)
         {
             object[] data = null;

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)

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -219,6 +219,17 @@ namespace Fort23.Mono
 	      return _Button_battleBoss;
 	     }
 	   }
+	  private MyImage _Icon_HeroExp;
+	  public MyImage Icon_HeroExp
+	   {
+	   get{
+	      if (_Icon_HeroExp == null)
+	       {
+	         _Icon_HeroExp  = GetUIUnit<MyImage>("Icon_HeroExp"); 
+	       }
+	      return _Icon_HeroExp;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShowItemMoveTarget/ShowItemMoveToTargetPanel.cs

@@ -60,7 +60,7 @@ namespace Fort23.Mono
             else
             {
                 MainUIPanel mainUIPanel = UIManager.Instance.GetComponent<MainUIPanel>();
-                Vector3 pos = mainUIPanel.Icon_Coin.position;
+                Vector3 pos = mainUIPanel.Icon_HeroExp.transform.position;
                 target = transform.worldToLocalMatrix * pos;
             }
 
@@ -113,7 +113,7 @@ namespace Fort23.Mono
                             ParticleSystemPool particleSystemPool =
                                 GObjectPool.Instance.FetchAsyncForGameObject<ParticleSystemPool>(mainUIPanel.fx_ui_coin,
                                     "fx_ui_coin");
-                            particleSystemPool.transform.SetParent(mainUIPanel.Icon_Coin.transform);
+                            particleSystemPool.transform.SetParent(mainUIPanel.Icon_HeroExp.transform);
                             particleSystemPool.transform.localPosition = Vector3.zero;
                             particleSystemPool.transform.localScale = Vector3.one;
                             BagController.Instance.AddHeroExp(currAddValue);
@@ -204,10 +204,11 @@ namespace Fort23.Mono
             gameObjectPool.own.transform.localScale = Vector3.zero;
             currImageMove.GameObjectPool = gameObjectPool;
             MyImage myImage = gameObjectPool.own.GetComponent<MyImage>();
-            myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
+            // myImage.onSpriteAlter = delegate { myImage.SetNativeSize(); };
             myImage.icon_name = itemConfig;
+        
             currImageMove.transform = gameObjectPool.own.GetComponent<RectTransform>();
-            // currImageMove.transform.sizeDelta = new Vector2(35, 35);
+            currImageMove.transform.sizeDelta = new Vector2(50, 65);
             currImageMove.moveStartPos = startPos;
             currImageMove.transform.anchoredPosition = currImageMove.moveStartPos;
             currImageMove.yanChi = Random.Range(0, 0.5f);

UserSettings/EditorUserSettings.asset

@@ -54,13 +54,13 @@ EditorUserSettings:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968786f9abada9bbaaa6a0f3a9f2fcae8ce8a2c182a6d8c2869bd1f5dc8e9c9b97ea9c819ffcca90898d86d598899ac5
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1ff929797919fe69399919196e8879d91b3ece1dac3d3c78cc2c5c09983dcf2d8ecc3f4f7c0f0f6cfcdfdcbf3ccccc9fe22aaed3a37353ef4eca5ab9d
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9195908797a7cf
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908cf3a1a7a4bdada5a4fdaef3fbab95e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918383dc8097d7c5c6
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

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