Skip to content

Commit e970679

Browse files
committed
Menu updated; + LinkUI; Minor fixes for Android
1 parent 9934854 commit e970679

Some content is hidden

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

48 files changed

+1364
-26949
lines changed

Assets/Animation/Character/Character.controller

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,26 @@ AnimatorController:
117117
m_Type: 4
118118
m_DefaultFloat: 0
119119
m_DefaultInt: 0
120-
m_DefaultBool: 0
121-
m_Controller: {fileID: 9100000}
120+
m_DefaultBool: 1
121+
m_Controller: {fileID: 0}
122122
- m_Name: OnStacked
123123
m_Type: 9
124124
m_DefaultFloat: 0
125125
m_DefaultInt: 0
126126
m_DefaultBool: 0
127-
m_Controller: {fileID: 9100000}
127+
m_Controller: {fileID: 0}
128128
- m_Name: OnAttack
129129
m_Type: 9
130130
m_DefaultFloat: 0
131131
m_DefaultInt: 0
132132
m_DefaultBool: 0
133-
m_Controller: {fileID: 9100000}
133+
m_Controller: {fileID: 0}
134+
- m_Name: Speed
135+
m_Type: 1
136+
m_DefaultFloat: 1
137+
m_DefaultInt: 0
138+
m_DefaultBool: 0
139+
m_Controller: {fileID: 0}
134140
m_AnimatorLayers:
135141
- serializedVersion: 5
136142
m_Name: Base Layer
@@ -152,7 +158,7 @@ AnimatorState:
152158
m_PrefabInstance: {fileID: 0}
153159
m_PrefabAsset: {fileID: 0}
154160
m_Name: Run
155-
m_Speed: 1.1
161+
m_Speed: 0.2
156162
m_CycleOffset: 0
157163
m_Transitions:
158164
- {fileID: 3158312709878067087}
@@ -161,16 +167,16 @@ AnimatorState:
161167
m_IKOnFeet: 1
162168
m_WriteDefaultValues: 1
163169
m_Mirror: 0
164-
m_SpeedParameterActive: 0
170+
m_SpeedParameterActive: 1
165171
m_MirrorParameterActive: 0
166172
m_CycleOffsetParameterActive: 0
167173
m_TimeParameterActive: 0
168174
m_Motion: {fileID: -203655887218126122, guid: 066201b0532ed9646ae7b389f43da1b0, type: 3}
169175
m_Tag:
170-
m_SpeedParameter:
176+
m_SpeedParameter: Speed
171177
m_MirrorParameter:
172178
m_CycleOffsetParameter:
173-
m_TimeParameter:
179+
m_TimeParameter: Speed
174180
--- !u!1101 &3158312709878067087
175181
AnimatorStateTransition:
176182
m_ObjectHideFlags: 1

Assets/Animation/Enemy/FastEnemy.controller

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,25 @@ AnimatorController:
115115
m_DefaultFloat: 0
116116
m_DefaultInt: 0
117117
m_DefaultBool: 0
118-
m_Controller: {fileID: 9100000}
118+
m_Controller: {fileID: 0}
119119
- m_Name: OnHit
120120
m_Type: 9
121121
m_DefaultFloat: 0
122122
m_DefaultInt: 0
123123
m_DefaultBool: 0
124-
m_Controller: {fileID: 9100000}
124+
m_Controller: {fileID: 0}
125125
- m_Name: OnAttack
126126
m_Type: 9
127127
m_DefaultFloat: 0
128128
m_DefaultInt: 0
129129
m_DefaultBool: 0
130-
m_Controller: {fileID: 9100000}
130+
m_Controller: {fileID: 0}
131+
- m_Name: Speed
132+
m_Type: 1
133+
m_DefaultFloat: 5
134+
m_DefaultInt: 0
135+
m_DefaultBool: 0
136+
m_Controller: {fileID: 0}
131137
m_AnimatorLayers:
132138
- serializedVersion: 5
133139
m_Name: Base Layer
@@ -284,7 +290,7 @@ AnimatorState:
284290
m_PrefabInstance: {fileID: 0}
285291
m_PrefabAsset: {fileID: 0}
286292
m_Name: Run
287-
m_Speed: 1
293+
m_Speed: 0.2
288294
m_CycleOffset: 0
289295
m_Transitions:
290296
- {fileID: -3404901314934681497}
@@ -293,13 +299,13 @@ AnimatorState:
293299
m_IKOnFeet: 1
294300
m_WriteDefaultValues: 1
295301
m_Mirror: 0
296-
m_SpeedParameterActive: 0
302+
m_SpeedParameterActive: 1
297303
m_MirrorParameterActive: 0
298304
m_CycleOffsetParameterActive: 0
299305
m_TimeParameterActive: 0
300306
m_Motion: {fileID: -203655887218126122, guid: 1fc3a4b9ca05a384aac0aa0d91a5ed60, type: 3}
301307
m_Tag:
302-
m_SpeedParameter:
308+
m_SpeedParameter: Speed
303309
m_MirrorParameter:
304310
m_CycleOffsetParameter:
305311
m_TimeParameter:

Assets/Animation/Enemy/SlowEnemy.overrideController

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ AnimatorOverrideController:
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
9-
m_Name: New Animator Override Controller
10-
m_Controller: {fileID: 0}
11-
m_Clips: []
9+
m_Name: SlowEnemy
10+
m_Controller: {fileID: 9100000, guid: 0d2bca4fc32bcc241a9baeff972d57db, type: 2}
11+
m_Clips:
12+
- m_OriginalClip: {fileID: -203655887218126122, guid: 1b1e52cc26ef3d3499d711b4ca2cf45e, type: 3}
13+
m_OverrideClip: {fileID: -203655887218126122, guid: 4f94a6a885111b94fa5b8281af529b2a, type: 3}
14+
- m_OriginalClip: {fileID: -203655887218126122, guid: 11eb1f2e21e2b0244b7ca6ff0c46cbb1, type: 3}
15+
m_OverrideClip: {fileID: -203655887218126122, guid: 11eb1f2e21e2b0244b7ca6ff0c46cbb1, type: 3}
16+
- m_OriginalClip: {fileID: -203655887218126122, guid: 9a07ac7b5cffd0b45a1a1177e3589c0f, type: 3}
17+
m_OverrideClip: {fileID: -203655887218126122, guid: 9a07ac7b5cffd0b45a1a1177e3589c0f, type: 3}
18+
- m_OriginalClip: {fileID: -203655887218126122, guid: 1fc3a4b9ca05a384aac0aa0d91a5ed60, type: 3}
19+
m_OverrideClip: {fileID: -203655887218126122, guid: c9ae43d6a09e858409ab17a675688727, type: 3}

Assets/Animation/Enemy/VerySlowEnemy.overrideController

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,13 @@ AnimatorOverrideController:
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
m_Name: VerySlowEnemy
10-
m_Controller: {fileID: 0}
11-
m_Clips: []
10+
m_Controller: {fileID: 9100000, guid: 0d2bca4fc32bcc241a9baeff972d57db, type: 2}
11+
m_Clips:
12+
- m_OriginalClip: {fileID: -203655887218126122, guid: 1b1e52cc26ef3d3499d711b4ca2cf45e, type: 3}
13+
m_OverrideClip: {fileID: -203655887218126122, guid: a2014cbc2a8084742adb5b7e6e9af702, type: 3}
14+
- m_OriginalClip: {fileID: -203655887218126122, guid: 11eb1f2e21e2b0244b7ca6ff0c46cbb1, type: 3}
15+
m_OverrideClip: {fileID: -203655887218126122, guid: 11eb1f2e21e2b0244b7ca6ff0c46cbb1, type: 3}
16+
- m_OriginalClip: {fileID: -203655887218126122, guid: 9a07ac7b5cffd0b45a1a1177e3589c0f, type: 3}
17+
m_OverrideClip: {fileID: -203655887218126122, guid: 9a07ac7b5cffd0b45a1a1177e3589c0f, type: 3}
18+
- m_OriginalClip: {fileID: -203655887218126122, guid: 1fc3a4b9ca05a384aac0aa0d91a5ed60, type: 3}
19+
m_OverrideClip: {fileID: -203655887218126122, guid: a24d54f0f37807d41a16bf05dcc8e034, type: 3}

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Outline.png.meta

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

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Outline_Arrows.png.meta

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

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Plain.png.meta

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

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Plain_Arrows.png.meta

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

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Ridged.png.meta

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

Assets/Plugins/Joystick Pack/Sprites/All Axis Backgrounds/AllAxis_Ridged_Arrows.png.meta

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

0 commit comments

Comments
 (0)