summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Art/Controllers/Old_AnimContro_Saionji.controller86
-rw-r--r--Assets/Scenes/Demo/SaionjiShowOff.unity4
2 files changed, 71 insertions, 19 deletions
diff --git a/Assets/Art/Controllers/Old_AnimContro_Saionji.controller b/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
index bc316299..481f5e6c 100644
--- a/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
+++ b/Assets/Art/Controllers/Old_AnimContro_Saionji.controller
@@ -445,7 +445,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101454043536429410
+--- !u!1101 &1101436651754219900
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -454,20 +454,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102852239038014270}
+ 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.921875
+ m_ExitTime: 0.9318182
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101469266850163080
+--- !u!1101 &1101454043536429410
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -476,20 +476,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102214570154610238}
+ m_DstState: {fileID: 1102852239038014270}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.8897059
+ m_ExitTime: 0.921875
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101482523402386996
+--- !u!1101 &1101469266850163080
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -498,20 +498,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102261251114294676}
+ m_DstState: {fileID: 1102214570154610238}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.5833334
+ m_ExitTime: 0.8897059
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101493030511974042
+--- !u!1101 &1101482523402386996
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -520,20 +520,20 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102675898855556462}
+ m_DstState: {fileID: 1102261251114294676}
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.5833334
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &1101513795353982864
+--- !u!1101 &1101493030511974042
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -542,14 +542,14 @@ AnimatorStateTransition:
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 1102885414272778094}
+ m_DstState: {fileID: 1102675898855556462}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.7916667
+ m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -907,6 +907,28 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1101 &1101966909240260662
+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.7916667
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &1101970544875295394
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -1042,7 +1064,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 1101513795353982864}
+ - {fileID: 1101966909240260662}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -1192,6 +1214,33 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1102 &1102198588836387766
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Take 001
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions:
+ - {fileID: 1101436651754219900}
+ 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: ca9525edc4cf2ae4bb31c396a8f791e8, type: 3}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1102 &1102214570154610238
AnimatorState:
serializedVersion: 5
@@ -2294,7 +2343,7 @@ AnimatorStateMachine:
m_Position: {x: 1752, y: 1008, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102078419924435696}
- m_Position: {x: 1872, y: 828, z: 0}
+ m_Position: {x: 2016, y: 744, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102114892237885210}
m_Position: {x: 1524, y: 1056, z: 0}
@@ -2352,6 +2401,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102389447397930402}
m_Position: {x: 704.2023, y: 1129.8792, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 1102198588836387766}
+ m_Position: {x: 2016, y: 816, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index 958819c1..cb2765f8 100644
--- a/Assets/Scenes/Demo/SaionjiShowOff.unity
+++ b/Assets/Scenes/Demo/SaionjiShowOff.unity
@@ -5290,7 +5290,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 534669902}
- m_LocalRotation: {x: 0.14655274, y: 0.00023932691, z: -0.00003545685, w: 0.98920286}
+ 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:
@@ -5656,7 +5656,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 801756637}
- m_LocalRotation: {x: 0.14655274, y: 0.00023932691, z: -0.00003545685, w: 0.98920286}
+ 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: