summaryrefslogtreecommitdiff
path: root/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller')
-rw-r--r--Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller78
1 files changed, 42 insertions, 36 deletions
diff --git a/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller b/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
index bfe90004..740eb66d 100644
--- a/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
+++ b/Assets/Art/Controllers/Controller_ArmorSoldierWhite.controller
@@ -22,28 +22,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
---- !u!1101 &1101498061417253058
-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: 1102574134003249206}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.25
- m_TransitionOffset: 0
- m_ExitTime: 0.8076923
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
--- !u!1102 &1102186699016087200
AnimatorState:
serializedVersion: 5
@@ -54,8 +32,7 @@ AnimatorState:
m_Name: Hurt_Front
m_Speed: 1
m_CycleOffset: 0
- m_Transitions:
- - {fileID: 1101498061417253058}
+ m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -71,7 +48,7 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1102 &1102204654550523522
+--- !u!1102 &1102574134003249206
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
@@ -91,20 +68,46 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400008, guid: 62f894a651c820a4da794f0f3b700ea6, type: 3}
+ m_Motion: {fileID: 7400000, guid: 64ed261a016005342b0e4d613bb64861, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1102 &1102574134003249206
+--- !u!1102 &1102599707197316612
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Hurt_Air
+ 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: b1bbc55421839a14191ab1babe4aeb63, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1102 &1102650587665124062
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: StandIdle
+ m_Name: New State
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
@@ -117,7 +120,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 64ed261a016005342b0e4d613bb64861, type: 2}
+ m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -133,14 +136,17 @@ AnimatorStateMachine:
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
- m_State: {fileID: 1102204654550523522}
- m_Position: {x: 708, y: 204, z: 0}
- - serializedVersion: 1
m_State: {fileID: 1102574134003249206}
- m_Position: {x: 36, y: 252, z: 0}
+ m_Position: {x: -276, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102186699016087200}
- m_Position: {x: 288, y: 192, z: 0}
+ m_Position: {x: -504, y: 120, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102650587665124062}
+ m_Position: {x: 228, y: 120, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102599707197316612}
+ m_Position: {x: -504, y: 180, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@@ -148,6 +154,6 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ExitPosition: {x: 252, y: 24, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
- m_DefaultState: {fileID: 1102574134003249206}
+ m_DefaultState: {fileID: 1102650587665124062}