Skip to content

Commit acf0b2f

Browse files
jojods1125jojods1125
committed
Merge branch 'master' into add-snow
2 parents b80cddf + 66e4289 commit acf0b2f

27 files changed

+1158
-376
lines changed

‎Assets/_Project/Animations/Default.anim‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ AnimationClip:
2828
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
2929
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
3030
- serializedVersion: 3
31-
time: 1
31+
time: 0.16666667
3232
value: {x: 0, y: 0, z: 0}
3333
inSlope: {x: 0, y: 0, z: 0}
3434
outSlope: {x: 0, y: 0, z: 0}
@@ -39,7 +39,7 @@ AnimationClip:
3939
m_PreInfinity: 2
4040
m_PostInfinity: 2
4141
m_RotationOrder: 4
42-
path: CubeAnim
42+
path: PlayerObject
4343
m_ScaleCurves: []
4444
m_FloatCurves: []
4545
m_PPtrCurves: []
@@ -51,7 +51,7 @@ AnimationClip:
5151
m_ClipBindingConstant:
5252
genericBindings:
5353
- serializedVersion: 2
54-
path: 2387847166
54+
path: 2189091576
5555
attribute: 1
5656
script: {fileID: 0}
5757
typeID: 4
@@ -63,7 +63,7 @@ AnimationClip:
6363
m_AdditiveReferencePoseClip: {fileID: 0}
6464
m_AdditiveReferencePoseTime: 0
6565
m_StartTime: 0
66-
m_StopTime: 1
66+
m_StopTime: 0.16666667
6767
m_OrientationOffsetY: 0
6868
m_Level: 0
6969
m_CycleOffset: 0
@@ -92,7 +92,7 @@ AnimationClip:
9292
inWeight: 0.33333334
9393
outWeight: 0.33333334
9494
- serializedVersion: 3
95-
time: 1
95+
time: 0.16666667
9696
value: 0
9797
inSlope: 0
9898
outSlope: 0
@@ -104,7 +104,7 @@ AnimationClip:
104104
m_PostInfinity: 2
105105
m_RotationOrder: 4
106106
attribute: m_LocalPosition.x
107-
path: CubeAnim
107+
path: PlayerObject
108108
classID: 4
109109
script: {fileID: 0}
110110
- curve:
@@ -120,7 +120,7 @@ AnimationClip:
120120
inWeight: 0.33333334
121121
outWeight: 0.33333334
122122
- serializedVersion: 3
123-
time: 1
123+
time: 0.16666667
124124
value: 0
125125
inSlope: 0
126126
outSlope: 0
@@ -132,7 +132,7 @@ AnimationClip:
132132
m_PostInfinity: 2
133133
m_RotationOrder: 4
134134
attribute: m_LocalPosition.y
135-
path: CubeAnim
135+
path: PlayerObject
136136
classID: 4
137137
script: {fileID: 0}
138138
- curve:
@@ -148,7 +148,7 @@ AnimationClip:
148148
inWeight: 0.33333334
149149
outWeight: 0.33333334
150150
- serializedVersion: 3
151-
time: 1
151+
time: 0.16666667
152152
value: 0
153153
inSlope: 0
154154
outSlope: 0
@@ -160,7 +160,7 @@ AnimationClip:
160160
m_PostInfinity: 2
161161
m_RotationOrder: 4
162162
attribute: m_LocalPosition.z
163-
path: CubeAnim
163+
path: PlayerObject
164164
classID: 4
165165
script: {fileID: 0}
166166
m_EulerEditorCurves: []

Assets/_Project/Animations/CubeAnimCtl.controller renamed to Assets/_Project/Animations/PlayerAnimController.controller

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ AnimatorStateTransition:
145145
m_Mute: 0
146146
m_IsExit: 0
147147
serializedVersion: 3
148-
m_TransitionDuration: 0
148+
m_TransitionDuration: 0.2
149149
m_TransitionOffset: 0
150150
m_ExitTime: 1
151151
m_HasExitTime: 0
@@ -315,15 +315,15 @@ AnimatorController:
315315
m_CorrespondingSourceObject: {fileID: 0}
316316
m_PrefabInstance: {fileID: 0}
317317
m_PrefabAsset: {fileID: 0}
318-
m_Name: CubeAnimCtl
318+
m_Name: PlayerAnimController
319319
serializedVersion: 5
320320
m_AnimatorParameters:
321321
- m_Name: state
322322
m_Type: 3
323323
m_DefaultFloat: 0
324324
m_DefaultInt: 0
325325
m_DefaultBool: 0
326-
m_Controller: {fileID: 0}
326+
m_Controller: {fileID: 9100000}
327327
m_AnimatorLayers:
328328
- serializedVersion: 5
329329
m_Name: Base Layer
@@ -471,9 +471,9 @@ AnimatorStateMachine:
471471
m_EntryTransitions: []
472472
m_StateMachineTransitions: {}
473473
m_StateMachineBehaviours: []
474-
m_AnyStatePosition: {x: 50, y: 20, z: 0}
475-
m_EntryPosition: {x: 50, y: 120, z: 0}
476-
m_ExitPosition: {x: 800, y: 120, z: 0}
474+
m_AnyStatePosition: {x: 50, y: 120, z: 0}
475+
m_EntryPosition: {x: 50, y: 180, z: 0}
476+
m_ExitPosition: {x: 50, y: 70, z: 0}
477477
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
478478
m_DefaultState: {fileID: -359137941183271379}
479479
--- !u!1102 &7250601107131478602

Assets/_Project/Animations/CubeAnimCtl.controller.meta renamed to Assets/_Project/Animations/PlayerAnimController.controller.meta

File renamed without changes.

Assets/_Project/Animations/Pop_sm_Shake.anim renamed to Assets/_Project/Animations/Pop_Shake_Stretch_sm.anim

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ AnimationClip:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: Pop_sm_Shake
9+
m_Name: Pop_Shake_Stretch_sm
1010
serializedVersion: 6
1111
m_Legacy: 0
1212
m_Compressed: 0
@@ -28,7 +28,7 @@ AnimationClip:
2828
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
2929
- serializedVersion: 3
3030
time: 0.33333334
31-
value: {x: 0, y: 25, z: 0}
31+
value: {x: 0, y: 0, z: 25}
3232
inSlope: {x: 0, y: 0, z: 0}
3333
outSlope: {x: 0, y: 0, z: 0}
3434
tangentMode: 0
@@ -37,7 +37,7 @@ AnimationClip:
3737
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
3838
- serializedVersion: 3
3939
time: 0.4
40-
value: {x: 0, y: -10, z: 0}
40+
value: {x: 0, y: 0, z: -10}
4141
inSlope: {x: 0, y: 0, z: 0}
4242
outSlope: {x: 0, y: 0, z: 0}
4343
tangentMode: 0
@@ -46,7 +46,7 @@ AnimationClip:
4646
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
4747
- serializedVersion: 3
4848
time: 0.46666667
49-
value: {x: 0, y: 25, z: 0}
49+
value: {x: 0, y: 0, z: 25}
5050
inSlope: {x: 0, y: 0, z: 0}
5151
outSlope: {x: 0, y: 0, z: 0}
5252
tangentMode: 0
@@ -55,7 +55,7 @@ AnimationClip:
5555
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
5656
- serializedVersion: 3
5757
time: 0.53333336
58-
value: {x: 0, y: -10, z: 0}
58+
value: {x: 0, y: 0, z: -10}
5959
inSlope: {x: 0, y: 0, z: 0}
6060
outSlope: {x: 0, y: 0, z: 0}
6161
tangentMode: 0
@@ -64,7 +64,7 @@ AnimationClip:
6464
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
6565
- serializedVersion: 3
6666
time: 0.6
67-
value: {x: 0, y: 25, z: 0}
67+
value: {x: 0, y: 0, z: 25}
6868
inSlope: {x: 0, y: 0, z: 0}
6969
outSlope: {x: 0, y: 0, z: 0}
7070
tangentMode: 0
@@ -83,7 +83,7 @@ AnimationClip:
8383
m_PreInfinity: 2
8484
m_PostInfinity: 2
8585
m_RotationOrder: 4
86-
path: CubeAnim
86+
path: PlayerObject
8787
m_PositionCurves: []
8888
m_ScaleCurves:
8989
- curve:
@@ -119,7 +119,7 @@ AnimationClip:
119119
m_PreInfinity: 2
120120
m_PostInfinity: 2
121121
m_RotationOrder: 4
122-
path: CubeAnim
122+
path: PlayerObject
123123
m_FloatCurves: []
124124
m_PPtrCurves: []
125125
m_SampleRate: 60
@@ -130,14 +130,14 @@ AnimationClip:
130130
m_ClipBindingConstant:
131131
genericBindings:
132132
- serializedVersion: 2
133-
path: 2387847166
133+
path: 2189091576
134134
attribute: 4
135135
script: {fileID: 0}
136136
typeID: 4
137137
customType: 4
138138
isPPtrCurve: 0
139139
- serializedVersion: 2
140-
path: 2387847166
140+
path: 2189091576
141141
attribute: 3
142142
script: {fileID: 0}
143143
typeID: 4
@@ -199,7 +199,7 @@ AnimationClip:
199199
m_PostInfinity: 2
200200
m_RotationOrder: 4
201201
attribute: m_LocalScale.x
202-
path: CubeAnim
202+
path: PlayerObject
203203
classID: 4
204204
script: {fileID: 0}
205205
- curve:
@@ -236,7 +236,7 @@ AnimationClip:
236236
m_PostInfinity: 2
237237
m_RotationOrder: 4
238238
attribute: m_LocalScale.y
239-
path: CubeAnim
239+
path: PlayerObject
240240
classID: 4
241241
script: {fileID: 0}
242242
- curve:
@@ -273,7 +273,7 @@ AnimationClip:
273273
m_PostInfinity: 2
274274
m_RotationOrder: 4
275275
attribute: m_LocalScale.z
276-
path: CubeAnim
276+
path: PlayerObject
277277
classID: 4
278278
script: {fileID: 0}
279279
- curve:
@@ -346,7 +346,7 @@ AnimationClip:
346346
m_PostInfinity: 2
347347
m_RotationOrder: 4
348348
attribute: localEulerAnglesRaw.x
349-
path: CubeAnim
349+
path: PlayerObject
350350
classID: 4
351351
script: {fileID: 0}
352352
- curve:
@@ -363,7 +363,7 @@ AnimationClip:
363363
outWeight: 0.33333334
364364
- serializedVersion: 3
365365
time: 0.33333334
366-
value: 25
366+
value: 0
367367
inSlope: 0
368368
outSlope: 0
369369
tangentMode: 136
@@ -372,7 +372,7 @@ AnimationClip:
372372
outWeight: 0.33333334
373373
- serializedVersion: 3
374374
time: 0.4
375-
value: -10
375+
value: 0
376376
inSlope: 0
377377
outSlope: 0
378378
tangentMode: 136
@@ -381,7 +381,7 @@ AnimationClip:
381381
outWeight: 0.33333334
382382
- serializedVersion: 3
383383
time: 0.46666667
384-
value: 25
384+
value: 0
385385
inSlope: 0
386386
outSlope: 0
387387
tangentMode: 136
@@ -390,7 +390,7 @@ AnimationClip:
390390
outWeight: 0.33333334
391391
- serializedVersion: 3
392392
time: 0.53333336
393-
value: -10
393+
value: 0
394394
inSlope: 0
395395
outSlope: 0
396396
tangentMode: 136
@@ -399,7 +399,7 @@ AnimationClip:
399399
outWeight: 0.33333334
400400
- serializedVersion: 3
401401
time: 0.6
402-
value: 25
402+
value: 0
403403
inSlope: 0
404404
outSlope: 0
405405
tangentMode: 136
@@ -419,7 +419,7 @@ AnimationClip:
419419
m_PostInfinity: 2
420420
m_RotationOrder: 4
421421
attribute: localEulerAnglesRaw.y
422-
path: CubeAnim
422+
path: PlayerObject
423423
classID: 4
424424
script: {fileID: 0}
425425
- curve:
@@ -436,7 +436,7 @@ AnimationClip:
436436
outWeight: 0.33333334
437437
- serializedVersion: 3
438438
time: 0.33333334
439-
value: 0
439+
value: 25
440440
inSlope: 0
441441
outSlope: 0
442442
tangentMode: 136
@@ -445,7 +445,7 @@ AnimationClip:
445445
outWeight: 0.33333334
446446
- serializedVersion: 3
447447
time: 0.4
448-
value: 0
448+
value: -10
449449
inSlope: 0
450450
outSlope: 0
451451
tangentMode: 136
@@ -454,7 +454,7 @@ AnimationClip:
454454
outWeight: 0.33333334
455455
- serializedVersion: 3
456456
time: 0.46666667
457-
value: 0
457+
value: 25
458458
inSlope: 0
459459
outSlope: 0
460460
tangentMode: 136
@@ -463,7 +463,7 @@ AnimationClip:
463463
outWeight: 0.33333334
464464
- serializedVersion: 3
465465
time: 0.53333336
466-
value: 0
466+
value: -10
467467
inSlope: 0
468468
outSlope: 0
469469
tangentMode: 136
@@ -472,7 +472,7 @@ AnimationClip:
472472
outWeight: 0.33333334
473473
- serializedVersion: 3
474474
time: 0.6
475-
value: 0
475+
value: 25
476476
inSlope: 0
477477
outSlope: 0
478478
tangentMode: 136
@@ -492,7 +492,7 @@ AnimationClip:
492492
m_PostInfinity: 2
493493
m_RotationOrder: 4
494494
attribute: localEulerAnglesRaw.z
495-
path: CubeAnim
495+
path: PlayerObject
496496
classID: 4
497497
script: {fileID: 0}
498498
m_EulerEditorCurves:
@@ -503,7 +503,7 @@ AnimationClip:
503503
m_PostInfinity: 2
504504
m_RotationOrder: 4
505505
attribute: m_LocalEulerAngles.x
506-
path: CubeAnim
506+
path: PlayerObject
507507
classID: 4
508508
script: {fileID: 0}
509509
- curve:
@@ -513,7 +513,7 @@ AnimationClip:
513513
m_PostInfinity: 2
514514
m_RotationOrder: 4
515515
attribute: m_LocalEulerAngles.y
516-
path: CubeAnim
516+
path: PlayerObject
517517
classID: 4
518518
script: {fileID: 0}
519519
- curve:
@@ -523,7 +523,7 @@ AnimationClip:
523523
m_PostInfinity: 2
524524
m_RotationOrder: 4
525525
attribute: m_LocalEulerAngles.z
526-
path: CubeAnim
526+
path: PlayerObject
527527
classID: 4
528528
script: {fileID: 0}
529529
m_HasGenericRootTransform: 0

‎Assets/_Project/Animations/Pop_Shake_Stretch_sm.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.

0 commit comments

Comments
 (0)