Skip to content

Commit 30aab35

Browse files
added a landing animation
1 parent c2b601b commit 30aab35

File tree

3 files changed

+283
-19
lines changed

3 files changed

+283
-19
lines changed
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Player Landing
10+
serializedVersion: 7
11+
m_Legacy: 0
12+
m_Compressed: 0
13+
m_UseHighQualityCurve: 1
14+
m_RotationCurves: []
15+
m_CompressedRotationCurves: []
16+
m_EulerCurves: []
17+
m_PositionCurves: []
18+
m_ScaleCurves:
19+
- curve:
20+
serializedVersion: 2
21+
m_Curve:
22+
- serializedVersion: 3
23+
time: 0
24+
value: {x: 1, y: 1, z: 1}
25+
inSlope: {x: 0, y: 0, z: 0}
26+
outSlope: {x: 0, y: 0, z: 0}
27+
tangentMode: 0
28+
weightedMode: 0
29+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
30+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
31+
- serializedVersion: 3
32+
time: 0.033333335
33+
value: {x: 1.4, y: 0.5, z: 1}
34+
inSlope: {x: 0, y: 0, z: 0}
35+
outSlope: {x: 0, y: 0, z: 0}
36+
tangentMode: 0
37+
weightedMode: 0
38+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
39+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
40+
- serializedVersion: 3
41+
time: 0.11666667
42+
value: {x: 1, y: 1, z: 1}
43+
inSlope: {x: 0, y: 0, z: 0}
44+
outSlope: {x: 0, y: 0, z: 0}
45+
tangentMode: 0
46+
weightedMode: 0
47+
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
48+
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
49+
m_PreInfinity: 2
50+
m_PostInfinity: 2
51+
m_RotationOrder: 4
52+
path: Sprite
53+
m_FloatCurves: []
54+
m_PPtrCurves: []
55+
m_SampleRate: 60
56+
m_WrapMode: 0
57+
m_Bounds:
58+
m_Center: {x: 0, y: 0, z: 0}
59+
m_Extent: {x: 0, y: 0, z: 0}
60+
m_ClipBindingConstant:
61+
genericBindings:
62+
- serializedVersion: 2
63+
path: 850496168
64+
attribute: 3
65+
script: {fileID: 0}
66+
typeID: 4
67+
customType: 0
68+
isPPtrCurve: 0
69+
isIntCurve: 0
70+
isSerializeReferenceCurve: 0
71+
pptrCurveMapping: []
72+
m_AnimationClipSettings:
73+
serializedVersion: 2
74+
m_AdditiveReferencePoseClip: {fileID: 0}
75+
m_AdditiveReferencePoseTime: 0
76+
m_StartTime: 0
77+
m_StopTime: 0.11666667
78+
m_OrientationOffsetY: 0
79+
m_Level: 0
80+
m_CycleOffset: 0
81+
m_HasAdditiveReferencePose: 0
82+
m_LoopTime: 1
83+
m_LoopBlend: 0
84+
m_LoopBlendOrientation: 0
85+
m_LoopBlendPositionY: 0
86+
m_LoopBlendPositionXZ: 0
87+
m_KeepOriginalOrientation: 0
88+
m_KeepOriginalPositionY: 1
89+
m_KeepOriginalPositionXZ: 0
90+
m_HeightFromFeet: 0
91+
m_Mirror: 0
92+
m_EditorCurves:
93+
- serializedVersion: 2
94+
curve:
95+
serializedVersion: 2
96+
m_Curve:
97+
- serializedVersion: 3
98+
time: 0
99+
value: 1
100+
inSlope: 0
101+
outSlope: 0
102+
tangentMode: 136
103+
weightedMode: 0
104+
inWeight: 0.33333334
105+
outWeight: 0.33333334
106+
- serializedVersion: 3
107+
time: 0.033333335
108+
value: 1.4
109+
inSlope: 0
110+
outSlope: 0
111+
tangentMode: 136
112+
weightedMode: 0
113+
inWeight: 0.33333334
114+
outWeight: 0.33333334
115+
- serializedVersion: 3
116+
time: 0.11666667
117+
value: 1
118+
inSlope: 0
119+
outSlope: 0
120+
tangentMode: 136
121+
weightedMode: 0
122+
inWeight: 0.33333334
123+
outWeight: 0.33333334
124+
m_PreInfinity: 2
125+
m_PostInfinity: 2
126+
m_RotationOrder: 4
127+
attribute: m_LocalScale.x
128+
path: Sprite
129+
classID: 4
130+
script: {fileID: 0}
131+
flags: 0
132+
- serializedVersion: 2
133+
curve:
134+
serializedVersion: 2
135+
m_Curve:
136+
- serializedVersion: 3
137+
time: 0
138+
value: 1
139+
inSlope: 0
140+
outSlope: 0
141+
tangentMode: 136
142+
weightedMode: 0
143+
inWeight: 0.33333334
144+
outWeight: 0.33333334
145+
- serializedVersion: 3
146+
time: 0.033333335
147+
value: 0.5
148+
inSlope: 0
149+
outSlope: 0
150+
tangentMode: 136
151+
weightedMode: 0
152+
inWeight: 0.33333334
153+
outWeight: 0.33333334
154+
- serializedVersion: 3
155+
time: 0.11666667
156+
value: 1
157+
inSlope: 0
158+
outSlope: 0
159+
tangentMode: 136
160+
weightedMode: 0
161+
inWeight: 0.33333334
162+
outWeight: 0.33333334
163+
m_PreInfinity: 2
164+
m_PostInfinity: 2
165+
m_RotationOrder: 4
166+
attribute: m_LocalScale.y
167+
path: Sprite
168+
classID: 4
169+
script: {fileID: 0}
170+
flags: 0
171+
- serializedVersion: 2
172+
curve:
173+
serializedVersion: 2
174+
m_Curve:
175+
- serializedVersion: 3
176+
time: 0
177+
value: 1
178+
inSlope: 0
179+
outSlope: 0
180+
tangentMode: 136
181+
weightedMode: 0
182+
inWeight: 0.33333334
183+
outWeight: 0.33333334
184+
- serializedVersion: 3
185+
time: 0.11666667
186+
value: 1
187+
inSlope: 0
188+
outSlope: 0
189+
tangentMode: 136
190+
weightedMode: 0
191+
inWeight: 0.33333334
192+
outWeight: 0.33333334
193+
m_PreInfinity: 2
194+
m_PostInfinity: 2
195+
m_RotationOrder: 4
196+
attribute: m_LocalScale.z
197+
path: Sprite
198+
classID: 4
199+
script: {fileID: 0}
200+
flags: 0
201+
m_EulerEditorCurves: []
202+
m_HasGenericRootTransform: 0
203+
m_HasMotionFloatCurves: 0
204+
m_Events: []

Assets/Animations/Player/Player Landing.anim.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Animations/Player/Player.controller

Lines changed: 71 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1101 &-8680650421497925369
4+
AnimatorStateTransition:
5+
m_ObjectHideFlags: 1
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name:
10+
m_Conditions: []
11+
m_DstStateMachine: {fileID: 0}
12+
m_DstState: {fileID: -2288193332639848937}
13+
m_Solo: 0
14+
m_Mute: 0
15+
m_IsExit: 0
16+
serializedVersion: 3
17+
m_TransitionDuration: 0
18+
m_TransitionOffset: 0
19+
m_ExitTime: 1
20+
m_HasExitTime: 1
21+
m_HasFixedDuration: 0
22+
m_InterruptionSource: 0
23+
m_OrderedInterruption: 1
24+
m_CanTransitionToSelf: 1
325
--- !u!1102 &-7450712049611910822
426
AnimatorState:
527
serializedVersion: 6
@@ -104,69 +126,69 @@ AnimatorStateTransition:
104126
m_InterruptionSource: 0
105127
m_OrderedInterruption: 1
106128
m_CanTransitionToSelf: 1
107-
--- !u!1101 &-3532780208030641589
129+
--- !u!1101 &-3632254113866321139
108130
AnimatorStateTransition:
109131
m_ObjectHideFlags: 1
110132
m_CorrespondingSourceObject: {fileID: 0}
111133
m_PrefabInstance: {fileID: 0}
112134
m_PrefabAsset: {fileID: 0}
113135
m_Name:
114136
m_Conditions:
115-
- m_ConditionMode: 1
116-
m_ConditionEvent: Jump
137+
- m_ConditionMode: 2
138+
m_ConditionEvent: isFalling
117139
m_EventTreshold: 0
118140
m_DstStateMachine: {fileID: 0}
119-
m_DstState: {fileID: 4179495403608682633}
141+
m_DstState: {fileID: 7411254991243336239}
120142
m_Solo: 0
121143
m_Mute: 0
122144
m_IsExit: 0
123145
serializedVersion: 3
124146
m_TransitionDuration: 0
125147
m_TransitionOffset: 0
126-
m_ExitTime: 0.75
148+
m_ExitTime: 0.5
127149
m_HasExitTime: 0
128150
m_HasFixedDuration: 0
129151
m_InterruptionSource: 0
130152
m_OrderedInterruption: 1
131-
m_CanTransitionToSelf: 0
132-
--- !u!1101 &-3200354799791078168
153+
m_CanTransitionToSelf: 1
154+
--- !u!1101 &-3532780208030641589
133155
AnimatorStateTransition:
134156
m_ObjectHideFlags: 1
135157
m_CorrespondingSourceObject: {fileID: 0}
136158
m_PrefabInstance: {fileID: 0}
137159
m_PrefabAsset: {fileID: 0}
138160
m_Name:
139161
m_Conditions:
140-
- m_ConditionMode: 3
141-
m_ConditionEvent: x
142-
m_EventTreshold: 0.01
162+
- m_ConditionMode: 1
163+
m_ConditionEvent: Jump
164+
m_EventTreshold: 0
143165
m_DstStateMachine: {fileID: 0}
144-
m_DstState: {fileID: -4613184842113770388}
166+
m_DstState: {fileID: 4179495403608682633}
145167
m_Solo: 0
146168
m_Mute: 0
147169
m_IsExit: 0
148170
serializedVersion: 3
149171
m_TransitionDuration: 0
150172
m_TransitionOffset: 0
151-
m_ExitTime: 0.5
173+
m_ExitTime: 0.75
152174
m_HasExitTime: 0
153175
m_HasFixedDuration: 0
154176
m_InterruptionSource: 0
155177
m_OrderedInterruption: 1
156-
m_CanTransitionToSelf: 1
157-
--- !u!1101 &-2499951782846237251
178+
m_CanTransitionToSelf: 0
179+
--- !u!1101 &-3200354799791078168
158180
AnimatorStateTransition:
159181
m_ObjectHideFlags: 1
160182
m_CorrespondingSourceObject: {fileID: 0}
161183
m_PrefabInstance: {fileID: 0}
162184
m_PrefabAsset: {fileID: 0}
163185
m_Name:
164186
m_Conditions:
165-
- m_ConditionMode: 2
166-
m_ConditionEvent: isFalling
167-
m_EventTreshold: 0
187+
- m_ConditionMode: 3
188+
m_ConditionEvent: x
189+
m_EventTreshold: 0.01
168190
m_DstStateMachine: {fileID: 0}
169-
m_DstState: {fileID: -2288193332639848937}
191+
m_DstState: {fileID: -4613184842113770388}
170192
m_Solo: 0
171193
m_Mute: 0
172194
m_IsExit: 0
@@ -527,6 +549,9 @@ AnimatorStateMachine:
527549
- serializedVersion: 1
528550
m_State: {fileID: -465723975634604256}
529551
m_Position: {x: -170, y: -50, z: 0}
552+
- serializedVersion: 1
553+
m_State: {fileID: 7411254991243336239}
554+
m_Position: {x: 60, y: 50, z: 0}
530555
m_ChildStateMachines: []
531556
m_AnyStateTransitions:
532557
- {fileID: -5444911202017502078}
@@ -578,8 +603,8 @@ AnimatorState:
578603
m_Speed: 1
579604
m_CycleOffset: 0
580605
m_Transitions:
581-
- {fileID: -2499951782846237251}
582606
- {fileID: 2725647654723790365}
607+
- {fileID: -3632254113866321139}
583608
m_StateMachineBehaviours: []
584609
m_Position: {x: 50, y: 50, z: 0}
585610
m_IKOnFeet: 0
@@ -647,3 +672,30 @@ AnimatorStateTransition:
647672
m_InterruptionSource: 0
648673
m_OrderedInterruption: 1
649674
m_CanTransitionToSelf: 1
675+
--- !u!1102 &7411254991243336239
676+
AnimatorState:
677+
serializedVersion: 6
678+
m_ObjectHideFlags: 1
679+
m_CorrespondingSourceObject: {fileID: 0}
680+
m_PrefabInstance: {fileID: 0}
681+
m_PrefabAsset: {fileID: 0}
682+
m_Name: Player Landing
683+
m_Speed: 1
684+
m_CycleOffset: 0
685+
m_Transitions:
686+
- {fileID: -8680650421497925369}
687+
m_StateMachineBehaviours: []
688+
m_Position: {x: 50, y: 50, z: 0}
689+
m_IKOnFeet: 0
690+
m_WriteDefaultValues: 1
691+
m_Mirror: 0
692+
m_SpeedParameterActive: 0
693+
m_MirrorParameterActive: 0
694+
m_CycleOffsetParameterActive: 0
695+
m_TimeParameterActive: 0
696+
m_Motion: {fileID: 7400000, guid: f005d0cbe304d4f7c8e5c156795ff55d, type: 2}
697+
m_Tag:
698+
m_SpeedParameter:
699+
m_MirrorParameter:
700+
m_CycleOffsetParameter:
701+
m_TimeParameter:

0 commit comments

Comments
 (0)