summaryrefslogtreecommitdiff
path: root/Assets/Art/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Art/Controllers')
-rw-r--r--Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller2
-rw-r--r--Assets/Art/Controllers/Controller_Saionji.controller58
2 files changed, 59 insertions, 1 deletions
diff --git a/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller b/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
index 5a3d00d9..be2a2946 100644
--- a/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
+++ b/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
@@ -117,7 +117,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 5a30133f997de1f47b9794d7ba2f08fa, type: 3}
+ m_Motion: {fileID: 7400000, guid: abd4168255233dd4ea6d4bbfd7568a7d, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
diff --git a/Assets/Art/Controllers/Controller_Saionji.controller b/Assets/Art/Controllers/Controller_Saionji.controller
index a96f9eb4..65a1888b 100644
--- a/Assets/Art/Controllers/Controller_Saionji.controller
+++ b/Assets/Art/Controllers/Controller_Saionji.controller
@@ -178,6 +178,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102100386771471372
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Air_Attk_1
+ m_Speed: 2
+ 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: 7535e92962faa6d46b58efa431459d0e, type: 2}
+ m_Tag: IgnoreRootMotion
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102176878648179266
AnimatorState:
serializedVersion: 5
@@ -360,6 +386,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102417002751357046
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Air_Dash
+ m_Speed: 4
+ 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: 049bfd403d73edb49bed4da44dbbbcad, type: 2}
+ m_Tag: IgnoreRootMotion
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102418584595668128
AnimatorState:
serializedVersion: 5
@@ -892,6 +944,12 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102025302705652370}
m_Position: {x: 2232, y: 252, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102417002751357046}
+ m_Position: {x: -1140, y: 252, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102100386771471372}
+ m_Position: {x: 2460, y: 252, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []