diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 0e014aac..dfc152dd 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -2551,7 +2551,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} m_Name: m_EditorClassIdentifier: - target: 2 + target: 5 --- !u!1 &3847096334227967442 GameObject: m_ObjectHideFlags: 0 @@ -3539,8 +3539,8 @@ RectTransform: 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: -2000.1, y: 34.7} - m_SizeDelta: {x: 117.7, y: 49.6} + m_AnchoredPosition: {x: -2404.8, y: 34.7} + m_SizeDelta: {x: 220, y: 49.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2306375091028476275 CanvasRenderer: @@ -3570,7 +3570,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Music:' + m_text: 'Voiceovers:' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: d564a6b9a8a781b438125b614edcc297, type: 2} m_sharedMaterial: {fileID: 2467261418627247352, guid: d564a6b9a8a781b438125b614edcc297, @@ -4890,7 +4890,7 @@ GameObject: - component: {fileID: 9123126080211807181} - component: {fileID: 2844805864736818914} m_Layer: 5 - m_Name: Music Slider + m_Name: Voiceover Slider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs index da189879..84077268 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs @@ -8,7 +8,8 @@ public class SliderToVCA : MonoBehaviour Ambiences, Music, SFX, - UI + UI, + Voiceovers } public VCATarget target; @@ -40,6 +41,8 @@ private float GetInitialValueFromAudioManager() return AudioManager.Instance.SFXVolume; case VCATarget.UI: return AudioManager.Instance.UIVolume; + case VCATarget.Voiceovers: + return AudioManager.Instance.VoiceoverVolume; default: return 0.5f; } @@ -76,6 +79,10 @@ private float GetInitialValueFromAudioManager() case VCATarget.UI: AudioManager.Instance.SetUIVCA(value); break; + + case VCATarget.Voiceovers: + AudioManager.Instance.SetVoiceoverVCA(value); + break; } } } diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 2de31118..216b69d5 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1f1582eee3b70a5fc30e3a67289b2cd6d930e96e6f1fe02e689ece142933439 -size 67169365 +oid sha256:bb27a9f1cbbc87e76c93125b6bcf7578001a0b305ddaf15ea31c1787f9ef083b +size 67167499 diff --git a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs index 3b9a4aad..6f343527 100644 --- a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs +++ b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs @@ -20,6 +20,7 @@ public class AudioManager : MonoBehaviour private VCA sfxVCA; private VCA uiVCA; private VCA ambienceVCA; + private VCA voiceoverVCA; [SerializeField] [Header("Volume")] @@ -40,6 +41,9 @@ public class AudioManager : MonoBehaviour public float UIVolume = 0.5f; [Range(0, 1)] + public float VoiceoverVolume = 0.5f; + [Range(0, 1)] + private Bus masterBus; private Bus ambientBus; private Bus musicBus; @@ -109,18 +113,19 @@ public class AudioManager : MonoBehaviour _instance.sfxBus = RuntimeManager.GetBus("bus:/SFX"); _instance.uiBus = RuntimeManager.GetBus("bus:/UI"); - _instance.masterVCA = RuntimeManager.GetVCA("vca:/Master"); _instance.musicVCA = RuntimeManager.GetVCA("vca:/Music"); _instance.ambienceVCA = RuntimeManager.GetVCA("vca:/Ambiences"); _instance.sfxVCA = RuntimeManager.GetVCA("vca:/SFX"); _instance.uiVCA = RuntimeManager.GetVCA("vca:/UI"); + _instance.voiceoverVCA = RuntimeManager.GetVCA("vca:/Voiceovers"); _instance.masterVCA.setVolume(_instance.MasterVolume); _instance.musicVCA.setVolume(_instance.MusicVolume); _instance.ambienceVCA.setVolume(_instance.AmbienceVolume); _instance.sfxVCA.setVolume(_instance.SFXVolume); _instance.uiVCA.setVolume(_instance.UIVolume); + _instance.voiceoverVCA.setVolume(_instance.VoiceoverVolume); _instance.dialogueCallback = new EVENT_CALLBACK(DialogueEventCallback); @@ -156,6 +161,11 @@ public class AudioManager : MonoBehaviour UIVolume = value; uiVCA.setVolume(UIVolume); } + public void SetVoiceoverVCA(float value) + { + VoiceoverVolume = value; + voiceoverVCA.setVolume(VoiceoverVolume); + } private void Awake() diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index 08f250ae..10cb67b9 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index bb1cac1a..51406e5c 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br index bab212d2..fdf7f538 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index 62c47741..2d8d0344 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index b7d948c5..88661550 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank index 10e31757..bf0b6558 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank differ diff --git a/DeltaVRFMOD/Metadata/Event/{377d4ed3-0649-4ad0-97fb-045c3a3d1231}.xml b/DeltaVRFMOD/Metadata/Event/{377d4ed3-0649-4ad0-97fb-045c3a3d1231}.xml index 64ae509b..d294d082 100644 --- a/DeltaVRFMOD/Metadata/Event/{377d4ed3-0649-4ad0-97fb-045c3a3d1231}.xml +++ b/DeltaVRFMOD/Metadata/Event/{377d4ed3-0649-4ad0-97fb-045c3a3d1231}.xml @@ -56,7 +56,7 @@ {f7b8336c-a7e9-4d4f-8950-e57f30a5971f} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {69ee688f-dc4e-4df2-a125-df79ed93217e} @@ -173,7 +173,6 @@ SourcePos - -2 @@ -182,7 +181,6 @@ OverallGain - -1 @@ -511,7 +509,6 @@ SimOutputs - 0 @@ -528,7 +525,6 @@ DistRange - -6 diff --git a/DeltaVRFMOD/Metadata/Event/{5bc004eb-f675-4539-934e-ddc1cde39105}.xml b/DeltaVRFMOD/Metadata/Event/{5bc004eb-f675-4539-934e-ddc1cde39105}.xml index 2b786918..335d451e 100644 --- a/DeltaVRFMOD/Metadata/Event/{5bc004eb-f675-4539-934e-ddc1cde39105}.xml +++ b/DeltaVRFMOD/Metadata/Event/{5bc004eb-f675-4539-934e-ddc1cde39105}.xml @@ -56,7 +56,7 @@ {d886c7f1-fcf5-4a00-8b61-79115e41e0de} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {69ee688f-dc4e-4df2-a125-df79ed93217e} @@ -172,7 +172,6 @@ SourcePos - -2 @@ -181,7 +180,6 @@ OverallGain - -1 @@ -510,7 +508,6 @@ SimOutputs - 0 @@ -527,7 +524,6 @@ DistRange - -6 diff --git a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml index 3f0aee1d..57de9588 100644 --- a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml +++ b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml @@ -5,7 +5,7 @@ Voiceovers - {162960f4-09a2-4526-a61e-7ac7e219d27d} + {2086c6d0-77e9-4bcf-967c-c4661459d91e} {18fe57ae-4110-48b9-92ff-598d3be28f6c} diff --git a/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml b/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml index 2778d2db..5912f377 100644 --- a/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml +++ b/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml @@ -5,7 +5,7 @@ Music - {3d7079dd-e886-4e28-bb4b-7466e809d6f0} + {7db632b8-c5c2-4e3e-ab97-f087b29d2976} {6f63c73c-f73f-479c-9da3-d9c4efc3e3d0} diff --git a/DeltaVRFMOD/Metadata/Snapshot/{aadbb74e-e208-40ec-baa7-1a4a80f49a6e}.xml b/DeltaVRFMOD/Metadata/Snapshot/{aadbb74e-e208-40ec-baa7-1a4a80f49a6e}.xml index ad413d7c..4f4b646f 100644 --- a/DeltaVRFMOD/Metadata/Snapshot/{aadbb74e-e208-40ec-baa7-1a4a80f49a6e}.xml +++ b/DeltaVRFMOD/Metadata/Snapshot/{aadbb74e-e208-40ec-baa7-1a4a80f49a6e}.xml @@ -59,7 +59,7 @@ decayTime - 3300 + 3600 {d00963d1-bc1e-48e6-8a9e-346bd1ed2e26} @@ -180,7 +180,7 @@ wetLevel - -16 + -14 {d00963d1-bc1e-48e6-8a9e-346bd1ed2e26}