Merge pull request #250 from hackerspace-ntnu/fix/audio

Fix music fade, Fix volume levels, Add extra auctioneer talking
hackerspace-ntnu · Oct 19, 2023 · 8d5c1e6 · 8d5c1e6
2 parents cd24bfa + d1c37fc
commit 8d5c1e6
Show file tree

Hide file tree

Showing 16 changed files with 979 additions and 848 deletions.
diff --git a/Assets/Audio/AudioMixer.mixer b/Assets/Audio/AudioMixer.mixer
@@ -1,5 +1,38 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!243 &-7677010254649928164
+AudioMixerGroupController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: VoiceLines
+  m_AudioMixer: {fileID: 24100000}
+  m_GroupID: de50e7a68b544614f892f567b79a96b6
+  m_Children: []
+  m_Volume: 0b49479f93763f94890331bcfe29dfe4
+  m_Pitch: 2be3b2aa5963d834981c51181d37c8c6
+  m_Send: 00000000000000000000000000000000
+  m_Effects:
+  - {fileID: -7078595059564997209}
+  m_UserColorIndex: 0
+  m_Mute: 0
+  m_Solo: 0
+  m_BypassEffects: 0
+--- !u!244 &-7078595059564997209
+AudioMixerEffectController:
+  m_ObjectHideFlags: 3
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_EffectID: 79e37f7b5648b7a4fa017aac6c0d8786
+  m_EffectName: Attenuation
+  m_MixLevel: 1fdc51280a4cf244bb5f6f681ab06b06
+  m_Parameters: []
+  m_SendTarget: {fileID: 0}
+  m_EnableWetMix: 0
+  m_Bypass: 0
 --- !u!243 &-4526622472270999318
 AudioMixerGroupController:
   m_ObjectHideFlags: 0
@@ -164,6 +197,7 @@ AudioMixerController:
     - 8ca2de57f27f07b36a965e74b23fe90e
     - 62275be6a96026d399d6d2c9991767aa
     - 37475af897eefe6ca981bc3554836356
+    - de50e7a68b544614f892f567b79a96b6
     name: View
   m_CurrentViewIndex: 0
   m_TargetSnapshot: {fileID: 24500006}
@@ -213,6 +247,7 @@ AudioMixerSnapshotController:
   m_SnapshotID: ab2c8b8a9b137634babc4603e5f74203
   m_FloatValues:
     64190992203dc2a44b81bf8adbdb61de: 0
+    0b49479f93763f94890331bcfe29dfe4: 4.5
   m_TransitionOverrides: {}
 --- !u!243 &894316070289458082
 AudioMixerGroupController:
@@ -270,7 +305,8 @@ AudioMixerGroupController:
   m_Name: Sound Effects
   m_AudioMixer: {fileID: 24100000}
   m_GroupID: 10f6546e7d54e064085d0ff7ca40f57d
-  m_Children: []
+  m_Children:
+  - {fileID: -7677010254649928164}
   m_Volume: 64190992203dc2a44b81bf8adbdb61de
   m_Pitch: 08150f24d4397eb448b1f702167ee2d0
   m_Send: 00000000000000000000000000000000

diff --git a/Assets/Prefabs/Characters/Auctioneer.prefab b/Assets/Prefabs/Characters/Auctioneer.prefab
@@ -6059,7 +6059,7 @@ AudioSource:
   m_GameObject: {fileID: 2418711659172625301}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: -7677010254649928164, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 0
   m_Volume: 1

diff --git a/Assets/Prefabs/GunParts/BulletBarrel.prefab b/Assets/Prefabs/GunParts/BulletBarrel.prefab
@@ -657,7 +657,7 @@ AudioSource:
   m_GameObject: {fileID: 6861618831928518119}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1

diff --git a/Assets/Prefabs/GunParts/CoilBarrel.prefab b/Assets/Prefabs/GunParts/CoilBarrel.prefab
@@ -397,7 +397,7 @@ AudioSource:
   m_GameObject: {fileID: 6861618831928518119}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1

diff --git a/Assets/Prefabs/GunParts/HatBarrel.prefab b/Assets/Prefabs/GunParts/HatBarrel.prefab
@@ -480,7 +480,7 @@ AudioSource:
   m_GameObject: {fileID: 5374020728950191348}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1

diff --git a/Assets/Prefabs/GunParts/ShotgunBarrel.prefab b/Assets/Prefabs/GunParts/ShotgunBarrel.prefab
@@ -643,7 +643,7 @@ AudioSource:
   m_GameObject: {fileID: 6861618831928518119}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1

diff --git a/Assets/Prefabs/Input/Player.prefab b/Assets/Prefabs/Input/Player.prefab
@@ -199,7 +199,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxhHealth: 100
   currentHealth: 0
-  owner: {fileID: -437592331247616425}
 --- !u!114 &3252978923923797766
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -250,7 +249,7 @@ AudioSource:
   m_GameObject: {fileID: 71015680234268067}
   m_Enabled: 1
   serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
+  OutputAudioMixerGroup: {fileID: 4898656368289658944, guid: 92cf7610df7967a41806df0e74d33c49, type: 2}
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
   m_Volume: 1

diff --git a/Assets/Prefabs/Volumes.meta → Assets/Prefabs/Sound.meta b/Assets/Prefabs/Volumes.meta → Assets/Prefabs/Sound.meta
diff --git a/Assets/Prefabs/Volumes/Global Volume.prefab → Assets/Prefabs/Sound/Global Volume.prefab b/Assets/Prefabs/Volumes/Global Volume.prefab → Assets/Prefabs/Sound/Global Volume.prefab
diff --git a/...Prefabs/Volumes/Global Volume.prefab.meta → ...s/Prefabs/Sound/Global Volume.prefab.meta b/...Prefabs/Volumes/Global Volume.prefab.meta → ...s/Prefabs/Sound/Global Volume.prefab.meta