Skip to content

Commit bd85763

Browse files
TomDotScottTomDotScott
committed
Options Menu
The player can now set the volume for the music and SFX through the options menu
1 parent c72161b commit bd85763

File tree

12 files changed

+3430
-927
lines changed

12 files changed

+3430
-927
lines changed

‎Assets/Prefabs/UI/UI.prefab‎

Lines changed: 2431 additions & 508 deletions
Large diffs are not rendered by default.

‎Assets/Scenes/Level1.unity‎

Lines changed: 57 additions & 23 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_Mesh367542
444+
m_Name: pb_Mesh47668
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_Mesh367336
607+
m_Name: pb_Mesh47462
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-804756
1084+
m_Name: pb_Mesh-222746
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_Mesh367362
1277+
m_Name: pb_Mesh47488
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_Mesh367274
1440+
m_Name: pb_Mesh47400
14411441
serializedVersion: 10
14421442
m_SubMeshes:
14431443
- serializedVersion: 2
@@ -2518,6 +2518,18 @@ 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:
25212533
--- !u!1001 &310451943
25222534
PrefabInstance:
25232535
m_ObjectHideFlags: 0
@@ -2599,7 +2611,7 @@ Mesh:
25992611
m_CorrespondingSourceObject: {fileID: 0}
26002612
m_PrefabInstance: {fileID: 0}
26012613
m_PrefabAsset: {fileID: 0}
2602-
m_Name: pb_Mesh367262
2614+
m_Name: pb_Mesh47388
26032615
serializedVersion: 10
26042616
m_SubMeshes:
26052617
- serializedVersion: 2
@@ -2762,7 +2774,7 @@ Mesh:
27622774
m_CorrespondingSourceObject: {fileID: 0}
27632775
m_PrefabInstance: {fileID: 0}
27642776
m_PrefabAsset: {fileID: 0}
2765-
m_Name: pb_Mesh367296
2777+
m_Name: pb_Mesh47422
27662778
serializedVersion: 10
27672779
m_SubMeshes:
27682780
- serializedVersion: 2
@@ -3645,7 +3657,7 @@ Mesh:
36453657
m_CorrespondingSourceObject: {fileID: 0}
36463658
m_PrefabInstance: {fileID: 0}
36473659
m_PrefabAsset: {fileID: 0}
3648-
m_Name: pb_Mesh367250
3660+
m_Name: pb_Mesh47376
36493661
serializedVersion: 10
36503662
m_SubMeshes:
36513663
- serializedVersion: 2
@@ -3808,7 +3820,7 @@ Mesh:
38083820
m_CorrespondingSourceObject: {fileID: 0}
38093821
m_PrefabInstance: {fileID: 0}
38103822
m_PrefabAsset: {fileID: 0}
3811-
m_Name: pb_Mesh367462
3823+
m_Name: pb_Mesh47588
38123824
serializedVersion: 10
38133825
m_SubMeshes:
38143826
- serializedVersion: 2
@@ -3965,13 +3977,25 @@ Mesh:
39653977
offset: 0
39663978
size: 0
39673979
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:
39683992
--- !u!43 &568996704
39693993
Mesh:
39703994
m_ObjectHideFlags: 0
39713995
m_CorrespondingSourceObject: {fileID: 0}
39723996
m_PrefabInstance: {fileID: 0}
39733997
m_PrefabAsset: {fileID: 0}
3974-
m_Name: pb_Mesh367348
3998+
m_Name: pb_Mesh47474
39753999
serializedVersion: 10
39764000
m_SubMeshes:
39774001
- serializedVersion: 2
@@ -4140,7 +4164,7 @@ Mesh:
41404164
m_CorrespondingSourceObject: {fileID: 0}
41414165
m_PrefabInstance: {fileID: 0}
41424166
m_PrefabAsset: {fileID: 0}
4143-
m_Name: pb_Mesh367476
4167+
m_Name: pb_Mesh47602
41444168
serializedVersion: 10
41454169
m_SubMeshes:
41464170
- serializedVersion: 2
@@ -5828,7 +5852,7 @@ Mesh:
58285852
m_CorrespondingSourceObject: {fileID: 0}
58295853
m_PrefabInstance: {fileID: 0}
58305854
m_PrefabAsset: {fileID: 0}
5831-
m_Name: pb_Mesh367308
5855+
m_Name: pb_Mesh47434
58325856
serializedVersion: 10
58335857
m_SubMeshes:
58345858
- serializedVersion: 2
@@ -5991,7 +6015,7 @@ Mesh:
59916015
m_CorrespondingSourceObject: {fileID: 0}
59926016
m_PrefabInstance: {fileID: 0}
59936017
m_PrefabAsset: {fileID: 0}
5994-
m_Name: pb_Mesh367490
6018+
m_Name: pb_Mesh47616
59956019
serializedVersion: 10
59966020
m_SubMeshes:
59976021
- serializedVersion: 2
@@ -6154,7 +6178,7 @@ Mesh:
61546178
m_CorrespondingSourceObject: {fileID: 0}
61556179
m_PrefabInstance: {fileID: 0}
61566180
m_PrefabAsset: {fileID: 0}
6157-
m_Name: pb_Mesh367588
6181+
m_Name: pb_Mesh47714
61586182
serializedVersion: 10
61596183
m_SubMeshes:
61606184
- serializedVersion: 2
@@ -7184,7 +7208,7 @@ Mesh:
71847208
m_CorrespondingSourceObject: {fileID: 0}
71857209
m_PrefabInstance: {fileID: 0}
71867210
m_PrefabAsset: {fileID: 0}
7187-
m_Name: pb_Mesh367502
7211+
m_Name: pb_Mesh47628
71887212
serializedVersion: 10
71897213
m_SubMeshes:
71907214
- serializedVersion: 2
@@ -7353,7 +7377,7 @@ Mesh:
73537377
m_CorrespondingSourceObject: {fileID: 0}
73547378
m_PrefabInstance: {fileID: 0}
73557379
m_PrefabAsset: {fileID: 0}
7356-
m_Name: pb_Mesh367226
7380+
m_Name: pb_Mesh47352
73577381
serializedVersion: 10
73587382
m_SubMeshes:
73597383
- serializedVersion: 2
@@ -7516,7 +7540,7 @@ Mesh:
75167540
m_CorrespondingSourceObject: {fileID: 0}
75177541
m_PrefabInstance: {fileID: 0}
75187542
m_PrefabAsset: {fileID: 0}
7519-
m_Name: pb_Mesh367412
7543+
m_Name: pb_Mesh47538
75207544
serializedVersion: 10
75217545
m_SubMeshes:
75227546
- serializedVersion: 2
@@ -8413,7 +8437,7 @@ Mesh:
84138437
m_CorrespondingSourceObject: {fileID: 0}
84148438
m_PrefabInstance: {fileID: 0}
84158439
m_PrefabAsset: {fileID: 0}
8416-
m_Name: pb_Mesh367374
8440+
m_Name: pb_Mesh47500
84178441
serializedVersion: 10
84188442
m_SubMeshes:
84198443
- serializedVersion: 2
@@ -9562,7 +9586,7 @@ Mesh:
95629586
m_CorrespondingSourceObject: {fileID: 0}
95639587
m_PrefabInstance: {fileID: 0}
95649588
m_PrefabAsset: {fileID: 0}
9565-
m_Name: pb_Mesh367396
9589+
m_Name: pb_Mesh47522
95669590
serializedVersion: 10
95679591
m_SubMeshes:
95689592
- serializedVersion: 2
@@ -9952,6 +9976,16 @@ PrefabInstance:
99529976
propertyPath: player
99539977
value:
99549978
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}
99559989
m_RemovedComponents: []
99569990
m_SourcePrefab: {fileID: 100100000, guid: 29227fbf81eeeba4a9764ebf0cd30845, type: 3}
99579991
--- !u!1 &1712260547
@@ -11063,7 +11097,7 @@ Mesh:
1106311097
m_CorrespondingSourceObject: {fileID: 0}
1106411098
m_PrefabInstance: {fileID: 0}
1106511099
m_PrefabAsset: {fileID: 0}
11066-
m_Name: pb_Mesh367558
11100+
m_Name: pb_Mesh47684
1106711101
serializedVersion: 10
1106811102
m_SubMeshes:
1106911103
- serializedVersion: 2
@@ -11226,7 +11260,7 @@ Mesh:
1122611260
m_CorrespondingSourceObject: {fileID: 0}
1122711261
m_PrefabInstance: {fileID: 0}
1122811262
m_PrefabAsset: {fileID: 0}
11229-
m_Name: pb_Mesh367446
11263+
m_Name: pb_Mesh47572
1123011264
serializedVersion: 10
1123111265
m_SubMeshes:
1123211266
- serializedVersion: 2
@@ -11697,7 +11731,7 @@ Mesh:
1169711731
m_CorrespondingSourceObject: {fileID: 0}
1169811732
m_PrefabInstance: {fileID: 0}
1169911733
m_PrefabAsset: {fileID: 0}
11700-
m_Name: pb_Mesh367604
11734+
m_Name: pb_Mesh47730
1170111735
serializedVersion: 10
1170211736
m_SubMeshes:
1170311737
- serializedVersion: 2
@@ -11860,7 +11894,7 @@ Mesh:
1186011894
m_CorrespondingSourceObject: {fileID: 0}
1186111895
m_PrefabInstance: {fileID: 0}
1186211896
m_PrefabAsset: {fileID: 0}
11863-
m_Name: pb_Mesh367210
11897+
m_Name: pb_Mesh47336
1186411898
serializedVersion: 10
1186511899
m_SubMeshes:
1186611900
- serializedVersion: 2

‎Assets/Scenes/Level2.unity‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,30 @@ 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:
13551379
--- !u!43 &52976342
13561380
Mesh:
13571381
m_ObjectHideFlags: 0
@@ -21197,6 +21221,18 @@ GameObject:
2119721221
type: 3}
2119821222
m_PrefabInstance: {fileID: 966824730}
2119921223
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:
2120021236
--- !u!43 &979624107
2120121237
Mesh:
2120221238
m_ObjectHideFlags: 0
@@ -31486,6 +31522,21 @@ PrefabInstance:
3148631522
propertyPath: m_LocalEulerAnglesHint.z
3148731523
value: 0
3148831524
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}
3148931540
m_RemovedComponents: []
3149031541
m_SourcePrefab: {fileID: 100100000, guid: 29227fbf81eeeba4a9764ebf0cd30845, type: 3}
3149131542
--- !u!4 &1476988130 stripped

0 commit comments

Comments
 (0)