Skip to content

Commit

Permalink
Fix music fade, Fix volume levels, Add extra auctioneer talking
Browse files Browse the repository at this point in the history
- Fix fading issue #241
- Tweak AudioMixer to have similar volume levels for all audio
- Add all audiosources to audioMixer
- Made the auctioneer more talkative
  • Loading branch information
Fueredoriku committed Oct 18, 2023
1 parent cd24bfa commit 2072185
Show file tree
Hide file tree
Showing 16 changed files with 979 additions and 848 deletions.
38 changes: 37 additions & 1 deletion Assets/Audio/AudioMixer.mixer
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -164,6 +197,7 @@ AudioMixerController:
- 8ca2de57f27f07b36a965e74b23fe90e
- 62275be6a96026d399d6d2c9991767aa
- 37475af897eefe6ca981bc3554836356
- de50e7a68b544614f892f567b79a96b6
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
Expand Down Expand Up @@ -213,6 +247,7 @@ AudioMixerSnapshotController:
m_SnapshotID: ab2c8b8a9b137634babc4603e5f74203
m_FloatValues:
64190992203dc2a44b81bf8adbdb61de: 0
0b49479f93763f94890331bcfe29dfe4: 4.5
m_TransitionOverrides: {}
--- !u!243 &894316070289458082
AudioMixerGroupController:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/Characters/Auctioneer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/GunParts/BulletBarrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/GunParts/CoilBarrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/GunParts/HatBarrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs/GunParts/ShotgunBarrel.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions Assets/Prefabs/Input/Player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
maxhHealth: 100
currentHealth: 0
owner: {fileID: -437592331247616425}
--- !u!114 &3252978923923797766
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 2072185

Please sign in to comment.