summaryrefslogtreecommitdiff
path: root/Assets/Art/Controllers
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2020-10-17 10:12:31 +0800
committerchai <chaifix@163.com>2020-10-17 10:12:31 +0800
commitf99c4d56cf95c563e95d3965ffd6d8ba33b660ee (patch)
treecbec1f362d5eb0fd2ee67885cae17a527796f41c /Assets/Art/Controllers
parentecb0cbe03d3eef32fdb7b43fa3c60f0f241b0129 (diff)
*ability system
Diffstat (limited to 'Assets/Art/Controllers')
-rw-r--r--Assets/Art/Controllers/Old_AnimContro_Saionji.controller100
1 files changed, 50 insertions, 50 deletions
diff --git a/Assets/Art/Controllers/Old_AnimContro_Saionji.controller b/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
index 32079610..3558ba3f 100644
--- a/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
+++ b/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
@@ -159,28 +159,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101120518788579436
-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: 1102198588836387766}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0.25
- m_TransitionOffset: 0
- m_ExitTime: 0.89285713
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
--- !u!1101 &1101152945117068412
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -467,6 +445,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1101 &1101368332333618172
+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: 1102198588836387766}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.84210527
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &1101454043536429410
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -731,7 +731,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101864297503992142
+--- !u!1101 &1101819769873565308
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -740,20 +740,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102672415632193008}
+ m_DstState: {fileID: 1102630461005910192}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.9050633
+ m_ExitTime: 0.9013158
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101871246713101674
+--- !u!1101 &1101864297503992142
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -762,20 +762,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102398723425775606}
+ m_DstState: {fileID: 1102672415632193008}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.765625
+ m_ExitTime: 0.9050633
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101880269067534016
+--- !u!1101 &1101871246713101674
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -784,20 +784,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102778898719444126}
+ m_DstState: {fileID: 1102398723425775606}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
+ m_ExitTime: 0.765625
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101899058159803444
+--- !u!1101 &1101880269067534016
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -806,20 +806,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102748194168913198}
+ m_DstState: {fileID: 1102778898719444126}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.92718446
+ m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101908395184220016
+--- !u!1101 &1101899058159803444
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -828,20 +828,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102194493929398020}
+ m_DstState: {fileID: 1102748194168913198}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.7540984
+ m_ExitTime: 0.92718446
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101918010191604742
+--- !u!1101 &1101908395184220016
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -850,20 +850,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102834310855589568}
+ m_DstState: {fileID: 1102194493929398020}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.6875
+ m_ExitTime: 0.7540984
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101922226210687350
+--- !u!1101 &1101918010191604742
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -872,14 +872,14 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102943125194423158}
+ m_DstState: {fileID: 1102834310855589568}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.84210527
+ m_ExitTime: 0.6875
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -1037,7 +1037,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 1101120518788579436}
+ - {fileID: 1101819769873565308}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -1047,7 +1047,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400002, guid: ca9525edc4cf2ae4bb31c396a8f791e8, type: 3}
+ m_Motion: {fileID: 7400000, guid: 62f894a651c820a4da794f0f3b700ea6, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -1261,7 +1261,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400002, guid: ca9525edc4cf2ae4bb31c396a8f791e8, type: 3}
+ m_Motion: {fileID: 7400000, guid: 62f894a651c820a4da794f0f3b700ea6, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -2058,7 +2058,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 1101922226210687350}
+ - {fileID: 1101368332333618172}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -2345,7 +2345,7 @@ AnimatorStateMachine:
m_Position: {x: 1308, y: 660, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102834310855589568}
- m_Position: {x: 1548, y: 660, z: 0}
+ m_Position: {x: 1320, y: 480, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102943125194423158}
m_Position: {x: 1788, y: 660, z: 0}
@@ -2429,10 +2429,10 @@ AnimatorStateMachine:
m_Position: {x: 704.2023, y: 1129.8792, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102198588836387766}
- m_Position: {x: 2004, y: 840, z: 0}
+ m_Position: {x: 780, y: 684, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102055897522011614}
- m_Position: {x: 2232, y: 840, z: 0}
+ m_Position: {x: 1008, y: 684, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []