*动画设置

10 files changed, 369 insertions, 45 deletions

diff --git a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Combo03_All.FBX.meta b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Combo03_All.FBX.meta
index 3ec26ac6..06215a98 100644
--- a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Combo03_All.FBX.meta
+++ b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Combo03_All.FBX.meta
@@ -182,6 +182,7 @@ ModelImporter:
     400174: upperarm_twist_01_l
     400176: upperarm_twist_01_r
     7400000: Take 001
+    7400002: Take 001 (1)
     9500000: //RootNode
     2186277476908879412: ImportLogs
   externalObjects: {}
@@ -261,6 +262,34 @@ ModelImporter:
       maskType: 3
       maskSource: {instanceID: 0}
       additiveReferencePoseFrame: 0
+    - serializedVersion: 16
+      name: Take 001 (1)
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 19
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 1
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 1
+      keepOriginalPositionY: 0
+      keepOriginalPositionXZ: 1
+      heightFromFeet: 1
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 1
   meshes:
     lODScreenPercentages: []
diff --git a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Evade_F.FBX.meta b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Evade_F.FBX.meta
index c63abc0d..9ba20868 100644
--- a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Evade_F.FBX.meta
+++ b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Evade_F.FBX.meta
@@ -239,7 +239,35 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Take 001
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 35
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 1
+      loopBlendPositionY: 1
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 1
+      keepOriginalPositionY: 0
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 1
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 1
   meshes:
     lODScreenPercentages: []
diff --git a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Skill03.FBX.meta b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Skill03.FBX.meta
index e9e63c68..010ee674 100644
--- a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Skill03.FBX.meta
+++ b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Skill03.FBX.meta
@@ -242,7 +242,35 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Take 001
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 125
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 1
+      loopBlendPositionY: 1
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 1
+      keepOriginalPositionY: 0
+      keepOriginalPositionXZ: 1
+      heightFromFeet: 1
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 1
   meshes:
     lODScreenPercentages: []
diff --git a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Tumbling_F.FBX.meta b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Tumbling_F.FBX.meta
index 085315a9..0186d474 100644
--- a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Tumbling_F.FBX.meta
+++ b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Tumbling_F.FBX.meta
@@ -240,7 +240,35 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: Take 001
+      takeName: Take 001
+      firstFrame: 0
+      lastFrame: 40
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 0
+      loopBlend: 0
+      loopBlendOrientation: 1
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 1
+      keepOriginalPositionY: 0
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 1
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 1
   meshes:
     lODScreenPercentages: []
diff --git a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Walk_Velocity.FBX.meta b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Walk_Velocity.FBX.meta
index eea95405..f916396a 100644
--- a/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Walk_Velocity.FBX.meta
+++ b/Assets/Art/AnimClips/Frank_Slash_Pack/Animations/Frank_SlashPack_Assassin/FBX Animation/Root_Motion/Frank_RPG_Assassin_Walk_Velocity.FBX.meta
@@ -269,7 +269,7 @@ ModelImporter:
     blendShapeNormalImportMode: 1
     normalSmoothingSource: 0
   importAnimation: 1
-  copyAvatar: 1
+  copyAvatar: 0
   humanDescription:
     serializedVersion: 2
     human:
@@ -1183,8 +1183,7 @@ ModelImporter:
     hasTranslationDoF: 0
     hasExtraRoot: 1
     skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 9c5d4daae8741034db47dd6cb5e66ba2,
-    type: 3}
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
   animationType: 3
   humanoidOversampling: 1
   additionalBone: 0
diff --git a/Assets/Art/AnimClips/Ninja/Attack/Hard_Attk_5.FBX.meta b/Assets/Art/AnimClips/Ninja/Attack/Hard_Attk_5.FBX.meta
index 012aba48..3f3dbe4e 100644
--- a/Assets/Art/AnimClips/Ninja/Attack/Hard_Attk_5.FBX.meta
+++ b/Assets/Art/AnimClips/Ninja/Attack/Hard_Attk_5.FBX.meta
@@ -243,15 +243,15 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
       loopBlendOrientation: 1
       loopBlendPositionY: 1
       loopBlendPositionXZ: 0
       keepOriginalOrientation: 1
-      keepOriginalPositionY: 1
-      keepOriginalPositionXZ: 0
-      heightFromFeet: 0
+      keepOriginalPositionY: 0
+      keepOriginalPositionXZ: 1
+      heightFromFeet: 1
       mirror: 0
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
diff --git a/Assets/Art/AnimClips/Ninja/Basic/Run_Turn180.FBX.meta b/Assets/Art/AnimClips/Ninja/Basic/Run_Turn180.FBX.meta
index 35558fc8..31a9c755 100644
--- a/Assets/Art/AnimClips/Ninja/Basic/Run_Turn180.FBX.meta
+++ b/Assets/Art/AnimClips/Ninja/Basic/Run_Turn180.FBX.meta
@@ -239,15 +239,15 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 1
+      loopTime: 0
       loopBlend: 0
-      loopBlendOrientation: 0
+      loopBlendOrientation: 1
       loopBlendPositionY: 1
       loopBlendPositionXZ: 0
-      keepOriginalOrientation: 0
-      keepOriginalPositionY: 1
+      keepOriginalOrientation: 1
+      keepOriginalPositionY: 0
       keepOriginalPositionXZ: 0
-      heightFromFeet: 0
+      heightFromFeet: 1
       mirror: 0
       bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
       curves: []
diff --git a/Assets/Art/AnimControllers/AnimContro_Saionji.controller b/Assets/Art/AnimControllers/AnimContro_Saionji.controller
index 47b2ac27..ceb62f44 100644
--- a/Assets/Art/AnimControllers/AnimContro_Saionji.controller
+++ b/Assets/Art/AnimControllers/AnimContro_Saionji.controller
@@ -159,7 +159,7 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &1101197939501959604
+--- !u!1101 &1101284656147292312
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -168,14 +168,36 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions: []
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102486787591487954}
+  m_DstState: {fileID: 1102502363569234842}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0.8648649
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101300044741256590
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102114892237885210}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9375
   m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -269,6 +291,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101513795353982864
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102885414272778094}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.7916667
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &1101521310115202102
 AnimatorStateTransition:
   m_ObjectHideFlags: 3
@@ -313,6 +357,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &1101585925134218930
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102486787591487954}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.8648649
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &1101871246713101674
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -423,7 +489,7 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &1101942552490006634
+--- !u!1101 &1101946530792804278
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -432,20 +498,20 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions: []
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102885414272778094}
+  m_DstState: {fileID: 1102613540171669876}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0.88
+  m_ExitTime: 0.68085104
   m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &1101946530792804278
+--- !u!1101 &1101970544875295394
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -454,14 +520,14 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions: []
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 1102613540171669876}
+  m_DstState: {fileID: 1102078419924435696}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0.68085104
+  m_ExitTime: 0.9032258
   m_HasExitTime: 1
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
@@ -515,6 +581,86 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102078419924435696
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Hard_Attk_5
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101513795353982864}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 379aa4625870291499ad27d9b80958bd, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102114892237885210
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Turn180
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101284656147292312}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: e87fceba8b7403b41983d13191350b8b, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102194314237528028
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Frank_RPG_Assassin_Tumbling_F
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 136effee3ff2b814f98e59f7cc1ff25a, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102194493929398020
 AnimatorState:
   serializedVersion: 5
@@ -622,6 +768,58 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102479893414609916
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Assassin_Skill03
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: a2d6b4d9cf4dee7489f3a06d906da0d7, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102485149506081126
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Frank_RPG_Assassin_Evade_F
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: b51208d85a6c54e48b65909bb785d278, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102486787591487954
 AnimatorState:
   serializedVersion: 5
@@ -629,11 +827,11 @@ AnimatorState:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Skill3
+  m_Name: Frank_RPG_Assassin_Combo03_All
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 1101942552490006634}
+  - {fileID: 1101970544875295394}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -659,7 +857,8 @@ AnimatorState:
   m_Name: Assassin Idle
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 1101300044741256590}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -1010,7 +1209,7 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 1101197939501959604}
+  - {fileID: 1101585925134218930}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -1198,10 +1397,25 @@ AnimatorStateMachine:
     m_Position: {x: 1632, y: 312, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102486787591487954}
-    m_Position: {x: 1692, y: 1032, z: 0}
+    m_Position: {x: 1740, y: 744, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 1102502363569234842}
-    m_Position: {x: 1128, y: 912, z: 0}
+    m_Position: {x: 1248, y: 1056, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102479893414609916}
+    m_Position: {x: 1764, y: 888, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102485149506081126}
+    m_Position: {x: 1752, y: 948, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102194314237528028}
+    m_Position: {x: 1752, y: 1008, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102078419924435696}
+    m_Position: {x: 1872, y: 828, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102114892237885210}
+    m_Position: {x: 1524, y: 1056, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index 066a4aec..5f641eb2 100644
--- a/Assets/Scenes/Demo/SaionjiShowOff.unity
+++ b/Assets/Scenes/Demo/SaionjiShowOff.unity
@@ -496,7 +496,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_BindingMode: 1
-  m_FollowOffset: {x: -0.0033898354, y: 2.976001, z: -7.104233}
+  m_FollowOffset: {x: -0.0033898354, y: 2.1522582, z: -7.104233}
   m_XDamping: 0
   m_YDamping: 0
   m_ZDamping: 0
@@ -5301,7 +5301,7 @@ Camera:
     height: 1
   near clip plane: 0.1
   far clip plane: 100
-  field of view: 60.400204
+  field of view: 57.132416
   orthographic: 0
   orthographic size: 5
   m_Depth: -1
@@ -5326,8 +5326,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 534669902}
-  m_LocalRotation: {x: 0.19705053, y: 0.00007397188, z: -0.000014867703, w: 0.98039335}
-  m_LocalPosition: {x: 2.05, y: 0.049999952, z: -1.2200003}
+  m_LocalRotation: {x: 0.14655274, y: 0.00023932688, z: -0.000035456844, w: 0.98920286}
+  m_LocalPosition: {x: 2.4494188, y: -0.78, z: -1.2200003}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1241327946}
@@ -5585,7 +5585,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 705651392}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.8805814, y: 0.10625702, z: -0.14796753}
+  m_LocalPosition: {x: 3.2800002, y: 0.1, z: -0.14796753}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -5646,12 +5646,12 @@ PrefabInstance:
     - target: {fileID: 9190676758457967543, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.5288372
+      value: -0.73
       objectReference: {fileID: 0}
     - target: {fileID: 9190676758457967543, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.12
+      value: 0.1
       objectReference: {fileID: 0}
     - target: {fileID: 9190676758457967543, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
         type: 3}
@@ -5768,8 +5768,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 801756637}
-  m_LocalRotation: {x: 0.19705053, y: 0.00007397188, z: -0.000014867703, w: 0.98039335}
-  m_LocalPosition: {x: 2.05, y: 0.049999952, z: -1.2200003}
+  m_LocalRotation: {x: 0.14655274, y: 0.00023932688, z: -0.000035456844, w: 0.98920286}
+  m_LocalPosition: {x: 2.4494188, y: -0.78, z: -1.2200003}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 433912768}
@@ -5838,8 +5838,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 804880616}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -1.84, z: 10.64}
-  m_LocalScale: {x: 1, y: 1, z: 3.97}
+  m_LocalPosition: {x: -0, y: -1.84, z: 6.96}
+  m_LocalScale: {x: 1.66, y: 1, z: 3.97}
   m_Children: []
   m_Father: {fileID: 788647719}
   m_RootOrder: 3
@@ -6359,7 +6359,7 @@ PrefabInstance:
     - target: {fileID: 9190676758457967543, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.09251404
+      value: 0.1
       objectReference: {fileID: 0}
     - target: {fileID: 9190676758457967543, guid: 8bd54aeb1f5bb9145a9a681ac1553364,
         type: 3}
@@ -6914,7 +6914,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1462768861}
   m_LocalRotation: {x: -0, y: 0.6185156, z: -0, w: 0.7857725}
-  m_LocalPosition: {x: 4.0300193, y: 1.674, z: 3.9500086}
+  m_LocalPosition: {x: 4.0300193, y: 1.78, z: 3.9500086}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 442560484}
diff --git a/Assets/Scripts/Test/RootConstainTest.cs b/Assets/Scripts/Test/RootConstainTest.cs
index 91d37062..7936fd25 100644
--- a/Assets/Scripts/Test/RootConstainTest.cs
+++ b/Assets/Scripts/Test/RootConstainTest.cs
@@ -26,8 +26,6 @@ public class RootConstainTest : MonoBehaviour
 			Vector3 position = transform.position;

 			position.x += animator.deltaPosition.x;

 			position.y += animator.deltaPosition.y;

-			//position.y = Mathf.Max(0, position.y);

-			//position.y = 0;

 

 			transform.position = position;