Audio functionality

4 年前 · 99c4ccb4
--- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
  m_Enabled: 1
  m_Avatar: {fileID: 0}
  m_Controller: {fileID: 9100000, guid: 7d5196a6002d44385b07f1b51b42eb86, type: 2}
-  m_CullingMode: 0
+  m_CullingMode: 1
  m_UpdateMode: 0
  m_ApplyRootMotion: 0
  m_LinearVelocityBlending: 0
--- a/UOP1_Project/Assets/Scenes/Initialization.unity
+++ b/UOP1_Project/Assets/Scenes/Initialization.unity
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &610459580
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 610459581}
+  - component: {fileID: 610459582}
+  m_Layer: 0
+  m_Name: AudioManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &610459581
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 610459580}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+--- !u!114 &610459582
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 610459580}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7dcf69f82f8783049ab749ba8f527f89, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _factory: {fileID: 11400000, guid: 0f82d558a11c88d458625502b6708251, type: 2}
+  _pool: {fileID: 11400000, guid: 4b2ed98efabac4446a90c61932acf933, type: 2}
+  _SFXEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
+  _musicEventChannel: {fileID: 0}
 --- !u!1 &841012433
 GameObject:
  m_ObjectHideFlags: 0
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 1
  m_PhysicalUnit: 3
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
--- a/UOP1_Project/Assets/Scenes/Locations/Beach.unity
+++ b/UOP1_Project/Assets/Scenes/Locations/Beach.unity
--- a/UOP1_Project/Assets/Scenes/Locations/Forest.unity
+++ b/UOP1_Project/Assets/Scenes/Locations/Forest.unity
  - component: {fileID: 1406036543}
  - component: {fileID: 1406036542}
  - component: {fileID: 1406036541}
+  - component: {fileID: 1406036546}
  m_Layer: 0
  m_Name: ExitToBeach
  m_TagString: Untagged
  m_Father: {fileID: 0}
  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1406036546
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1406036540}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 54f92f965dbe44449b252b814ddc7137, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _audioCue: {fileID: 11400000, guid: cd2aedc39ac8b734bb291c84c3d68a97, type: 2}
+  _playOnAwake: 0
+  _audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,
+    type: 2}
+  _audioConfiguration: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a,
+    type: 2}
 --- !u!1001 &1521534075
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: 1657732992883833910, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.035635047
+      value: 0.03563515
-      value: -0.00917581
+      value: -0.009175836
-      value: 0.24919108
+      value: 0.24919106
-      value: 0.035795644
+      value: 0.035795752
-      value: -0.0085278265
+      value: -0.0085278535
-      value: 0.23159356
+      value: 0.23159355
-      value: 0.22959729
+      value: 0.22959733
-      value: 0.035813097
+      value: 0.035813168
-      value: 0.0000004172325
+      value: 0
-      value: -0.008454323
+      value: -0.008454344
-      value: 0.9725899
+      value: 0.97258985
-      value: -0.0000009536743
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8745341640208226293, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
    - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.73545045
+      value: -0.73545265
      objectReference: {fileID: 0}
    - target: {fileID: 8745341641394998850, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
    - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.03563505
+      value: 0.03563516
-      value: -0.009175809
+      value: -0.009175838
      objectReference: {fileID: 0}
    - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
    - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.73545045
+      value: -0.73545265
      objectReference: {fileID: 0}
    - target: {fileID: 8745341642014614482, guid: 45632f0a227c860489bcba0eb1f4ec3e,
        type: 3}
--- a/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
+++ b/UOP1_Project/Assets/Scenes/Menus/MainMenu.unity
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 1
+  m_UseShadowmask: 0
 --- !u!196 &4
 NavMeshSettings:
  serializedVersion: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -204.4}
-  m_SizeDelta: {x: 160, y: 65.18812}
+  m_AnchoredPosition: {x: 0, y: -323.2}
+  m_SizeDelta: {x: 337.9086, y: 144.69672}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &403475998
 MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_FontSize: 60
-    m_MinSize: 10
-    m_MaxSize: 40
+    m_MinSize: 4
+    m_MaxSize: 60
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: -39.3}
-  m_SizeDelta: {x: 0, y: 131.1564}
+  m_SizeDelta: {x: 0, y: 441.28995}
  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1228641981
 MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.9056604, g: 0.9056604, b: 0.9056604, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
  m_Maskable: 1
  m_OnCullStateChanged:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 49
+    m_FontSize: 120
-    m_MaxSize: 116
+    m_MaxSize: 120
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
  m_Text: 'Open Project #1:

-    Action Adventure'
+    Chop Chop'
 --- !u!222 &1228641982
 CanvasRenderer:
  m_ObjectHideFlags: 0
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_FontSize: 60
-    m_MinSize: 10
-    m_MaxSize: 40
+    m_MinSize: 4
+    m_MaxSize: 60
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: -107}
-  m_SizeDelta: {x: 160, y: 65.18812}
+  m_SizeDelta: {x: 337.9086, y: 144.69672}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1967191112
 MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
--- a/UOP1_Project/Assets/Scenes/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/TestingGround.unity
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/DefaultConfiguration.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioConfigurations/DefaultConfiguration.asset
  BypassEffects: 0
  BypassListenerEffects: 0
  BypassReverbZones: 0
-  Loop: 0
-  SpatialBlend: 0
+  SpatialBlend: 1
  ReverbZoneMix: 1
  DopplerLevel: 1
  Spread: 0
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX_4_Mechanisms.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX_4_Mechanisms.asset
  m_Script: {fileID: 11500000, guid: 08e854ccd8588da4694c3ae040c10c5e, type: 3}
  m_Name: SFX_4_Mechanisms
  m_EditorClassIdentifier: 
-  _looping: 0
+  looping: 0
-  - sequenceMode: 1
+  - sequenceMode: 2
    audioClips:
    - {fileID: 8300000, guid: 60c2068e770cc2049ae9e26f1b010743, type: 3}
    - {fileID: 8300000, guid: 57fe0a526d29da941965b75399970e2c, type: 3}
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX_4_Mechanisms_Magic.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/AudioCues/SFX_4_Mechanisms_Magic.asset
  m_Script: {fileID: 11500000, guid: 08e854ccd8588da4694c3ae040c10c5e, type: 3}
  m_Name: SFX_4_Mechanisms_Magic
  m_EditorClassIdentifier: 
-  _looping: 0
+  looping: 0
  _audioClipGroups:
  - sequenceMode: 1
    audioClips:
    - {fileID: 8300000, guid: 0ef6ad8b7422bb84090b2494e510a968, type: 3}
-  - sequenceMode: 0
+  - sequenceMode: 2
    audioClips:
    - {fileID: 8300000, guid: 203476aa43e456e48a9d4b8a17f72f58, type: 3}
--- a/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioConfigurationSO.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioConfigurationSO.cs.meta
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - OutputAudioMixerGroup: {instanceID: 0}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCue.cs
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCue.cs
 /// </summary>
 public class AudioCue : MonoBehaviour
 {
+	[Header("Sound definition")]
+	[SerializeField] private bool _playOnAwake = false;
+
+	[Header("Configuration")]
+
+	private void Awake()
+	{
+		if (_playOnAwake)
+			PlayAudioCue();
+	}
+
+	private void OnTriggerEnter(Collider other)
+	{
+		PlayAudioCue();
+	}

 	public void PlayAudioCue()
 	{
--- a/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCue.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCue.cs.meta
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _audioCue: {instanceID: 0}
+  - _audioCueEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e,
+      type: 2}
+  - _audioConfiguration: {fileID: 11400000, guid: 8d4217c8fabf9824490196f34baf326a,
+      type: 2}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCueSO.cs
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioData/AudioCueSO.cs
 					break;

 				case SequenceMode.Sequential:
-					_nextClipToPlay = (int)Mathf.Repeat(_nextClipToPlay++, audioClips.Length);
+					_nextClipToPlay = (int)Mathf.Repeat(++_nextClipToPlay, audioClips.Length);
 					break;
 			}
 		}
--- a/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs

 public class AudioManager : MonoBehaviour
 {
-	[Tooltip("Amount of sound emitters created on Start")]
-	[SerializeField] private int _initialPoolSize = 1;
-	[SerializeField] private SoundEmitter _soundEmitterPrefab = default;
+	[Header("SoundEmitters pool")]
+	[SerializeField] private SoundEmitterFactorySO _factory;
+	[SerializeField] private SoundEmitterPoolSO _pool;
+
+	[Header("Listening on channels")]
-	[SerializeField] private AudioCueEventChannelSO _SFXEvent = default;
+	[SerializeField] private AudioCueEventChannelSO _SFXEventChannel = default;
-	[SerializeField] private AudioCueEventChannelSO _musicEvent = default;
-
-	private SoundEmitterFactorySO _factory;
-	private SoundEmitterPoolSO _pool;
+	[SerializeField] private AudioCueEventChannelSO _musicEventChannel = default;
-		InitPool();
-
-		_SFXEvent.OnAudioCueRequested += PlayAudioCue;
-	}
-
-	private void InitPool()
-	{
-		_factory = ScriptableObject.CreateInstance<SoundEmitterFactorySO>();
-		_factory.prefab = _soundEmitterPrefab;
-		_pool = ScriptableObject.CreateInstance<SoundEmitterPoolSO>();
-		_pool.name = "SoundEmitter Pool";
-		_pool.Factory = _factory;
-		_pool.InitialPoolSize = _initialPoolSize;
+		_SFXEventChannel.OnAudioCueRequested += PlayAudioCue;
 	}

 	public static bool SetGroupVolume(AudioMixerGroup group, float volume)
 			SoundEmitter soundEmitter = _pool.Request();
 			if (soundEmitter != null)
 			{
-				soundEmitter.PlaySound(clipsToPlay[i], settings, audioCue.looping, position);
-				if (audioCue.looping)
+				soundEmitter.PlayAudioClip(clipsToPlay[i], settings, audioCue.looping, position);
+				if(!audioCue.looping)
 					soundEmitter.OnSoundFinishedPlaying += OnSoundEmitterFinishedPlaying;
 			}
 		}
 	private void OnSoundEmitterFinishedPlaying(SoundEmitter soundEmitter)
 	{
 		soundEmitter.OnSoundFinishedPlaying -= OnSoundEmitterFinishedPlaying;
-		soundEmitter.StopSound();
+		soundEmitter.Stop();
 		Pool.Return(soundEmitter);
 	}

--- a/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Audio/AudioManager.cs.meta
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _factory: {fileID: 11400000, guid: 0f82d558a11c88d458625502b6708251, type: 2}
+  - _pool: {fileID: 11400000, guid: 4b2ed98efabac4446a90c61932acf933, type: 2}
+  - _SFXEventChannel: {fileID: 11400000, guid: c3c796b7c31ad3647a3fbae42e74764e, type: 2}
+  - _musicEventChannel: {instanceID: 0}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitter.cs
+++ b/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitter.cs
 using System.Collections;
-using System.Collections.Generic;
-using UnityEngine.Audio;
-using UOP1.Pool;
-using System;
 using UnityEngine.Events;

 [RequireComponent(typeof(AudioSource))]
-	private float _lastUseTimestamp = 0;

 	public event UnityAction<SoundEmitter> OnSoundFinishedPlaying;

 	/// <param name="settings"></param>
 	/// <param name="hasToLoop"></param>
 	/// <param name="position"></param>
-	public void PlaySound(AudioClip clip, AudioConfigurationSO settings, bool hasToLoop, Vector3 position = default)
+	public void PlayAudioClip(AudioClip clip, AudioConfigurationSO settings, bool hasToLoop, Vector3 position = default)
 	{
 		_audioSource.clip = clip;
 		ApplySettings(_audioSource, settings);
 		source.ignoreListenerPause = settings.IgnoreListenerPause;
 	}

-	public void StopSound()
+	/// <summary>
+	/// Used when the game is unpaused, to pick up SFX from where they left.
+	/// </summary>
+	public void Resume()
-		_lastUseTimestamp = Time.realtimeSinceStartup;
+		_audioSource.Play();
+	}
+
+	/// <summary>
+	/// Used when the game is paused.
+	/// </summary>
+	public void Pause()
+	{
+		_audioSource.Pause();
+	}
+
+	/// <summary>
+	/// Used when the SFX finished playing. Called by the <c>AudioManager</c>.
+	/// </summary>
+	public void Stop() // Redundant?
+	{
 		_audioSource.Stop();
 	}

 	public bool IsLooping()
 	{
 		return _audioSource.loop;
-	}
-
-	public float LastUseTimestamp()
-	{
-		return _lastUseTimestamp;
 	}

 	IEnumerator FinishedPlaying(float clipLength)
--- a/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitterFactorySO.cs
+++ b/UOP1_Project/Assets/Scripts/Audio/SoundEmitters/SoundEmitterFactorySO.cs

 	public override SoundEmitter Create()
 	{
-		return prefab;
+		return Instantiate(prefab);
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Characters/Protagonist.cs.meta
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
-  defaultReferences: []
+  defaultReferences:
+  - _inputReader: {fileID: 11400000, guid: 945ec0365077176418488737deed54be, type: 2}
+  - gameplayCamera: {instanceID: 0}
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/UOP1_Project/Assets/Settings/Audio/DefaultAudioMixer.mixer
+++ b/UOP1_Project/Assets/Settings/Audio/DefaultAudioMixer.mixer
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!243 &-2919845427630868010
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Music
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: 89fabad72cbc3624b9ce90c0c044678f
+  m_Children: []
+  m_Volume: 55eed10a876d8ce468e0e8868531d4f0
+  m_Pitch: e7c2d50d98215ef45a1b8e1d31a48282
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 7116850598058880758}
+  m_UserColorIndex: 5
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!243 &-706250057875642703
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: SFX
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: f31790cebbb59e14cb7a555a6cecdef0
+  m_Children: []
+  m_Volume: 513fe3c885e155747ac88d19b4dc4191
+  m_Pitch: 0c368ab105d667d4eb3230b206bf0514
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: 383433361790407199}
+  m_UserColorIndex: 8
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
 --- !u!241 &24100000
 AudioMixerController:
  m_ObjectHideFlags: 0
  m_SuspendThreshold: -80
  m_EnableSuspend: 1
  m_UpdateMode: 0
-  m_ExposedParameters: []
-  m_AudioMixerGroupViews: []
+  m_ExposedParameters:
+  - guid: 9271f6921315a7245b91413294248994
+    name: MasterVolume
+  - guid: 55eed10a876d8ce468e0e8868531d4f0
+    name: MusicVolume
+  - guid: 513fe3c885e155747ac88d19b4dc4191
+    name: SFXVolume
+  m_AudioMixerGroupViews:
+  - guids:
+    - deb5bf4eb8d0dc044a6b4d78ed072bf1
+    - 89fabad72cbc3624b9ce90c0c044678f
+    - f31790cebbb59e14cb7a555a6cecdef0
+    name: View
  m_CurrentViewIndex: 0
  m_TargetSnapshot: {fileID: 24500006}
 --- !u!243 &24300002
  m_Name: Master
  m_AudioMixer: {fileID: 24100000}
  m_GroupID: deb5bf4eb8d0dc044a6b4d78ed072bf1
-  m_Children: []
+  m_Children:
+  - {fileID: -2919845427630868010}
+  - {fileID: -706250057875642703}
  m_Volume: 9271f6921315a7245b91413294248994
  m_Pitch: faf7d9b6bb1b169458d96a38e2e184cf
  m_Send: 00000000000000000000000000000000
  m_SnapshotID: d2c2ea162004da549b54501f768d5652
  m_FloatValues: {}
  m_TransitionOverrides: {}
+--- !u!244 &383433361790407199
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: ac95f17f314a7cf4db0718b3b1f1c451
+  m_EffectName: Attenuation
+  m_MixLevel: 93345488281584c45b3a2ba237fe3dfc
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
+--- !u!244 &7116850598058880758
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: edfada8b2c6547e49bf9edf9fc95378a
+  m_EffectName: Attenuation
+  m_MixLevel: 560716efed283e9448d32a85d6956e98
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
--- a/UOP1_Project/Assets/Prefabs/Audio.meta
+++ b/UOP1_Project/Assets/Prefabs/Audio.meta
+fileFormatVersion: 2
+guid: 04dfc5c290665e0419064c04b4d562b4
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterFactory.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterFactory.asset
+%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: f04e493d0e3149245bc4d6979f603110, type: 3}
+  m_Name: SoundEmitterFactory
+  m_EditorClassIdentifier: 
+  prefab: {fileID: 4208798310655593324, guid: ba2540edc08cd914aa0155f159ca7bd1, type: 3}
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterFactory.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterFactory.asset.meta
+fileFormatVersion: 2
+guid: 0f82d558a11c88d458625502b6708251
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterPool.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterPool.asset
+%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: abd55e716171ecc4daf19691871d6ee1, type: 3}
+  m_Name: SoundEmitterPool
+  m_EditorClassIdentifier: 
+  _factory: {fileID: 11400000, guid: 0f82d558a11c88d458625502b6708251, type: 2}
+  _initialPoolSize: 10
--- a/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterPool.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Audio/SoundEmitterPool.asset.meta
+fileFormatVersion: 2
+guid: 4b2ed98efabac4446a90c61932acf933
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Prefabs/Audio/SoundEmitter.prefab
+++ b/UOP1_Project/Assets/Prefabs/Audio/SoundEmitter.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6263384390003549418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3375407393371140290}
+  - component: {fileID: 5246841695734493053}
+  - component: {fileID: 4208798310655593324}
+  m_Layer: 0
+  m_Name: SoundEmitter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3375407393371140290
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6263384390003549418}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &5246841695734493053
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6263384390003549418}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!114 &4208798310655593324
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6263384390003549418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4189beafe49762549ac23e37feb5f28c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
--- a/UOP1_Project/Assets/Prefabs/Audio/SoundEmitter.prefab.meta
+++ b/UOP1_Project/Assets/Prefabs/Audio/SoundEmitter.prefab.meta
+fileFormatVersion: 2
+guid: ba2540edc08cd914aa0155f159ca7bd1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: