diff options
| author | chai <chaifix@163.com> | 2020-11-18 20:27:56 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2020-11-18 20:27:56 +0800 |
| commit | 9a5444b6eadbdafe5a2abb829fba600523343f11 (patch) | |
| tree | 0a914e50c2592c86af93a81ec7a770f3a5676d40 /Assets/Art/Controllers | |
| parent | 71b23799b537869e2bd7ca5f070f65fdd22114a9 (diff) | |
| parent | 37b2c83f0ed383374ca6d9dcdf4d7111f2731367 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/Erika
Diffstat (limited to 'Assets/Art/Controllers')
| -rw-r--r-- | Assets/Art/Controllers/Controller_Saionji.controller | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/Assets/Art/Controllers/Controller_Saionji.controller b/Assets/Art/Controllers/Controller_Saionji.controller index f03025f6..0ac7ce7a 100644 --- a/Assets/Art/Controllers/Controller_Saionji.controller +++ b/Assets/Art/Controllers/Controller_Saionji.controller @@ -393,7 +393,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: SuperKickCombo + m_Name: SuperKickCombo_ m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -490,6 +490,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102461443478983692 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SuperKickCombo + 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: 97e147ac4ea1e8a42a19f888331ddd52, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102480476022316750 AnimatorState: serializedVersion: 5 @@ -1008,6 +1034,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1102026075718825746} m_Position: {x: -252, y: 552, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102461443478983692} + m_Position: {x: 1320, y: 312, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] |