修改代码

Assets/Scripts/GameLogic/Combat/Buff/BuffBasic.cs

@@ -38,7 +38,7 @@ namespace GameLogic.Combat.Buff
             object extraData = null)
         {
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                source.combatHeroTimeLineControl.TimeLineData
+                source.combatHeroTimeLineControl
                     .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(groupName, null);
             try
             {
@@ -76,13 +76,13 @@ namespace GameLogic.Combat.Buff
 
         public void Update(float t)
         {
-         
             _currTime += t;
-            if (buffInf.buffTime>0&&_currTime > buffInf.buffTime)
+            if (buffInf.buffTime > 0 && _currTime > buffInf.buffTime)
             {
                 combatHeroEntity.BuffControl.RemoveBuff(this);
                 return;
             }
+
             ProUpdate(t);
         }
 

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

@@ -25,22 +25,7 @@ namespace GameLogic.Combat.CombatGuide
                 return;
             }
 
-            switch (index)
-            {
-                case 0:
-                    currGuide = new Guide_JiaRuFaShi();
-                    break;
-                case 1:
-                    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

@@ -1,50 +0,0 @@
-using Common.Utility.CombatEvent;
-using Core.Language;
-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();
-                   
-                };
-                // LanguageManager.Instance.Text()
-                showDialogueEventData.dialogueMessaga = new string[] {LanguageManager.Instance.Text(118), 
-                    LanguageManager.Instance.Text(119),
-                    LanguageManager.Instance.Text(120) };
-                showDialogueEventData.icon = new string[] { "icon_tx105", "icon_tx105", "icon_tx105" };
-                showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-                EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-            }
-        }
-    }
-}

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

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

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

@@ -1,132 +0,0 @@
-using Common.Utility.CombatEvent;
-using Core.Language;
-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
-    {
-        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 (state == 0)
-            {
-                if (isTrgger)
-                {
-                    return;
-                }
-
-                LevelBattleCombatType levelBattleCombatType =
-                    (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
-                if (levelBattleCombatType._levelBattleConfig.ID == 3 && !levelBattleCombatType.isActiveCombat &&
-                    !CombatController.currActiveCombat.isStopAi)
-                {
-                    isTrgger = true;
-                    Guide2_0();
-                }
-            }
-            else if (state == 1)
-            {
-                if (isTrgger)
-                {
-                    return;
-                }
-                CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-                if (Vector3.Distance(allHero[0].dotPos, heroEntity.dotPos) < 5)
-                {
-                    isTrgger = true;
-                    Guide2_1();
-                }
-            }
-        }
-
-        private async void Guide2_0()
-        {
-            heroData2 = new AccountFileInfo.HeroData
-            {
-                heroModelId = 116,
-                heroPowerId = 10,
-                heroPromoteId = 3,
-                isLead = true,
-            };
-            heroInfo = new HeroInfo();
-            heroInfo.InitHero(heroData2);
-
-            LevelBattleCombatType levelBattleCombatType =
-                (LevelBattleCombatType)CombatController.currActiveCombat.CombatTypeBasic;
-            heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-            heroEntity.IsEnemy = false;
-            heroEntity.number = 1;
-            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
-            {
-                CombatController.currActiveCombat.isStopAi = false;
-                state = 1;
-                isTrgger = false;
-            };
-            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(126),
-                LanguageManager.Instance.Text(127) };
-            showDialogueEventData.icon = new string[] { "icon_tx116", "icon_tx116" };
-            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[] { LanguageManager.Instance.Text(121) };
-            showDialogueEventData.icon = new string[] { "icon_tx116"};
-            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.DeployHeroToLead(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[] { LanguageManager.Instance.Text(122), LanguageManager.Instance.Text(123) };
-            showDialogueEventData.icon = new string[] { "icon_tx105"};
-            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-            
-        }
-    }
-}

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

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 35544af084cb4853a4f04733a65cab2d
-timeCreated: 1734603615

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

@@ -1,122 +0,0 @@
-using Common.Utility.CombatEvent;
-using Core.Language;
-using Fort23.Core;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Hero;
-using UnityEngine;
-
-namespace GameLogic.Combat.CombatGuide
-{
-    public class Guide_JiaRuFaShi : GuideBasic
-    {
-        protected bool isTrgger;
-        
-        protected override void ProUpdate()
-        {
-
-            Trigger();
-
-        }
-
-        protected void Trigger()
-        {
-            if (isTrgger)
-            {
-                return;
-            }
-
-            int index = AccountFileInfo.Instance.playerData.combatGuideIndex;
-            if (index > 3)
-            {
-                return;
-            }
-
-            switch (index)
-            {
-                case 0:
-                    CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(true);
-                    // if (allHero!=null&&allHero.Length >=7 &&CombatController.currActiveCombat.CombatTypeBasic.dieHeroCount>7)
-                    if (CombatController.currActiveCombat.CombatTypeBasic.dieHeroCount > 10)
-                    {
-                        isTrgger = true;
-                        Guide1();
-                    }
-
-                    break;
-            }
-        }
-          private async void Guide1()
-        {
-            CombatController.currActiveCombat.isStopAi = true;
-
-           
-
-            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-            showDialogueEventData.finish = Guide1_1;
-          
-            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(124), 
-                LanguageManager.Instance.Text(125) };
-            showDialogueEventData.icon = new string[] { "icon_tx105"};
-            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-        }
-
-        private async void Guide1_1()
-        {
-            
-            AccountFileInfo.HeroData heroData2 = new AccountFileInfo.HeroData
-            {
-                heroModelId = 107,
-                heroPowerId = 5,
-                heroPromoteId = 3,
-                isLead = true,
-            };
-            HeroInfo heroInfo = new HeroInfo();
-            heroInfo.InitHero(heroData2);
-            AccountFileInfo.Instance.playerData.HeroListData.Add(heroData2);
-            PlayerManager.Instance.heroController.DeployHeroToLead(heroInfo);
-            AccountFileInfo.Instance.playerData.combatGuideIndex = 1;
-            AccountFileInfo.Instance.SavePlayerData();
-
-            CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-            CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-            heroEntity.IsEnemy = false;
-            heroEntity.number = 1;
-            Vector3 pos = allHero[0].dotPos + allHero[0].faceDir * -2;
-            await heroEntity.Init(new CombatAIBasic(), heroInfo, pos,
-                delegate(CombatHeroEntity entity)
-                {
-                    CombatController.currActiveCombat.CombatHeroController.AddHero(entity);
-                    // entity.GameObject.SetActive(false);
-                });
-            CombatController.currActiveCombat.CombatCameraControllder.Shaking(0.2f);
-            // await TimerComponent.Instance.WaitAsync(1000);
-            // heroEntity.GameObject.SetActive(true);
-            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-            showDialogueEventData.finish = Guide1_2;
-            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(128),
-                LanguageManager.Instance.Text(129)};
-            showDialogueEventData.icon = new string[] { "icon_tx107"};
-            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-            
-            heroEntity.GameObject.transform.eulerAngles = allHero[0].GameObject.transform.eulerAngles;
-            heroEntity.CombatHeroSkillControl.AddCommandSkill(heroEntity.CombatHeroSkillControl.GetSkillBasic(30001));
-        }
-
-        private async void Guide1_2()
-        {
-            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-            showDialogueEventData.finish = delegate
-            {
-                CombatController.currActiveCombat.isStopAi = false;
-                CombatGuideManager.Instance.NextGuide();
-            };
-            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(130)};
-            showDialogueEventData.icon = new string[] { "icon_tx105"};
-            showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-            EventManager.Instance.Dispatch(CustomEventType.ShowDialogue, showDialogueEventData);
-            EventManager.Instance.Dispatch(CustomEventType.AlterCombatHero, null);
-        }
-    }
-}

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

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 177f2876826644e2bf8d74c3af8e2be5
-timeCreated: 1734602989

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

@@ -1,94 +0,0 @@
-using Common.Utility.CombatEvent;
-using Core.Language;
-using Fort23.Core;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Hero;
-using UnityEngine;
-
-namespace GameLogic.Combat.CombatGuide
-{
-    public class Guide_MuShi : GuideBasic
-    {
-        protected bool isTrgger;
-
-        public Guide_MuShi()
-        {
-            Guide3();
-        }
-
-
-        private void Guide3()
-        {
-            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroHpUpdate, HeroHpUpdateEventData);
-        }
-
-        private void HeroHpUpdateEventData(IEventData eventData)
-        {
-            if (isTrgger)
-            {
-                return;
-            }
-            HeroHpUpdateEventData data = eventData as HeroHpUpdateEventData;
-            CombatHeroEntity combatHeroEntity = data.combatHeroEntity;
-            if (!combatHeroEntity.IsEnemy)
-            {
-                if (data.combatHeroEntity.HpBl <= 60)
-                {
-                    CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroHpUpdate,
-                        HeroHpUpdateEventData);
-                    CombatController.currActiveCombat.isStopAi = true;
-                    ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-                    showDialogueEventData.finish = Guide3_1;
-                    showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(131)};
-                    showDialogueEventData.icon = new string[] { "icon_tx105"};
-                    showDialogueEventData.messageShowType = ShowDialogueEventData.MessageShowType.Verbatim;
-                    EventManager.Instance.Dispatch(CustomEventType.ShowDialogue,
-                        showDialogueEventData);
-                }
-            }
-        }
-
-        private async void Guide3_1()
-        {
-            AccountFileInfo.HeroData heroData2 = new AccountFileInfo.HeroData
-            {
-                heroModelId = 113,
-                heroPowerId = 10,
-                heroPromoteId = 3,
-                isLead = true,
-            };
-            HeroInfo heroInfo = new HeroInfo();
-            heroInfo.InitHero(heroData2);
-            AccountFileInfo.Instance.playerData.HeroListData.Add(heroData2);
-            PlayerManager.Instance.heroController.DeployHeroToLead(heroInfo);
-            AccountFileInfo.Instance.playerData.combatGuideIndex = 3;
-            AccountFileInfo.Instance.SavePlayerData();
-
-            CombatHeroEntity[] allHero = CombatController.currActiveCombat.CombatHeroController.GetHero(false);
-            CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-            heroEntity.IsEnemy = false;
-            heroEntity.number = 1;
-            Vector3 pos = allHero[0].dotPos + allHero[0].faceDir * -2;
-            await heroEntity.Init(new CombatAIBasic(), heroInfo, pos,
-                delegate(CombatHeroEntity entity)
-                {
-                    CombatController.currActiveCombat.CombatHeroController.AddHero(entity);
-                });
-            ShowDialogueEventData showDialogueEventData = ShowDialogueEventData.Create();
-            showDialogueEventData.finish = delegate
-            {
-                heroEntity.CombatHeroSkillControl.AddCommandSkill(
-                    heroEntity.CombatHeroSkillControl.GetSkillBasic(20001));
-                CombatController.currActiveCombat.isStopAi = false;
-                AccountFileInfo.Instance.playerData.combatGuideIndex =4;
-                AccountFileInfo.Instance.SavePlayerData();
-            };
-            showDialogueEventData.dialogueMessaga = new string[] { LanguageManager.Instance.Text(132), 
-                LanguageManager.Instance.Text(133) };
-            showDialogueEventData.icon = new string[] { "icon_tx113"};
-            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.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 0ca5e2686a3847d3b3e077da214b6efb
-timeCreated: 1734603943

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

@@ -34,18 +34,15 @@ namespace GameLogic.Combat.CombatTool
 
         public CombatHeroEntity followTarget;
 
-        public PlayerHeroEntity PlayerHeroEntity;
 
         public async CTask Init(CombatController combatController)
         {
             this.combatController = combatController;
             CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, CombatUseSkillEventData);
             EventManager.Instance.AddEventListener(CustomEventType.HeroPowerUp, HeroPowerUp);
-            PlayerHeroEntity = new PlayerHeroEntity();
+
             CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
             combatHeroInfo.attack = (EncryptionLong)10;
-            await PlayerHeroEntity.Init(new PlayerHeroAi(), combatHeroInfo, Vector3.zero, null);
-            // EventManager.Instance.AddEventListener(CustomEventType.HeroPromote, HeroPowerUp);
         }
 
         private void HeroPowerUp(IEventData eventData)
@@ -140,7 +137,7 @@ namespace GameLogic.Combat.CombatTool
                 return;
             }
 
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.enabled = true;
+
             if (combatHeroEntity.heroDieNodeId !=
                 CombatController.currActiveCombat.CombatTypeBasic.allWinNodeCount)
             {
@@ -152,7 +149,6 @@ namespace GameLogic.Combat.CombatTool
                 }
 
                 combatHeroEntity.combatHeroGameObject.SetPosition(pos);
-                combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(pos);
             }
 
 
@@ -178,7 +174,6 @@ namespace GameLogic.Combat.CombatTool
             {
                 heroDie[i].Update(t);
             }
-            PlayerHeroEntity.Update(t);
         }
 
         public void LateUpdate(float t)
@@ -327,6 +322,7 @@ namespace GameLogic.Combat.CombatTool
             return followTarget.combatHeroGameObject.transform.TransformPoint((followMovePos[index]));
             // return followMovePos[index] + .dotPos;
         }
+
         public BetterList<CombatHeroEntity> GetHeroList(bool isEnemy)
         {
             if (isEnemy)
@@ -338,6 +334,7 @@ namespace GameLogic.Combat.CombatTool
                 return myHero;
             }
         }
+
         public CombatHeroEntity[] GetHero(bool isEnemy)
         {
             if (isEnemy)
@@ -349,6 +346,7 @@ namespace GameLogic.Combat.CombatTool
                 return myHero.ToArray();
             }
         }
+
         public CombatHeroEntity GetHeroForId(int modelID)
         {
             if (myHero == null)
@@ -366,6 +364,7 @@ namespace GameLogic.Combat.CombatTool
 
             return null;
         }
+
         public CombatHeroEntity[] GetDieHero()
         {
             return heroDie.ToArray();

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

@@ -21,185 +21,17 @@ namespace GameLogic.Combat.CombatType
 {
     public class LevelBattleCombatType : CombatTypeBasic
     {
-        private TestCombatHeroConfig testCombatHeroConfig;
+       
 
-        /// <summary>
-        /// 等待复活
-        /// </summary>
-        protected bool _isAwaitResurrection;
 
-        // protected TestCombatHeroConfig.EnemyGroup currEnemyGroup;
-        /// <summary>
-        /// 当前关卡战斗的波次节点
-        /// </summary>
-        protected int _currLevelBattleNodeIndex;
-
-        private float _currTime;
-        // private int _currBoChi;
-
-        public LevelBattleConfig _levelBattleConfig;
-        protected MonsterWavesConfig _currWavesConfig;
-
-        /// <summary>
-        ///  当前节点的波次下标
-        /// </summary>
-        protected int _currNodeWavesIndex;
-
-
-        public int exp
-        {
-            get { return _exp; }
-            set
-            {
-                _exp = value;
-                CombatEventManager.Instance.Dispatch(CombatEventType.CombatExpAlter, null);
-                if (!AccountFileInfo.Instance.playerData.isAllHeroDie)
-                {
-                    if (!isBossCombat && exp >= _levelBattleConfig.exp) // 到达目标值，开始打boss
-                    {
-                        StartBossCombat();
-                    }
-                }
-            }
-        }
-
-        private int _exp;
-
-        private int _simulatedExp;
-
-        public int CurrMaxExp
-        {
-            get { return _levelBattleConfig.exp; }
-        }
-
-        public bool isBossCombat;
-
-
-        protected List<string> equipName = new List<string>()
-        {
-            "fx_down_zb_blue",
-            "fx_down_zb_blue",
-            "fx_down_zb_blue",
-            "fx_down_zb_gold",
-            "fx_down_zb_green",
-            "fx_down_zb_orange",
-            "fx_down_zb_purple",
-        };
-
-        protected override void ProInit()
-        {
-            _levelBattleConfig = ConfigComponent.Instance.Get<LevelBattleConfig>(_startCombatInfo.levelBattleId);
-            _currLevelBattleNodeIndex = 0;
-            exp = 0;
-            _simulatedExp = 0;
-            PlayBgm();
-        }
-
-        /// <summary>
-        /// 掉落逻辑放这里
-        /// </summary>
-        private void EntityDropLogic(CombatHeroEntity combatHeroEntity, float waitTime = 2f)
-        {
-            // return;
-            List<ItemInfo> equipmentList =
-                DropManager.Instance.DropEquipment(_levelBattleConfig, combatHeroEntity.CurrCombatHeroInfo.heroType);
-
-            if (equipmentList.Count <= 0)
-            {
-                return;
-            }
-
-            Combat_EquipFallEventData combatEquipFallEventData = Combat_EquipFallEventData.Create();
-            //allEquip存放特效标记
-            List<string> allEquip = new List<string>();
-            for (int i = 0; i < equipmentList.Count; i++)
-            {
-                ItemInfo eqItemInfo = equipmentList[i];
-                allEquip.Add(equipName[eqItemInfo.eqInfo.quality - 1]);
-            }
-
-            combatEquipFallEventData.fallEquip = allEquip.ToArray();
-            combatEquipFallEventData.startPos_WorldPos = combatHeroEntity.combatHeroGameObject.position;
-            combatEquipFallEventData.waitTime = waitTime;
-            EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
-        }
+    
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity, HarmReturnInfo harmReturnInfo)
         {
-            if (harmReturnInfo == null || harmReturnInfo.harmType == HarmType.SystemKo)
-            {
-                return;
-            }
-
-            if (combatHeroEntity.IsEnemy) //怪死了
-            {
-                if (!isBossCombat)
-                {
-                    EntityDropLogic(combatHeroEntity);
-                    MiniMonsterDie(combatHeroEntity);
-                }
-                else if (combatHeroEntity.CurrCombatHeroInfo.heroType == 4) ///boss死了
-                {
-                    for (int i = 0; i < 5; i++)
-                    {
-                        EntityDropLogic(combatHeroEntity, 0.8f);
-                    }
-
-                    BossKo(combatHeroEntity);
-                }
-            }
-            else //英雄死了
-            {
-                CombatHeroEntity[] myHero = combatController.CombatHeroController.GetHero(false);
-                if (myHero == null || myHero.Length <= 0) //死完了
-                {
-                    CombatController.currActiveCombat.IsGameOver = true;
-                }
-            }
-        }
-
-        public void Resume()
-        {
-            HarmReturnInfo newharm = new HarmReturnInfo();
-            newharm.harmType = HarmType.SystemKo;
-            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            if (allHero != null)
-            {
-                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-                heroEntities.AddRange(allHero);
-                for (int i = 0; i < heroEntities.Count; i++)
-                {
-                    heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
-                }
-            }
-
-            Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");
-            PottingMobile._FailLevel(_levelBattleConfig.levelName);
-            PlayBgm();
-            AccountFileInfo.Instance.playerData.isAllHeroDie = true;
-            TimerComponent.Instance.AddTimer(1000, delegate
-            {
-                CombatController.currActiveCombat.IsGameOver = false;
-                CombatHeroEntity[] allMyHero = combatController.CombatHeroController.GetDieHero();
-                BetterList<CombatHeroEntity> allMyHeroList = CombatListPool<CombatHeroEntity>.Instance.Get();
-                allMyHeroList.AddRange(allMyHero);
-                for (int i = 0; i < allMyHeroList.Count; i++)
-                {
-                    CombatHeroEntity dieHero = allMyHeroList[i];
-                    if (dieHero != null && !dieHero.IsEnemy && dieHero.isDie)
-                    {
-                        dieHero.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection, isQiangZhi: true);
-                    }
-                }
-
-                allMyHeroList.Dispose();
-                CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-                // CombatController.currActiveCombat.speed = 1;
-            });
-            isActiveCombat = false;
-            _isAwaitResurrection = true;
+   
         }
 
+    
         private void PlayBgm()
         {
             AudioManager.Instance.PlayBGM("combatBattle.wav");
@@ -207,91 +39,13 @@ namespace GameLogic.Combat.CombatType
 
         private void ResurrectionFinish()
         {
-            _isAwaitResurrection = false;
-            _currLevelBattleNodeIndex = 0;
-            InitNewMonsterConfig();
-            isBossCombat = false;
-            exp = 0;
-            _simulatedExp = 0;
-            _currLevelBattleNodeIndex = 0;
-            EventManager.Instance.Dispatch(CustomEventType.ShowBattleExp, null);
-            isActiveCombat = true;
+          
         }
 
 
-        private void MiniMonsterDie(CombatHeroEntity combatHeroEntity)
-        {
-            if (isBossCombat)
-            {
-                return;
-            }
-
-
-            BagController.Instance.AddHeroExp(_levelBattleConfig.miniExpAndGold[0]);
-
-            // BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
-            //     _levelBattleConfig.miniExpAndGold[0]);
-            int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-            if (odds < 70)
-            {
-                ShowTextEventData showTextEventData = ShowTextEventData.Create();
-                showTextEventData.text = "+金幣 5";
-                showTextEventData.Color = new Color(1f, 0.64f, 0.22f);
-                showTextEventData.worldPos = combatHeroEntity.combatHeroGameObject.position;
-                EventManager.Instance.Dispatch(CustomEventType.ShowText, showTextEventData);
-                BagController.Instance.AddCoin(5);
-            }
-
-
-            // //TODO 装备掉落后，飞特效得逻辑
-            // List<string> allEquip = new List<string>();
-            // for (int i = 0; i < 3; i++)
-            // {
-            //     int odds = CombatCalculateTool.Instance.GetOdd();
-            //     if (odds < 20)
-            //     {
-            //         allEquip.Add(equipName[CombatCalculateTool.Instance.GetOdd(0, equipName.Count)]);
-            //     }
-            // }
-            //
-            // Combat_EquipFallEventData combatEquipFallEventData = Combat_EquipFallEventData.Create();
-            // combatEquipFallEventData.fallEquip = allEquip.ToArray();
-            // combatEquipFallEventData.startPos_WorldPos = combatItemShowEventData.startPos_WorldPos;
-            // EventManager.Instance.Dispatch(CustomEventType.Combat_EquipFall, combatEquipFallEventData);
-
-
-            // BagController.Instance.AddHeroExp(10);
-            int levelExp = combatHeroEntity.CurrCombatHeroInfo.heroType == 2 ? 1 : 1;
-            _simulatedExp += levelExp;
-            BagController.Instance.DropLevelExp(combatHeroEntity.combatHeroGameObject.position, levelExp, levelExp);
+      
 
-
-            if (_simulatedExp < _levelBattleConfig.exp || AccountFileInfo.Instance.playerData.isAllHeroDie)
-            {
-                CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-                if (allHero == null || allHero.Length <= 0)
-                {
-                    if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length)
-                    {
-                        CreateEnemy(new CTaskAwaitBuffer());
-                    }
-                    else
-                    {
-                        InitNewMonsterConfig();
-                    }
-                }
-            }
-        }
-
-        private void InitNewMonsterConfig()
-        {
-            _currNodeWavesIndex = 0;
-            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-
-            FindNextConfig();
-            InitTestCombatBoChi();
-            CreateEnemy(new CTaskAwaitBuffer());
-        }
+ 
 
         protected override async CTask ProStartGame()
         {
@@ -304,111 +58,12 @@ namespace GameLogic.Combat.CombatType
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
 
-        protected void BossKo(CombatHeroEntity combatHeroEntity)
-        {
-            PottingMobile._FinishLevel(_levelBattleConfig.levelName);
-            dieHeroCount = 0;
-            AccountFileInfo.Instance.playerData.isAllHeroDie = false;
-            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            if (allHero != null)
-            {
-                HarmReturnInfo harmReturnInfo = new HarmReturnInfo();
-                harmReturnInfo.harmType = HarmType.SystemKo;
-
-                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-                heroEntities.AddRange(allHero);
-                for (int i = 0; i < heroEntities.Count; i++)
-                {
-                    heroEntities[i].HeroDie(harmReturnInfo);
-                }
-            }
-
-            BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
-                _levelBattleConfig.bossExpAndGold);
-            BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
-                500);
-            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-            isBossCombat = false;
-            LevelBattleConfig levelBattleConfig =
-                ConfigComponent.Instance.Get<LevelBattleConfig>(_levelBattleConfig.ID + 1);
-            if (levelBattleConfig.ID > 0)
-            {
-                AccountFileInfo.Instance.playerData.levelBattle = levelBattleConfig.ID;
-                AccountFileInfo.Instance.SavePlayerData();
-                _levelBattleConfig = levelBattleConfig;
-                EventManager.Instance.Dispatch(CustomEventType.LevelUpdate, null);
-            }
-
-            exp = 0;
-            _simulatedExp = 0;
-            _currLevelBattleNodeIndex = 0;
-            InitNewMonsterConfig();
-            EventManager.Instance.Dispatch(CustomEventType.ShowBattleExp, null);
-            // CombatController.currActiveCombat.speed = 0.3f;
-            Time.timeScale = 0.3f;
-            CombatController.currActiveCombat.isStopAi = true;
-            TimerComponent.Instance.AddTimer(2000, delegate
-            {
-                PlayBgm();
-                CombatController.currActiveCombat.isStopAi = false;
-                CombatHeroEntity[] allMyHero = combatController.CombatHeroController.GetDieHero();
-                BetterList<CombatHeroEntity> allMyHeroList = CombatListPool<CombatHeroEntity>.Instance.Get();
-                allMyHeroList.AddRange(allMyHero);
-                for (int i = 0; i < allMyHeroList.Count; i++)
-                {
-                    CombatHeroEntity dieHero = allMyHeroList[i];
-                    if (dieHero != null && !dieHero.IsEnemy && dieHero.isDie)
-                    {
-                        dieHero.CombatAIBasic.ChangeState(CombatHeroStateType.Resurrection, isQiangZhi: true);
-                    }
-                }
-
-                allMyHeroList.Dispose();
-
-                Time.timeScale = 1f;
-                CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-                // CombatController.currActiveCombat.speed = 1;
-            });
-        }
+   
+        
 
         public void StartBossCombat()
         {
-            isBossCombat = true;
-            CombatController.currActiveCombat.isStopAi = true;
-            AudioManager.Instance.PlayBGM("bossBattle.wav");
-            CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            if (allHero != null)
-            {
-                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-                heroEntities.AddRange(allHero);
-                for (int i = 0; i < heroEntities.Count; i++)
-                {
-                    heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
-                }
-            }
-
-            CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
-            FindNextConfig();
-            _currWavesConfig =
-                ConfigComponent.Instance.Get<MonsterWavesConfig>(
-                    _levelBattleConfig.BossMonsterWavesId);
-            _currNodeWavesIndex = -1;
-            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
-
-            Vector3 pos = nextConfig.monsterPoint[0].position + new Vector3(
-                CombatCalculateTool.Instance.GetOdd(-4, 4), 0, CombatCalculateTool.Instance.GetOdd(-4, 4));
-
-            CreateEnemy(cTaskAwaitBuffer, _levelBattleConfig.bossMonsterId,
-                _levelBattleConfig.bossLv, _levelBattleConfig.bossStar, 0, pos,
-                delegate(CombatHeroEntity entity)
-                {
-                    ShowBossHpEventData showBossHpEventData = ShowBossHpEventData.Create();
-                    showBossHpEventData.boss = entity;
-                    EventManager.Instance.Dispatch(CustomEventType.ShowBossHp, showBossHpEventData);
-                    EventManager.Instance.Dispatch(CustomEventType.StartBossBattle, null);
-                });
-            CreateEnemy(cTaskAwaitBuffer);
-            CombatTimerManager.Instance.AddTimer(2, delegate { StartBossBattle(); });
+      
         }
 
         public void StartBossBattle()
@@ -419,57 +74,13 @@ namespace GameLogic.Combat.CombatType
 
         protected void InitTestCombatBoChi()
         {
-            _currLevelBattleNodeIndex %= _levelBattleConfig.MonsterWavesConfigId.Length;
-            _currWavesConfig =
-                ConfigComponent.Instance.Get<MonsterWavesConfig>(
-                    _levelBattleConfig.MonsterWavesConfigId[_currLevelBattleNodeIndex]);
-            _currLevelBattleNodeIndex++;
-            _currNodeWavesIndex = -1;
+ 
         }
 
 
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
-            if (_currWavesConfig.ID <= 0)
-            {
-                return;
-            }
-
-            _currNodeWavesIndex++;
-            int nodeIndex = _currNodeWavesIndex % _currWavesConfig.monsterGroupConfigId.Length;
-            int miniCount = _currWavesConfig.miniMonsterCount[nodeIndex];
-            MonsterGroupConfig monsterGroupConfig =
-                ConfigComponent.Instance.Get<MonsterGroupConfig>(
-                    _currWavesConfig.monsterGroupConfigId[nodeIndex]);
-            // count = 500;
-            for (int i = 0; i < miniCount; i++)
-            {
-                int index = i;
-                int monsterIndex = Random.Range(0, monsterGroupConfig.miniMonsterId.Length);
-                int monsterId = monsterGroupConfig.miniMonsterId[monsterIndex];
-                Vector3 dir = new Vector3(
-                    CombatCalculateTool.Instance.GetOdd(-10, 10) * 0.1f, 0,
-                    CombatCalculateTool.Instance.GetOdd(-10, 10) * 0.1f).normalized;
-                Vector3 pos = nextConfig.targetMoveStartPoint.position +
-                              dir * CombatCalculateTool.Instance.GetOdd(5, 10);
-                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar,
-                    index, pos);
-            }
-
-            int eliteCount = _currWavesConfig.eliteMonsterCount[nodeIndex];
-            for (int i = 0; i < eliteCount; i++)
-            {
-                int index = i;
-                int monsterIndex = Random.Range(0, monsterGroupConfig.eliteMonsterId.Length);
-                int monsterId = monsterGroupConfig.eliteMonsterId[monsterIndex];
-                Vector3 dir = new Vector3(
-                    CombatCalculateTool.Instance.GetOdd(-10, 10) * 0.1f, 0,
-                    CombatCalculateTool.Instance.GetOdd(-10, 10) * 0.1f).normalized;
-                Vector3 pos = nextConfig.targetMoveStartPoint.position +
-                              dir * CombatCalculateTool.Instance.GetOdd(5, 10);
-                CreateEnemy(cTaskAwaitBuffer, monsterId, _levelBattleConfig.monsterLv, _levelBattleConfig.monsterStar,
-                    index, pos);
-            }
+      
         }
 
         private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int star, int index,
@@ -489,46 +100,11 @@ namespace GameLogic.Combat.CombatType
                 }));
         }
 
-        public void ExtraCreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer, int monsterId, int level, int star, Vector3 pos)
-        {
-            CombatHeroEntity heroEntity = CObjectPool.Instance.Fetch<CombatHeroEntity>();
-            heroEntity.IsEnemy = true;
-            CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-            combatHeroInfo.InitMonster(monsterId, level, star);
-            cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo, pos,
-                delegate(CombatHeroEntity entity) { combatController.CombatHeroController.AddHero(entity); }));
-        }
+    
 
         protected override void ProUpdate(float t)
         {
-            if (_isAwaitResurrection)
-            {
-                CombatHeroEntity[] myHero = combatController.CombatHeroController.GetHero(false);
-                if (myHero != null && myHero.Length >= PlayerManager.Instance.heroController.heroDicInLead.Count)
-                {
-                    ResurrectionFinish();
-                }
-
-                return;
-            }
-
-            if (!isActiveCombat)
-            {
-                return;
-            }
-
-            if (_currWavesConfig.ID > 0)
-            {
-                if (_currNodeWavesIndex < _currWavesConfig.monsterGroupConfigId.Length - 1)
-                {
-                    _currTime += Time.deltaTime;
-                    if (_currTime > _currWavesConfig.wavesDelay)
-                    {
-                        CreateEnemy(new CTaskAwaitBuffer());
-                        _currTime = 0;
-                    }
-                }
-            }
+       
         }
 
 
@@ -553,28 +129,6 @@ namespace GameLogic.Combat.CombatType
                 combatController.CombatCameraControllder.root.position.y, p.z + 13);
         }
 
-        // private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
-        // {
-        //     testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();
-        //     if (testCombatHeroConfig != null)
-        //     {
-        //         for (int i = 0; i < testCombatHeroConfig.myHeroInfo.Length; i++)
-        //         {
-        //             int index = i;
-        //             TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = testCombatHeroConfig.myHeroInfo[i];
-        //             CombatHeroEntity heroEntity = new CombatHeroEntity();
-        //             heroEntity.IsEnemy = false;
-        //             heroEntity.number = i;
-        //             CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
-        //             testHeroInfoConfig.CopyToCombatHeroInfo((combatHeroInfo));
-        //             cTaskAwaitBuffer.AddTask(heroEntity.Init(new CombatAIBasic(), combatHeroInfo,
-        //                 delegate(CombatHeroEntity entity)
-        //                 {
-        //                     combatController.CombatHeroController.AddHero(entity);
-        //                     heroEntity.combatHeroGameObject.SetPosition(_combatScenesConfig.heroPoint[index].position);
-        //                 }));
-        //         }
-        //     }
-        // }
+       
     }
 }

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

@@ -15,7 +15,7 @@ using UnityEngine.AI;
 public class CombatAIBasic : IDisposable
 {
     public StateControl stateControl;
-    public NavMeshAgent NavMeshAgent;
+   
 
     private BetterList<SubStatusBasic> _subStatusList = new BetterList<SubStatusBasic>();
 
@@ -52,16 +52,12 @@ public class CombatAIBasic : IDisposable
     private BetterList<GameObject> _HindAreaList = new BetterList<GameObject>();
     private float _t;
 
-    public void Init(CombatHeroEntity combatHeroEntity, NavMeshAgent navMeshAgent)
+    public void Init(CombatHeroEntity combatHeroEntity)
     {
         CombatEventManager.Instance.AddEventListener(CombatEventType.AlertTrigger, AlertTrigger);
         _combatHeroEntity = combatHeroEntity;
         stateControl = new StateControl();
-        NavMeshAgent = navMeshAgent;
-        if (NavMeshAgent != null)
-        {
-            NavMeshAgent.enabled = true;
-        }
+     
 
         ProInitState();
         ProInit();

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

@@ -78,7 +78,8 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
         get { return combatHeroGameObject.transform.forward; }
     }
 
-    public virtual async CTask<CombatHeroEntity> Init(CombatAIBasic combatAIBasic, CombatHeroInfo combatHeroInfo, Vector3 pos,
+    public virtual async CTask<CombatHeroEntity> Init(CombatAIBasic combatAIBasic, CombatHeroInfo combatHeroInfo,
+        Vector3 pos,
         System.Action<CombatHeroEntity> callBack = null)
     {
         //后面记到检查战斗里面不要出现异步加载，也不要出现同步IO加载
@@ -120,7 +121,8 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
         timeLienData.DeserializeData();
         assetHandle.Release();
         combatHeroTimeLineControl = new CombatHeroTimeLineControl();
-        combatHeroTimeLineControl.Init(this, timeLienData);
+        combatHeroTimeLineControl.Init(this);
+        combatHeroTimeLineControl.AddTimeLienData(timeLienData);
         BuffControl = new BuffControl();
         BuffControl.Init(this);
 
@@ -139,7 +141,7 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
 
         heroEntityMono.combatHeroEntity = this;
         CombatAIBasic = combatAIBasic;
-        CombatAIBasic.Init(this, navMeshAgent);
+        CombatAIBasic.Init(this);
 
 
         CombatHeroSkillControl = new CombatHeroSkillControl();
@@ -174,11 +176,7 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
 
     public virtual void Update(float t)
     {
-        // if (!CombatController.currActiveCombat.isStopAi)
-        // {
         CombatAIBasic.Update(t);
-        // }
-
         CombatHeroSkillControl.Update(t);
         combatHeroTimeLineControl.Update(t);
         combatHeroAnimtion.Update(t);
@@ -252,9 +250,9 @@ public class CombatHeroEntity : CObject, ITimeLineSpecialDotPos, ILifeCycle, ITi
         HeroHpUpdateEventData heroHpUpdateEventData = HeroHpUpdateEventData.Create();
         heroHpUpdateEventData.combatHeroEntity = this;
         CombatEventManager.Instance.Dispatch(CombatEventType.HeroHpUpdate, heroHpUpdateEventData);
-        
-        HeroResurrectionEventData heroResurrectionEventData= HeroResurrectionEventData.Create();
-        heroResurrectionEventData.combatHeroEntity= this;
+
+        HeroResurrectionEventData heroResurrectionEventData = HeroResurrectionEventData.Create();
+        heroResurrectionEventData.combatHeroEntity = this;
         CombatEventManager.Instance.Dispatch(CombatEventType.HeroResurrection, heroResurrectionEventData);
     }
 

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

@@ -195,25 +195,25 @@ namespace GameLogic.Combat.Hero
 
         public void SetNormalAttCd()
         {
-            if (NormalAttack == null)
-            {
-                return;
-            }
-
-            string timeLineName = "attack";
-            float maxTime = _combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventLogicGroupForTime(
-                timeLineName, null);
-            float attackSpeed = _combatHeroEntity.CurrCombatHeroInfo.attSpeed.Value;
-            float cd = 1.0f / attackSpeed;
-            float attSpeed = (float)1;
-            if (cd < maxTime)
-            {
-                attSpeed = maxTime / cd;
-            }
-
-            NormalAttSpeedScale = attSpeed;
-            // Debug.Log(NormalAttSpeedScale);
-            NormalAttCd = cd;
+            // if (NormalAttack == null)
+            // {
+            //     return;
+            // }
+            //
+            // string timeLineName = "attack";
+            // float maxTime = _combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventLogicGroupForTime(
+            //     timeLineName, null);
+            // float attackSpeed = _combatHeroEntity.CurrCombatHeroInfo.attSpeed.Value;
+            // float cd = 1.0f / attackSpeed;
+            // float attSpeed = (float)1;
+            // if (cd < maxTime)
+            // {
+            //     attSpeed = maxTime / cd;
+            // }
+            //
+            // NormalAttSpeedScale = attSpeed;
+            // // Debug.Log(NormalAttSpeedScale);
+            // NormalAttCd = cd;
         }
 
         public void Dispose()

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

@@ -1,39 +1,99 @@
 using System;
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Fort23.Core;
+using Utility;
 
 namespace GameLogic.Combat.Hero
 {
     public class CombatHeroTimeLineControl : IDisposable
     {
-        public TimeLienData TimeLineData
-        {
-            get { return _timeLineData; }
-        }
-
-        public TimeLienData _timeLineData;
-
         private BetterList<TimeLineEventLogicGroupBasic> _currRunEventLogicGroupList =
             new BetterList<TimeLineEventLogicGroupBasic>();
 
         private CombatHeroEntity combatHeroEntity;
-        public void Init(CombatHeroEntity combatHeroEntity, TimeLienData timeLienData)
+
+        private Map<string, TimeLienData> _addTimeLienDatas = new Map<string, TimeLienData>();
+
+        public void Init(CombatHeroEntity combatHeroEntity)
         {
             this.combatHeroEntity = combatHeroEntity;
-            _timeLineData = timeLienData;
         }
 
+        public void AddTimeLienData(string key, TimeLienData timeLienData)
+        {
+            _addTimeLienDatas.Add(key, timeLienData);
+        }
+
+        public void AddTimeLienData(TimeLienData timeLienData)
+        {
+            _addTimeLienDatas.Add(timeLienData.timeLineName, timeLienData);
+        }
+
+        public void RemoveTimeLineData(string key)
+        {
+            _addTimeLienDatas.Remove(key);
+        }
+
+        public void RemoveTimeLineData(TimeLienData timeLienData)
+        {
+            _addTimeLienDatas.Remove(timeLienData.timeLineName);
+        }
+
+
         public TimeLineEventLogicGroupBasic AddEventLogicGroup(string groupName)
         {
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(groupName, null);
-            if (timeLineEventLogicGroup != null)
+            for (_addTimeLienDatas.Begin(); _addTimeLienDatas.Next();)
+            {
+                TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+                    _addTimeLienDatas.Value
+                        .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(groupName, null);
+                if (timeLineEventLogicGroup != null)
+                {
+                    timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+                    combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+                }
+
+                return timeLineEventLogicGroup;
+            }
+
+            return null;
+        }
+
+        public T GetTimeLineEventLogicGroup<T>(string groupName) where T : TimeLineEventLogicGroupBasic, new()
+        {
+            for (_addTimeLienDatas.Begin(); _addTimeLienDatas.Next();)
             {
-                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+                T timeLineEventLogicGroup =
+                    _addTimeLienDatas.Value
+                        .GetTimeLineEventLogicGroup<T>(groupName, null);
+
+                return timeLineEventLogicGroup;
             }
-            return timeLineEventLogicGroup;
+
+            return null;
+        }
+
+        public T GetTimeLineEventLogicGroup<T>(string timeLineName, string groupName)
+            where T : TimeLineEventLogicGroupBasic, new()
+        {
+            if (string.IsNullOrEmpty(timeLineName))
+            {
+                return GetTimeLineEventLogicGroup<T>(groupName);
+            }
+            else
+            {
+                if (_addTimeLienDatas.TryGetValue(timeLineName, out TimeLienData timeLienData))
+                {
+                    T timeLineEventLogicGroup =
+                        _addTimeLienDatas.Value
+                            .GetTimeLineEventLogicGroup<T>(groupName, null);
+
+                    return timeLineEventLogicGroup;
+                }
+            }
+
+
+            return null;
         }
 
         public void AddEventLogicGroup(TimeLineEventLogicGroupBasic eventLogicGroup)
@@ -64,7 +124,7 @@ namespace GameLogic.Combat.Hero
         public void Dispose()
         {
             _currRunEventLogicGroupList.Clear();
-            _timeLineData = null;
+            _addTimeLienDatas.Clear();
         }
     }
 }

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

@@ -1,125 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Animancer;
-using Common.Utility.CombatEvent;
-using Excel2Json;
-using Fort23.Core;
-using Fort23.Mono;
-using Fort23.UTool;
-using GameLogic.Combat.Buff;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Skill;
-using UnityEngine;
-using UnityEngine.AI;
-using UnityEngine.EventSystems;
-
-namespace GameLogic.Combat.Hero
-{
-    public class PlayerHeroEntity : CombatHeroEntity
-    {
-        public Vector3 startPos;
-        public Vector3 endPos;
-
-        private Vector3 lasetHeroPos;
-        private float lasetTime;
-        List<RaycastResult> results = new List<RaycastResult>();
-        public override async CTask<CombatHeroEntity> Init(CombatAIBasic combatAIBasic, CombatHeroInfo combatHeroInfo,
-            Vector3 pos, Action<CombatHeroEntity> callBack = null)
-        {
-            CurrCombatHeroInfo = combatHeroInfo.Copy();
-            MaxCombatHeroInfo = combatHeroInfo.Copy();
-
-            TimeLienData timeLienData = CombatController.currActiveCombat.CombatDataController.generalBuffTimeLienData;
-
-            combatHeroTimeLineControl = new CombatHeroTimeLineControl();
-            combatHeroTimeLineControl.Init(this, timeLienData);
-            BuffControl = new BuffControl();
-            BuffControl.Init(this);
-
-
-            if (combatAIBasic == null)
-            {
-                combatAIBasic = new CombatAIBasic();
-            }
-
-
-            CombatAIBasic = combatAIBasic;
-            CombatAIBasic.Init(this, null);
-
-            combatHeroGameObject = new CombatHeroGameObject();
-            combatHeroGameObject.Init(this, null);
-
-            CombatHeroSkillControl = new CombatHeroSkillControl();
-            CombatHeroSkillControl.Init(this);
-            SkillConfig skillConfig = ConfigComponent.Instance.Get<SkillConfig>(9000011);
-            CombatHeroSkillControl.AddSkill(skillConfig);
-
-            CombatAIBasic.ChangeState(CombatHeroStateType.NullState);
-            callBack?.Invoke(this);
-            return this;
-        }
-
-        public override void Update(float t)
-        {
-            combatHeroTimeLineControl.Update(t);
-            CombatAIBasic.Update(t);
-            if (CombatController.currActiveCombat.IsGameOver)
-            {
-                return;
-            }
-
-            if (Input.GetMouseButtonDown(0))
-            {
-                float currTime= Time.time;
-                if (currTime - lasetTime < 0.1f)
-                {
-                    return;
-                }
-
-                PointerEventData pointerEventData = new PointerEventData(UIManager.Instance.current);
-                pointerEventData.position = Input.mousePosition;
-
-              
-                
-
-                
-                UIManager.Instance.current.RaycastAll(pointerEventData, results);
-
-                
-                if (results.Count > 0)
-                {
-                    return;
-                }
-               
-                lasetTime= currTime;
-                S900001 skillBasic = (S900001) CombatHeroSkillControl.GetSkillBasic(900001);
-                BetterList<CombatHeroEntity> allHero =
-                    CombatController.currActiveCombat.CombatHeroController.GetHeroList(true);
-
-                if (allHero.Count <= 0)
-                {
-                    allHero =
-                        CombatController.currActiveCombat.CombatHeroController.GetHeroList(false);
-                }
-
-                CombatHeroEntity combatHeroEntity = null;
-                if (allHero.Count > 0)
-                {
-                    int index = CombatCalculateTool.Instance.GetOdd(0, allHero.Count);
-                    combatHeroEntity = allHero[index];
-                }
-
-                if (combatHeroEntity != null)
-                {
-                    lasetHeroPos = combatHeroEntity.dotPos;
-                }
-                endPos = lasetHeroPos + new Vector3(CombatCalculateTool.Instance.GetOdd(-3, 3), 0,
-                    CombatCalculateTool.Instance.GetOdd(-3, 3));
-                startPos = endPos + new Vector3(5, 15, 5);
-                skillBasic.UseSkill();
-                EventManager.Instance.Dispatch(CustomEventType.PlayerUseSkill,null);
-                // CombatHeroSkillControl.AddCommandSkill(skillBasic);
-            }
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Hero/PlayerHeroEntity.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d73d06e3c4ce43aea8374cc915f0cf2f
-timeCreated: 1735021121

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

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

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

@@ -23,79 +23,22 @@ namespace GameLogic.Combat.Hero.State
         }
         protected override void ProEnter()
         {
-            lasetTaregtPoint = new Vector3(999999, 99999, 99999);
-            _transitionAsset = combatHeroEntity.combatHeroAnimtion.Play("run");
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.updateRotation = false;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType =
-                ObstacleAvoidanceType.HighQualityObstacleAvoidance;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 20;
-            defMoveSpeed = combatHeroEntity.CombatAIBasic.NavMeshAgent.speed;
+          
         }
 
         protected override void ProExit()
         {
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.speed = defMoveSpeed;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
-            // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 0;
+       
         }
 
         protected void SetNewPath(Vector3 taregtPos)
         {
-            lastMovePoint = combatHeroEntity.dotPos;
-            lasetTaregtPoint = taregtPos;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = false;
-            // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 8;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.SetDestination(taregtPos);
+           
         }
 
         protected override void ProUpdate(float t)
         {
-            // if (combatHeroEntity.CombatAIBasic.currFocusTarget == null)
-            // {
-            //     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-            //     return;
-            // }
-
-            Vector3 targetPos = CombatController.currActiveCombat.CombatHeroController.GetFollowPos(combatHeroEntity);
-            Vector3 myPos = combatHeroEntity.dotPos;
-            float bl = Vector3.SqrMagnitude(lasetTaregtPoint - targetPos) / 1f;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.speed = bl * 2.5f + defMoveSpeed;
-            if (Vector3.SqrMagnitude(lasetTaregtPoint - targetPos) > 1)
-            {
-                SetNewPath(targetPos);
-            }
-            else
-            {
-                if (Vector3.SqrMagnitude(myPos - targetPos) < 0.1f)
-                {
-                    combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.followIdle);
-                    return;
-                }
-            }
-
-            if (_transitionAsset != null)
-            {
-                float v = combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity.sqrMagnitude;
-                float v2 = v / 36;
-
-                _transitionAsset.SetSpeed(Mathf.Clamp(v2, 0.2f, 1.5f));
-            }
-
-
-            if (!combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped)
-            {
-                Vector3 nextPos = myPos;
-                Vector3 p = nextPos - lastMovePoint;
-                lastMovePoint = myPos;
-                if (p.sqrMagnitude > 0.0001)
-                {
-                    combatHeroEntity.combatHeroGameObject.rotation = Quaternion.Lerp(
-                        combatHeroEntity.combatHeroGameObject.rotation, Quaternion.LookRotation(p.normalized), 0.5f);
-                }
-            }
+           
         }
     }
 }

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

@@ -12,15 +12,7 @@ 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

@@ -27,7 +27,7 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProEnter()
         {
             EventManager.Instance.AddEventListener(CustomEventType.RefreshFull,RefreshFull);
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.Warp(combatHeroEntity.dotPos);
+         
             Start();
         }
 
@@ -35,16 +35,8 @@ namespace GameLogic.Combat.Hero.State
         {
             lasetTaregtPoint = new Vector3(999999, 99999, 99999);
             _transitionAsset = combatHeroEntity.combatHeroAnimtion.Play("run");
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.updateRotation = false;
-            if ( combatHeroEntity.CombatAIBasic.NavMeshAgent.isOnNavMesh == false)
-            {
-                Debug.LogError("对象错误");
-            }
-
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.obstacleAvoidanceType =
-                ObstacleAvoidanceType.HighQualityObstacleAvoidance;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 40;
+        
+       
         }
 
         protected void RefreshFull(IEventData ieEventData)
@@ -53,9 +45,7 @@ namespace GameLogic.Combat.Hero.State
             if (data.isFullShow&&!isStop)
             {
                 isStop = true;
-                combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-                combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
-                combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
+              
             }
             else if(isStop)
             {
@@ -67,8 +57,7 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProExit()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.RefreshFull,RefreshFull);
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
+         
         
             // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 0;
         }
@@ -77,9 +66,7 @@ namespace GameLogic.Combat.Hero.State
         {
             lastMovePoint = combatHeroEntity.dotPos;
             lasetTaregtPoint = taregtPos;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = false;
-            // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 8;
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.SetDestination(taregtPos);
+          
         }
 
         protected override void ProUpdate(float t)
@@ -114,27 +101,8 @@ namespace GameLogic.Combat.Hero.State
                 return;
             }
 
-            if (_transitionAsset != null)
-            {
-                float v = combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity.sqrMagnitude;
-                
-                float v2 = v / (combatHeroEntity.IsEnemy?9:36);
-
-                _transitionAsset.SetSpeed(Mathf.Clamp(v2, 0.2f, 1.5f));
-            }
-
-           
-            if ( combatHeroEntity.CombatAIBasic.NavMeshAgent.isOnNavMesh&&!combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped)
-            {
-                Vector3 nextPos = myPos;
-                Vector3 p = nextPos - lastMovePoint;
-                lastMovePoint = myPos;
-                if (p.sqrMagnitude > 0.00001)
-                {
-                    combatHeroEntity.combatHeroGameObject.rotation = Quaternion.Lerp(
-                        combatHeroEntity.combatHeroGameObject.rotation, Quaternion.LookRotation(p.normalized), 0.5f);
-                }
-            }
+       
+          
         }
     }
 }

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

@@ -48,22 +48,22 @@ namespace GameLogic.Combat.Hero.State
             _rollingStateData = iStateEnterData as RollingStateData;
             combatHeroEntity.combatHeroAnimtion.Play("idle");
 
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("fangun1", null);
-            try
-            {
-                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-                timeLineEventLogicGroup.TimeLineUpdateEnd = delegate { };
-                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            }
-            catch (Exception e)
-            {
-                LogTool.Error(e);
-            }
+            // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+            //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+            //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("fangun1", null);
+            // try
+            // {
+            //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+            //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate { };
+            //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            // }
+            // catch (Exception e)
+            // {
+            //     LogTool.Error(e);
+            // }
 
-            ACurve = combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventACurve("fangun1", "fangun",
-                null);
+            // ACurve = combatHeroEntity.combatHeroTimeLineControl.TimeLineData.GetTimeLineEventACurve("fangun1", "fangun",
+            //     null);
 
             Vector3 dir = combatHeroEntity.faceDir;
             if (_rollingStateData != null)
@@ -87,17 +87,7 @@ namespace GameLogic.Combat.Hero.State
         {
             _currTime += t * speed;
             Vector3 moveToTarget = Vector3.Lerp(startPos, targetPos, ACurve.Evaluate(_currTime));
-            combatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(moveToTarget, out NavMeshHit hit);
-            if (!hit.hit)
-            {
-                combatHeroEntity.combatHeroGameObject.SetPosition(moveToTarget);
-            }
-
-            if (_currTime >= 1)
-            {
-                combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.idle);
-                return;
-            }
+       
         }
     }
 }

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

@@ -27,20 +27,20 @@ namespace GameLogic.Combat.Hero.State
             combatHeroEntity.CombatAIBasic.isAlert = true;
             combatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(true).IsHide = true;
             CombatEventManager.Instance.AddEventListener(CombatEventType.ActiveCombat, ActiveCombat);
-            TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("xiumian", null);
-            if (timeLineEventLogicGroup != null)
-            {
-                timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
-                timeLineEventLogicGroup.TimeLineUpdateEnd = delegate { FinishTimeLine(); };
-                combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
-            }
-            else
-            {
-                combatHeroEntity.GameObject.SetActive(false);
-                FinishTimeLine();
-            }
+            // TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
+            //     combatHeroEntity.combatHeroTimeLineControl.TimeLineData
+            //         .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>("xiumian", null);
+            // if (timeLineEventLogicGroup != null)
+            // {
+            //     timeLineEventLogicGroup.SetCombatInfo(combatHeroEntity, null, null, new TriggerData(), null);
+            //     timeLineEventLogicGroup.TimeLineUpdateEnd = delegate { FinishTimeLine(); };
+            //     combatHeroEntity.combatHeroTimeLineControl.AddEventLogicGroup(timeLineEventLogicGroup);
+            // }
+            // else
+            // {
+            //     combatHeroEntity.GameObject.SetActive(false);
+            //     FinishTimeLine();
+            // }
         }
 
         protected void FinishTimeLine()

Assets/Scripts/GameLogic/Combat/Hero/SubStatus/RepelledStatusState.cs

@@ -35,25 +35,7 @@ namespace GameLogic.Combat.Hero.SubStatus
         {
             float addDis = speed * t;
             Vector3 pos= CombatHeroEntity.combatHeroGameObject.transform.position + dir * addDis;
-            CombatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(pos,
-                out NavMeshHit hit);
-            if (!hit.hit)
-            {
-                CombatHeroEntity.combatHeroGameObject.transform.position = pos;
-            }
-            else
-            {
-                callBack?.Invoke();
-                Dispose();
-                return;
-            }
-
-            _currMoveDis += addDis;
-            if (_currMoveDis >= repelledDis)
-            {
-                callBack?.Invoke();
-                Dispose();
-            }
+          
         }
     }
 }

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

@@ -1,99 +1,21 @@
-using System;
 using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using Excel2Json;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UnityEngine;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace GameLogic.Combat.Skill
 {
     /// <summary>
-    /// 战士的旋风斩
+    /// 剑诀
     /// </summary>
     public class S10001 : SkillBasic
     {
-        protected float _harm;
-        protected int count = 0;
-
-        // protected 
-        protected override void ProInitSkillConfig()
-        {
-            count = 1;
-            _harm = SelfSkillConfig.effectValue[0];
-
-
-            // if(
-            AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
-        }
-
-        protected override void ProInitSkill()
-        {
-            SkillConfig skillBasic = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(10004);
-            if (skillBasic.ID > 0)
-            {
-                count += (int)skillBasic.effectValue[0];
-            }
-        }
-
-
         protected override void ProUseSkill()
         {
-            ActivationTimeLineData("sk1");
+            // ActivationTimeLineData()
         }
 
-        protected void Sk1_fasheTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
+        protected override void ProTimelineFxLogicInit(string groupName, ITimelineFxLogic timelineFxLogic, TriggerData triggerData)
         {
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                _harm);
-            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                v, AttType.Skill, triggerData);
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            if (targetEntity.combatHeroEntity == CombatHeroEntity)
-            {
-                Vector3 forward = new Vector3(0, 0, 1);
-                Vector3 eulerAngles = CombatHeroEntity.combatHeroGameObject.transform.eulerAngles;
-                Vector3 zdPos = CombatHeroEntity.GetSpecialDotInfo("zdpos").GetWorlPos();
-                int angle = 90 / count;
-
-                for (int i = 0; i < count; i++)
-                {
-                    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(currEulerAngles);
-                    Vector3 newForward = quaternion * forward;
-                    Vector3 targetPos = zdPos + newForward;
-                    ActivationTimeLineData("sk1_fashe", null, new Vector3[] { targetPos });
-                }
-            }
-            else
-            {
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                    CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                    _harm);
-                HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                    v, AttType.Skill, triggerData);
-            }
+            base.ProTimelineFxLogicInit(groupName, timelineFxLogic, triggerData);
         }
     }
 }

Assets/Scripts/GameLogic/Combat/Skill/S10001.cs.meta

@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: 3ccce3528f0c470b8781c77ab2c5c3a2
-timeCreated: 1731915229
+guid: 2663a5cc22544db1b8d10dc71c7f640c
+timeCreated: 1738912903

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

@@ -1,19 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UnityEngine;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 增加{0}道[旋风斩]的剑气数量
-    /// </summary>
-    public class S10004 : SkillBasic
-    {
-        protected override void ProUseSkill()
-        {
-            
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S10004.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 66fd1eaa8bb1486f93726e0fa97f42ab
-timeCreated: 1733820098

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

@@ -1,27 +0,0 @@
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 降低收到的{0}伤害
-    /// </summary>
-    public class S10005 : SkillBasic
-    {
-        protected float lasetAddValue;
-
-        protected override void ProUseSkill()
-        {
-            
-        }
-
-        protected override void ProInitSkillConfig()
-        {
-            
-        }
-
-        protected override void ProInitSkill()
-        {
-            CombatHeroEntity.CurrCombatHeroInfo.reduceHitDamage -= lasetAddValue;
-            lasetAddValue = SelfSkillConfig.effectValue[0];
-            CombatHeroEntity.CurrCombatHeroInfo.reduceHitDamage += lasetAddValue;
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S10005.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a44fa17889cf4b1bb08749ce6ecedb11
-timeCreated: 1733820587

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

@@ -1,65 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 大蛇第一个技能，对敌人照成伤害，并将敌人击退一段距离
-    /// </summary>
-    public class S110001 : SkillBasic
-    {
-        private float _harm;
-
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk1");
-        }
-
-        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-            TimeLineEventLogicBasic timeLineEventLogicBasic)
-        {
-            ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[_enterAlertTarget.Count];
-
-            for (int i = 0; i < _enterAlertTarget.Count; i++)
-            {
-                CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-                lifetCycleHitPoints[i] = combatHeroHitPoint;
-            }
-            return  lifetCycleHitPoints;
-        }
-
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            for (int i = 0; i < _enterAlertTarget.Count; i++)
-            {
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                    CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                    _harm);
-                CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-                HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, combatHeroHitPoint,
-                    v, AttType.Skill, triggerData);
-            }
-        }
-
-        public override bool IsCanUse()
-        {
-            int odds = CombatCalculateTool.Instance.GetOdd();
-            if (odds < 50)
-            {
-                return true;
-            }
-            SkillCd = SkillMaxCd;
-            return false;
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S110001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 93845533d57341abb299ce2ca1b89936
-timeCreated: 1732087751

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

@@ -1,100 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 大蛇技能2，吐火焰经过的敌人收到伤害,没0.5秒收到一次伤害
-    /// </summary>
-    public class S110002 : SkillBasic
-    {
-        private float _harm;
-        private float _currTime;
-        private bool _isUpdate;
-
-        // protected BetterList<CombatHeroEntity> 
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-        }
-
-        protected override void ProUseSkill()
-        {
-            int odds = CombatCalculateTool.Instance.GetOdd();
-            string timeName = odds < 50 ? "sk2" : "sk3";
-            ActivationTimeLineData(timeName);
-            _currTime = 0;
-            // _isUpdate = true;
-        }
-
-        // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-        //     TimeLineEventLogicBasic timeLineEventLogicBasic)
-        // {
-        //     ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[_enterAlertTarget.Count];
-        //
-        //     for (int i = 0; i < _enterAlertTarget.Count; i++)
-        //     {
-        //         CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-        //         lifetCycleHitPoints[i] = combatHeroHitPoint;
-        //     }
-        //     return  lifetCycleHitPoints;
-        // }
-
-        protected override void ProHeroEnter(TimeLineAlertSeriailztion timeLineAlertSeriailztion,
-            CombatHeroEntity target)
-        {
-            // base.ProHeroEnter(timeLineAlertSeriailztion, target);
-        }
-
-        protected override void ProSkillPlayFinish()
-        {
-            _isUpdate = false;
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            _isUpdate = true;
-        }
-
-        protected override void ProCombatUpdate(float time)
-        {
-            if (!_isUpdate)
-            {
-                return;
-            }
-
-            _currTime += time;
-            while (_currTime > 0.2f)
-            {
-                _currTime -= 0.2f;
-                for (int i = 0; i < _enterAlertTarget.Count; i++)
-                {
-                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                        CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                        _harm);
-                    CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-                    HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, combatHeroHitPoint,
-                        v, AttType.Skill, triggerData);
-                }
-            }
-        }
-
-        public override bool IsCanUse()
-        {
-            int odds = CombatCalculateTool.Instance.GetOdd();
-            float bl = CombatHeroEntity.CurrCombatHeroInfo.hp.Value * 100.0f /
-                       CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
-            // if (bl < 50 && odds < 50)
-            {
-                return true;
-            }
-
-            SkillCd = SkillMaxCd;
-            return false;
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S110002.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f22bd3c57f274987b48221b9450544eb
-timeCreated: 1732088456

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

@@ -1,10 +0,0 @@
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 大蛇召唤小蛇
-    /// </summary>
-    public class S110003
-    {
-        
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S110003.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f5e8d3dca4ee4068ae6febaaf338ad16
-timeCreated: 1732091365

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

@@ -1,121 +0,0 @@
-using Animancer;
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using GameLogic.Combat.Hero.SubStatus;
-using UnityEngine;
-using UnityEngine.AI;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 小蛇精英怪技能 向前冲撞，对冲撞的敌人造成伤害
-    /// </summary>
-    public class S120001 : SkillBasic
-    {
-        private float _harm;
-
-        private bool _startMove;
-
-        private Vector3 moveTargetPos;
-
-        private Vector3 moveStartPos;
-
-        private float _currTime;
-
-        private float _currAddTime;
-
-        // protected BetterList<CombatHeroEntity> 
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk1");
-        }
-
-        // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-        //     TimeLineEventLogicBasic timeLineEventLogicBasic)
-        // {
-        //     ILifetCycleHitPoint[] lifetCycleHitPoints = new ILifetCycleHitPoint[_enterAlertTarget.Count];
-        //
-        //     for (int i = 0; i < _enterAlertTarget.Count; i++)
-        //     {
-        //         CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-        //         lifetCycleHitPoints[i] = combatHeroHitPoint;
-        //     }
-        //     return  lifetCycleHitPoints;
-        // }
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            _startMove = true;
-            moveStartPos = CombatHeroEntity.dotPos;
-            moveTargetPos = CombatHeroEntity.combatHeroGameObject.transform.TransformPoint(new Vector3(0, 0, 5));
-            _currTime = 0;
-            _currAddTime = 1.0f / 0.5f;
-        }
-
-
-        protected override void ProCombatUpdate(float time)
-        {
-            if (!_startMove)
-            {
-                return;
-            }
-
-            _currTime += time * _currAddTime;
-            Vector3 t = Vector3.Lerp(moveStartPos, moveTargetPos, _currTime);
-            CombatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(t,
-                out NavMeshHit hit);
-            if (!hit.hit)
-            {
-                CombatHeroEntity.combatHeroGameObject.SetPosition(t);
-            }
-            else
-            {
-                Debug.Log(("打到墙了" + hit.mask));
-            }
-
-            if (_currTime >= 1)
-            {
-                _startMove = false;
-            }
-        }
-
-        protected override void ProHeroEnter(TimeLineAlertSeriailztion timeLineAlertSeriailztion,
-            CombatHeroEntity target)
-        {
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                _harm);
-            CombatHeroHitPoint combatHeroHitPoint = target.GetMainHotPoin<CombatHeroHitPoint>();
-            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, combatHeroHitPoint,
-                v, AttType.Skill, triggerData);
-
-            Vector3 dir = target.combatHeroGameObject.transform.forward * -1;
-            float d = (target.dotPos - CombatHeroEntity.dotPos).magnitude;
-            float moveDis = 3 - d;
-            moveDis = Mathf.Clamp(moveDis, 0, 3);
-            float jiao = Vector3.Dot(target.combatHeroGameObject.transform.forward,
-                CombatHeroEntity.combatHeroGameObject.transform.forward);
-            jiao = Mathf.Abs(jiao);
-            if (jiao > 0.9)
-            {
-                dir += new Vector3(0.8f, 0, 0);
-            }
-
-            RepelledStatusState repelledStatusState = new RepelledStatusState(dir, moveDis*jiao, 10, null);
-            target.CombatAIBasic.AddSubStatus(repelledStatusState);
-        }
-
-        protected override void ProSkillPlayFinish()
-        {
-            _startMove = false;
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S120001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 5af317f1db5f477ca7b58fecaa85c621
-timeCreated: 1732094807

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

@@ -1,35 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 狼精英技能
-    /// </summary>
-    public class S130001 : SkillBasic
-    {
-        private float _harm;
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk1");
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity, ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            // base.ProDefaultTimeLineTrigger(groupName, targetEntity, timelineFxLogic, triggerData);
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                _harm);
-            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value, AttType.Normal, triggerData);
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S130001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1aefee5597c0498e8f3477c26fac9689
-timeCreated: 1733108482

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

@@ -1,34 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 狼boss的第一个技能
-    /// </summary>
-    public class S140001 : SkillBasic
-    {
-        private float _harm;
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk1");
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity, ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                _harm);
-            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                CombatHeroEntity.CurrCombatHeroInfo.attack.Value, AttType.Normal, triggerData);
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S140001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: c0b48dae986a416eb80bae34b9556b91
-timeCreated: 1733108682

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

@@ -1,82 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using Core.Utility;
-using Fort23.Core;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using GameLogic.Combat.Hero.SubStatus;
-using UnityEngine;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 狼boss 第3个技能，跳跃攻击范围那的敌人
-    /// </summary>
-    public class S140003 : SkillBasic
-    {
-        private float _harm;
-
-        private Parabola3DPath parabolaPath;
-
-        protected float _currTime;
-        protected float _addTime;
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-            _addTime=1.0f/0.37f;
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk3");
-        }
-
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            _currTime = 0;
-            parabolaPath = CObjectPool.Instance.Fetch<Parabola3DPath>();
-            parabolaPath.addY += 3;
-            Vector3 startPos = CombatHeroEntity.dotPos;
-            Vector3 targetPos = startPos + CombatHeroEntity.faceDir * 4 ;
-            parabolaPath.SetPos(startPos, targetPos);
-          
-        }
-
-        protected override void ProSkillPlayFinish()
-        {
-            CObjectPool.Instance.Recycle(parabolaPath);
-            parabolaPath = null;
-        }
-
-
-        protected override void ProCombatUpdate(float time)
-        {
-            if (parabolaPath != null)
-            {
-                _currTime += time*_addTime;
-                Vector3 pos = parabolaPath.GetPositionAtTime(_currTime);
-                CombatHeroEntity.combatHeroGameObject.SetPosition(pos);
-                if (_currTime >= 1)
-                {
-                    CObjectPool.Instance.Recycle(parabolaPath);
-                    parabolaPath = null;
-                    long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                        CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                        _harm);
-
-                    for (int i = 0; i < _enterAlertTarget.Count; i++)
-                    {
-                        CombatHeroHitPoint combatHeroHitPoint = _enterAlertTarget[i].GetMainHotPoin<CombatHeroHitPoint>();
-                        HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, combatHeroHitPoint,
-                            v, AttType.Skill, triggerData);
-                        RepelledStatusState repelledStatusState = new RepelledStatusState(_enterAlertTarget[i].faceDir*-1, 2, 10, null);
-                        _enterAlertTarget[i].CombatAIBasic.AddSubStatus(repelledStatusState);
-                    }
-                }
-            }
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S140003.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 30ab4643277643d3a0863213b06c0574
-timeCreated: 1733108710

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

@@ -1,72 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using Excel2Json;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 牧师加血
-    /// </summary>
-    public class S20001 : SkillBasic
-    {
-        protected float recoverValue;
-
-        private int _count;
-        private SkillConfig _skillBasic2004;
-        private SkillConfig _skillBasic2005;
-
-        protected override void ProInitSkillConfig()
-        {
-            recoverValue = SelfSkillConfig.effectValue[0];
-            _count = 1;
-         
-        }
-
-        protected override void ProInitSkill()
-        {
-            _skillBasic2004 = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(20004);
-            _skillBasic2005 = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(20005);
-            if (_skillBasic2005.ID>0)
-            {
-                _count += (int)_skillBasic2005.effectValue[0];
-            }
-        }
-
-        protected override void ProUseSkill()
-        {
-            ActivationTimeLineData("sk1");
-        }
-
-        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-            TimeLineEventLogicBasic timeLineEventLogicBasic)
-        {
-            ILifetCycleHitPoint[] allLifetCycleHitPoints =
-                CombatController.currActiveCombat.CombatHeroController.GetHeroHitPoint(CombatHeroEntity.IsEnemy);
-            return CombatCalculateTool.Instance.GetMinHpHero(allLifetCycleHitPoints, _count);
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            float currRecoverValue = recoverValue;
-            if (_skillBasic2004.ID>0)
-            {
-                float hpBl = _skillBasic2004.effectValue[0];
-                float currBl = (float)(targetEntity.combatHeroEntity.CurrCombatHeroInfo.hp.Value * 100f /
-                                       targetEntity.combatHeroEntity.MaxCombatHeroInfo.hp.Value);
-                if (currBl <= hpBl)
-                {
-                    currRecoverValue += _skillBasic2004.effectValue[1];
-                }
-            }
-
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                currRecoverValue);
-            HarmReturnInfo harmReturnInfo = Recover(CombatHeroEntity, targetEntity,
-                v, AttType.Normal, HarmType.Default);
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S20001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 413ae8a1e8994db38ff51cad94fc67be
-timeCreated: 1731995171

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

@@ -1,199 +0,0 @@
-using System.Linq;
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Combat.Buff;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UnityEngine;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 火烧
-    /// </summary>
-    public class S30001 : SkillBasic
-    {
-        protected float _harm;
-        protected float _maxTime;
-        protected float _currTime;
-        // private BetterList<ILifetCycleHitPoint> _currTrigger = new BetterList<ILifetCycleHitPoint>();
-        protected TimeLineEventLogicGroupBasic loopGroupBasic;
-        protected TimeLineEventLogicGroupBasic currMyLoopGroupBasic;
-        protected bool _isUpdate;
-        protected float _currAllTime;
-
-        private BetterList<ILifetCycleHitPoint> _diffusionBuff = new BetterList<ILifetCycleHitPoint>();
-        private BetterList<ILifetCycleHitPoint> _triggerDiffusion = new BetterList<ILifetCycleHitPoint>();
-
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-            _maxTime = SelfSkillConfig.effectValue[1];
-        }
-
-        protected override void ProInitSkill()
-        {
-            SkillBasic skillBasic = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic(30004);
-            if (skillBasic != null)
-            {
-                _maxTime += skillBasic.SelfSkillConfig.effectValue[0];
-            }
-        }
-        // protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-        //     TimeLineEventLogicBasic timeLineEventLogicBasic)
-        // {
-        //     ILifetCycleHitPoint[] allHero = new ILifetCycleHitPoint[_enterAlertTarget.Count];
-        //     for (int i = 0; i < _enterAlertTarget.Count; i++)
-        //     {
-        //         allHero[i] = _enterAlertTarget[i].GetMainHotPoin<ILifetCycleHitPoint>();
-        //     }
-        //
-        //     return allHero;
-        // }
-
-
-        protected override void ProUseSkill()
-        {
-            _finishTimeLineGroupName = "-1";
-            currMyLoopGroupBasic = ActivationTimeLineData("sk1");
-            _isUpdate = true;
-            _currTime = 0;
-            _currAllTime = 0;
-            _triggerDiffusion.Clear();
-            _diffusionBuff.Clear();
-        }
-
-        protected override void ProBreakSkill()
-        {
-            Finish();
-        }
-
-        protected void Finish()
-        {
-            currMyLoopGroupBasic?.BreakTimeLine(CombatHeroEntity);
-            if (loopGroupBasic != null)
-            {
-                loopGroupBasic.BreakTimeLine(CombatHeroEntity);
-            }
-
-            loopGroupBasic = null;
-            _isUpdate = false;
-            SpecialDotInfo specialDotInfo = CombatHeroEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
-                .GetSpecialDotInfo("sk1_trigger");
-            specialDotInfo.targetTran.gameObject.SetActive(false);
-        }
-
-        protected override void ProSkillPlayFinish()
-        {
-            Finish();
-        }
-
-        protected override void ProCombatUpdate(float time)
-        {
-            if (!_isUpdate)
-            {
-                return;
-            }
-
-            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)
-            {
-                _currTime -= 0.2f;
-                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(
-                    CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                    _harm);
-                if (loopGroupBasic != null)
-                {
-                    loopGroupBasic.BreakTimeLine(CombatHeroEntity);
-                }
-
-
-                // _currTrigger.Clear();
-
-                for (int i = 0; i < _enterAlertTarget.Count; i++)
-                {
-                    ILifetCycleHitPoint targetEntity = _enterAlertTarget[i].GetMainHotPoin<ILifetCycleHitPoint>();
-                    // _currTrigger.Add(targetEntity);
-                    HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity as CombatHeroHitPoint,
-                        v, AttType.Skill, triggerData);
-                    DiffusionBuff(targetEntity);
-                }
-
-                for (int i = 0; i < _diffusionBuff.Count; i++)
-                {
-                    DiffusionBuff(_diffusionBuff[i]);
-                }
-
-                // "sk1_hit"
-                // string hitName = "sk1_hit_lv4";
-                // loopGroupBasic = ActivationTimeLineData(hitName, _currTrigger);
-            }
-
-            if (_currAllTime > _maxTime)
-            {
-                SkillPlayFinish();
-            }
-        }
-
-        protected void DiffusionBuff(ILifetCycleHitPoint diffusion)
-        {
-            if (diffusion == null)
-            {
-                return;
-            }
-
-            CombatHeroEntity diffusionCombatHeroEntity = diffusion.IfLifeCycle as CombatHeroEntity;
-            if (diffusionCombatHeroEntity.isDie||!diffusionCombatHeroEntity.isActive)
-            {
-                _diffusionBuff.Remove(diffusion);
-                return;
-            }
-
-            if (!_diffusionBuff.Contains(diffusion))
-            {
-                BuffInfo buffInfo = BuffInfo.GetBuffInfo(100101, 0.5f, 1);
-               
-                diffusionCombatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
-                _diffusionBuff.Add(diffusion);
-            }
-
-            if (_triggerDiffusion.Contains(diffusion))
-            {
-                return;
-            }
-
-            _triggerDiffusion.Add(diffusion);
-            ILifetCycleHitPoint[] allHitPoints =
-                CombatController.currActiveCombat.CombatHeroController.GetHeroHitPoint(true);
-            for (int i = 0; i < allHitPoints.Length; i++)
-            {
-                ILifetCycleHitPoint cycleHitPoint = allHitPoints[i];
-                if (_diffusionBuff.Contains(cycleHitPoint))
-                {
-                    continue;
-                }
-
-                if (Vector3.SqrMagnitude(cycleHitPoint.Position - diffusion.Position) < 4)
-                {
-                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(1001, -1, 1);
-                    CombatHeroEntity combatHeroEntity = cycleHitPoint.IfLifeCycle as CombatHeroEntity;
-                    combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity, buffInfo);
-                    _diffusionBuff.Add(diffusion);
-                }
-            }
-        }
-    }
-}

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

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 41ae098991ba4107b8d89db60f94e0b9
-timeCreated: 1731918739

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

@@ -1,14 +0,0 @@
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 专精:
-    /// 延长{0}秒[火焰烧烤]的持续时间
-    /// </summary>
-    public class S30004: SkillBasic
-    {
-        protected override void ProUseSkill()
-        {
-            
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S30004.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 381d09b60c524e849c6a8234d28733dd
-timeCreated: 1733821854

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

@@ -1,24 +0,0 @@
-namespace GameLogic.Combat.Skill
-{
-    public class S30005: SkillBasic
-    {
-        protected float lasetAddValue;
-
-        protected override void ProUseSkill()
-        {
-            
-        }
-
-        protected override void ProInitSkillConfig()
-        {
-           
-        }
-
-        protected override void ProInitSkill()
-        {
-            CombatHeroEntity.CurrCombatHeroInfo.skillCritDamage -= lasetAddValue;
-            lasetAddValue = SelfSkillConfig.effectValue[0];
-            CombatHeroEntity.CurrCombatHeroInfo.skillCritDamage += lasetAddValue;
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S30005.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 4370c94f3bf74c8d82c74b18c3e799f3
-timeCreated: 1733822192

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

@@ -1,116 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using Excel2Json;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using UnityEngine;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    /// <summary>
-    /// 弓箭发射多个见
-    /// </summary>
-    public class S40001 : SkillBasic
-    {
-        private float _harm;
-
-        protected int _count;
-        protected int _currCount;
-        private int _gongJianCount;
-
-        private SkillConfig _skillBasic4005;
-
-        protected override void ProInitSkillConfig()
-        {
-            _harm = SelfSkillConfig.effectValue[0];
-            _count = 1;
-            _gongJianCount = 5;
-            AddTriggerCallBack("sk1_fashe", Sk1_fasheTrigger);
-        }
-
-        protected override void ProInitSkill()
-        {
-            SkillConfig skillBasic = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(40004);
-            if (skillBasic.ID > 0)
-            {
-                _gongJianCount += (int)skillBasic.effectValue[0];
-            }
-
-            _skillBasic4005 = CombatHeroEntity.CurrCombatHeroInfo.GetGroupSkillConfig(40005);
-        }
-
-        protected override void ProUseSkill()
-        {
-            _finishTimeLineGroupName = "-1";
-            _currCount = 0;
-
-            ActiveSk1();
-        }
-
-        protected void ActiveSk1()
-        {
-            if (_currCount >= _count)
-            {
-                SkillPlayFinish();
-                return;
-            }
-
-            _currCount++;
-            TimeLineEventLogicGroupBasic currMyLoopGroupBasic = ActivationTimeLineData("sk1");
-            currMyLoopGroupBasic.TimeLineUpdateEnd += ActiveSk1;
-        }
-
-        protected override ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
-            TimeLineEventLogicBasic timeLineEventLogicBasic)
-        {
-            if (CombatHeroEntity.CombatAIBasic.currFocusTarget == null)
-            {
-                return null;
-            }
-
-            return new[]
-            {
-                CombatHeroEntity.CombatAIBasic.currFocusTarget.GetThis<CombatHeroEntity>()
-                    .GetMainHotPoin<ILifetCycleHitPoint>()
-            };
-        }
-
-        protected void Sk1_fasheTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            float harm = _harm;
-            if (_skillBasic4005.ID>0)
-            {
-                if (targetEntity.combatHeroEntity.HpBl < _skillBasic4005.effectValue[0])
-                {
-                    harm += _skillBasic4005.effectValue[1];
-                }
-            }
-
-            long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(CombatHeroEntity.CurrCombatHeroInfo.attack.Value,
-                harm);
-            HarmReturnInfo harmReturnInfo = Harm(CombatHeroEntity, targetEntity,
-                v, AttType.Skill, triggerData);
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            int minC = _gongJianCount / 2;
-            int startAngle = minC * -5;
-            for (int i = 0; i < _gongJianCount; i++)
-            {
-                Vector3 forward = CombatHeroEntity.combatHeroGameObject.transform.forward;
-                Quaternion quaternion = Quaternion.AngleAxis(i * 5 + startAngle, 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);
-                forward = quaternion * forward;
-                Vector3 targetPos = CombatHeroEntity.combatHeroGameObject.transform.position + forward;
-                ActivationTimeLineData("sk1_fashe", null, new Vector3[] { targetPos });
-            }
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S40001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 833dc3fc967740ceb523abc6e4cb93b2
-timeCreated: 1731995178

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

@@ -1,63 +0,0 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
-using GameLogic.Bag;
-using GameLogic.Combat.CombatTool;
-using GameLogic.Combat.Hero;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
-using UnityEngine;
-using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
-
-namespace GameLogic.Combat.Skill
-{
-    public class S900001 : SkillBasic
-    {
-        protected override void ProUseSkill()
-        {
-          
-        }
-
-        public void UseSkill()
-        {
-            PlayerHeroEntity playerHeroEntity = CombatHeroEntity as PlayerHeroEntity;
-            Vector3[] pos = new Vector3[] { playerHeroEntity.startPos, playerHeroEntity.endPos };
-            ActivationTimeLineData("900001", customizePos: pos);
-        }
-
-        protected override void ProSkillPlayFinish()
-        {
-        }
-
-        protected override void ProDefaultTimeLineTrigger(string groupName, CombatHeroHitPoint targetEntity,
-            ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            CombatCalculateTool.Instance.TrueHarm(CombatHeroEntity, targetEntity, 1, AttType.Skill, triggerData);
-
-            if (targetEntity.combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
-            {
-                int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-                if (odds < 40)
-                {
-                    BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
-                        3,
-                        3);
-                }
-            }
-            else
-            {
-                int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-                if (odds < 30)
-                {
-                    BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
-                        1,
-                        1);
-                }
-            }
-        }
-
-        protected override void ProTimeLineTriggerGround(string groupName, ITimelineFxLogic timelineFxLogic,
-            TriggerData triggerData)
-        {
-            base.ProTimeLineTriggerGround(groupName, timelineFxLogic, triggerData);
-        }
-    }
-}

Assets/Scripts/GameLogic/Combat/Skill/S900001.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 974efc3b1dec432ab2982d05dd67493b
-timeCreated: 1735025695

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

@@ -140,6 +140,17 @@ namespace GameLogic.Combat.Skill
         {
         }
 
+        /// <summary>
+        /// 激活技能，准备使用技能
+        /// </summary>
+        public void ActiveSkill()
+        {
+        }
+
+        protected void ProActiveSkill()
+        {
+        }
+
         /// <summary>
         /// 休眠
         /// </summary>
@@ -256,7 +267,7 @@ namespace GameLogic.Combat.Skill
         /// </summary>
         public void UseSkill()
         {
-            SkillCd= SkillMaxCd;
+            SkillCd = SkillMaxCd;
             _enterAlertTarget.Clear();
             UseCount++;
             _triggerData = new TriggerData();
@@ -359,7 +370,7 @@ namespace GameLogic.Combat.Skill
         /// <param name="extraData">透传消息</param>
         /// <param name="customizePos">自定义坐标</param>
         /// <param name="finishCallBack">timeLine完成回调</param>
-        public TimeLineEventLogicGroupBasic ActivationTimeLineData(string groupName,
+        public TimeLineEventLogicGroupBasic ActivationTimeLineData(string groupName, string timeLineName = null,
             BetterList<ILifetCycleHitPoint> currTarget = null,
             Vector3[] customizePos = null, System.Action finishCallBack = null, float startTime = default,
             object extraData = null)
@@ -372,8 +383,8 @@ namespace GameLogic.Combat.Skill
             }
 
             TimeLineEventLogicGroupBasic timeLineEventLogicGroup =
-                _combatHeroEntity.combatHeroTimeLineControl.TimeLineData
-                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(groupName, null);
+                _combatHeroEntity.combatHeroTimeLineControl
+                    .GetTimeLineEventLogicGroup<TimeLineEventLogicGroupBasic>(timeLineName, groupName);
             try
             {
                 if (timeLineEventLogicGroup != null)

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

@@ -0,0 +1,54 @@
+using Fort23.Core;
+
+namespace GameLogic.Combat.Skill
+{
+    public enum SkillFeaturesType
+    {
+        // 金
+        Gold = 1,
+
+        // 木
+        Wood = 2,
+
+        // 水
+        Water = 4,
+
+        // 火
+        Fire = 8,
+
+        // 土
+        Earth = 16,
+    }
+
+    public class SkillFeaturesData : CObject
+    {
+        /// <summary>
+        /// 威能值，影响最后的伤害数值
+        /// </summary>
+        public float Vaillant;
+
+        /// <summary>
+        /// 伤害值，影响最终的伤害数值
+        /// </summary>
+        public float harmValue;
+
+        public SkillFeaturesType SkillFeaturesType;
+
+        public SkillFeaturesData CapyFeaturesData()
+        {
+            SkillFeaturesData skillFeaturesData = CObjectPool.Instance.Fetch<SkillFeaturesData>();
+            skillFeaturesData.Vaillant = Vaillant;
+            skillFeaturesData.harmValue = harmValue;
+            skillFeaturesData.SkillFeaturesType = SkillFeaturesType;
+            return skillFeaturesData;
+        }
+
+        public override void ActiveObj()
+        {
+        }
+
+        public override void DormancyObj()
+        {
+        }
+    }
+}

Assets/Scripts/GameLogic/Combat/Skill/SkillFeaturesData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 85fdd013ad4b4d6da593645aa53fe14e
+timeCreated: 1738914766

Assets/Scripts/GameLogic/Hero/HeroController.cs

@@ -10,6 +10,9 @@ namespace GameLogic.Hero
 {
     public class HeroController
     {
+        
+        
+        
         /// <summary>
         /// 所有英雄
         /// </summary>

Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -4,6 +4,7 @@ using Fort23.Common;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Skill;
 
 #if !COMBAT_SERVER
 using UnityEngine;
@@ -19,6 +20,7 @@ namespace Common.Combat.FxAILogic
         private TimeLineEventParticleLogicBasic _timeLineEventParticleLogicBasic;
         private ILifetCycleHitPoint _attTarget;
 
+        public SkillFeaturesData SkillFeaturesData;
         [Header("碰撞时的特效")] public string hitFxName;
         [Header("碰撞音效")]
         public string hitAudioName;

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLienData.cs

@@ -13,6 +13,7 @@ using UnityEngine;
 [System.Serializable]
 public class TimeLienData
 {
+    public string timeLineName;
     public List<string> key = new List<string>();
 
     public List<string> value = new List<string>();
@@ -85,7 +86,7 @@ public class TimeLienData
             return null;
         }
 
-        T timeLineEventLogicGroup =CObjectPool.Instance.Fetch<T>();
+        T timeLineEventLogicGroup = CObjectPool.Instance.Fetch<T>();
         timeLineEventLogicGroup.groupName = groupName;
 
         timeLineEventLogicGroup.Init(timeLineAssetSerializations);

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightExp2DefaultDefaultNoneURP.mat

@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VFLitAlphaBlendHeightExp2DefaultDefaultNoneURP
+  m_Shader: {fileID: 4800000, guid: 7f7c781938da547458f3504a30f44560, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - FXV_EXP2_FALLOFF
+  - FXV_FOGTYPE_HEIGHT
+  - FXV_IN_AIR_FOG
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AxisFadeEnabled: 0
+    - _BlendMode: 0
+    - _DstBlend: 10
+    - _FogClipping: 0
+    - _FogFalloff: 1
+    - _FogFalloffType: 3
+    - _FogMeshType: 0
+    - _FogType: 6
+    - _InAirEnabled: 1
+    - _QueueControl: -1
+    - _QueueOffset: 0
+    - _SrcBlend: 5
+    - _ZWrite: 0
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightExp2DefaultDefaultNoneURP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WStOsHiqVHlNtCX2oqKjIBLAtNDQdujfmkw2tE0JrQNKXsOKl3KLhM0=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightExpDefaultDefaultNoneURP.mat

@@ -0,0 +1,57 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VFLitAlphaBlendHeightExpDefaultDefaultNoneURP
+  m_Shader: {fileID: 4800000, guid: 7f7c781938da547458f3504a30f44560, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - FXV_EXP_FALLOFF
+  - FXV_FOGTYPE_HEIGHT
+  - FXV_IN_AIR_FOG
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AxisFadeEnabled: 0
+    - _BlendMode: 0
+    - _DstBlend: 10
+    - _FogClipping: 0
+    - _FogFalloff: 1
+    - _FogFalloffType: 2
+    - _FogMeshType: 0
+    - _FogType: 6
+    - _InAirEnabled: 1
+    - _QueueControl: -1
+    - _QueueOffset: 0
+    - _SrcBlend: 5
+    - _ZWrite: 0
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightExpDefaultDefaultNoneURP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CHwetXytUX6HE06nNJmikuE5tx4cdVEOQ6tFEf7dmliGlP64qazcZDY=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightLinearSimplifiedDefaultNoneURP.mat

@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VFLitAlphaBlendHeightLinearSimplifiedDefaultNoneURP
+  m_Shader: {fileID: 4800000, guid: 7f7c781938da547458f3504a30f44560, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - FXV_FOGTYPE_HEIGHT
+  - FXV_LINEAR_FALLOFF
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AxisFadeEnabled: 0
+    - _BlendMode: 0
+    - _DstBlend: 10
+    - _FogClipping: 0
+    - _FogFalloff: 1
+    - _FogFalloffType: 0
+    - _FogMeshType: 0
+    - _FogType: 6
+    - _InAirEnabled: 0
+    - _QueueControl: -1
+    - _QueueOffset: 0
+    - _SrcBlend: 5
+    - _ZWrite: 0
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFLitAlphaBlendHeightLinearSimplifiedDefaultNoneURP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XH0f4XirAXyrASgdOwjYHu7tItuPG9sh1EuksdxVmniP1/6/9OaM/40=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFUnlitAlphaBlendHeightLinearDefaultDefaultNoneURP.mat

@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VFUnlitAlphaBlendHeightLinearDefaultDefaultNoneURP
+  m_Shader: {fileID: 4800000, guid: f2d29474332815c4da4b72623b7102e4, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - FXV_FOGTYPE_HEIGHT
+  - FXV_IN_AIR_FOG
+  - FXV_LINEAR_FALLOFF
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats:
+    - _AxisFadeEnabled: 0
+    - _BlendMode: 0
+    - _DstBlend: 10
+    - _FogClipping: 0
+    - _FogFalloff: 1
+    - _FogFalloffType: 0
+    - _FogMeshType: 0
+    - _FogType: 6
+    - _InAirEnabled: 1
+    - _SrcBlend: 5
+    - _ZWrite: 0
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/xiuxian/FXV/VolumeFog/Resources/MaterialsCache/VFUnlitAlphaBlendHeightLinearDefaultDefaultNoneURP.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DXkasyz4VS04QVdvcAb6oLZ5lRirC0VFM/2Tb++M98i4EMDLZibCGjE=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
+      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 52035153040d5d0f5f5f0f21117a0744154f4e79282d70357a2b4f61e6e4656a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

UserSettings/Layouts/default-2022.dwlt

@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
-    y: 51
+    x: 0
+    y: 43
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Console
+  m_Title: Hierarchy
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
+  m_Maximized: 1
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -40,14 +40,14 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 486
-    width: 1178
-    height: 402
+    y: 692
+    width: 1223
+    height: 152
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &3
@@ -67,14 +67,14 @@ MonoBehaviour:
   - {fileID: 2}
   m_Position:
     serializedVersion: 2
-    x: 596
+    x: 642
     y: 0
-    width: 1178
-    height: 888
+    width: 1223
+    height: 844
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 60
+  controlID: 61
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -86,21 +86,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: TimelineWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1178
-    height: 486
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 1223
+    height: 692
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
+  - {fileID: 17}
   - {fileID: 15}
-  m_Selected: 0
+  m_Selected: 1
   m_LastSelected: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -197,7 +198,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 150}
   m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 95
+  controlID: 186
   draggingID: 0
 --- !u!114 &9
 MonoBehaviour:
@@ -218,12 +219,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1969
+    width: 2077
     height: 1299
   m_MinSize: {x: 300, y: 150}
   m_MaxSize: {x: 24288, y: 24288}
   vertical: 1
-  controlID: 96
+  controlID: 115
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -245,12 +246,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1969
-    height: 888
+    width: 2077
+    height: 844
   m_MinSize: {x: 300, y: 100}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 97
+  controlID: 116
   draggingID: 0
 --- !u!114 &11
 MonoBehaviour:
@@ -269,15 +270,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 596
-    height: 888
+    width: 642
+    height: 844
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 18}
   m_Panes:
+  - {fileID: 18}
   - {fileID: 16}
   m_Selected: 0
-  m_LastSelected: 0
+  m_LastSelected: 1
 --- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -293,15 +295,15 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1774
+    x: 1865
     y: 0
-    width: 195
-    height: 888
+    width: 212
+    height: 844
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &13
@@ -320,14 +322,14 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 888
-    width: 1969
-    height: 411
+    y: 844
+    width: 2077
+    height: 455
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &14
@@ -345,18 +347,131 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1969
+    x: 2077
     y: 0
-    width: 591
+    width: 483
     height: 1299
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
 --- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Timeline
+    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 642
+    y: 73
+    width: 1221
+    height: 671
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_Preferences:
+    editType: 0
+    timeReferenceMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_SequenceHierarchy: {fileID: 0}
+  m_SequencePath:
+    m_SelectionRoot: 0
+    m_SubElements: []
+--- !u!114 &16
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Animator
+    m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 641
+    height: 706
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ViewTransforms:
+    m_KeySerializationHelper:
+    - {fileID: -8315694826801552787, guid: 9538eb37b36698344bd6a8a4562d25f7, type: 2}
+    m_ValueSerializationHelper:
+    - e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+  m_PreviewAnimator: {fileID: 0}
+  m_AnimatorController: {fileID: 9100000, guid: 9538eb37b36698344bd6a8a4562d25f7, type: 2}
+  m_BreadCrumbs:
+  - m_Target: {fileID: -8315694826801552787, guid: 9538eb37b36698344bd6a8a4562d25f7, type: 2}
+    m_ScrollPosition: {x: 0, y: 0}
+  stateMachineGraph: {fileID: 0}
+  stateMachineGraphGUI: {fileID: 0}
+  blendTreeGraph: {fileID: 0}
+  blendTreeGraphGUI: {fileID: 0}
+  m_AutoLiveLink: 1
+  m_MiniTool: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_CurrentEditor: 0
+  m_LayerEditor:
+    m_SelectedLayerIndex: 0
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -376,10 +491,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 604
-    y: 81
-    width: 1176
-    height: 465
+    x: 713
+    y: 73
+    width: 1357
+    height: 746
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -421,7 +536,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 1
+    m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -432,29 +547,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1176
-      height: 444
-    m_Scale: {x: 0.27339903, y: 0.27339903}
-    m_Translation: {x: 588, y: 221.99997}
+      width: 1357
+      height: 725
+    m_Scale: {x: 0.44642857, y: 0.44642857}
+    m_Translation: {x: 678.5, y: 362.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -2150.7026
-      y: -811.9999
-      width: 4301.4053
-      height: 1623.9999
+      x: -1519.84
+      y: -812
+      width: 3039.68
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.27339903
-  m_LastWindowPixelSize: {x: 1176, y: 465}
+  m_defaultScale: 0.44642857
+  m_LastWindowPixelSize: {x: 1357, y: 746}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -474,10 +589,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 81
-    width: 595
-    height: 867
+    x: 0
+    y: 73
+    width: 641
+    height: 823
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -587,7 +702,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Light Settings
-      index: 2
+      index: 1
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -769,7 +884,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Tilemap Focus
-      index: 1
+      index: 2
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -782,7 +897,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: AINavigationOverlay
-      index: 9
+      index: 11
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -795,7 +910,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/Path
-      index: 10
+      index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -808,7 +923,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: APV Overlay
-      index: 11
+      index: 9
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -821,7 +936,7 @@ MonoBehaviour:
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: Scene View/TrailRenderer
-      index: 12
+      index: 10
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
@@ -829,16 +944,16 @@ MonoBehaviour:
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_Gizmos: 0
   m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -1.385468, y: 2.0412562, z: 0}
+    m_Target: {x: 0, y: 0, z: 0}
     speed: 2
-    m_Value: {x: -1.385468, y: 2.0412562, z: 0}
+    m_Value: {x: 0, y: 0, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -849,7 +964,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -884,13 +999,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.032308366, y: 0.27438083, z: -0.009246606, w: -0.96107554}
+    m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
     speed: 2
-    m_Value: {x: -0.03230707, y: 0.2743698, z: -0.009246235, w: -0.9610369}
+    m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_Size:
-    m_Target: 2.2241204
+    m_Target: 10
     speed: 2
-    m_Value: 2.2241204
+    m_Value: 10
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -917,7 +1032,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &17
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -937,10 +1052,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1782
-    y: 81
-    width: 193
-    height: 867
+    x: 1865
+    y: 73
+    width: 210
+    height: 823
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -956,7 +1071,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 80faffff
+      m_ExpandedIDs: 3e41feff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -980,7 +1095,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1000,10 +1115,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 969
-    width: 1968
-    height: 390
+    x: 0
+    y: 917
+    width: 2076
+    height: 434
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1025,7 +1140,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameUI/UI/Hero
+    - Assets/Scripts/GameData
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1033,30 +1148,30 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameUI/UI/Hero
+  - Assets/Scripts/GameData
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\unityProject\XY001
+  m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 490}
-    m_SelectedIDs: f2e90000
-    m_LastClickedID: 59890
-    m_ExpandedIDs: 0000000036a5000038a500003aa5000040a5000042a5000044a5000046a500004aa500004ca500004ea5000050a5000036a7000046a7000010b0000018b00000b4b0000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 621}
+    m_SelectedIDs: 6ef50000
+    m_LastClickedID: 62830
+    m_ExpandedIDs: 000000002843000042f500004af50000a2f5000026f600002ef60000eaf6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: GameLogic
-      m_OriginalName: GameLogic
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 42304
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 13}
     m_SearchString: 
@@ -1070,7 +1185,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000036a5000038a500003aa500003ca500003ea5000040a5000042a5000044a5000046a5000048a500004aa500004ca500004ea5000050a50000
+    m_ExpandedIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1098,18 +1213,18 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100988c0100
+    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100988c01008a34010080380100e6380100f43901009e3e0100b03901004aee0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: ClientMemoryWrap
-      m_OriginalName: ClientMemoryWrap
+      m_Name: SerializationTimeLine
+      m_OriginalName: SerializationTimeLine
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 59674
+      m_UserData: 63302
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -1122,11 +1237,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 73}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 363.8
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1146,10 +1261,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 604
-    y: 567
-    width: 1176
-    height: 381
+    x: 642
+    y: 765
+    width: 1221
+    height: 131
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1160,7 +1275,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &20
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1180,9 +1295,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1977
-    y: 81
-    width: 590
+    x: 2077
+    y: 73
+    width: 482
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1197,11 +1312,11 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: -246.99994
+    m_CachedPref: 359
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 90
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker: