1 files changed, 12 insertions, 1 deletions
diff --git a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs
index 27a51f74..128010d7 100644
--- a/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs
+++ b/Erika/Assets/Scripts/Unit/Components/UnitStatemachine/Common/MoveState.cs
@@ -12,17 +12,28 @@ namespace UnitStates.Common
         {
         }
 
+        public bool useCrossfade;
+
         public override void ModifyNextState(EUnitState state, UnitStateBase nextState)
         {
         }
 
         public override void OnEnter(IStateParam param)
         {
-            m_Motion.Trigger(EAnimationType.Move);
+            if (useCrossfade)
+            {
+                MotionData motion = m_Motion.GetMotionDataByAnimationType(EAnimationType.Move);
+                m_Motion.CrossFade(motion.uid, motion.extraData.crossfadeNormalizedTransitionDuration, motion.extraData.crossfadeNormalizedTimeOffset);
+            }
+            else
+            {
+                m_Motion.Trigger(EAnimationType.Move);
+            }
         }
 
         public override void OnExit()
         {
+            useCrossfade = false;
         }
 
         public override void OnFixedUpdate()