Skip to content

Commit 5c5b7ea

Browse files
TomDotScottTomDotScott
committed
Revert "Options Menu"
This reverts commit bd85763.
1 parent bd85763 commit 5c5b7ea

File tree

12 files changed

+851
-3354
lines changed

12 files changed

+851
-3354
lines changed

‎Assets/Prefabs/UI/UI.prefab‎

Lines changed: 432 additions & 2355 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/Level1.unity‎

Lines changed: 23 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ Mesh:
441441
m_CorrespondingSourceObject: {fileID: 0}
442442
m_PrefabInstance: {fileID: 0}
443443
m_PrefabAsset: {fileID: 0}
444-
m_Name: pb_Mesh47668
444+
m_Name: pb_Mesh367542
445445
serializedVersion: 10
446446
m_SubMeshes:
447447
- serializedVersion: 2
@@ -604,7 +604,7 @@ Mesh:
604604
m_CorrespondingSourceObject: {fileID: 0}
605605
m_PrefabInstance: {fileID: 0}
606606
m_PrefabAsset: {fileID: 0}
607-
m_Name: pb_Mesh47462
607+
m_Name: pb_Mesh367336
608608
serializedVersion: 10
609609
m_SubMeshes:
610610
- serializedVersion: 2
@@ -1081,7 +1081,7 @@ Mesh:
10811081
m_CorrespondingSourceObject: {fileID: 0}
10821082
m_PrefabInstance: {fileID: 0}
10831083
m_PrefabAsset: {fileID: 0}
1084-
m_Name: pb_Mesh-222746
1084+
m_Name: pb_Mesh-804756
10851085
serializedVersion: 10
10861086
m_SubMeshes:
10871087
- serializedVersion: 2
@@ -1274,7 +1274,7 @@ Mesh:
12741274
m_CorrespondingSourceObject: {fileID: 0}
12751275
m_PrefabInstance: {fileID: 0}
12761276
m_PrefabAsset: {fileID: 0}
1277-
m_Name: pb_Mesh47488
1277+
m_Name: pb_Mesh367362
12781278
serializedVersion: 10
12791279
m_SubMeshes:
12801280
- serializedVersion: 2
@@ -1437,7 +1437,7 @@ Mesh:
14371437
m_CorrespondingSourceObject: {fileID: 0}
14381438
m_PrefabInstance: {fileID: 0}
14391439
m_PrefabAsset: {fileID: 0}
1440-
m_Name: pb_Mesh47400
1440+
m_Name: pb_Mesh367274
14411441
serializedVersion: 10
14421442
m_SubMeshes:
14431443
- serializedVersion: 2
@@ -2518,18 +2518,6 @@ Transform:
25182518
m_Father: {fileID: 1525555314}
25192519
m_RootOrder: 13
25202520
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001}
2521-
--- !u!114 &271925608 stripped
2522-
MonoBehaviour:
2523-
m_CorrespondingSourceObject: {fileID: 271925608, guid: 6473b3ec243e7e54f86ba08a7f201d49,
2524-
type: 3}
2525-
m_PrefabInstance: {fileID: 7507602229393546970}
2526-
m_PrefabAsset: {fileID: 0}
2527-
m_GameObject: {fileID: 0}
2528-
m_Enabled: 1
2529-
m_EditorHideFlags: 0
2530-
m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3}
2531-
m_Name:
2532-
m_EditorClassIdentifier:
25332521
--- !u!1001 &310451943
25342522
PrefabInstance:
25352523
m_ObjectHideFlags: 0
@@ -2611,7 +2599,7 @@ Mesh:
26112599
m_CorrespondingSourceObject: {fileID: 0}
26122600
m_PrefabInstance: {fileID: 0}
26132601
m_PrefabAsset: {fileID: 0}
2614-
m_Name: pb_Mesh47388
2602+
m_Name: pb_Mesh367262
26152603
serializedVersion: 10
26162604
m_SubMeshes:
26172605
- serializedVersion: 2
@@ -2774,7 +2762,7 @@ Mesh:
27742762
m_CorrespondingSourceObject: {fileID: 0}
27752763
m_PrefabInstance: {fileID: 0}
27762764
m_PrefabAsset: {fileID: 0}
2777-
m_Name: pb_Mesh47422
2765+
m_Name: pb_Mesh367296
27782766
serializedVersion: 10
27792767
m_SubMeshes:
27802768
- serializedVersion: 2
@@ -3657,7 +3645,7 @@ Mesh:
36573645
m_CorrespondingSourceObject: {fileID: 0}
36583646
m_PrefabInstance: {fileID: 0}
36593647
m_PrefabAsset: {fileID: 0}
3660-
m_Name: pb_Mesh47376
3648+
m_Name: pb_Mesh367250
36613649
serializedVersion: 10
36623650
m_SubMeshes:
36633651
- serializedVersion: 2
@@ -3820,7 +3808,7 @@ Mesh:
38203808
m_CorrespondingSourceObject: {fileID: 0}
38213809
m_PrefabInstance: {fileID: 0}
38223810
m_PrefabAsset: {fileID: 0}
3823-
m_Name: pb_Mesh47588
3811+
m_Name: pb_Mesh367462
38243812
serializedVersion: 10
38253813
m_SubMeshes:
38263814
- serializedVersion: 2
@@ -3977,25 +3965,13 @@ Mesh:
39773965
offset: 0
39783966
size: 0
39793967
path:
3980-
--- !u!114 &566593240 stripped
3981-
MonoBehaviour:
3982-
m_CorrespondingSourceObject: {fileID: 566593240, guid: 6473b3ec243e7e54f86ba08a7f201d49,
3983-
type: 3}
3984-
m_PrefabInstance: {fileID: 7507602229393546970}
3985-
m_PrefabAsset: {fileID: 0}
3986-
m_GameObject: {fileID: 0}
3987-
m_Enabled: 1
3988-
m_EditorHideFlags: 0
3989-
m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3}
3990-
m_Name:
3991-
m_EditorClassIdentifier:
39923968
--- !u!43 &568996704
39933969
Mesh:
39943970
m_ObjectHideFlags: 0
39953971
m_CorrespondingSourceObject: {fileID: 0}
39963972
m_PrefabInstance: {fileID: 0}
39973973
m_PrefabAsset: {fileID: 0}
3998-
m_Name: pb_Mesh47474
3974+
m_Name: pb_Mesh367348
39993975
serializedVersion: 10
40003976
m_SubMeshes:
40013977
- serializedVersion: 2
@@ -4164,7 +4140,7 @@ Mesh:
41644140
m_CorrespondingSourceObject: {fileID: 0}
41654141
m_PrefabInstance: {fileID: 0}
41664142
m_PrefabAsset: {fileID: 0}
4167-
m_Name: pb_Mesh47602
4143+
m_Name: pb_Mesh367476
41684144
serializedVersion: 10
41694145
m_SubMeshes:
41704146
- serializedVersion: 2
@@ -5852,7 +5828,7 @@ Mesh:
58525828
m_CorrespondingSourceObject: {fileID: 0}
58535829
m_PrefabInstance: {fileID: 0}
58545830
m_PrefabAsset: {fileID: 0}
5855-
m_Name: pb_Mesh47434
5831+
m_Name: pb_Mesh367308
58565832
serializedVersion: 10
58575833
m_SubMeshes:
58585834
- serializedVersion: 2
@@ -6015,7 +5991,7 @@ Mesh:
60155991
m_CorrespondingSourceObject: {fileID: 0}
60165992
m_PrefabInstance: {fileID: 0}
60175993
m_PrefabAsset: {fileID: 0}
6018-
m_Name: pb_Mesh47616
5994+
m_Name: pb_Mesh367490
60195995
serializedVersion: 10
60205996
m_SubMeshes:
60215997
- serializedVersion: 2
@@ -6178,7 +6154,7 @@ Mesh:
61786154
m_CorrespondingSourceObject: {fileID: 0}
61796155
m_PrefabInstance: {fileID: 0}
61806156
m_PrefabAsset: {fileID: 0}
6181-
m_Name: pb_Mesh47714
6157+
m_Name: pb_Mesh367588
61826158
serializedVersion: 10
61836159
m_SubMeshes:
61846160
- serializedVersion: 2
@@ -7208,7 +7184,7 @@ Mesh:
72087184
m_CorrespondingSourceObject: {fileID: 0}
72097185
m_PrefabInstance: {fileID: 0}
72107186
m_PrefabAsset: {fileID: 0}
7211-
m_Name: pb_Mesh47628
7187+
m_Name: pb_Mesh367502
72127188
serializedVersion: 10
72137189
m_SubMeshes:
72147190
- serializedVersion: 2
@@ -7377,7 +7353,7 @@ Mesh:
73777353
m_CorrespondingSourceObject: {fileID: 0}
73787354
m_PrefabInstance: {fileID: 0}
73797355
m_PrefabAsset: {fileID: 0}
7380-
m_Name: pb_Mesh47352
7356+
m_Name: pb_Mesh367226
73817357
serializedVersion: 10
73827358
m_SubMeshes:
73837359
- serializedVersion: 2
@@ -7540,7 +7516,7 @@ Mesh:
75407516
m_CorrespondingSourceObject: {fileID: 0}
75417517
m_PrefabInstance: {fileID: 0}
75427518
m_PrefabAsset: {fileID: 0}
7543-
m_Name: pb_Mesh47538
7519+
m_Name: pb_Mesh367412
75447520
serializedVersion: 10
75457521
m_SubMeshes:
75467522
- serializedVersion: 2
@@ -8437,7 +8413,7 @@ Mesh:
84378413
m_CorrespondingSourceObject: {fileID: 0}
84388414
m_PrefabInstance: {fileID: 0}
84398415
m_PrefabAsset: {fileID: 0}
8440-
m_Name: pb_Mesh47500
8416+
m_Name: pb_Mesh367374
84418417
serializedVersion: 10
84428418
m_SubMeshes:
84438419
- serializedVersion: 2
@@ -9586,7 +9562,7 @@ Mesh:
95869562
m_CorrespondingSourceObject: {fileID: 0}
95879563
m_PrefabInstance: {fileID: 0}
95889564
m_PrefabAsset: {fileID: 0}
9589-
m_Name: pb_Mesh47522
9565+
m_Name: pb_Mesh367396
95909566
serializedVersion: 10
95919567
m_SubMeshes:
95929568
- serializedVersion: 2
@@ -9976,16 +9952,6 @@ PrefabInstance:
99769952
propertyPath: player
99779953
value:
99789954
objectReference: {fileID: 3329433734417624045}
9979-
- target: {fileID: 6756524775032712877, guid: 29227fbf81eeeba4a9764ebf0cd30845,
9980-
type: 3}
9981-
propertyPath: musicSlider
9982-
value:
9983-
objectReference: {fileID: 271925608}
9984-
- target: {fileID: 6756524775032712877, guid: 29227fbf81eeeba4a9764ebf0cd30845,
9985-
type: 3}
9986-
propertyPath: sfxSlider
9987-
value:
9988-
objectReference: {fileID: 566593240}
99899955
m_RemovedComponents: []
99909956
m_SourcePrefab: {fileID: 100100000, guid: 29227fbf81eeeba4a9764ebf0cd30845, type: 3}
99919957
--- !u!1 &1712260547
@@ -11097,7 +11063,7 @@ Mesh:
1109711063
m_CorrespondingSourceObject: {fileID: 0}
1109811064
m_PrefabInstance: {fileID: 0}
1109911065
m_PrefabAsset: {fileID: 0}
11100-
m_Name: pb_Mesh47684
11066+
m_Name: pb_Mesh367558
1110111067
serializedVersion: 10
1110211068
m_SubMeshes:
1110311069
- serializedVersion: 2
@@ -11260,7 +11226,7 @@ Mesh:
1126011226
m_CorrespondingSourceObject: {fileID: 0}
1126111227
m_PrefabInstance: {fileID: 0}
1126211228
m_PrefabAsset: {fileID: 0}
11263-
m_Name: pb_Mesh47572
11229+
m_Name: pb_Mesh367446
1126411230
serializedVersion: 10
1126511231
m_SubMeshes:
1126611232
- serializedVersion: 2
@@ -11731,7 +11697,7 @@ Mesh:
1173111697
m_CorrespondingSourceObject: {fileID: 0}
1173211698
m_PrefabInstance: {fileID: 0}
1173311699
m_PrefabAsset: {fileID: 0}
11734-
m_Name: pb_Mesh47730
11700+
m_Name: pb_Mesh367604
1173511701
serializedVersion: 10
1173611702
m_SubMeshes:
1173711703
- serializedVersion: 2
@@ -11894,7 +11860,7 @@ Mesh:
1189411860
m_CorrespondingSourceObject: {fileID: 0}
1189511861
m_PrefabInstance: {fileID: 0}
1189611862
m_PrefabAsset: {fileID: 0}
11897-
m_Name: pb_Mesh47336
11863+
m_Name: pb_Mesh367210
1189811864
serializedVersion: 10
1189911865
m_SubMeshes:
1190011866
- serializedVersion: 2

‎Assets/Scenes/Level2.unity‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,30 +1352,6 @@ MonoBehaviour:
13521352
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
13531353
m_Name:
13541354
m_EditorClassIdentifier:
1355-
--- !u!114 &52880488 stripped
1356-
MonoBehaviour:
1357-
m_CorrespondingSourceObject: {fileID: 566593240, guid: 6473b3ec243e7e54f86ba08a7f201d49,
1358-
type: 3}
1359-
m_PrefabInstance: {fileID: 52880483}
1360-
m_PrefabAsset: {fileID: 0}
1361-
m_GameObject: {fileID: 0}
1362-
m_Enabled: 1
1363-
m_EditorHideFlags: 0
1364-
m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1365-
m_Name:
1366-
m_EditorClassIdentifier:
1367-
--- !u!114 &52880489 stripped
1368-
MonoBehaviour:
1369-
m_CorrespondingSourceObject: {fileID: 271925608, guid: 6473b3ec243e7e54f86ba08a7f201d49,
1370-
type: 3}
1371-
m_PrefabInstance: {fileID: 52880483}
1372-
m_PrefabAsset: {fileID: 0}
1373-
m_GameObject: {fileID: 0}
1374-
m_Enabled: 1
1375-
m_EditorHideFlags: 0
1376-
m_Script: {fileID: -113659843, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1377-
m_Name:
1378-
m_EditorClassIdentifier:
13791355
--- !u!43 &52976342
13801356
Mesh:
13811357
m_ObjectHideFlags: 0
@@ -21221,18 +21197,6 @@ GameObject:
2122121197
type: 3}
2122221198
m_PrefabInstance: {fileID: 966824730}
2122321199
m_PrefabAsset: {fileID: 0}
21224-
--- !u!114 &966824732 stripped
21225-
MonoBehaviour:
21226-
m_CorrespondingSourceObject: {fileID: 6526632517528651534, guid: c2dc14f109b09a743b03757ef68006c7,
21227-
type: 3}
21228-
m_PrefabInstance: {fileID: 966824730}
21229-
m_PrefabAsset: {fileID: 0}
21230-
m_GameObject: {fileID: 966824731}
21231-
m_Enabled: 1
21232-
m_EditorHideFlags: 0
21233-
m_Script: {fileID: 11500000, guid: bedef31058aa28142829c34206f79b48, type: 3}
21234-
m_Name:
21235-
m_EditorClassIdentifier:
2123621200
--- !u!43 &979624107
2123721201
Mesh:
2123821202
m_ObjectHideFlags: 0
@@ -31522,21 +31486,6 @@ PrefabInstance:
3152231486
propertyPath: m_LocalEulerAnglesHint.z
3152331487
value: 0
3152431488
objectReference: {fileID: 0}
31525-
- target: {fileID: 6756524775032712877, guid: 29227fbf81eeeba4a9764ebf0cd30845,
31526-
type: 3}
31527-
propertyPath: player
31528-
value:
31529-
objectReference: {fileID: 966824732}
31530-
- target: {fileID: 6756524775032712877, guid: 29227fbf81eeeba4a9764ebf0cd30845,
31531-
type: 3}
31532-
propertyPath: musicSlider
31533-
value:
31534-
objectReference: {fileID: 52880489}
31535-
- target: {fileID: 6756524775032712877, guid: 29227fbf81eeeba4a9764ebf0cd30845,
31536-
type: 3}
31537-
propertyPath: sfxSlider
31538-
value:
31539-
objectReference: {fileID: 52880488}
3154031489
m_RemovedComponents: []
3154131490
m_SourcePrefab: {fileID: 100100000, guid: 29227fbf81eeeba4a9764ebf0cd30845, type: 3}
3154231491
--- !u!4 &1476988130 stripped

0 commit comments

Comments
 (0)