Skip to content

Commit e2509b8

Browse files
mcroche611mcroche611
committed
Improved Level info UI, fixed next/retry/exit buttons.
Now game over load main scene
1 parent d95e7fc commit e2509b8

File tree

8 files changed

+237
-76
lines changed

8 files changed

+237
-76
lines changed

‎Assets/Prefabs/Panels/Level info panel.prefab‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ RectTransform:
3535
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3636
m_AnchorMin: {x: 0.5, y: 1}
3737
m_AnchorMax: {x: 0.51439047, y: 1}
38-
m_AnchoredPosition: {x: 12.979858, y: 1}
39-
m_SizeDelta: {x: 206.095, y: 37.8144}
38+
m_AnchoredPosition: {x: -0.000030517578, y: -20.5}
39+
m_SizeDelta: {x: 146.5199, y: 37.3008}
4040
m_Pivot: {x: 0.5, y: 1}
4141
--- !u!222 &6229936961569413361
4242
CanvasRenderer:
@@ -172,8 +172,8 @@ RectTransform:
172172
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
173173
m_AnchorMin: {x: 0, y: 0}
174174
m_AnchorMax: {x: 0, y: 0}
175-
m_AnchoredPosition: {x: 979.63965, y: 629.6504}
176-
m_SizeDelta: {x: 196.63965, y: 204.15039}
175+
m_AnchoredPosition: {x: 241, y: 211}
176+
m_SizeDelta: {x: 241, y: 211}
177177
m_Pivot: {x: 1, y: 1}
178178
--- !u!222 &6229936961925413822
179179
CanvasRenderer:
@@ -196,15 +196,15 @@ MonoBehaviour:
196196
m_Name:
197197
m_EditorClassIdentifier:
198198
m_Material: {fileID: 0}
199-
m_Color: {r: 0, g: 0, b: 0, a: 0.7058824}
199+
m_Color: {r: 1, g: 1, b: 1, a: 1}
200200
m_RaycastTarget: 1
201201
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
202202
m_Maskable: 1
203203
m_OnCullStateChanged:
204204
m_PersistentCalls:
205205
m_Calls: []
206-
m_Sprite: {fileID: 0}
207-
m_Type: 0
206+
m_Sprite: {fileID: 21300000, guid: 47707b1e14472e101abc36eaac4de8a1, type: 3}
207+
m_Type: 1
208208
m_PreserveAspect: 0
209209
m_FillCenter: 1
210210
m_FillMethod: 4
@@ -248,8 +248,8 @@ RectTransform:
248248
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
249249
m_AnchorMin: {x: 0.5, y: 1}
250250
m_AnchorMax: {x: 0.5, y: 1}
251-
m_AnchoredPosition: {x: -0.54907227, y: -45.9268}
252-
m_SizeDelta: {x: 209.045, y: 190.1639}
251+
m_AnchoredPosition: {x: -3.3759, y: -45.9268}
252+
m_SizeDelta: {x: 203.39, y: 194.7861}
253253
m_Pivot: {x: 0.5, y: 1}
254254
--- !u!222 &6229936962346235840
255255
CanvasRenderer:
@@ -346,7 +346,7 @@ MonoBehaviour:
346346
m_VertexBufferAutoSizeReduction: 0
347347
m_useMaxVisibleDescender: 1
348348
m_pageToDisplay: 1
349-
m_margin: {x: 13.253807, y: 0, z: 17.04065, w: 64.37526}
349+
m_margin: {x: 32.7698, y: 8.730835, z: 17.04065, w: 64.37526}
350350
m_isUsingLegacyAnimationComponent: 0
351351
m_isVolumetricText: 0
352352
m_hasFontAssetChanged: 0

‎Assets/Scenes/Levels/Level0.unity‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,11 +1097,11 @@ PrefabInstance:
10971097
objectReference: {fileID: 0}
10981098
- target: {fileID: 6229936961569413363, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
10991099
propertyPath: m_AnchoredPosition.x
1100-
value: -0.00050354
1100+
value: -2
11011101
objectReference: {fileID: 0}
11021102
- target: {fileID: 6229936961569413363, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11031103
propertyPath: m_AnchoredPosition.y
1104-
value: 1.0000043
1104+
value: -19
11051105
objectReference: {fileID: 0}
11061106
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11071107
propertyPath: m_Pivot.x
@@ -1133,7 +1133,7 @@ PrefabInstance:
11331133
objectReference: {fileID: 0}
11341134
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11351135
propertyPath: m_SizeDelta.x
1136-
value: 246.568
1136+
value: 241.28
11371137
objectReference: {fileID: 0}
11381138
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11391139
propertyPath: m_SizeDelta.y
@@ -1181,7 +1181,7 @@ PrefabInstance:
11811181
objectReference: {fileID: 0}
11821182
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11831183
propertyPath: m_AnchoredPosition.x
1184-
value: 246.69
1184+
value: 241.40002
11851185
objectReference: {fileID: 0}
11861186
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
11871187
propertyPath: m_AnchoredPosition.y
@@ -1203,13 +1203,37 @@ PrefabInstance:
12031203
propertyPath: m_Name
12041204
value: Level info panel
12051205
objectReference: {fileID: 0}
1206+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1207+
propertyPath: m_Type
1208+
value: 1
1209+
objectReference: {fileID: 0}
1210+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1211+
propertyPath: m_Sprite
1212+
value:
1213+
objectReference: {fileID: 21300000, guid: 47707b1e14472e101abc36eaac4de8a1, type: 3}
1214+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1215+
propertyPath: m_Color.a
1216+
value: 1
1217+
objectReference: {fileID: 0}
1218+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1219+
propertyPath: m_Color.b
1220+
value: 1
1221+
objectReference: {fileID: 0}
1222+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1223+
propertyPath: m_Color.g
1224+
value: 1
1225+
objectReference: {fileID: 0}
1226+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1227+
propertyPath: m_Color.r
1228+
value: 1
1229+
objectReference: {fileID: 0}
12061230
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
12071231
propertyPath: m_margin.w
1208-
value: 0.052879326
1232+
value: 34.159782
12091233
objectReference: {fileID: 0}
12101234
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
12111235
propertyPath: m_margin.x
1212-
value: 0.27539062
1236+
value: 14.6362
12131237
objectReference: {fileID: 0}
12141238
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
12151239
propertyPath: m_margin.z
@@ -1219,6 +1243,14 @@ PrefabInstance:
12191243
propertyPath: m_SizeDelta.y
12201244
value: 121.03
12211245
objectReference: {fileID: 0}
1246+
- target: {fileID: 6229936962346235842, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1247+
propertyPath: m_AnchoredPosition.x
1248+
value: -2
1249+
objectReference: {fileID: 0}
1250+
- target: {fileID: 6229936962346235842, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
1251+
propertyPath: m_AnchoredPosition.y
1252+
value: -45.930008
1253+
objectReference: {fileID: 0}
12221254
m_RemovedComponents: []
12231255
m_SourcePrefab: {fileID: 100100000, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
12241256
--- !u!1 &730423540
@@ -2688,6 +2720,14 @@ PrefabInstance:
26882720
propertyPath: m_LocalEulerAnglesHint.z
26892721
value: 0
26902722
objectReference: {fileID: 0}
2723+
- target: {fileID: 5033053613669742682, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
2724+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
2725+
value:
2726+
objectReference: {fileID: 1064095240}
2727+
- target: {fileID: 5033053613669742682, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
2728+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
2729+
value: ExitButtonPressed
2730+
objectReference: {fileID: 0}
26912731
m_RemovedComponents: []
26922732
m_SourcePrefab: {fileID: 100100000, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
26932733
--- !u!224 &1258217670 stripped
@@ -3451,7 +3491,7 @@ PrefabInstance:
34513491
- target: {fileID: 5886467534881633134, guid: 5eaf2730d79ada443a1d744aefac3bd4, type: 3}
34523492
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
34533493
value:
3454-
objectReference: {fileID: 0}
3494+
objectReference: {fileID: 1064095240}
34553495
- target: {fileID: 5886467534881633134, guid: 5eaf2730d79ada443a1d744aefac3bd4, type: 3}
34563496
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
34573497
value: NextLevelPressed
@@ -4033,7 +4073,7 @@ PrefabInstance:
40334073
- target: {fileID: 5886467534881633134, guid: 275604b6f0de2034e9e638c0e7b6f9a8, type: 3}
40344074
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
40354075
value:
4036-
objectReference: {fileID: 0}
4076+
objectReference: {fileID: 1064095240}
40374077
- target: {fileID: 5886467534881633134, guid: 275604b6f0de2034e9e638c0e7b6f9a8, type: 3}
40384078
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
40394079
value: RetryPressed

‎Assets/Scenes/Levels/Level1.unity‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ PrefabInstance:
783783
- target: {fileID: 5886467534881633134, guid: 5eaf2730d79ada443a1d744aefac3bd4, type: 3}
784784
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
785785
value:
786-
objectReference: {fileID: 0}
786+
objectReference: {fileID: 1023797266}
787787
- target: {fileID: 5886467534881633134, guid: 5eaf2730d79ada443a1d744aefac3bd4, type: 3}
788788
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
789789
value: NextLevelPressed
@@ -2260,7 +2260,7 @@ PrefabInstance:
22602260
- target: {fileID: 5886467534881633134, guid: 275604b6f0de2034e9e638c0e7b6f9a8, type: 3}
22612261
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
22622262
value:
2263-
objectReference: {fileID: 0}
2263+
objectReference: {fileID: 1023797266}
22642264
- target: {fileID: 5886467534881633134, guid: 275604b6f0de2034e9e638c0e7b6f9a8, type: 3}
22652265
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
22662266
value: RetryPressed
@@ -2318,9 +2318,13 @@ PrefabInstance:
23182318
m_Modification:
23192319
m_TransformParent: {fileID: 212943825}
23202320
m_Modifications:
2321+
- target: {fileID: 6229936961569413362, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2322+
propertyPath: m_margin.x
2323+
value: 19.746063
2324+
objectReference: {fileID: 0}
23212325
- target: {fileID: 6229936961569413362, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23222326
propertyPath: m_margin.z
2323-
value: 0.03489692
2327+
value: 26.961525
23242328
objectReference: {fileID: 0}
23252329
- target: {fileID: 6229936961569413362, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23262330
propertyPath: m_HorizontalAlignment
@@ -2340,11 +2344,11 @@ PrefabInstance:
23402344
objectReference: {fileID: 0}
23412345
- target: {fileID: 6229936961569413363, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23422346
propertyPath: m_AnchoredPosition.x
2343-
value: -0.00050354
2347+
value: 2.6449966
23442348
objectReference: {fileID: 0}
23452349
- target: {fileID: 6229936961569413363, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23462350
propertyPath: m_AnchoredPosition.y
2347-
value: 1.0000043
2351+
value: -19
23482352
objectReference: {fileID: 0}
23492353
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23502354
propertyPath: m_Pivot.x
@@ -2376,11 +2380,11 @@ PrefabInstance:
23762380
objectReference: {fileID: 0}
23772381
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23782382
propertyPath: m_SizeDelta.x
2379-
value: 246.568
2383+
value: 241.28
23802384
objectReference: {fileID: 0}
23812385
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23822386
propertyPath: m_SizeDelta.y
2383-
value: 166.96
2387+
value: 167.06
23842388
objectReference: {fileID: 0}
23852389
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
23862390
propertyPath: m_LocalScale.x
@@ -2424,11 +2428,11 @@ PrefabInstance:
24242428
objectReference: {fileID: 0}
24252429
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24262430
propertyPath: m_AnchoredPosition.x
2427-
value: 246.69
2431+
value: 241.40002
24282432
objectReference: {fileID: 0}
24292433
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24302434
propertyPath: m_AnchoredPosition.y
2431-
value: 167.03998
2435+
value: 167.04
24322436
objectReference: {fileID: 0}
24332437
- target: {fileID: 6229936961925413808, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24342438
propertyPath: m_LocalEulerAnglesHint.x
@@ -2446,22 +2450,58 @@ PrefabInstance:
24462450
propertyPath: m_Name
24472451
value: Level info panel
24482452
objectReference: {fileID: 0}
2453+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2454+
propertyPath: m_Type
2455+
value: 1
2456+
objectReference: {fileID: 0}
2457+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2458+
propertyPath: m_Sprite
2459+
value:
2460+
objectReference: {fileID: 21300000, guid: 47707b1e14472e101abc36eaac4de8a1, type: 3}
2461+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2462+
propertyPath: m_Color.a
2463+
value: 1
2464+
objectReference: {fileID: 0}
2465+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2466+
propertyPath: m_Color.b
2467+
value: 1
2468+
objectReference: {fileID: 0}
2469+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2470+
propertyPath: m_Color.g
2471+
value: 1
2472+
objectReference: {fileID: 0}
2473+
- target: {fileID: 6229936961925413823, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2474+
propertyPath: m_Color.r
2475+
value: 1
2476+
objectReference: {fileID: 0}
24492477
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24502478
propertyPath: m_margin.w
2451-
value: 0.052879326
2479+
value: 44.93038
24522480
objectReference: {fileID: 0}
24532481
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24542482
propertyPath: m_margin.x
24552483
value: 0.27539062
24562484
objectReference: {fileID: 0}
2485+
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2486+
propertyPath: m_margin.y
2487+
value: -9.220148
2488+
objectReference: {fileID: 0}
24572489
- target: {fileID: 6229936962346235841, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24582490
propertyPath: m_margin.z
2459-
value: -0.4302292
2491+
value: 21.11097
24602492
objectReference: {fileID: 0}
24612493
- target: {fileID: 6229936962346235842, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24622494
propertyPath: m_SizeDelta.y
24632495
value: 121.03
24642496
objectReference: {fileID: 0}
2497+
- target: {fileID: 6229936962346235842, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2498+
propertyPath: m_AnchoredPosition.x
2499+
value: 15.451416
2500+
objectReference: {fileID: 0}
2501+
- target: {fileID: 6229936962346235842, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
2502+
propertyPath: m_AnchoredPosition.y
2503+
value: -65.926796
2504+
objectReference: {fileID: 0}
24652505
m_RemovedComponents: []
24662506
m_SourcePrefab: {fileID: 100100000, guid: f46315c3156474c40a1e994aa01541b3, type: 3}
24672507
--- !u!114 &1014875358 stripped
@@ -2719,6 +2759,14 @@ PrefabInstance:
27192759
propertyPath: m_LocalEulerAnglesHint.z
27202760
value: 0
27212761
objectReference: {fileID: 0}
2762+
- target: {fileID: 5033053613669742682, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
2763+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
2764+
value:
2765+
objectReference: {fileID: 1023797266}
2766+
- target: {fileID: 5033053613669742682, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
2767+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
2768+
value: ExitButtonPressed
2769+
objectReference: {fileID: 0}
27222770
m_RemovedComponents: []
27232771
m_SourcePrefab: {fileID: 100100000, guid: 777e86226ce027144a7694f213e7ac7d, type: 3}
27242772
--- !u!1001 &1278629683

0 commit comments

Comments
 (0)