diff --git a/Sources/Animations/ToriaMainController.controller b/Sources/Animations/ToriaMainController.controller index 7c3a17bc..714fb8ec 100644 --- a/Sources/Animations/ToriaMainController.controller +++ b/Sources/Animations/ToriaMainController.controller @@ -372,19 +372,19 @@ AnimatorStateMachine: m_Position: {x: 370, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -5543411188675245712} - m_Position: {x: 80, y: -30, z: 0} + m_Position: {x: 70, y: -260, z: 0} - serializedVersion: 1 m_State: {fileID: -1313778480453751101} - m_Position: {x: 60, y: 120, z: 0} + m_Position: {x: 70, y: -210, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: - {fileID: -1931153641401969202} - m_AnyStatePosition: {x: -150, y: 40, z: 0} + m_AnyStatePosition: {x: 40, y: 40, z: 0} m_EntryPosition: {x: 310, y: -120, z: 0} - m_ExitPosition: {x: 720, y: 60, z: 0} + m_ExitPosition: {x: 690, y: 50, z: 0} m_ParentStateMachinePosition: {x: 670, y: -130, z: 0} m_DefaultState: {fileID: -2382883915593464437} --- !u!114 &-8930624701029723617 @@ -708,34 +708,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-8708794718147743283 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Drink - m_EventTreshold: 0 - - m_ConditionMode: 2 - m_ConditionEvent: usingRightHand - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1313778480453751101} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.55 - m_TransitionOffset: 0.55 - m_ExitTime: 0.75000006 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1109 &-8687447019825654439 AnimatorTransition: m_ObjectHideFlags: 1 @@ -911,8 +883,7 @@ AnimatorState: m_Name: Pick Up Right hand m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -160865950913035107} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -1682,8 +1653,7 @@ AnimatorState: m_Name: Pick Up Left Hand m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 6601526279044107154} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -2881,6 +2851,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5981354934216818064 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Drink + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: usingRightHand + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2382883915593464437} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.55 + m_TransitionOffset: 0.25 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!206 &-5970406462082585971 BlendTree: m_ObjectHideFlags: 1 @@ -3186,8 +3184,7 @@ AnimatorState: m_Name: Pick Up Right hand m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 5581262524315150174} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -7106,8 +7103,7 @@ AnimatorState: m_Name: Pick Up Left Hand m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 2054223239367027945} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -7173,34 +7169,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-1222473256408152349 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Eat - m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: usingRightHand - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -8529267728397746160} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.55 - m_TransitionOffset: 0.55 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-1221114283255932794 AnimatorState: serializedVersion: 6 @@ -7465,6 +7433,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-968260217053974488 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Eat + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: usingRightHand + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7239415842714381813} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.55 + m_TransitionOffset: 0.55 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-959946624040543965 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -8078,28 +8074,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-160865950913035107 -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: 3327662357873538777} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.38 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-139408523221655204 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -9350,20 +9324,20 @@ AnimatorStateMachine: - {fileID: -2108005851219352118} m_EntryTransitions: [] m_StateMachineTransitions: - - first: {fileID: -7448563200367427012} - second: - - {fileID: -748102009989761206} - - first: {fileID: 411531533518700860} + - first: {fileID: 725683335656276177} second: [] - first: {fileID: -1579995056181703242} second: [] + - first: {fileID: -1395468597926689958} + second: [] + - first: {fileID: 411531533518700860} + second: [] + - first: {fileID: -7448563200367427012} + second: + - {fileID: -748102009989761206} - first: {fileID: 6482788772242386950} second: - {fileID: -63830430343019236} - - first: {fileID: -1395468597926689958} - second: [] - - first: {fileID: 725683335656276177} - second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -840, y: 410, z: 0} m_EntryPosition: {x: -90, y: 350, z: 0} @@ -10034,20 +10008,20 @@ AnimatorStateMachine: m_Position: {x: 400, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: -8529267728397746160} - m_Position: {x: 30, y: 110, z: 0} + m_Position: {x: 10, y: -120, z: 0} - serializedVersion: 1 m_State: {fileID: -7510262218976065747} - m_Position: {x: 40, y: 30, z: 0} + m_Position: {x: 10, y: -170, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: - {fileID: -4738892171723079579} - m_AnyStatePosition: {x: -260, y: 60, z: 0} + m_AnyStatePosition: {x: 70, y: 70, z: 0} m_EntryPosition: {x: 420, y: 250, z: 0} m_ExitPosition: {x: 760, y: 70, z: 0} - m_ParentStateMachinePosition: {x: 800, y: -10, z: 0} + m_ParentStateMachinePosition: {x: 530, y: -100, z: 0} m_DefaultState: {fileID: 3327662357873538777} --- !u!1101 &661568260245737055 AnimatorStateTransition: @@ -19692,28 +19666,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &2054223239367027945 -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: -4858198611675600759} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.38 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &2068417564913779826 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -20048,34 +20000,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &2321733719371246818 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Eat - m_EventTreshold: 0 - - m_ConditionMode: 2 - m_ConditionEvent: usingRightHand - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7510262218976065747} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.55 - m_TransitionOffset: 0.55 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &2380044907357951534 AnimatorState: serializedVersion: 6 @@ -20980,6 +20904,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &3499185835172548715 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Eat + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: usingRightHand + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3327662357873538777} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.55 + m_TransitionOffset: 0.55 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3526913920586604733 AnimatorState: serializedVersion: 6 @@ -22636,28 +22588,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &5581262524315150174 -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: -2382883915593464437} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.38 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &5628049190715659510 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -23658,28 +23588,6 @@ MonoBehaviour: notifyServer: 0 useFixedDuration: 1 fixedDuration: 0.3 ---- !u!1101 &6601526279044107154 -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: 7239415842714381813} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.38 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1109 &6619128042508312759 AnimatorTransition: m_ObjectHideFlags: 1 @@ -23886,34 +23794,6 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 ---- !u!1101 &6894763011379703901 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Drink - m_EventTreshold: 0 - - m_ConditionMode: 1 - m_ConditionEvent: usingRightHand - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -5543411188675245712} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.55 - m_TransitionOffset: 0.55 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &6932059071774427762 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -24153,12 +24033,12 @@ AnimatorStateMachine: - {fileID: -3608484024256401941} - {fileID: 3140406177344519732} - {fileID: -4242407590833523230} - - {fileID: 6894763011379703901} - - {fileID: -8708794718147743283} - - {fileID: -1222473256408152349} - - {fileID: 2321733719371246818} - {fileID: -5011973266676856927} - {fileID: -7852093631680206620} + - {fileID: -968260217053974488} + - {fileID: 3499185835172548715} + - {fileID: -5981354934216818064} + - {fileID: 7351713263963190847} m_EntryTransitions: [] m_StateMachineTransitions: - first: {fileID: -8771091911677747698} @@ -24425,6 +24305,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &7351713263963190847 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Drink + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: usingRightHand + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4858198611675600759} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.55 + m_TransitionOffset: 0.25 + m_ExitTime: 0.75000006 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7428377864246682609 AnimatorStateTransition: m_ObjectHideFlags: 1