Skip to content

Commit 55d74be

Browse files
committed
Added tilesets and a wave gui label
1 parent e1b5dce commit 55d74be

File tree

58 files changed

+4238
-37
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+4238
-37
lines changed

Diff for: Assets/Player/Male with Gun.png

831 Bytes
Loading

Diff for: Assets/Player/Male with Gun.png.meta

+252
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Assets/Player/Player.controller

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ AnimatorController:
149149
m_DefaultFloat: 0
150150
m_DefaultInt: 0
151151
m_DefaultBool: 0
152-
m_Controller: {fileID: 0}
152+
m_Controller: {fileID: 9100000}
153153
- m_Name: ySpeed
154154
m_Type: 1
155155
m_DefaultFloat: 0
156156
m_DefaultInt: 0
157157
m_DefaultBool: 0
158-
m_Controller: {fileID: 0}
158+
m_Controller: {fileID: 9100000}
159159
m_AnimatorLayers:
160160
- serializedVersion: 5
161161
m_Name: Base Layer
@@ -191,7 +191,7 @@ AnimatorState:
191191
m_MirrorParameterActive: 0
192192
m_CycleOffsetParameterActive: 0
193193
m_TimeParameterActive: 0
194-
m_Motion: {fileID: 7400000, guid: e3ae83db4eac1164bb405fb467d65c5e, type: 2}
194+
m_Motion: {fileID: 7400000, guid: abebd4c6f45d4c3459cc092fc433cc15, type: 2}
195195
m_Tag:
196196
m_SpeedParameter:
197197
m_MirrorParameter:

Diff for: Assets/Player/idle.anim

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ AnimationClip:
2020
m_PPtrCurves:
2121
- curve:
2222
- time: 0
23-
value: {fileID: 4182546201154124187, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
24-
- time: 0.25
25-
value: {fileID: 586531430091078548, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
23+
value: {fileID: 206168726491010752, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
24+
- time: 0.33333334
25+
value: {fileID: -9131678820442998602, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
2626
attribute: m_Sprite
2727
path:
2828
classID: 212
2929
script: {fileID: 0}
30-
m_SampleRate: 4
30+
m_SampleRate: 3
3131
m_WrapMode: 0
3232
m_Bounds:
3333
m_Center: {x: 0, y: 0, z: 0}
@@ -42,14 +42,14 @@ AnimationClip:
4242
customType: 23
4343
isPPtrCurve: 1
4444
pptrCurveMapping:
45-
- {fileID: 4182546201154124187, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
46-
- {fileID: 586531430091078548, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
45+
- {fileID: 206168726491010752, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
46+
- {fileID: -9131678820442998602, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
4747
m_AnimationClipSettings:
4848
serializedVersion: 2
4949
m_AdditiveReferencePoseClip: {fileID: 0}
5050
m_AdditiveReferencePoseTime: 0
5151
m_StartTime: 0
52-
m_StopTime: 0.5
52+
m_StopTime: 0.6666667
5353
m_OrientationOffsetY: 0
5454
m_Level: 0
5555
m_CycleOffset: 0

Diff for: Assets/Player/idle.anim.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Assets/Player/walking.anim

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ AnimationClip:
2020
m_PPtrCurves:
2121
- curve:
2222
- time: 0
23-
value: {fileID: -7234040697616300703, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
23+
value: {fileID: -6881839915968492003, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
2424
- time: 0.25
25-
value: {fileID: 7350855835724970844, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
25+
value: {fileID: 8120409761499996373, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
2626
attribute: m_Sprite
2727
path:
2828
classID: 212
@@ -42,8 +42,8 @@ AnimationClip:
4242
customType: 23
4343
isPPtrCurve: 1
4444
pptrCurveMapping:
45-
- {fileID: -7234040697616300703, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
46-
- {fileID: 7350855835724970844, guid: 5b03e867e5eb66a40b974ddc9e67724a, type: 3}
45+
- {fileID: -6881839915968492003, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
46+
- {fileID: 8120409761499996373, guid: 4a47523c369a7df43b15ba416f19d3f5, type: 3}
4747
m_AnimationClipSettings:
4848
serializedVersion: 2
4949
m_AdditiveReferencePoseClip: {fileID: 0}

0 commit comments

Comments
 (0)