From aeee055e18e4f02565b2aa90864167427591d093 Mon Sep 17 00:00:00 2001 From: Timur Nizamov Date: Wed, 21 Jan 2026 15:51:17 +0200 Subject: [PATCH] voiceover vca and volume slider added to Unity and FMOD --- .../NewHandPresence/Prefabs/XR Origin.prefab | 10 +++++----- .../Prefabs/XROrigin Scripts/SliderToVCA.cs | 9 ++++++++- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- Assets/_PROJECT/Scripts/Audio/AudioManager.cs | 12 +++++++++++- .../.cache/buildrecords/Desktop/Master.br | Bin 144 -> 144 bytes .../.cache/buildrecords/Desktop/SFX.br | Bin 76 -> 76 bytes DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br | Bin 74 -> 74 bytes DeltaVRFMOD/Build/Desktop/Desktop/Master.bank | Bin 10082 -> 10082 bytes DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank | Bin 14035584 -> 14035584 bytes DeltaVRFMOD/Build/Desktop/Desktop/UI.bank | Bin 386496 -> 386496 bytes ...{377d4ed3-0649-4ad0-97fb-045c3a3d1231}.xml | 6 +----- ...{5bc004eb-f675-4539-934e-ddc1cde39105}.xml | 6 +----- ...{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml | 2 +- ...{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml | 2 +- ...{aadbb74e-e208-40ec-baa7-1a4a80f49a6e}.xml | 4 ++-- 15 files changed, 32 insertions(+), 23 deletions(-) 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 08f250ae51e826d56228912df568a14b14179804..10cb67b954315e62790c2328d2a66804897218cb 100644 GIT binary patch delta 52 zcmbQhIDt{dDah5Cfq{V$hz0nQ^1Flf?W+te?N>Q5{q3=dG7>Bg&QE?h(LxJEznYk) F1puXl6XgH^ delta 52 zcmbQhIDt{dDah5Cfq{V$hy^yE6^{=(n4Y!b!5`N0$;V12%1E%B&|WxyqJe delta 59 zcmebAk#P!gb!K2-U<6_TOKbUQdWJb+)~u`cysk|OoG2q9aY8@B3na%7%;3fl!Jx;G L#E{64$B+#Gj{glV diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br index bab212d207651e835081ef623479a1bd63279b42..fdf7f538bd4123e657f7b342a7614ca01243bdeb 100644 GIT binary patch delta 57 zcmebBl5q-hb!K2-U<6_T)1?cd^VT$W@iVCl-M;+e;6xb-u?K4=+ylz-F@!RBGUzcR LF(fkNF=PV($&wG$ delta 57 zcmebBl5q-hb!K2-U<6`;HM$G_M(R2rtp5-fwOi}Vrin5VVkcxj<^kpS7(y958T1&E K7!n!s7_tG~HxK;) diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index 62c47741d2741b1fb4be33066ff5a9bbca871e4b..2d8d03442711e85e940b658fdf49c1c41ed1bf84 100644 GIT binary patch delta 268 zcmaFl_sDNU3gcupCaKBG*rX=&u?TEl!C1pAaN$^+!prjW-qUK1q=`h{l$+ecqP01W z^$Dk91Oo#@n6sk-5IZ>l**lE3)gC%(=eK(LhxSc#HOp8hf8-aQoW`#+`2xRy3c5MW z3<3<(^)#zgYnQt3nRQ{?@kG@{lgs#Z{O?v4*tWgU@Z0TOlJz{ud^ z863g_Wo1#4b(lN(o@xopHtpj5lf%>!SRzkMO`g0`V z^$Dkn2Ll5`n6sk-5IY$F**lE3)gC%(=eK(LhxSc#HOrV81Q;fl@#`p=At{stvM(HK zQ+Qc^-g{cjku;IWn{tc{ldtjVB%)gl($6w))}NNZhyD{1r diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index b7d948c5dc7715036c52fead4728c47616e5dee6..88661550f8bf35c950c6406b10a6ef79473c2623 100644 GIT binary patch delta 913 zcmWm0#Znaj002NAK2bpw8@s!^ySuv^6+1BzR8TQN5$whe)Ms~KCo>%U1donq*Tc?i zLSBA&0yq9fq=glU%b6J&5%xbx`B9<#sKD>^U~Fo9Rw(y$Ai7Yn{J^XN8NV(BQi6Zd z?`I~*W(NqPAVCTdPGO2rln5dzMij*PMQO@VmU5IQh6+@q5|yb!RjN^)8q}l~ zwW&j0>QSEtG^7!YX+l$)(VP~vq!q1cLtEO>o(^=R6P@WoSGv)i9`vLaz3D?=`q7^O z3}g_48NyJ8F`N;MWE7(r!&t^Ko(W835|f$2RHiYV8O&rBvzfzO<`K($7O;>w7O|Km zEM*zXS;0zHv6?lkC7yMxX9FAA#AXuMLLy0QWgFW`CWRgBWEZLIW)FMW$9@iwMmh&M zL);3J>-%oo1$jqm*6XDBv1FDCIH<)_6T delta 947 zcmZw6M^q000KnlFf22gVWM*VAr>})Ap_Q;Nm%HG*~@A+N_XP)<*oqg^O z-{tp9`IcWeg-d@z!aGLCy+}^H9Gf1Io0$~+qss2^z}Tztp&LRG3!ohWKhlUmd!nmW{_9`$KJLmJVTCN!lP&1pePS`kBQ z+R&DEw5J0d=|pF`(3NgV_oFqc$9*2~kVib`2~T;(b6)V0SG?v8Z+XXiKJbxG PeC7*Z^Ad8tRY?5{D#_8k diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank index 10e317578df71fff0bd185a85ccc5f83d3ad406c..bf0b655840a2640b7f2788cf111ec2ecee5a6f25 100644 GIT binary patch delta 39 rcmX?bTKvFi@eOAJSguDK>Nj5qXulA^2*gZ4%nZaV+b;yLewYFPcUTfo delta 39 rcmX?bTKvFi@eOAJSR!tib~IlIXulA^2*gZ4%nZaV+b;yLewYFPfEN<0 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}