Fixes on the AudioManager, music in the Main Menu

ciro-unity · ciro-unity · commit 63c88b9daf15 · 2021-03-01T23:16:35.000+01:00
diff --git a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/MusicTracks.asset b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/MusicTracks.asset
@@ -12,12 +12,56 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
   m_Name: MusicTracks
   m_EditorClassIdentifier: 
-  m_GroupName: Packed Assets
+  m_GroupName: MusicTracks
   m_Data:
     m_SerializedData: []
   m_GUID: aeea0f42beabf4f468ce11b41d51e169
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 0d3b647e3c636ab40a6d9b48d8ffab35
+    m_Address: Assets/Audio/Music/Music_Beach.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: f55746203c03f2141a9e1a1649072238
+    m_Address: Assets/Audio/Music/Music_Forest.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 9871c84304b51b24c9c545454c791b2f
+    m_Address: Assets/Audio/Music/Music_Glade.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 1a61bf74a2f341b498082f54f67188b5
+    m_Address: Assets/Audio/Music/Music_MainTheme.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 18249a96d1decd241a4e0fc9bb78ebb6
+    m_Address: Assets/Audio/Music/Music_Path.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 72ef6eda0caaa744a819f1c0bcfce397
+    m_Address: Assets/Audio/Music/Music_PauseMenu.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
+  - m_GUID: 848739acdaf728b45a57a87160f9021e
+    m_Address: Assets/Audio/Music/Music_Town.wav
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 0}
+    m_TargetAsset: {fileID: 0}
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:
-    m_Schemas: []
+    m_Schemas:
+    - {fileID: 11400000, guid: 8463d1b8bad77e342b617bcedc02ec3a, type: 2}
+    - {fileID: 11400000, guid: a19f7b2b258a48f49aa5e6ab3a77c765, type: 2}
diff --git a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/SFX.asset b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/SFX.asset
@@ -12,12 +12,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
   m_Name: SFX
   m_EditorClassIdentifier: 
-  m_GroupName: Packed Assets
+  m_GroupName: SFX
   m_Data:
     m_SerializedData: []
   m_GUID: 7085e6b05c846d2448d509eb503e4d43
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: 283a4aea3a1670c4ebf8fa5901d18c08
+    m_Address: Assets/Audio/SFX
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    m_MainAsset: {fileID: 102900000, guid: 283a4aea3a1670c4ebf8fa5901d18c08, type: 3}
+    m_TargetAsset: {fileID: 102900000, guid: 283a4aea3a1670c4ebf8fa5901d18c08, type: 3}
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: bffab80dc16c4464b92b2e97b6a1964c, type: 2}
   m_SchemaSet:
-    m_Schemas: []
+    m_Schemas:
+    - {fileID: 11400000, guid: 55465dd6c93d83d439579d4dfa80c947, type: 2}
+    - {fileID: 11400000, guid: c3328767eca3b18418a23e420b4e3b86, type: 2}
diff --git a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/MusicTracks_BundledAssetGroupSchema.asset b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/MusicTracks_BundledAssetGroupSchema.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
   m_Name: MusicTracks_BundledAssetGroupSchema
   m_EditorClassIdentifier: 
-  m_Group: {fileID: 0}
+  m_Group: {fileID: 11400000, guid: c6089159bfe469d46ad3b0e68fe4aa09, type: 2}
   m_Compression: 1
   m_IncludeAddressInCatalog: 1
   m_IncludeGUIDInCatalog: 1
@@ -31,10 +31,10 @@ MonoBehaviour:
   m_RedirectLimit: -1
   m_RetryCount: 0
   m_BuildPath:
-    m_Id: 
+    m_Id: 5002d2ecf2c3647f8b6e3a264a6b45f8
   m_LoadPath:
-    m_Id: 
-  m_BundleMode: 0
+    m_Id: 343a2af8396fc47cb9e730bf77e141f0
+  m_BundleMode: 1
   m_AssetBundleProviderType:
     m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
     m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
diff --git a/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/MusicTracks_ContentUpdateGroupSchema.asset b/UOP1_Project/Assets/AddressableAssetsData/AssetGroups/Schemas/MusicTracks_ContentUpdateGroupSchema.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
   m_Name: MusicTracks_ContentUpdateGroupSchema
   m_EditorClassIdentifier: 
-  m_Group: {fileID: 0}
-  m_StaticContent: 0
+  m_Group: {fileID: 11400000, guid: c6089159bfe469d46ad3b0e68fe4aa09, type: 2}
+  m_StaticContent: 1
diff --git a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
@@ -98,7 +98,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -121,6 +121,81 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1001 &115741521
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593990, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593992, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: m_Name
+      value: MusicPlayer
+      objectReference: {fileID: 0}
+    - target: {fileID: 7961433267914593993, guid: 0b664a194840b8947ba233200964f991,
+        type: 3}
+      propertyPath: _thisSceneSO
+      value: 
+      objectReference: {fileID: 11400000, guid: 431ff81b74b48fb4d9301fb76ca633dd,
+        type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0b664a194840b8947ba233200964f991, type: 3}
 --- !u!1 &403475996
 GameObject:
   m_ObjectHideFlags: 0
@@ -720,7 +795,7 @@ PrefabInstance:
     - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
         type: 3}
       propertyPath: m_RootOrder
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 40564194958535909, guid: 54d1f8b93400ea64d97c276fab375df3,
         type: 3}
@@ -1046,7 +1121,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!81 &1419319622
 AudioListener:
@@ -1139,7 +1214,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1806157292
 GameObject:
@@ -1478,7 +1553,7 @@ RectTransform:
   - {fileID: 684748717}
   - {fileID: 821853655}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
diff --git a/UOP1_Project/Assets/Scenes/Skybox/ClearSky.meta b/UOP1_Project/Assets/Scenes/Skybox/ClearSky.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_MainTheme.asset b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_MainTheme.asset
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 08e854ccd8588da4694c3ae040c10c5e, type: 3}
+  m_Name: Music_MainTheme
+  m_EditorClassIdentifier: 
+  looping: 1
+  _audioClipGroups:
+  - sequenceMode: 2
+    audioClips:
+    - {fileID: 8300000, guid: 1a61bf74a2f341b498082f54f67188b5, type: 3}
diff --git a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_MainTheme.asset.meta b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/Music/Music_MainTheme.asset.meta
diff --git a/UOP1_Project/Assets/ScriptableObjects/SceneData/Menus/MainMenu.asset b/UOP1_Project/Assets/ScriptableObjects/SceneData/Menus/MainMenu.asset
@@ -12,9 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3546e1f9ebb6f054fb677b86f543542b, type: 3}
   m_Name: MainMenu
   m_EditorClassIdentifier: 
+  _guid: 431ff81b74b48fb4d9301fb76ca633dd
   description: Main/title menu, the only menu that exists as a standalone scene
   sceneType: 1
   sceneReference:
     m_AssetGUID: df490f8a21305b549b67b8301af79724
     m_SubObjectName: 
     m_SubObjectType: 
+  musicTrack: {fileID: 11400000, guid: 755065c424b9ce346977ffa54ae3c9c1, type: 2}
diff --git a/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs b/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs
@@ -124,6 +124,7 @@ private AudioCueKey PlayMusicTrack(AudioCueSO audioCue, AudioConfigurationSO aud
 
 		_musicSoundEmitter = _pool.Request();
 		_musicSoundEmitter.FadeMusicIn(audioCue.GetClips()[0], audioConfiguration, 1f, startTime);
+		_musicSoundEmitter.OnSoundFinishedPlaying += StopMusicEmitter;
 
 		return AudioCueKey.Invalid; //No need to return a valid key for music
 	}
@@ -216,4 +217,10 @@ private void StopAndCleanEmitter(SoundEmitter soundEmitter)
 		//_soundEmitterVault.Remove(audioCueKey); is never called if StopAndClean is called after a Finish event
 		//How is the key removed from the vault?
 	}
+
+	private void StopMusicEmitter(SoundEmitter soundEmitter)
+	{
+		soundEmitter.OnSoundFinishedPlaying -= StopMusicEmitter;
+		_pool.Return(soundEmitter);
+	}
 }
diff --git a/UOP1_Project/Assets/Scripts/Audio/MusicPlayer.cs b/UOP1_Project/Assets/Scripts/Audio/MusicPlayer.cs
@@ -7,7 +7,7 @@ public class MusicPlayer : MonoBehaviour
 {
 	[SerializeField] private VoidEventChannelSO _onSceneReady = default;
 	[SerializeField] private AudioCueEventChannelSO _playMusicOn = default;
-	[SerializeField] private LocationSO _thisSceneSO = default;
+	[SerializeField] private GameSceneSO _thisSceneSO = default;
 	[SerializeField] private AudioConfigurationSO _audioConfig = default;
 
 	private void OnEnable()
diff --git a/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitter.cs b/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitter.cs
@@ -30,6 +30,7 @@ public void PlayAudioClip(AudioClip clip, AudioConfigurationSO settings, bool ha
 		settings.ApplyTo(_audioSource);
 		_audioSource.transform.position = position;
 		_audioSource.loop = hasToLoop;
+		_audioSource.time = 0f; //Reset in case this AudioSource is being reused for a short SFX after being used for a long music track
 		_audioSource.Play();
 
 		if (!hasToLoop)
diff --git a/UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameSceneSO.cs b/UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/GameSceneSO.cs
@@ -8,6 +8,7 @@ public class GameSceneSO : DescriptionBaseSO
 {
 	public GameSceneType sceneType;
 	public AssetReference sceneReference; //Used at runtime to load the scene from the right AssetBundle
+	public AudioCueSO musicTrack;
 
 	/// <summary>
 	/// Used by the SceneSelector tool to discern what type of scene it needs to load
diff --git a/UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs b/UOP1_Project/Assets/Scripts/SceneManagement/ScriptableObjects/LocationSO.cs
@@ -9,5 +9,4 @@
 public class LocationSO : GameSceneSO
 {
 	public LocalizedString locationName;
-	public AudioCueSO musicTrack;
 }

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ private AudioCueKey PlayMusicTrack(AudioCueSO audioCue, AudioConfigurationSO aud`
`124`	`124`
`125`	`125`	`_musicSoundEmitter = _pool.Request();`
`126`	`126`	`_musicSoundEmitter.FadeMusicIn(audioCue.GetClips()[0], audioConfiguration, 1f, startTime);`
	`127`	`+ _musicSoundEmitter.OnSoundFinishedPlaying += StopMusicEmitter;`
`127`	`128`
`128`	`129`	`return AudioCueKey.Invalid; //No need to return a valid key for music`
`129`	`130`	`}`
`@@ -216,4 +217,10 @@ private void StopAndCleanEmitter(SoundEmitter soundEmitter)`
`216`	`217`	`//_soundEmitterVault.Remove(audioCueKey); is never called if StopAndClean is called after a Finish event`
`217`	`218`	`//How is the key removed from the vault?`
`218`	`219`	`}`
	`220`	`+`
	`221`	`+ private void StopMusicEmitter(SoundEmitter soundEmitter)`
	`222`	`+ {`
	`223`	`+ soundEmitter.OnSoundFinishedPlaying -= StopMusicEmitter;`
	`224`	`+ _pool.Return(soundEmitter);`
	`225`	`+ }`
`219`	`226`	`}`