修改翻滚

Assets/Art/ArtHero/Hero01.prefab

@@ -1674,8 +1674,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Art/ArtHero/Hero02.prefab

@@ -463,8 +463,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Art/ArtHero/Hero03.prefab

@@ -673,8 +673,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Art/ArtHero/Hero04.prefab

@@ -659,8 +659,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Art/HeroTimeLine/Hero01.playable

@@ -574,22 +574,6 @@ MonoBehaviour:
     m_DisplayName: fx_hero01_dg
   m_Markers:
     m_Objects: []
---- !u!114 &-7162324253849020917
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 683eb9f12ea94ddda5e5780eaceef1d1, type: 3}
-  m_Name: CameraShakingAsset
-  m_EditorClassIdentifier: 
-  camera:
-    exposedName: 
-    defaultValue: {fileID: 0}
-  qiangDu: 0.3
 --- !u!114 &-7083228526680016239
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -639,9 +623,103 @@ MonoBehaviour:
   - {fileID: -889926587357520947}
   - {fileID: -7166918911015196851}
   - {fileID: -3828777382670004432}
+  - {fileID: -6938129486409711545}
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-6938129486409711545
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -7018264418762285241}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 6307751214612044961}
+    m_Duration: 0.5333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -6938129486409711545}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &-5982478465854521364
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1252,76 +1330,7 @@ MonoBehaviour:
   m_Curves: {fileID: 0}
   m_Parent: {fileID: -7018264418762285241}
   m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0.2
-    m_ClipIn: 0
-    m_Asset: {fileID: -7162324253849020917}
-    m_Duration: 0.26666666666666666
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -889926587357520947}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: CameraShakingAsset
+  m_Clips: []
   m_Markers:
     m_Objects: []
 --- !u!114 &-757740235362837759
@@ -2477,6 +2486,18 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
+--- !u!114 &6307751214612044961
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &6565258489726515437
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Art/RPGTinyHeroWavePBR/Animation/SwordAndShield/Attack02_SwordAndShiled.fbx.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 8283fadf2c89507469495f30db8680db
+guid: B3gXtnz8By0lbHB3IpJIWhUqzoxZE28X4AWaoq6Gf4Md+WjXb1Ee+3s=
 ModelImporter:
-  serializedVersion: 20200
+  serializedVersion: 22200
   internalIDToNameTable:
   - first:
       74: 1827226128182048838
@@ -17,6 +17,7 @@ ModelImporter:
     bakeSimulation: 0
     resampleCurves: 1
     optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
     motionNodeName: 
     rigImportErrors: 
     rigImportWarnings: 
@@ -46,7 +47,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 1
       loopBlendPositionY: 1
@@ -162,6 +163,15 @@ ModelImporter:
       maskSource: {fileID: 31900000, guid: 0a2d610c66cc08b4492b8b3de93fdbde, type: 2}
       additiveReferencePoseFrame: 16
     isReadable: 0
+    virtualGeometry: 0
+    hasBoneWeight: 0
+    generateGeometryBuffer: 0
+    positionPrecision: -2147483648
+    normalPrecision: -1
+    tangentPrecision: -1
+    surfaceCompensation: 0
+    allMeshUse: 1
+    ignoreSimpleMesh: 0
   meshes:
     lODScreenPercentages: []
     globalScale: 1
@@ -169,10 +179,12 @@ ModelImporter:
     addColliders: 0
     useSRGBMaterialColor: 1
     sortHierarchyByName: 1
+    importPhysicalCameras: 1
     importVisibility: 1
     importBlendShapes: 1
     importCameras: 1
     importLights: 1
+    nodeNameCollisionStrategy: 0
     fileIdsGeneration: 2
     swapUVChannels: 0
     generateSecondaryUV: 0
@@ -184,6 +196,7 @@ ModelImporter:
     skinWeightsMode: 0
     maxBonesPerVertex: 4
     minBoneWeight: 0.001
+    optimizeBones: 1
     meshOptimizationFlags: -1
     indexFormat: 0
     secondaryUVAngleDistortion: 8
@@ -194,6 +207,7 @@ ModelImporter:
     secondaryUVMinObjectScale: 1
     secondaryUVPackMargin: 4
     useFileScale: 1
+    strictVertexDataChecks: 0
   tangentSpace:
     normalSmoothAngle: 60
     normalImportMode: 0
@@ -742,13 +756,14 @@ ModelImporter:
     hasTranslationDoF: 1
     hasExtraRoot: 1
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 0308cf4e83cf517488b60af58b290fe0,
-    type: 3}
+  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 0308cf4e83cf517488b60af58b290fe0, type: 3}
   autoGenerateAvatarMappingIfUnspecified: 1
   animationType: 3
   humanoidOversampling: 1
   avatarSetup: 2
   addHumanoidExtraRootOnlyWhenUsingAvatar: 0
+  importBlendShapeDeformPercent: 0
+  remapMaterialsIfMaterialImportModeIsNone: 1
   additionalBone: 0
   userData: 
   assetBundleName: 

Assets/Bundles/BuildConfig.prefab

@@ -91,4 +91,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: -619468675
+    gameObject: {fileID: 102900000, guid: 5631d3334d5148948b8726ee3b543cc1, type: 3}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1

Assets/Res/CombatHero/Hero02.prefab

@@ -2010,8 +2010,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Res/CombatHero/Hero03.prefab

@@ -1243,8 +1243,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Res/CombatHero/Hero04.prefab

@@ -1483,8 +1483,8 @@ NavMeshAgent:
   m_Enabled: 1
   m_AgentTypeID: 0
   m_Radius: 0.7
-  m_Speed: 3.5
-  m_Acceleration: 8
+  m_Speed: 8
+  m_Acceleration: 30
   avoidancePriority: 50
   m_AngularSpeed: 7200
   m_StoppingDistance: 0.5

Assets/Res/HeroAnimtion/Hero01_library.asset

@@ -138,7 +138,7 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: 5eee3d6dbfbcef04ab20b548575d7b9d, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: 0791e523b7f1b2740a3b1cde42b6aeac, type: 3}
         _NormalizedStartTime: NaN
 --- !u!114 &-1093939256595028265
 MonoBehaviour:
@@ -186,6 +186,12 @@ MonoBehaviour:
     - _From: 7
       _To: 6
       _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 6
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &4132149882535381313
@@ -264,7 +270,7 @@ MonoBehaviour:
     - rid: 6156714516004732962
       type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
       data:
-        _FadeDuration: 0.25
+        _FadeDuration: 0
         _Speed: 1
         _Events:
           _NormalizedTimes: []

Assets/Res/HeroAnimtion/Hero02_library.asset

@@ -181,6 +181,18 @@ MonoBehaviour:
     - _From: 0
       _To: 4
       _Fade: 0
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &3578840217490985036
@@ -209,5 +221,5 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: 03e7b9c42e25e6c4f89acb40263d29f9, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: 61b882f7d27344948b5ebcaa1c47a47c, type: 3}
         _NormalizedStartTime: NaN

Assets/Res/HeroAnimtion/Hero03_library.asset

@@ -54,7 +54,7 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: 03e7b9c42e25e6c4f89acb40263d29f9, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: 61b882f7d27344948b5ebcaa1c47a47c, type: 3}
         _NormalizedStartTime: NaN
 --- !u!114 &-5827242348574449950
 MonoBehaviour:
@@ -118,7 +118,19 @@ MonoBehaviour:
     - {fileID: -5627690267219994143}
     - {fileID: -9192171538510261934}
     - {fileID: -8693759471711124066}
-    _Modifiers: []
+    _Modifiers:
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0
 --- !u!114 &2952580267153325199

Assets/Res/HeroAnimtion/Hero04_library.asset

@@ -181,7 +181,7 @@ MonoBehaviour:
           _NormalizedTimes: []
           _Callbacks: []
           _Names: []
-        _Clip: {fileID: 1827226128182048838, guid: 03e7b9c42e25e6c4f89acb40263d29f9, type: 3}
+        _Clip: {fileID: 1827226128182048838, guid: 61b882f7d27344948b5ebcaa1c47a47c, type: 3}
         _NormalizedStartTime: NaN
 --- !u!114 &6845602817871315611
 MonoBehaviour:

Assets/Scenes/testCombat.scene

@@ -395,13 +395,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 852523981}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956}
-  m_LocalPosition: {x: 0, y: 10.77, z: -10.77}
+  m_LocalRotation: {x: 0.37086314, y: -0.22785029, z: 0.09437861, w: 0.8953421}
+  m_LocalPosition: {x: 9.6, y: 9.6, z: -5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 855042511}
-  m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 45, y: -28.556, z: 0}
 --- !u!114 &852523983
 MonoBehaviour:
   m_ObjectHideFlags: 0

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

@@ -15,6 +15,7 @@ public class CombatAIBasic : IDisposable
 {
     public StateControl stateControl;
     public NavMeshAgent NavMeshAgent;
+    public NavMeshObstacle NavMeshObstacle;
     protected CombatHeroEntity _combatHeroEntity;
     protected float _r = 5;
 
@@ -32,10 +33,25 @@ public class CombatAIBasic : IDisposable
         _combatHeroEntity = combatHeroEntity;
         stateControl = new StateControl();
         NavMeshAgent = navMeshAgent;
+        // NavMeshAgent.enabled = false;
+        // NavMeshObstacle=   navMeshAgent.gameObject.GetComponent<NavMeshObstacle>();
+        // if (NavMeshObstacle == null)
+        // {
+        //     NavMeshObstacle=  navMeshAgent.gameObject.AddComponent<NavMeshObstacle>();
+        //     NavMeshObstacle.shape= NavMeshObstacleShape.Capsule;
+        //     NavMeshObstacle.radius = NavMeshAgent.radius-0.1f;
+        //     NavMeshObstacle.carving = true;
+        // }
+
         ProInitState();
         ProInit();
     }
 
+    public GameObject[] AreaList
+    {
+        get { return _areaList.ToArray(); }
+    }
+
     protected virtual void ProInit()
     {
     }
@@ -45,7 +61,7 @@ public class CombatAIBasic : IDisposable
         AlertTriggerEventData alertTriggerEventData = iEventData as AlertTriggerEventData;
         if (alertTriggerEventData.combatHeroEntity == _combatHeroEntity)
         {
-            if (alertTriggerEventData.isTrigger && _areaList.Contains(alertTriggerEventData.triggerObject))
+            if (alertTriggerEventData.isTrigger && !_areaList.Contains(alertTriggerEventData.triggerObject))
             {
                 _areaList.Add(alertTriggerEventData.triggerObject);
             }
@@ -72,6 +88,15 @@ public class CombatAIBasic : IDisposable
 
     public void Update(float t)
     {
+        for (int i = 0; i < _areaList.Count; i++)
+        {
+            if (!_areaList[i].activeSelf)
+            {
+                _areaList.RemoveAt(i);
+                i--;
+            }
+        }
+
         CombatHeroEntity[] allHero =
             CombatController.currActiveCombat.CombatHeroController.GetHero(!_combatHeroEntity.IsEnemy);
         FindMinDixtance(allHero, out currFocusTarget);

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

@@ -43,27 +43,40 @@ namespace GameLogic.Combat.Hero
 
         protected void OnAnimatorMove()
         {
+            if (AnimancerComponent == null || AnimancerComponent.Animator.velocity.sqrMagnitude < .01f)
+            {
+                return;
+            }
+
+            bool isOk = false;
+
+   
+
             combatHeroEntity.CombatAIBasic.NavMeshAgent.Raycast(AnimancerComponent.Animator.rootPosition,
                 out NavMeshHit hit);
             if (!hit.hit)
             {
                 combatHeroEntity.combatHeroGameObject.SetPosition(AnimancerComponent.Animator.rootPosition);
             }
+
         }
 
-        public void Play(string name, float speed = 1)
+        public AnimancerState Play(string name, float speed = 1)
         {
             if (!_transitionMap.TryGetValue(name, out TransitionAsset clipTransition))
             {
                 LogTool.Log("没有找到要播放的动画" + name);
-                return;
+                return null;
             }
 
-            clipTransition.Speed = speed;
+            // clipTransition.Speed = speed;
             // clipTransition. = isLoop;
-            AnimancerComponent.Play(clipTransition);
+            AnimancerState animancerState = AnimancerComponent.Play(clipTransition);
+            animancerState.Speed = speed;
+            return animancerState;
         }
 
+
         public void Dispose()
         {
             _transitionMap.Clear();

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

@@ -3,6 +3,7 @@ using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Skill;
+using UnityEngine;
 
 namespace GameLogic.Combat.Hero
 {
@@ -139,6 +140,7 @@ namespace GameLogic.Combat.Hero
             }
 
             NormalAttSpeedScale = attSpeed;
+            Debug.Log(NormalAttSpeedScale);
             NormalAttCd = cd;
         }
 

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

@@ -25,13 +25,14 @@ namespace GameLogic.Combat.Hero.State
             
             Vector3 targetPos = combatHeroEntity.CombatAIBasic.currFocusTarget.dotPos;
             Vector3 myPos = combatHeroEntity.dotPos;
-            if (Vector3.SqrMagnitude(targetPos-myPos) > combatHeroEntity.CurrCombatHeroInfo.maxDisTo)
+            if (Vector3.SqrMagnitude(targetPos - myPos) > combatHeroEntity.CurrCombatHeroInfo.maxDisTo)
             {
                 combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.move);
             }
             else
             {
-                if (!combatHeroEntity.IsEnemy)
+                GameObject[] b = combatHeroEntity.CombatAIBasic.AreaList;
+                if (b != null && b.Length > 0)
                 {
                     combatHeroEntity.CombatAIBasic.ChangeState(CombatHeroStateType.rolling);
                 }

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

@@ -1,3 +1,4 @@
+using Animancer;
 using UnityEngine;
 using UnityEngine.AI;
 
@@ -8,6 +9,7 @@ namespace GameLogic.Combat.Hero.State
         protected Vector3 lasetTaregtPoint;
 
         protected Vector3 lastMovePoint;
+        protected AnimancerState _transitionAsset;
 
         public CombatHeroMoveState(CombatHeroEntity combatHeroEntity) : base(combatHeroEntity)
         {
@@ -16,9 +18,12 @@ namespace GameLogic.Combat.Hero.State
         protected override void ProEnter()
         {
             lasetTaregtPoint = new Vector3(999999, 99999, 99999);
-            combatHeroEntity.combatHeroAnimtion.Play("run");
+            _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;
             // SetNewPath();
         }
 
@@ -26,7 +31,7 @@ namespace GameLogic.Combat.Hero.State
         {
             combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped = true;
             combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity = Vector3.zero;
-
+            combatHeroEntity.CombatAIBasic.NavMeshAgent.avoidancePriority = 50;
             // combatHeroEntity.CombatAIBasic.NavMeshAgent.acceleration = 0;
         }
 
@@ -63,7 +68,14 @@ namespace GameLogic.Combat.Hero.State
                 return;
             }
 
-       
+            if (_transitionAsset != null)
+            {
+                float v = combatHeroEntity.CombatAIBasic.NavMeshAgent.velocity.sqrMagnitude;
+                float v2 = v / 15;
+
+                _transitionAsset.Speed = Mathf.Clamp(v2, 0.2f, 1.5f);
+            }
+
 
             if (!combatHeroEntity.CombatAIBasic.NavMeshAgent.isStopped)
             {

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

@@ -602,7 +602,7 @@ namespace GameLogic.Combat.Skill
             CombatAlertManager.Instance.RemoveAlert(gameObject);
         }
 
-        public void Enter(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider)
+        public void Enter(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider,GameObject gameObject)
         {
             HeroEntityMono heroEntityMono = collider.gameObject.GetComponent<HeroEntityMono>();
             if (heroEntityMono == null)
@@ -611,8 +611,8 @@ namespace GameLogic.Combat.Skill
             }
 
             CombatHeroEntity target = heroEntityMono.combatHeroEntity;
-            if (target.IsEnemy && !timeLineAlertSeriailztion.isFindEnemy ||
-                !target.IsEnemy && !timeLineAlertSeriailztion.isFindMyHero)
+            if ( timeLineAlertSeriailztion.isFindEnemy&& target.IsEnemy==_combatHeroEntity.IsEnemy ||
+                 timeLineAlertSeriailztion.isFindMyHero&& target.IsEnemy!=_combatHeroEntity.IsEnemy )
             {
                 return;
             }
@@ -629,12 +629,13 @@ namespace GameLogic.Combat.Skill
                 alertTriggerEventData.combatHeroEntity = target;
                 alertTriggerEventData.attackEntity = _combatHeroEntity;
                 alertTriggerEventData.collider = collider;
+                alertTriggerEventData.triggerObject= gameObject;
                 alertTriggerEventData.isTrigger = true;
                 CombatEventManager.Instance.Dispatch(CombatEventType.AlertTrigger, alertTriggerEventData);
             }
         }
 
-        public void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider)
+        public void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider,GameObject gameObject)
         {
             HeroEntityMono heroEntityMono = collider.gameObject.GetComponent<HeroEntityMono>();
             if (heroEntityMono == null)
@@ -661,6 +662,7 @@ namespace GameLogic.Combat.Skill
                 alertTriggerEventData.attackEntity = _combatHeroEntity;
                 alertTriggerEventData.collider = collider;
                 alertTriggerEventData.isTrigger = false;
+                alertTriggerEventData.triggerObject= gameObject;
                 CombatEventManager.Instance.Dispatch(CombatEventType.AlertTrigger, alertTriggerEventData);
             }
         }

Assets/Scripts/GameTimeLine/CustomizeTime/TimeLineAlertAsset/TimeLineAlertAsset.cs

@@ -9,6 +9,6 @@ public class TimeLineAlertAsset : CustomizePlayableAsset
     [Header("查找敌人")] public bool isFindEnemy = true;
     [Header("查找队友")] public bool isFindMyHero;
 
-    [Header("前方角度")] public float angle;
+    [Header("前方角度")] public int angle;
     // [Header("开始点GUID(英雄上的点，可以不填)")] public string startPosGuid;
 }

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAlertLogic.cs

@@ -9,6 +9,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
         private IUnRegister _enterRegister;
         private IUnRegister _exitRegister;
 
+        protected GameObject _gameObject;
         protected override void ProSetCombatInfo()
         {
         }
@@ -21,6 +22,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
             {
                 SpecialDotInfo specialDotInfo = castEntity.GetMainHotPoin<ILifetCycleHitPoint>(true)
                     .GetSpecialDotInfo(timeLineAlertSeriailztion.guid);
+                _gameObject = specialDotInfo.targetTran.gameObject;
+                _gameObject.SetActive(false);
                 _enterRegister = specialDotInfo.targetTran.gameObject.OnTriggerEnterEvent(OnTriggerEnterEvent);
                 _exitRegister = specialDotInfo.targetTran.gameObject.OnTriggerExitEvent(OnTriggerExitEvent);
                 ITimeLineAlertTargetEnter timeLineAlertTarget =
@@ -29,6 +32,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 {
                     timeLineAlertTarget.InitAlert(timeLineAlertSeriailztion,specialDotInfo.targetTran.gameObject);
                 }
+                specialDotInfo.targetTran.gameObject.SetActive(true);
             }
         }
 
@@ -40,7 +44,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
             if (timeLineAlertTarget != null)
             {
-                timeLineAlertTarget.Enter(timeLineAlertSeriailztion, collider);
+                timeLineAlertTarget.Enter(timeLineAlertSeriailztion, collider,_gameObject);
             }
         }
 
@@ -52,7 +56,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 _timeLineTriggerEntity as ITimeLineAlertTargetEnter;
             if (timeLineAlertTarget != null)
             {
-                timeLineAlertTarget.Leave(timeLineAlertSeriailztion, collider);
+                timeLineAlertTarget.Leave(timeLineAlertSeriailztion, collider,_gameObject);
             }
         }
 
@@ -75,6 +79,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
             _enterRegister?.UnRegister();
             _exitRegister?.UnRegister();
+            _enterRegister = null;
+            _exitRegister = null;
         }
 
         protected override void ProTimeUpdate()
@@ -100,6 +106,8 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
             _enterRegister?.UnRegister();
             _exitRegister?.UnRegister();
+            _enterRegister = null;
+            _exitRegister = null;
         }
 
         protected override void ProDispose()

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TineLineAnimationEventLogic.cs

@@ -19,7 +19,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
                 ITimeLineAnimtion tinmLineAnim = _castEntity as ITimeLineAnimtion;
                 tinmLineAnim.PlayAnim(tineLineAnimationPlayableSerialization.animName,
                     tineLineAnimationPlayableSerialization.loopMode == 1,
-                    tineLineAnimationPlayableSerialization.layerId, true, 1);
+                    tineLineAnimationPlayableSerialization.layerId, true, _timeLineEventLogicGroup.attSpeed);
             }
         }
 

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAlertTargetEnter.cs

@@ -6,7 +6,7 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface
     {
         void InitAlert(TimeLineAlertSeriailztion timeLineAlertSeriailztion, GameObject gameObject);
         void LeaveAlert(TimeLineAlertSeriailztion timeLineAlertSeriailztion, GameObject gameObject);
-        void Enter(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider);
-        void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider);
+        void Enter(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider, GameObject gameObject);
+        void Leave(TimeLineAlertSeriailztion timeLineAlertSeriailztion, Collider collider, GameObject gameObject);
     }
 }

Assets/Scripts/GameTimeLine/CustomizeTimeLogic/SpecialDotInfo.cs

@@ -35,17 +35,7 @@ public class SpecialDotInfo
 
     public Vector3 GetEulerAngles()
     {
-        {
-            Vector3 dir = heroEntity.faceDir;
-            if (dir.x > 0)
-            {
-                return new Vector3(0, 0);
-            }
-            else
-            {
-                return new Vector3(0, -180);
-            }
-        }
+        return targetTran.eulerAngles;
     }
 
     public Vector3 GetWorlPos(Vector3 pos)

Assets/Scripts/GameTimeLine/SerializationTimeLine/SerializationTimeLineTool.cs

@@ -256,12 +256,12 @@ public class SerializationTimeLineTool
                             new TineLineAnimationPlayableSerialization(playableDirector, groupTrack, valueClip);
                         timeLienData.key.Add("TineLineAnimationPlayableSerialization");
                     }
-                    // else if (asset is FMODEventPlayable)
-                    // {
-                    //     serialization =
-                    //         new FMODEventPlayableSerializtion(playableDirector, groupTrack, valueClip);
-                    //     timeLienData.key.Add("FMODEventPlayableSerializtion");
-                    // }
+                    else if (asset is TimeLineAlertAsset)
+                    {
+                        serialization =
+                            new TimeLineAlertSeriailztion(playableDirector, groupTrack, valueClip);
+                        timeLienData.key.Add("TimeLineAlertSeriailztion");
+                    }
                     else if (asset is TimeLineFallAsset)
                     {
                         serialization =

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLienData.cs

@@ -94,7 +94,7 @@ public class TimeLienData
         for (int i = 0; i < timeLineAssetSerializations.Count; i++)
         {
             TimeLineAssetSerialization timeLineAssetSerialization = timeLineAssetSerializations[i];
-            if (timeLineAssetSerialization is TimeLineMaxTimeSerializtion)
+            if (timeLineAssetSerialization is TineLineAnimationPlayableSerialization)
             {
                 if (maxTime < timeLineAssetSerialization.endTime)
                 {

Assets/Scripts/GameTimeLine/SerializationTimeLine/TimeLineSerialization/TimeLineAlertSeriailztion.cs

@@ -6,7 +6,7 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
 public class TimeLineAlertSeriailztion : TimeLineAssetSerialization
 {
     public string guid;
-    public float angle;
+    public int angle;
     public bool isFindEnemy;
     public bool isFindMyHero;
     public TimeLineAlertType alertType;

UserSettings/Layouts/default-2022.dwlt

@@ -19,12 +19,64 @@ MonoBehaviour:
     width: 2560
     height: 1349
   m_ShowMode: 4
-  m_Title: Inspector
-  m_RootView: {fileID: 8}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 10}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   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: 430
+    width: 578
+    height: 600
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 16}
+  m_Panes:
+  - {fileID: 16}
+  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: 15}
+  - {fileID: 2}
+  m_Position:
+    serializedVersion: 2
+    x: 1056
+    y: 0
+    width: 578
+    height: 1030
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 2450
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -41,16 +93,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 484
     y: 0
-    width: 454
+    width: 572
     height: 1030
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -67,16 +119,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1634
     y: 0
-    width: 459
+    width: 404
     height: 1299
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -97,12 +149,12 @@ MonoBehaviour:
     height: 269
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -115,21 +167,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 3}
-  - {fileID: 6}
+  - {fileID: 13}
+  - {fileID: 5}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
     width: 2560
     height: 1299
-  m_MinSize: {x: 500, y: 100}
-  m_MaxSize: {x: 40480, y: 16192}
+  m_MinSize: {x: 500, y: 150}
+  m_MaxSize: {x: 40480, y: 24288}
   vertical: 0
-  controlID: 197
+  controlID: 71
   draggingID: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -144,18 +196,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2093
+    x: 2038
     y: 0
-    width: 467
+    width: 522
     height: 1299
   m_MinSize: {x: 275, y: 50}
   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 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -176,12 +228,12 @@ MonoBehaviour:
     height: 1030
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -194,9 +246,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 5}
-  - {fileID: 10}
+  - {fileID: 11}
+  - {fileID: 7}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -209,7 +261,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -231,7 +283,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -252,7 +304,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 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: 12}
-  - {fileID: 4}
+  - {fileID: 14}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1634
     height: 1299
-  m_MinSize: {x: 300, y: 100}
-  m_MaxSize: {x: 24288, y: 16192}
+  m_MinSize: {x: 300, y: 150}
+  m_MaxSize: {x: 24288, y: 24288}
   vertical: 1
-  controlID: 70
+  controlID: 72
   draggingID: 0
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -291,21 +343,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 2}
-  - {fileID: 13}
+  - {fileID: 9}
+  - {fileID: 4}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
     width: 1634
     height: 1030
-  m_MinSize: {x: 300, y: 50}
-  m_MaxSize: {x: 24288, y: 8096}
+  m_MinSize: {x: 300, y: 100}
+  m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 71
+  controlID: 73
   draggingID: 0
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -320,20 +372,19 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 938
+    x: 0
     y: 0
-    width: 696
-    height: 1030
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 19}
+    width: 578
+    height: 430
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 19}
-  - {fileID: 15}
-  - {fileID: 14}
+  - {fileID: 21}
+  - {fileID: 17}
   m_Selected: 0
-  m_LastSelected: 2
---- !u!114 &14
+  m_LastSelected: 0
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -353,10 +404,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1128
-    y: 73
-    width: 621
-    height: 920
+    x: 1056
+    y: 503
+    width: 576
+    height: 579
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -376,7 +427,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -446,7 +497,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -468,7 +519,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 1634
     y: 73
-    width: 457
+    width: 402
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -481,7 +532,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: hero01
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -491,40 +542,40 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/Chapter
+    - Assets/Scripts/GameUI/Combat
     m_Globs: []
-    m_OriginalText: hero01
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Art/Chapter
+  - Assets/Scripts/GameUI/Combat
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 50840000
-    m_LastClickedID: 33872
-    m_ExpandedIDs: 00000000f8810000fc810000fe81000000820000028200000482000006820000088200000a820000c88300000484000000ca9a3b
+    scrollPos: {x: 0, y: 182}
+    m_SelectedIDs: 8aa60000
+    m_LastClickedID: 42634
+    m_ExpandedIDs: 0000000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a4000026a600002ea6000040a6000088a60000b8a90000dca900005838010000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: SceneDependencyCache
-      m_OriginalName: SceneDependencyCache
+      m_Name: Epic Toon FX
+      m_OriginalName: Epic Toon FX
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 33750
+      m_UserData: 43484
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -536,7 +587,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f8810000fa810000fc810000fe81000000820000028200000482000006820000088200000a820000
+    m_ExpandedIDs: 0000000044a4000046a4000048a400004aa400004ca400004ea4000050a4000052a4000054a4000056a4000058a40000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -564,23 +615,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb0000
+    m_ExpandedInstanceIDs: c62300000000000080430100f23d0200d03c02008a440200163f020082410200143b02005a430200184002009a3e0200c43e0200d4410200ee400200341cf7ff0c4d020042b30200727e0200429e020046be0200e2b200007eb50000e87e0000f4b900009cbb000050f90000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: Hero01
+      m_OriginalName: Hero01
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 32398
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 3}
+      m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -591,8 +642,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 407
---- !u!114 &17
+  m_DirectoriesAreaWidth: 221
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -612,9 +663,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2093
+    x: 2038
     y: 73
-    width: 466
+    width: 521
     height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -639,7 +690,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -676,25 +727,25 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 60acffff
-      m_LastClickedID: -21408
-      m_ExpandedIDs: 5c79feff4443ffff088dffff92aaffffc0faffffc6faffffc8faffff
+      m_SelectedIDs: 5c6cfeff
+      m_LastClickedID: -103332
+      m_ExpandedIDs: c8faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: CombatRoot (1)
-        m_OriginalName: CombatRoot (1)
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: -29432
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 7}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -702,7 +753,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -722,10 +773,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 938
+    x: 1056
     y: 73
-    width: 694
-    height: 1009
+    width: 576
+    height: 409
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1078,9 +1129,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -216, y: 48}
+      snapOffset: {x: -216, y: -344}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 1
+      snapCorner: 3
       id: AINavigationOverlay
       index: 12
       layout: 4
@@ -1097,9 +1148,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 21.631733, y: -6.9294667, z: 18.593288}
+    m_Target: {x: 26.02345, y: 0.03280351, z: 6.268601}
     speed: 2
-    m_Value: {x: 21.631733, y: -6.9294667, z: 18.593288}
+    m_Value: {x: 26.02345, y: 0.03280351, z: 6.268601}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1145,13 +1196,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.011906991, y: -0.90323824, z: 0.4283312, w: 0.025256814}
+    m_Target: {x: 0.02076369, y: -0.9458984, z: 0.3179951, w: 0.061997056}
     speed: 2
-    m_Value: {x: 0.01194434, y: -0.9025557, z: 0.42966697, w: 0.025237838}
+    m_Value: {x: 0.02076245, y: -0.9458419, z: 0.31797612, w: 0.061993353}
   m_Size:
-    m_Target: 9.763143
+    m_Target: 1.0869048
     speed: 2
-    m_Value: 9.763143
+    m_Value: 1.0869048
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -1178,7 +1229,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &20
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1200,7 +1251,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 484
     y: 73
-    width: 452
+    width: 570
     height: 1009
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1254,29 +1305,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 452
+      width: 570
       height: 988
-    m_Scale: {x: 0.6026667, y: 0.6026667}
-    m_Translation: {x: 226, y: 494}
+    m_Scale: {x: 0.60837436, y: 0.60837436}
+    m_Translation: {x: 285, y: 494}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -375
-      y: -819.69025
-      width: 750
-      height: 1639.3805
+      x: -468.46155
+      y: -812.00006
+      width: 936.9231
+      height: 1624.0001
     m_MinimalGUI: 1
-  m_defaultScale: 0.6026667
-  m_LastWindowPixelSize: {x: 452, y: 1009}
+  m_defaultScale: 0.60837436
+  m_LastWindowPixelSize: {x: 570, y: 1009}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &21
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}