aboutsummaryrefslogtreecommitdiffstats
path: root/Assets/Animations/Prototype
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Animations/Prototype')
-rw-r--r--Assets/Animations/Prototype/Land.anim2
-rw-r--r--Assets/Animations/Prototype/Player.controller322
2 files changed, 161 insertions, 163 deletions
diff --git a/Assets/Animations/Prototype/Land.anim b/Assets/Animations/Prototype/Land.anim
index a351ebe..f6a957a 100644
--- a/Assets/Animations/Prototype/Land.anim
+++ b/Assets/Animations/Prototype/Land.anim
@@ -54,7 +54,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
- m_LoopTime: 1
+ m_LoopTime: 0
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
diff --git a/Assets/Animations/Prototype/Player.controller b/Assets/Animations/Prototype/Player.controller
index 7ab32e2..8f5c56a 100644
--- a/Assets/Animations/Prototype/Player.controller
+++ b/Assets/Animations/Prototype/Player.controller
@@ -1,27 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1101 &-9086515956729898478
-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: 6109551287401904689}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0
- m_TransitionOffset: 0.002329318
- m_ExitTime: 1
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
--- !u!1101 &-8626510112679481558
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -52,8 +30,8 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Stop
+ - m_ConditionMode: 2
+ m_ConditionEvent: moving
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3614093525302314329}
@@ -69,16 +47,19 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &-8037084840048493620
+--- !u!1101 &-6878608224570280004
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
- m_Conditions: []
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: fall
+ m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 9132405649074356357}
+ m_DstState: {fileID: 4014801967865307794}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
@@ -86,12 +67,12 @@ AnimatorStateTransition:
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 1
- m_HasExitTime: 1
+ m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &-6878608224570280004
+--- !u!1101 &-6106642904432627373
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -100,51 +81,23 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionEvent: isAirborn
+ m_ConditionEvent: moving
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 4014801967865307794}
+ m_DstState: {fileID: 6109551287401904689}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
- m_ExitTime: 1
+ m_ExitTime: 0
m_HasExitTime: 0
- m_HasFixedDuration: 0
+ m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1107 &-6872323855171964326
-AnimatorStateMachine:
- serializedVersion: 6
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Running
- m_ChildStates:
- - serializedVersion: 1
- m_State: {fileID: -1407507127539071288}
- m_Position: {x: 460, y: -50, z: 0}
- - serializedVersion: 1
- m_State: {fileID: 6109551287401904689}
- m_Position: {x: 460, y: 50, z: 0}
- - serializedVersion: 1
- m_State: {fileID: 3614093525302314329}
- m_Position: {x: 460, y: 160, z: 0}
- m_ChildStateMachines: []
- m_AnyStateTransitions: []
- m_EntryTransitions: []
- m_StateMachineTransitions: {}
- m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 120, y: -250, z: 0}
- m_EntryPosition: {x: 480, y: -150, z: 0}
- m_ExitPosition: {x: 120, y: -210, z: 0}
- m_ParentStateMachinePosition: {x: 460, y: 270, z: 0}
- m_DefaultState: {fileID: -1407507127539071288}
---- !u!1101 &-6298420612714592867
+--- !u!1101 &-4025803860441014948
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -152,20 +105,20 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 2
- m_ConditionEvent: isAirborn
+ - m_ConditionMode: 1
+ m_ConditionEvent: jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: 4014801967865307794}
- m_Solo: 1
+ m_DstState: {fileID: -3360105894821777026}
+ m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0
- m_HasExitTime: 1
- m_HasFixedDuration: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@@ -208,7 +161,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 2651979714303655906}
- - {fileID: -8037084840048493620}
+ - {fileID: -1449902651349316248}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -224,6 +177,53 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &-1631153991909036912
+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: 9132405649074356357}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-1449902651349316248
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: airborn
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: 0}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 1
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &-1407507127539071288
AnimatorState:
serializedVersion: 6
@@ -262,31 +262,36 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 9132405649074356357}
- m_Position: {x: 310, y: 110, z: 0}
+ m_Position: {x: 250, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: -3360105894821777026}
- m_Position: {x: 450, y: 240, z: 0}
+ m_Position: {x: 450, y: 210, z: 0}
- serializedVersion: 1
m_State: {fileID: 4014801967865307794}
- m_Position: {x: 310, y: 350, z: 0}
+ m_Position: {x: 300, y: 320, z: 0}
- serializedVersion: 1
m_State: {fileID: -3109416563068774462}
- m_Position: {x: 170, y: 240, z: 0}
- m_ChildStateMachines:
+ m_Position: {x: 200, y: 210, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: -1407507127539071288}
+ m_Position: {x: 510, y: 50, z: 0}
- serializedVersion: 1
- m_StateMachine: {fileID: -6872323855171964326}
- m_Position: {x: 580, y: 110, z: 0}
+ m_State: {fileID: 3614093525302314329}
+ m_Position: {x: 510, y: -70, z: 0}
+ - serializedVersion: 1
+ m_State: {fileID: 6109551287401904689}
+ m_Position: {x: 750, y: -10, z: 0}
+ m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: -6878608224570280004}
- m_EntryTransitions: []
- m_StateMachineTransitions:
- - first: {fileID: -6872323855171964326}
- second:
- - {fileID: 1807663489023768798}
+ - {fileID: -4025803860441014948}
+ m_EntryTransitions:
+ - {fileID: 9028498521707221212}
+ m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 360, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
- m_ExitPosition: {x: 830, y: 50, z: 0}
+ m_AnyStatePosition: {x: 610, y: 320, z: 0}
+ m_EntryPosition: {x: 270, y: 110, z: 0}
+ m_ExitPosition: {x: 60, y: 70, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 9132405649074356357}
--- !u!91 &9100000
@@ -298,42 +303,30 @@ AnimatorController:
m_Name: Player
serializedVersion: 5
m_AnimatorParameters:
- - m_Name: isRunning
+ - m_Name: moving
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
- - m_Name: isAirborn
- m_Type: 4
- m_DefaultFloat: 0
- m_DefaultInt: 0
- m_DefaultBool: 0
- m_Controller: {fileID: 0}
- - m_Name: Jump
- m_Type: 9
- m_DefaultFloat: 0
- m_DefaultInt: 0
- m_DefaultBool: 0
- m_Controller: {fileID: 0}
- - m_Name: Land
+ m_Controller: {fileID: 9100000}
+ - m_Name: jump
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
- - m_Name: Run
+ m_Controller: {fileID: 9100000}
+ - m_Name: fall
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
- - m_Name: Stop
- m_Type: 9
+ m_Controller: {fileID: 9100000}
+ - m_Name: airborn
+ m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@@ -356,7 +349,7 @@ AnimatorTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionEvent: Jump
+ m_ConditionEvent: jump
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3360105894821777026}
@@ -372,8 +365,8 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: Land
+ - m_ConditionMode: 2
+ m_ConditionEvent: airborn
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -3109416563068774462}
@@ -411,56 +404,6 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &3059356124330920494
-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: Jump
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -3360105894821777026}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0
- m_TransitionOffset: 0
- m_ExitTime: 1
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
---- !u!1101 &3124419127409144405
-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: Run
- m_EventTreshold: 0
- m_DstStateMachine: {fileID: -6872323855171964326}
- m_DstState: {fileID: 0}
- m_Solo: 0
- m_Mute: 0
- m_IsExit: 0
- serializedVersion: 3
- m_TransitionDuration: 0
- m_TransitionOffset: 0
- m_ExitTime: 1
- m_HasExitTime: 1
- m_HasFixedDuration: 1
- m_InterruptionSource: 0
- m_OrderedInterruption: 1
- m_CanTransitionToSelf: 1
--- !u!1102 &3614093525302314329
AnimatorState:
serializedVersion: 6
@@ -473,6 +416,8 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 6564945159879590472}
+ - {fileID: -6106642904432627373}
+ - {fileID: -1631153991909036912}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -488,6 +433,20 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1109 &3809652522530214263
+AnimatorTransition:
+ 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: 9132405649074356357}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
--- !u!1102 &4014801967865307794
AnimatorState:
serializedVersion: 6
@@ -500,7 +459,6 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 2585772133770462678}
- - {fileID: -6298420612714592867}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -528,7 +486,6 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -8388212156864459442}
- - {fileID: -9086515956729898478}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -588,6 +545,48 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1101 &8602053559700435507
+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: moving
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1407507127539071288}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1109 &9028498521707221212
+AnimatorTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: moving
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -1407507127539071288}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 1
--- !u!1102 &9132405649074356357
AnimatorState:
serializedVersion: 6
@@ -599,8 +598,7 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- - {fileID: 3124419127409144405}
- - {fileID: 3059356124330920494}
+ - {fileID: 8602053559700435507}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-20 10:40:24 +0000