Skip to content

Commit 834d4a4

Browse files
ciro-unityciro-unity
committed
Audio changes
1 parent f3bf432 commit 834d4a4

38 files changed

+207
-161
lines changed

‎UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,10 @@ MonoBehaviour:
344344
m_Name:
345345
m_EditorClassIdentifier:
346346
_sfxEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
347-
_audioConfig: {fileID: 11400000, guid: 6b42c99763682d64ba019b447d78be04, type: 2}
347+
_audioConfig: {fileID: 11400000, guid: 046cbfdf9a2c0964ea8a01b8e3814e51, type: 2}
348348
caneSwing: {fileID: 11400000, guid: ab9635318edf5da409588eec7deb39f2, type: 2}
349349
objectPickup: {fileID: 11400000, guid: 802be3a8bc6d3064e84c781cad59cb68, type: 2}
350-
footstep: {fileID: 11400000, guid: ddb0fd735bd6f904eaae159c865eb35f, type: 2}
350+
footstep: {fileID: 11400000, guid: 412141fe54999534a8d2800c2a567b55, type: 2}
351351
--- !u!114 &5557640735889932260
352352
MonoBehaviour:
353353
m_ObjectHideFlags: 0

‎UOP1_Project/Assets/Scenes/Locations/Beach.unity

Lines changed: 80 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ PrefabInstance:
142142
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
143143
type: 3}
144144
propertyPath: m_RootOrder
145-
value: 9
145+
value: 10
146146
objectReference: {fileID: 0}
147147
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
148148
type: 3}
@@ -292,7 +292,7 @@ Transform:
292292
m_LocalScale: {x: 1, y: 1, z: 1}
293293
m_Children: []
294294
m_Father: {fileID: 0}
295-
m_RootOrder: 5
295+
m_RootOrder: 6
296296
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
297297
--- !u!1001 &402461090
298298
PrefabInstance:
@@ -309,7 +309,7 @@ PrefabInstance:
309309
- target: {fileID: 5215257785267415874, guid: 647ea42d84b3f17469f1992b976ab5bb,
310310
type: 3}
311311
propertyPath: m_RootOrder
312-
value: 30
312+
value: 31
313313
objectReference: {fileID: 0}
314314
- target: {fileID: 5215257785267415874, guid: 647ea42d84b3f17469f1992b976ab5bb,
315315
type: 3}
@@ -519,7 +519,7 @@ Transform:
519519
m_LocalScale: {x: 100, y: 1, z: 100}
520520
m_Children: []
521521
m_Father: {fileID: 0}
522-
m_RootOrder: 22
522+
m_RootOrder: 23
523523
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
524524
--- !u!1 &674609686
525525
GameObject:
@@ -599,7 +599,7 @@ Transform:
599599
m_Children:
600600
- {fileID: 534203084}
601601
m_Father: {fileID: 0}
602-
m_RootOrder: 20
602+
m_RootOrder: 21
603603
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
604604
--- !u!1 &682182498
605605
GameObject:
@@ -629,7 +629,7 @@ Transform:
629629
m_LocalScale: {x: 1, y: 1, z: 1}
630630
m_Children: []
631631
m_Father: {fileID: 0}
632-
m_RootOrder: 19
632+
m_RootOrder: 20
633633
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
634634
--- !u!1001 &764049134
635635
PrefabInstance:
@@ -676,7 +676,7 @@ PrefabInstance:
676676
- target: {fileID: 2125786285293829335, guid: e978d53d440e0814086759404585ac32,
677677
type: 3}
678678
propertyPath: m_RootOrder
679-
value: 2
679+
value: 3
680680
objectReference: {fileID: 0}
681681
- target: {fileID: 2125786285293829335, guid: e978d53d440e0814086759404585ac32,
682682
type: 3}
@@ -862,7 +862,7 @@ Transform:
862862
m_LocalScale: {x: 6.2555, y: 3.6674, z: 3.0208502}
863863
m_Children: []
864864
m_Father: {fileID: 0}
865-
m_RootOrder: 11
865+
m_RootOrder: 12
866866
m_LocalEulerAnglesHint: {x: 0, y: 30.526001, z: 0}
867867
--- !u!114 &1021375555
868868
MonoBehaviour:
@@ -876,7 +876,7 @@ MonoBehaviour:
876876
m_Script: {fileID: 11500000, guid: 54f92f965dbe44449b252b814ddc7137, type: 3}
877877
m_Name:
878878
m_EditorClassIdentifier:
879-
_audioCue: {fileID: 11400000, guid: 68848f118f687254baf4d4e2f4bfbe65, type: 2}
879+
_audioCue: {fileID: 0}
880880
_playOnStart: 0
881881
_audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,
882882
type: 2}
@@ -902,7 +902,7 @@ PrefabInstance:
902902
- target: {fileID: 4578008936480288453, guid: c8cca569043f8f242b8293341538d805,
903903
type: 3}
904904
propertyPath: m_RootOrder
905-
value: 26
905+
value: 27
906906
objectReference: {fileID: 0}
907907
- target: {fileID: 4578008936480288453, guid: c8cca569043f8f242b8293341538d805,
908908
type: 3}
@@ -976,7 +976,7 @@ PrefabInstance:
976976
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
977977
type: 3}
978978
propertyPath: m_RootOrder
979-
value: 8
979+
value: 9
980980
objectReference: {fileID: 0}
981981
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
982982
type: 3}
@@ -1036,6 +1036,53 @@ PrefabInstance:
10361036
type: 2}
10371037
m_RemovedComponents: []
10381038
m_SourcePrefab: {fileID: 100100000, guid: 3b5498e27a52ce243b2ce35ba305d864, type: 3}
1039+
--- !u!1 &1213892518
1040+
GameObject:
1041+
m_ObjectHideFlags: 0
1042+
m_CorrespondingSourceObject: {fileID: 0}
1043+
m_PrefabInstance: {fileID: 0}
1044+
m_PrefabAsset: {fileID: 0}
1045+
serializedVersion: 6
1046+
m_Component:
1047+
- component: {fileID: 1213892520}
1048+
- component: {fileID: 1213892519}
1049+
m_Layer: 0
1050+
m_Name: MusicPlayer
1051+
m_TagString: Untagged
1052+
m_Icon: {fileID: 0}
1053+
m_NavMeshLayer: 0
1054+
m_StaticEditorFlags: 0
1055+
m_IsActive: 1
1056+
--- !u!114 &1213892519
1057+
MonoBehaviour:
1058+
m_ObjectHideFlags: 0
1059+
m_CorrespondingSourceObject: {fileID: 0}
1060+
m_PrefabInstance: {fileID: 0}
1061+
m_PrefabAsset: {fileID: 0}
1062+
m_GameObject: {fileID: 1213892518}
1063+
m_Enabled: 1
1064+
m_EditorHideFlags: 0
1065+
m_Script: {fileID: 11500000, guid: 6bac00fb906d5ce448625eccf4aa04ec, type: 3}
1066+
m_Name:
1067+
m_EditorClassIdentifier:
1068+
_onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
1069+
_playMusicOn: {fileID: 11400000, guid: 51854f522e1d88442a90b878b27ea839, type: 2}
1070+
_thisSceneSO: {fileID: 11400000, guid: 2f386bbc670c05145834a0f9c7d55798, type: 2}
1071+
_audioConfig: {fileID: 11400000, guid: 7dc92129d2e4ae84dabc197b593ba446, type: 2}
1072+
--- !u!4 &1213892520
1073+
Transform:
1074+
m_ObjectHideFlags: 0
1075+
m_CorrespondingSourceObject: {fileID: 0}
1076+
m_PrefabInstance: {fileID: 0}
1077+
m_PrefabAsset: {fileID: 0}
1078+
m_GameObject: {fileID: 1213892518}
1079+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1080+
m_LocalPosition: {x: 0, y: 0, z: 0}
1081+
m_LocalScale: {x: 1, y: 1, z: 1}
1082+
m_Children: []
1083+
m_Father: {fileID: 0}
1084+
m_RootOrder: 1
1085+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10391086
--- !u!1 &1443998548
10401087
GameObject:
10411088
m_ObjectHideFlags: 0
@@ -1127,7 +1174,7 @@ Transform:
11271174
m_LocalScale: {x: 100, y: 1, z: 100}
11281175
m_Children: []
11291176
m_Father: {fileID: 0}
1130-
m_RootOrder: 21
1177+
m_RootOrder: 22
11311178
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11321179
--- !u!1 &1481348462
11331180
GameObject:
@@ -1270,7 +1317,7 @@ Transform:
12701317
m_LocalScale: {x: 12.369, y: 7.25155, z: 5.9731274}
12711318
m_Children: []
12721319
m_Father: {fileID: 0}
1273-
m_RootOrder: 13
1320+
m_RootOrder: 14
12741321
m_LocalEulerAnglesHint: {x: 0, y: 82.234, z: 0}
12751322
--- !u!1 &1814819702
12761323
GameObject:
@@ -1335,7 +1382,7 @@ Transform:
13351382
m_LocalScale: {x: 1, y: 1, z: 1}
13361383
m_Children: []
13371384
m_Father: {fileID: 0}
1338-
m_RootOrder: 6
1385+
m_RootOrder: 7
13391386
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
13401387
--- !u!1001 &1835452175
13411388
PrefabInstance:
@@ -1347,7 +1394,7 @@ PrefabInstance:
13471394
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
13481395
type: 3}
13491396
propertyPath: m_RootOrder
1350-
value: 29
1397+
value: 30
13511398
objectReference: {fileID: 0}
13521399
- target: {fileID: 2723178623857253410, guid: 7f3c311f1ca46334ab26b1adfc5be02f,
13531400
type: 3}
@@ -1421,7 +1468,7 @@ PrefabInstance:
14211468
- target: {fileID: 4336536613454148666, guid: adbee91cfe65b4a4b8f1ea3316dbcb5b,
14221469
type: 3}
14231470
propertyPath: m_RootOrder
1424-
value: 28
1471+
value: 29
14251472
objectReference: {fileID: 0}
14261473
- target: {fileID: 4336536613454148666, guid: adbee91cfe65b4a4b8f1ea3316dbcb5b,
14271474
type: 3}
@@ -1508,7 +1555,7 @@ MonoBehaviour:
15081555
m_Script: {fileID: 11500000, guid: 54f92f965dbe44449b252b814ddc7137, type: 3}
15091556
m_Name:
15101557
m_EditorClassIdentifier:
1511-
_audioCue: {fileID: 11400000, guid: 68848f118f687254baf4d4e2f4bfbe65, type: 2}
1558+
_audioCue: {fileID: 0}
15121559
_playOnStart: 0
15131560
_audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,
15141561
type: 2}
@@ -1605,7 +1652,7 @@ Transform:
16051652
m_LocalScale: {x: 6.2555, y: 3.6674, z: 3.0208502}
16061653
m_Children: []
16071654
m_Father: {fileID: 0}
1608-
m_RootOrder: 12
1655+
m_RootOrder: 13
16091656
m_LocalEulerAnglesHint: {x: 0, y: 76.899, z: 0}
16101657
--- !u!1001 &1899846896
16111658
PrefabInstance:
@@ -1627,7 +1674,7 @@ PrefabInstance:
16271674
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
16281675
type: 3}
16291676
propertyPath: m_RootOrder
1630-
value: 10
1677+
value: 11
16311678
objectReference: {fileID: 0}
16321679
- target: {fileID: 5540501665159811850, guid: 3b5498e27a52ce243b2ce35ba305d864,
16331680
type: 3}
@@ -1715,7 +1762,7 @@ Transform:
17151762
m_LocalScale: {x: 1, y: 1, z: 1}
17161763
m_Children: []
17171764
m_Father: {fileID: 0}
1718-
m_RootOrder: 14
1765+
m_RootOrder: 15
17191766
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17201767
--- !u!1 &1928770499
17211768
GameObject:
@@ -1745,7 +1792,7 @@ Transform:
17451792
m_LocalScale: {x: 1, y: 1, z: 1}
17461793
m_Children: []
17471794
m_Father: {fileID: 0}
1748-
m_RootOrder: 7
1795+
m_RootOrder: 8
17491796
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17501797
--- !u!1 &1958420419
17511798
GameObject:
@@ -1775,7 +1822,7 @@ Transform:
17751822
m_LocalScale: {x: 1, y: 1, z: 1}
17761823
m_Children: []
17771824
m_Father: {fileID: 0}
1778-
m_RootOrder: 4
1825+
m_RootOrder: 5
17791826
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17801827
--- !u!1001 &2046241436
17811828
PrefabInstance:
@@ -1887,7 +1934,7 @@ PrefabInstance:
18871934
- target: {fileID: 2955398947125553842, guid: 45632f0a227c860489bcba0eb1f4ec3e,
18881935
type: 3}
18891936
propertyPath: m_LocalRotation.z
1890-
value: -0.11854541
1937+
value: -0.118545376
18911938
objectReference: {fileID: 0}
18921939
- target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
18931940
type: 3}
@@ -1897,7 +1944,7 @@ PrefabInstance:
18971944
- target: {fileID: 8745341640208226295, guid: 45632f0a227c860489bcba0eb1f4ec3e,
18981945
type: 3}
18991946
propertyPath: m_RootOrder
1900-
value: 3
1947+
value: 4
19011948
objectReference: {fileID: 0}
19021949
- target: {fileID: 8745341640208226295, guid: 45632f0a227c860489bcba0eb1f4ec3e,
19031950
type: 3}
@@ -2038,7 +2085,7 @@ PrefabInstance:
20382085
- target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
20392086
type: 3}
20402087
propertyPath: m_RootOrder
2041-
value: 1
2088+
value: 2
20422089
objectReference: {fileID: 0}
20432090
- target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
20442091
type: 3}
@@ -2129,7 +2176,7 @@ PrefabInstance:
21292176
- target: {fileID: 2397232258201416951, guid: 2b0687cec5da670488d4dc3627e6ea49,
21302177
type: 3}
21312178
propertyPath: m_RootOrder
2132-
value: 16
2179+
value: 17
21332180
objectReference: {fileID: 0}
21342181
- target: {fileID: 2397232258201416951, guid: 2b0687cec5da670488d4dc3627e6ea49,
21352182
type: 3}
@@ -2193,7 +2240,7 @@ PrefabInstance:
21932240
- target: {fileID: 2543186840983142744, guid: cd349fd75563ded46bf218c75f16a1f5,
21942241
type: 3}
21952242
propertyPath: m_RootOrder
2196-
value: 27
2243+
value: 28
21972244
objectReference: {fileID: 0}
21982245
- target: {fileID: 2543186840983142744, guid: cd349fd75563ded46bf218c75f16a1f5,
21992246
type: 3}
@@ -2262,7 +2309,7 @@ PrefabInstance:
22622309
- target: {fileID: 2892076701290493137, guid: 23735bc8688dbfe429c6bf9ae25d7cd8,
22632310
type: 3}
22642311
propertyPath: m_RootOrder
2265-
value: 15
2312+
value: 16
22662313
objectReference: {fileID: 0}
22672314
- target: {fileID: 2892076701290493137, guid: 23735bc8688dbfe429c6bf9ae25d7cd8,
22682315
type: 3}
@@ -2351,7 +2398,7 @@ PrefabInstance:
23512398
- target: {fileID: 3769111898081533676, guid: 0e833246093ee8b43aa849cd306ddaa8,
23522399
type: 3}
23532400
propertyPath: m_RootOrder
2354-
value: 18
2401+
value: 19
23552402
objectReference: {fileID: 0}
23562403
- target: {fileID: 3769111898081533676, guid: 0e833246093ee8b43aa849cd306ddaa8,
23572404
type: 3}
@@ -2710,7 +2757,7 @@ PrefabInstance:
27102757
- target: {fileID: 5426752796581055613, guid: 4c96eefe12d9d2b4da051ac1e459080a,
27112758
type: 3}
27122759
propertyPath: m_RootOrder
2713-
value: 24
2760+
value: 25
27142761
objectReference: {fileID: 0}
27152762
- target: {fileID: 5426752796581055613, guid: 4c96eefe12d9d2b4da051ac1e459080a,
27162763
type: 3}
@@ -2774,7 +2821,7 @@ PrefabInstance:
27742821
- target: {fileID: 8480342874862479705, guid: 58b2fce34466e6e40963f42dfd5ffa61,
27752822
type: 3}
27762823
propertyPath: m_RootOrder
2777-
value: 17
2824+
value: 18
27782825
objectReference: {fileID: 0}
27792826
- target: {fileID: 8480342874862479705, guid: 58b2fce34466e6e40963f42dfd5ffa61,
27802827
type: 3}
@@ -2853,7 +2900,7 @@ PrefabInstance:
28532900
- target: {fileID: 4492041825994751890, guid: ef9e28c2d08876542860097704aa63b2,
28542901
type: 3}
28552902
propertyPath: m_RootOrder
2856-
value: 25
2903+
value: 26
28572904
objectReference: {fileID: 0}
28582905
- target: {fileID: 4492041825994751890, guid: ef9e28c2d08876542860097704aa63b2,
28592906
type: 3}
@@ -2972,7 +3019,7 @@ PrefabInstance:
29723019
- target: {fileID: 9223003383603547671, guid: c00f714522ff4b74cab5680809e09e67,
29733020
type: 3}
29743021
propertyPath: m_RootOrder
2975-
value: 23
3022+
value: 24
29763023
objectReference: {fileID: 0}
29773024
- target: {fileID: 9223003383603547671, guid: c00f714522ff4b74cab5680809e09e67,
29783025
type: 3}

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/2.5DSFX_Config.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: b357a35b19afa6e4ca9ed9cc1830f6de, type: 3}
1313
m_Name: 2.5DSFX_Config
1414
m_EditorClassIdentifier:
15-
OutputAudioMixerGroup: {fileID: 8911742078530553623, guid: 548a7f001ca6d3d4cb67c8edf84f62a3,
15+
OutputAudioMixerGroup: {fileID: -6246855377066869883, guid: 548a7f001ca6d3d4cb67c8edf84f62a3,
1616
type: 2}
1717
_priorityLevel: 128
1818
Mute: 0

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/2DSFX_Config.asset renamed to ‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/UISFX_Config.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: b357a35b19afa6e4ca9ed9cc1830f6de, type: 3}
13-
m_Name: 2DSFX_Config
13+
m_Name: UISFX_Config
1414
m_EditorClassIdentifier:
1515
OutputAudioMixerGroup: {fileID: 8911742078530553623, guid: 548a7f001ca6d3d4cb67c8edf84f62a3,
1616
type: 2}

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/2DSFX_Config.asset.meta renamed to ‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/UISFX_Config.asset.meta

File renamed without changes.

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Tests.meta renamed to ‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music.meta

File renamed without changes.

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Tests/SFX_1_ChooChoo.asset renamed to ‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_Beach.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: 08e854ccd8588da4694c3ae040c10c5e, type: 3}
13-
m_Name: SFX_1_ChooChoo
13+
m_Name: Music_Beach
1414
m_EditorClassIdentifier:
1515
looping: 1
1616
_audioClipGroups:
1717
- sequenceMode: 2
1818
audioClips:
19-
- {fileID: 8300000, guid: 8b7037330a72ab94693661c7b6688cf6, type: 3}
19+
- {fileID: 8300000, guid: 0d3b647e3c636ab40a6d9b48d8ffab35, type: 3}

‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Tests/Music_8Bit.asset.meta renamed to ‎UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_Beach.asset.meta

File renamed without changes.

0 commit comments

Comments
 (0)