添加动画

Assembly-CSharp.csproj

@@ -122,6 +122,7 @@
     <None Include="Assets\Art\UIAssets\TextrueJson\hylb.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\gd.txt" />
     <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Surface.shader" />
+    <None Include="Assets\Res\TimeLineAssets\GuaiwuBoss01_TD.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\cangbaotu.txt" />
     <None Include="Assets\TextMesh Pro\Sprites\EmojiOne Attribution.txt" />
     <None Include="Assets\Art\UIAssets\TextrueJson\shangdianjie.txt" />

Assets/Res/CombatHero/Guaiwu01.prefab

@@ -1482,6 +1482,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 2481963719419220013}
+  - component: {fileID: 8809564594839383504}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: RigHeadGizmo
@@ -1505,3 +1506,16 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4152218416339741213}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8809564594839383504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8444171462352528811}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos

Assets/Res/CombatHero/Hero04.prefab

@@ -234,7 +234,7 @@ Transform:
   m_Children:
   - {fileID: 6658816480584090692}
   m_Father: {fileID: 5394626201295223385}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!1 &1631493624665612900
 GameObject:
   m_ObjectHideFlags: 0
@@ -896,7 +896,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1223921661656152496}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0.13839483, y: 90, z: 0}
 --- !u!1 &3378250547052173530
 GameObject:
   m_ObjectHideFlags: 0
@@ -1193,7 +1193,7 @@ Transform:
   m_Children:
   - {fileID: 5801872575356085018}
   m_Father: {fileID: 7132100528885988962}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -34.513237}
 --- !u!1 &4667154589559778362
 GameObject:
   m_ObjectHideFlags: 0
@@ -1203,6 +1203,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6737761535893455892}
+  - component: {fileID: 1951402211279015759}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: weapon_l
@@ -1227,6 +1228,19 @@ Transform:
   - {fileID: 5394626201295223385}
   m_Father: {fileID: 8215795629164982519}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1951402211279015759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4667154589559778362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos
 --- !u!1 &4836261357933999081
 GameObject:
   m_ObjectHideFlags: 0
@@ -1842,7 +1856,7 @@ Transform:
   m_Children:
   - {fileID: 3307320703658618013}
   m_Father: {fileID: 8328064477229056442}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 1.25786426e-14, y: -180, z: -44.14545}
 --- !u!1 &6652178329937751665
 GameObject:
   m_ObjectHideFlags: 0
@@ -1907,7 +1921,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6180849404089156093}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -6.383131e-15, y: -180, z: 135.85454}
 --- !u!1 &6919773691627964941
 GameObject:
   m_ObjectHideFlags: 0
@@ -1982,6 +1996,7 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 1736473325898874597}
+  - component: {fileID: 2536221452850730406}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: spine_01
@@ -2006,6 +2021,19 @@ Transform:
   - {fileID: 8633698519792698502}
   m_Father: {fileID: 1318613181228186045}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2536221452850730406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7210200393259643445}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
 --- !u!1 &7212755461260907166
 GameObject:
   m_ObjectHideFlags: 0
@@ -2038,7 +2066,7 @@ Transform:
   m_Children:
   - {fileID: 3083761560431504521}
   m_Father: {fileID: 6271468940457991547}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!1 &7277061893863020581
 GameObject:
   m_ObjectHideFlags: 0
@@ -2243,7 +2271,7 @@ Transform:
   m_Children:
   - {fileID: 1223921661656152496}
   m_Father: {fileID: 5768703196053138399}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -34.513218}
 --- !u!1 &7733933901525014765
 GameObject:
   m_ObjectHideFlags: 0
@@ -2309,7 +2337,7 @@ Transform:
   m_Children:
   - {fileID: 6180849404089156093}
   m_Father: {fileID: 6658816480584090692}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 7.339931e-15, y: -180, z: -0.6305983}
 --- !u!1 &7856613090327621132
 GameObject:
   m_ObjectHideFlags: 0
@@ -2441,7 +2469,7 @@ Transform:
   m_Children:
   - {fileID: 8328064477229056442}
   m_Father: {fileID: 6658816480584090692}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -2.5999887}
 --- !u!1 &8727639424048460394
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/Config/SkillConfig.json

@@ -60,6 +60,30 @@
       "effectValue": [
         200.0
       ]
+    },
+    {
+      "ID": 1100011,
+      "scriptName": "S110001",
+      "IDGroup": 1001,
+      "cd": 3,
+      "SkillType": 2,
+      "level": 1,
+      "name": 405077,
+      "effectValue": [
+        200.0
+      ]
+    },
+    {
+      "ID": 1100021,
+      "scriptName": "S110002",
+      "IDGroup": 1001,
+      "cd": 3,
+      "SkillType": 2,
+      "level": 1,
+      "name": 405077,
+      "effectValue": [
+        50.0
+      ]
     }
   ]
 }

Assets/Scenes/testCombat.scene

@@ -484,11 +484,76 @@ PrefabInstance:
       propertyPath: m_Name
       value: Chapter01
       objectReference: {fileID: 0}
+    - target: {fileID: 7876193226129309935, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 343b9f4c52e0c3a42ab034b985fbe3a7, type: 3}
+--- !u!1001 &767702641
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2297707870892051097, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8368859004707141568, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_Name
+      value: GuaiwuBoss01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8368859004707141568, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: cf0c4c87758e2c34da7f86e5961c5b69, type: 3}
 --- !u!1 &852523981
 GameObject:
   m_ObjectHideFlags: 0
@@ -1129,7 +1194,9 @@ MonoBehaviour:
     attDis: 2
     skillId: 1b270000eb930400
   enemyHeroInfo:
-  - enemyHeroInfo:
+  - count: 0
+    jianGe: 0
+    enemyHeroInfo:
     - modelName: Guaiwu01
       hp: 300
       att: 3
@@ -1154,7 +1221,9 @@ MonoBehaviour:
       attSpeed: 1
       attDis: 2
       skillId: 1b270000
-  - enemyHeroInfo:
+  - count: 0
+    jianGe: 0
+    enemyHeroInfo:
     - modelName: Guaiwu01
       hp: 300
       att: 3
@@ -1250,7 +1319,9 @@ MonoBehaviour:
     attDis: 6
     skillId: 1b2700008b1a0600
   enemyHeroInfo:
-  - enemyHeroInfo:
+  - count: 3
+    jianGe: 10
+    enemyHeroInfo:
     - modelName: Guaiwu01
       hp: 300
       att: 3
@@ -1275,7 +1346,9 @@ MonoBehaviour:
       attSpeed: 1
       attDis: 2
       skillId: 1b270000
-  - enemyHeroInfo:
+  - count: 0
+    jianGe: 0
+    enemyHeroInfo:
     - modelName: Guaiwu01
       hp: 300
       att: 3
@@ -1300,6 +1373,12 @@ MonoBehaviour:
       attSpeed: 1
       attDis: 2
       skillId: 1b270000
+    - modelName: GuaiwuBoss01
+      hp: 10000
+      att: 10
+      attSpeed: 1
+      attDis: 2
+      skillId: 1b270000ebc81000f5c81000
 --- !u!4 &1509080106
 Transform:
   m_ObjectHideFlags: 0
@@ -1596,3 +1675,4 @@ SceneRoots:
   - {fileID: 1354674195}
   - {fileID: 2927414971820386470}
   - {fileID: 2017303172}
+  - {fileID: 767702641}

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

@@ -1,4 +1,5 @@
-using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
+using System;
+using CombatLibrary.CombatLibrary.CombatCore.CustomizeTimeLogic.FxLogic;
 using Excel2Json;
 using Fort23.Core;
 using GameLogic.Combat.Hero;
@@ -8,7 +9,18 @@ namespace GameLogic.Combat.CombatTool
 {
     public class CombatCalculateTool : Singleton<CombatCalculateTool>
     {
-        
+        public Random Random = new Random();
+
+        public CombatCalculateTool()
+        {
+            Random = new Random(System.DateTime.Now.Millisecond);
+        }
+
+        public int GetOdd()
+        {
+            return Random.Next(0, 100);
+        }
+
         public long GetVlaueRatioForLong(long value, float ration)
         {
             long v = (value * (long)(ration * 100)) / 10000;

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

@@ -13,6 +13,7 @@ namespace GameLogic.Combat.CombatType
         protected CombatScenesConfig _combatScenesConfig;
         protected CombatScenesNodeConfig nextConfig;
 
+
         public void Init(CombatController combatController)
         {
             CombatEventManager.Instance.AddEventListener(CombatEventType.HeroDie, HeroDieEventData);
@@ -39,6 +40,7 @@ namespace GameLogic.Combat.CombatType
         {
             _currIndex %= _combatScenesConfig.allNodeConfig.Length;
             nextConfig = _combatScenesConfig.allNodeConfig[_currIndex];
+
             _currIndex++;
         }
 
@@ -55,6 +57,7 @@ namespace GameLogic.Combat.CombatType
 
         public void Update(float t)
         {
+            ProUpdate(t);
         }
 
         protected virtual void ProInit()
@@ -65,6 +68,10 @@ namespace GameLogic.Combat.CombatType
         {
         }
 
+        protected virtual void ProUpdate(float t)
+        {
+        }
+
         protected virtual void ProDispose()
         {
         }

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

@@ -12,7 +12,11 @@ namespace GameLogic.Combat.CombatType
     {
         private TestCombatHeroConfig testCombatHeroConfig;
         private int currEnemyIndex;
+        protected TestCombatHeroConfig.EnemyGroup currEnemyGroup;
 
+        private float _currTime;
+
+        private int _currBoChi;
 
         protected override void ProHeroDie(CombatHeroEntity combatHeroEntity)
         {
@@ -36,14 +40,23 @@ namespace GameLogic.Combat.CombatType
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
             if (allHero == null || allHero.Length <= 0)
             {
-                InitNewMonsterConfig();
+                if (_currBoChi < currEnemyGroup.count)
+                {
+                    CreateEnemy(new CTaskAwaitBuffer());
+                }
+                else
+                {
+                    InitNewMonsterConfig();
+                }
             }
         }
 
         private void InitNewMonsterConfig()
         {
+            _currBoChi = 0;
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             FindNextConfig();
+            InitTestCombatBoChi();
             CreateEnemy(new CTaskAwaitBuffer());
         }
 
@@ -51,20 +64,27 @@ namespace GameLogic.Combat.CombatType
         {
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
             TestCombat(cTaskAwaitBuffer);
+            InitTestCombatBoChi();
             CreateEnemy(cTaskAwaitBuffer);
             await cTaskAwaitBuffer.WaitAll();
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
         }
 
 
-        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
+        protected void InitTestCombatBoChi()
         {
             currEnemyIndex %= testCombatHeroConfig.enemyHeroInfo.Count;
-            TestCombatHeroConfig.EnemyGroup enemyGroup = testCombatHeroConfig.enemyHeroInfo[currEnemyIndex];
-            for (int i = 0; i < enemyGroup.enemyHeroInfo.Length; i++)
+            currEnemyGroup = testCombatHeroConfig.enemyHeroInfo[currEnemyIndex];
+            currEnemyIndex++;
+        }
+
+        private void CreateEnemy(CTaskAwaitBuffer cTaskAwaitBuffer)
+        {
+            _currBoChi += 1;
+            for (int i = 0; i < currEnemyGroup.enemyHeroInfo.Length; i++)
             {
                 int index = i;
-                TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = enemyGroup.enemyHeroInfo[i];
+                TestCombatHeroConfig.TestHeroInfoConfig testHeroInfoConfig = currEnemyGroup.enemyHeroInfo[i];
                 CombatHeroEntity heroEntity = new CombatHeroEntity();
                 heroEntity.IsEnemy = true;
                 CombatHeroInfo combatHeroInfo = new CombatHeroInfo();
@@ -73,11 +93,25 @@ namespace GameLogic.Combat.CombatType
                     delegate(CombatHeroEntity entity)
                     {
                         combatController.CombatHeroController.AddHero(entity);
+                        index %= nextConfig.monsterPoint.Length;
                         heroEntity.combatHeroGameObject.SetPosition(nextConfig.monsterPoint[index].position);
                     }));
             }
         }
 
+        protected override void ProUpdate(float t)
+        {
+            if (_currBoChi < currEnemyGroup.count)
+            {
+                _currTime += t;
+                if (_currTime > currEnemyGroup.jianGe)
+                {
+                    CreateEnemy(new CTaskAwaitBuffer());
+                    _currTime = 0;
+                }
+            }
+        }
+
         private void TestCombat(CTaskAwaitBuffer cTaskAwaitBuffer)
         {
             testCombatHeroConfig = GameObject.FindObjectOfType<TestCombatHeroConfig>();

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

@@ -27,12 +27,15 @@ public class CombatAIBasic : IDisposable
 
     private BetterList<GameObject> _areaList = new BetterList<GameObject>();
 
+    private float _t;
+
     public void Init(CombatHeroEntity combatHeroEntity, NavMeshAgent navMeshAgent)
     {
         CombatEventManager.Instance.AddEventListener(CombatEventType.AlertTrigger, AlertTrigger);
         _combatHeroEntity = combatHeroEntity;
         stateControl = new StateControl();
         NavMeshAgent = navMeshAgent;
+        // WeChatWASM.File
         // NavMeshAgent.enabled = false;
         // NavMeshObstacle=   navMeshAgent.gameObject.GetComponent<NavMeshObstacle>();
         // if (NavMeshObstacle == null)
@@ -99,13 +102,20 @@ public class CombatAIBasic : IDisposable
             }
         }
 
-        CombatHeroEntity[] allHero =
-            CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
-        FindMinDixtance(allHero, out currFocusTarget);
+        if (currFocusTarget == null || currFocusTarget.isDie||!_combatHeroEntity.IsAttDis(currFocusTarget.dotPos))
+        {
+            CombatHeroEntity[] allHero =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
+            FindMinDixtance(allHero, out currFocusTarget);
+           
+        }
+
+
         stateControl.Update(t);
-        if (currFocusTarget != null)
+        if (currFocusTarget != null&&!_combatHeroEntity.isDie)
         {
-            if (!stateControl.CurrStateName.Equals(CombatHeroStateType.move)&&!stateControl.CurrStateName.Equals(CombatHeroStateType.followMove))
+            if (!stateControl.CurrStateName.Equals(CombatHeroStateType.move) &&
+                !stateControl.CurrStateName.Equals(CombatHeroStateType.followMove))
             {
                 Vector3 nextPos = currFocusTarget.dotPos;
                 Vector3 p = nextPos - _combatHeroEntity.dotPos;
@@ -141,7 +151,7 @@ public class CombatAIBasic : IDisposable
                 _combatHeroEntity.combatHeroGameObject.position);
             if (distance < minDistance)
             {
-                if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDis + 3)
+                if (!_combatHeroEntity.IsEnemy || distance < _combatHeroEntity.CurrCombatHeroInfo.maxDis + 10)
                 {
                     minDistance = distance;
                     minDistanceHero = hero;

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

@@ -186,6 +186,11 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
         heroLoopParticle.Clear();
     }
 
+    public bool IsAttDis(Vector3 pos)
+    {
+        return Vector3.SqrMagnitude(pos - combatHeroGameObject.transform.position) < CurrCombatHeroInfo.maxDisTo;
+    }
+
     public void Dispose()
     {
         CombatHeroSkillControl.Dispose();

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

@@ -103,6 +103,7 @@ namespace GameLogic.Combat.Hero
             for (int i = 0; i < SkillCommands.size; i++)
             {
                 skillBasic = SkillCommands[i];
+                break;
             }
 
             return skillBasic;
@@ -118,7 +119,7 @@ namespace GameLogic.Combat.Hero
                 if (skillBasic.SelfSkillConfig.SkillType!=1&&!SkillCommands.Contains(skillBasic) && currUseSkill != skillBasic)
                 {
                     skillBasic.ReduceCd(t);
-                    if (skillBasic.SkillCd <= 0)
+                    if (skillBasic.SkillCd <= 0&&skillBasic.IsCanUse())
                     {
                         skillBasic.SkillCd = skillBasic.SkillMaxCd;
                         AddCommandSkill(skillBasic);

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

@@ -0,0 +1,65 @@
+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 ProInitSkill()
+        {
+            _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

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

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

@@ -0,0 +1,100 @@
+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 ProInitSkill()
+        {
+            _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;
+            if (_currTime > 0.1f)
+            {
+                _currTime -= 0.1f;
+                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

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

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

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

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

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

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

@@ -189,6 +189,7 @@ namespace GameLogic.Combat.Skill
         {
         }
 
+      
         public HarmReturnInfo Harm(CombatHeroEntity source, CombatHeroHitPoint target, long att, AttType attType,
             TriggerData triggerData, HarmType harmType = HarmType.Null)
         {
@@ -507,7 +508,7 @@ namespace GameLogic.Combat.Skill
         protected virtual ILifetCycleHitPoint[] ProGetTineLineTargetEntity(
             TimeLineEventLogicBasic timeLineEventLogicBasic)
         {
-            return null;
+            return new[] { CombatHeroEntity.CombatAIBasic.currFocusTarget.GetMainHotPoin<ILifetCycleHitPoint>() };
         }
 
         /// <summary>
@@ -634,6 +635,12 @@ namespace GameLogic.Combat.Skill
                 alertTriggerEventData.isTrigger = true;
                 CombatEventManager.Instance.Dispatch(CombatEventType.AlertTrigger, alertTriggerEventData);
             }
+
+            ProHeroEnter(timeLineAlertSeriailztion,target);
+        }
+
+        protected virtual void ProHeroEnter(TimeLineAlertSeriailztion timeLineAlertSeriailztion, CombatHeroEntity target )
+        {
         }
 
         public void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider,GameObject gameObject)
@@ -666,6 +673,11 @@ namespace GameLogic.Combat.Skill
                 alertTriggerEventData.triggerObject= gameObject;
                 CombatEventManager.Instance.Dispatch(CombatEventType.AlertTrigger, alertTriggerEventData);
             }
+
+            ProHeroLeave(timeLineAlertSeriailztion,target);
+        }
+        protected virtual void ProHeroLeave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, CombatHeroEntity target )
+        {
         }
     }
 }

Assets/Scripts/GameLogic/CombatScenesTool/CombatScenesNodeConfig.cs

@@ -8,6 +8,12 @@ namespace GameLogic.CombatScenesTool
     public class CombatScenesNodeConfig : MonoBehaviour
     {
         public Transform[] monsterPoint;
+
+        /// <summary>
+        /// 英雄移动的点
+        /// </summary>
+        public Transform targetMoveStartPoint;
+       
         // public Transform heroStartPos;
     }
 }

Assets/Scripts/GameLogic/CombatScenesTool/TestCombatHeroConfig.cs

@@ -33,6 +33,15 @@ namespace GameLogic.CombatScenesTool
         [System.Serializable]
         public class EnemyGroup
         {
+            /// <summary>
+            /// 波次数
+            /// </summary>
+            public int count;
+            /// <summary>
+            /// 间隔时间
+            /// </summary>
+            public float jianGe;
+
             public TestHeroInfoConfig[] enemyHeroInfo;
         }
 

Fort23.GameLogic.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatTool\HarmType.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\SkillBasic.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatState\CombatStateBasic.cs" />
+    <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\S110001.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatTool\SkillScriptManager.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Paritcle\ParitcleLogic\FxAILogicBasic.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatTool\CombatHeroController.cs" />
@@ -99,6 +100,8 @@
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatEvent\CombatUseSkillEventData.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Paritcle\GameTimeLineParticleFactory.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatEvent\HarmUpdateEventData.cs" />
+    <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\S110003.cs" />
+    <Compile Include="Assets\Scripts\GameLogic\Combat\Skill\S110002.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\Hero\CombatHeroInfo.cs" />
     <Compile Include="Assets\Scripts\GameLogic\MyPlugin.cs" />
     <Compile Include="Assets\Scripts\GameLogic\Combat\CombatEvent\ICombatEventData.cs" />

UserSettings/Layouts/default-2022.dwlt

@@ -14,17 +14,69 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
-    y: 51
-    width: 2544
-    height: 1341
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 7}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 9}
   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
+  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: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: TimelineWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 756
+    width: 794
+    height: 204
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &3
+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: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 14}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 776
+    y: 0
+    width: 794
+    height: 960
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 20155
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -39,18 +91,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1560
+    x: 1570
     y: 0
-    width: 445
-    height: 1291
+    width: 448
+    height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -66,17 +118,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 954
-    width: 1560
-    height: 337
-  m_MinSize: {x: 101, y: 121}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 19}
+    y: 960
+    width: 1570
+    height: 339
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -89,21 +141,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 10}
-  - {fileID: 2}
-  - {fileID: 5}
+  - {fileID: 12}
+  - {fileID: 4}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1291
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 150}
+  m_MaxSize: {x: 32384, y: 24288}
   vertical: 0
-  controlID: 236
+  controlID: 184
   draggingID: 0
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -118,18 +170,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2005
+    x: 2018
     y: 0
-    width: 539
-    height: 1291
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+    width: 542
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -146,16 +198,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 830
-    height: 954
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+    width: 776
+    height: 960
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,22 +220,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 4}
-  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 6}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1341
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -200,12 +252,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -221,12 +273,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1321
-    width: 2544
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,20 +291,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 3}
+  - {fileID: 13}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1560
-    height: 1291
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 1570
+    height: 1299
+  m_MinSize: {x: 200, y: 150}
+  m_MaxSize: {x: 16192, y: 24288}
   vertical: 1
-  controlID: 113
+  controlID: 58
   draggingID: 0
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -265,20 +317,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 12}
+  - {fileID: 8}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1560
-    height: 954
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
+    width: 1570
+    height: 960
+  m_MinSize: {x: 200, y: 100}
+  m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 83
+  controlID: 59
   draggingID: 0
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -293,21 +345,64 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 830
+    x: 0
     y: 0
-    width: 730
-    height: 954
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+    width: 794
+    height: 756
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 20}
-  - {fileID: 18}
-  - {fileID: 14}
-  - {fileID: 13}
+  - {fileID: 23}
+  - {fileID: 21}
+  - {fileID: 17}
+  - {fileID: 16}
   m_Selected: 0
-  m_LastSelected: 2
---- !u!114 &13
+  m_LastSelected: 3
+--- !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: 776
+    y: 829
+    width: 792
+    height: 183
+  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: -162282
+    m_SubElements: []
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -327,10 +422,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 881
+    x: 776
     y: 73
-    width: 995
-    height: 420
+    width: 792
+    height: 789
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -341,42 +436,56 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  _SourceObject: {fileID: 11400000, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
+  _SourceObject: {fileID: 11400000, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
   _Data:
     _Transitions:
-    - {fileID: 7983366941572866360, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -5301559858133920215, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -6463034078416130267, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: 5213943374726065970, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -4218299810317163657, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: 4132149882535381313, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -3110653298159896961, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -7492277400977875935, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
-    - {fileID: -6088646584569579690, guid: 2d5a5321cc6e9ce459c464251b203538, type: 2}
+    - {fileID: -8040148307380970633, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: -4151114463907510451, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: -268238426723371374, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: 5409110357427690842, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: -4147067873176081146, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: -8181351011713561019, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: -4203501595805408910, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
+    - {fileID: 5732826297057185392, guid: 7ec7b6367dc17c54b9b317f4e6242248, type: 2}
     _Modifiers:
     - _From: 0
-      _To: 5
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 0
       _Fade: 0
-    - _From: 7
-      _To: 5
+    - _From: 2
+      _To: 0
       _Fade: 0
-    - _From: 7
-      _To: 6
+    - _From: 3
+      _To: 0
       _Fade: 0
-    - _From: 5
+    - _From: 4
       _To: 0
       _Fade: 0
     - _From: 6
       _To: 0
       _Fade: 0
-    - _From: 1
-      _To: 5
+    - _From: 5
+      _To: 0
       _Fade: 0
     - _From: 1
-      _To: 6
+      _To: 7
       _Fade: 0
-    - _From: 1
-      _To: 1
+    - _From: 2
+      _To: 7
+      _Fade: 0
+    - _From: 3
+      _To: 7
+      _Fade: 0
+    - _From: 4
+      _To: 7
+      _Fade: 0
+    - _From: 5
+      _To: 7
+      _Fade: 0
+    - _From: 6
+      _To: 7
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
@@ -398,7 +507,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &14
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -468,7 +577,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &15
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -488,10 +597,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1568
-    y: 81
-    width: 443
-    height: 1270
+    x: 1570
+    y: 73
+    width: 446
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -513,7 +622,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/Res/HeroAnimtion
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -521,16 +630,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scenes
+  - Assets/Res/HeroAnimtion
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
+  m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: d4bb0000
-    m_LastClickedID: 48084
-    m_ExpandedIDs: 000000008ab9000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 10}
+    m_SelectedIDs: 6eb00000
+    m_LastClickedID: 45166
+    m_ExpandedIDs: 000000007cae00007eae000080ae000082ae000084ae000086ae00008aae00008cae00008eae000090ae000092ae000094ae000096ae000052b00000b4b00000b6b00000bcb000004efd000078fd00007cfd00005802010068350100d2db010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -546,7 +655,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 2}
+      m_ClientGUIView: {fileID: 4}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -558,7 +667,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000008ab90000
+    m_ExpandedIDs: 000000007cae00007eae000080ae000082ae000084ae000086ae000088ae00008aae00008cae00008eae000090ae000092ae000094ae000096ae0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -586,23 +695,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f05000ce80000
+    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000e4230100847d00006c7f05001a800500ce7f05000ce80000fa380100563901006a3a01000e3a0100da360100363701009e380100c63a0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: GuaiwuBoss01
+      m_OriginalName: GuaiwuBoss01
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 167324
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 2}
+      m_ClientGUIView: {fileID: 4}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -614,7 +723,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 221
---- !u!114 &16
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -634,10 +743,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2013
-    y: 81
-    width: 538
-    height: 1270
+    x: 2018
+    y: 73
+    width: 541
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -651,7 +760,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 514
+    m_CachedPref: 363
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
@@ -661,7 +770,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &17
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -681,10 +790,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 81
-    width: 829
-    height: 933
+    x: 0
+    y: 73
+    width: 775
+    height: 939
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -698,9 +807,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: bae50000
+      m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 0e7effff1a86ffff90dbffff
+      m_ExpandedIDs: b483fdfffa85fdff1686fdfff8a2feff76a4feff08a5feffacccfeffc6ccfeff02cdfeff06cdfeff14cdfeff482bffffaa2effff2e2fffffb82fffffb632ffff3e71ffff7471ffffb871ffffc671ffff1ef9ffffda01010024020100340701006c0701007e070100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -716,7 +825,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 6}
+        m_ClientGUIView: {fileID: 8}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -724,7 +833,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &18
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -744,10 +853,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1
-    y: 19
-    width: 728
-    height: 614
+    x: 776
+    y: 73
+    width: 792
+    height: 530
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -763,7 +872,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 1
       snapOffset: {x: -166, y: -26}
-      snapOffsetDelta: {x: -5, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -1119,9 +1228,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 24.874147, y: 1.0752587, z: -7.8629093}
+    m_Target: {x: 0.2759186, y: 1.2032156, z: 1.4939675}
     speed: 2
-    m_Value: {x: 24.874147, y: 1.0752587, z: -7.8629093}
+    m_Value: {x: 0.2759186, y: 1.2032156, z: 1.4939675}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1167,13 +1276,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.043901984, y: -0.8398548, z: 0.5369094, w: -0.06867038}
+    m_Target: {x: -0.26530346, y: 0.37753096, z: -0.113743275, w: -0.87990606}
     speed: 2
-    m_Value: {x: -0.043896046, y: -0.8397412, z: 0.53683674, w: -0.068661086}
+    m_Value: {x: -0.2652918, y: 0.3775144, z: -0.11373828, w: -0.87986743}
   m_Size:
-    m_Target: 1.950612
+    m_Target: 3.689859
     speed: 2
-    m_Value: 1.950612
+    m_Value: 3.689859
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1200,7 +1309,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &19
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1220,10 +1329,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 1035
-    width: 1559
-    height: 316
+    x: 0
+    y: 1033
+    width: 1569
+    height: 318
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1234,7 +1343,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &20
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1254,10 +1363,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 838
-    y: 81
-    width: 728
-    height: 933
+    x: 776
+    y: 73
+    width: 792
+    height: 735
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1284,7 +1393,7 @@ MonoBehaviour:
   m_UseMipMap: 0
   m_VSyncEnabled: 0
   m_Gizmos: 0
-  m_Stats: 1
+  m_Stats: 0
   m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
@@ -1303,7 +1412,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -1312,23 +1421,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 728
-      height: 912
-    m_Scale: {x: 0.56157637, y: 0.56157637}
-    m_Translation: {x: 364, y: 456}
+      width: 792
+      height: 714
+    m_Scale: {x: 0.43965518, y: 0.43965518}
+    m_Translation: {x: 396, y: 357}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -648.1754
+      x: -900.7059
       y: -812
-      width: 1296.3508
+      width: 1801.4117
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.56157637
-  m_LastWindowPixelSize: {x: 728, y: 933}
+  m_defaultScale: 0.43965518
+  m_LastWindowPixelSize: {x: 792, y: 735}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000