From 48860cf906c73784515ffda16d2d0d1af3bc3091 Mon Sep 17 00:00:00 2001 From: Timur Nizamov Date: Mon, 20 Oct 2025 00:02:08 +0300 Subject: [PATCH] =?UTF-8?q?k=C3=B5ik=20vanad=20helid=20lisatud,=20peaaegu?= =?UTF-8?q?=20k=C3=B5ik=20esimese=20iteratsiooni=20helid=20on=20lisatud,?= =?UTF-8?q?=20auto=20jaoks=20=C3=BCks=20lisaloogika=20on=20tehtud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Intercation Logic/Car Driving Routine.cs | 1 + .../Bolt/Intercation Logic/Passanger Seat.cs | 11 +- .../Components/Drawing/Scripts/SprayGun.cs | 20 +- .../Elevator/Scripts/Elevator outer.cs | 1 + .../Scripts/Continuos locomotion Conf.cs | 2 + .../Prefabs/Scripts/HoverSlideButton.cs | 1 + .../Prefabs/Scripts/Menu Teleport Button.cs | 13 + .../NewHandPresence/Prefabs/Scripts/Menu.cs | 22 +- .../Overlay UI/NetworkManagerUI.prefab | 11 +- .../Portals2/Space enter Collider.cs | 19 + .../Components/Portals2/StencilPortal.cs | 3 - .../Components/Server room/Alarm Trigger.cs | 24 +- .../Multiplayer/CustomNetworkManager.prefab | 6 +- .../Prefabs/Robotics/Flatrobot Variant.prefab | 43 ++- .../Prefabs/Robotics/Robot Variant.prefab | 306 +++++++++++++++- .../_PROJECT/Scenes/DeltaBuilding_base.unity | 4 +- Assets/_PROJECT/Scripts/Audio/AudioManager.cs | 7 +- Assets/_PROJECT/Scripts/Audio/FMODEvents.cs | 3 + .../.cache/buildrecords/Desktop/Ambience.br | Bin 86 -> 86 bytes .../.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 .../.cache/fsbcache/Desktop/6FF9F17F.fobj | Bin 0 -> 5772675 bytes .../.cache/fsbcache/Desktop/80714BF7.fobj | Bin 0 -> 22248 bytes ...{aca59a11-2008-4aa8-b275-81770e355d5b}.pdc | Bin 0 -> 2848556 bytes ...{bdb574e3-9437-457f-b219-8495dcac5ced}.pdc | Bin 0 -> 9156 bytes .../Robots/242740__marlonhj__engine.wav | 3 + .../Imported_Ambiences/Robots/fastrobot.mp3 | 3 + .../Build/Desktop/Desktop/Ambience.bank | Bin 4410240 -> 10211936 bytes DeltaVRFMOD/Build/Desktop/Desktop/Master.bank | Bin 1962 -> 3208 bytes .../Build/Desktop/Desktop/Master.strings.bank | Bin 2726 -> 3236 bytes DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank | Bin 2230656 -> 2235712 bytes DeltaVRFMOD/Build/Desktop/Desktop/UI.bank | Bin 41632 -> 41632 bytes ...{e3c6f794-3db8-47ae-a806-8bec93c3c713}.xml | 11 + ...{aca59a11-2008-4aa8-b275-81770e355d5b}.xml | 23 ++ ...{bdb574e3-9437-457f-b219-8495dcac5ced}.xml | 20 ++ ...{0318642c-4b78-4d3a-83b4-c9f48a27cd74}.xml | 2 +- ...{0345befd-8f71-4bc2-acd0-e5b9d7f899e8}.xml | 6 +- ...{0cc3b481-962c-43bc-a963-058a71c1632b}.xml | 85 ++++- ...{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml | 2 +- ...{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml | 92 ++++- ...{39a2d8ec-9c25-457e-8222-8aa42e2ccf70}.xml | 17 +- ...{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml | 2 +- ...{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml | 2 +- ...{5dde6524-3f0f-46a1-869b-6997da43c578}.xml | 2 +- ...{6360411a-8ba1-4d05-895f-3731610e36bf}.xml | 32 +- ...{6d9f0cbb-17cd-4070-a5af-f267ad35e82f}.xml | 333 ++++++++++++++++++ ...{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml | 170 ++++++--- ...{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml | 10 +- ...{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml | 17 +- ...{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml | 208 +++++++++++ ...{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml | 2 +- ...{9867565d-52c3-40cf-89d0-4040b1498ce2}.xml | 224 ++++++++++++ ...{afa580e5-c55e-47b8-995f-2a9871e06469}.xml | 17 +- ...{b8580522-9727-4d0b-a90f-0506536859fc}.xml | 2 +- ...{ce89abc5-417e-4800-9b30-18883a321145}.xml | 96 ++++- ...{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml | 2 +- ...{dbd4958a-6ef2-4241-9e49-b786845fdcef}.xml | 23 +- ...{debd0048-f7da-4ea8-8e42-084262639fd0}.xml | 6 +- ...{ead4a758-711a-46af-9be3-3d28f5a3f5db}.xml | 2 +- ...{f4113020-2cbf-4b8d-8b35-4d57b3da94fb}.xml | 2 +- ...{ffebdbfb-a448-48c1-812e-5467298c8408}.xml | 193 ++++++++++ ...{492f1f1e-6836-4f89-90a3-c9b795482c9f}.xml | 11 + ...{7ec75b45-6865-4d1b-bfab-f8e3ca952cf8}.xml | 82 +++++ ...{09acd8cf-4bc5-49b4-8d58-25102d8eb8dd}.xml | 39 ++ ...{09b7a108-c526-4e56-a535-055b90acdc95}.xml | 2 +- ...{319559ef-04bf-4399-ad4d-f2857201675d}.xml | 28 ++ ...{35883518-74f9-4941-a6e5-f9ab41a72d4a}.xml | 28 ++ ...{51d6f185-be2f-4bf5-8d01-304a53f0f787}.xml | 28 ++ ...{53a0c204-15b9-4549-977f-0e09c7978eca}.xml | 28 ++ ...{93911052-d607-437a-81e8-1cf13f366980}.xml | 2 +- ...{b606b63b-df73-4954-9e2a-32090ebc31f1}.xml | 2 +- ...{bfc4a4d4-d949-43e0-887f-375ff2ccbb43}.xml | 28 ++ ...{c1ce84df-2b09-47f8-ae4d-7c8f6d0a505e}.xml | 28 ++ ...{676de615-0183-4bd2-a2b9-8e8068db47bf}.xml | 11 + highscore.json | 2 +- highscores.json | 4 + 77 files changed, 2291 insertions(+), 138 deletions(-) create mode 100644 DeltaVRFMOD/.cache/fsbcache/Desktop/6FF9F17F.fobj create mode 100644 DeltaVRFMOD/.cache/fsbcache/Desktop/80714BF7.fobj create mode 100644 DeltaVRFMOD/.cache/{aca59a11-2008-4aa8-b275-81770e355d5b}.pdc create mode 100644 DeltaVRFMOD/.cache/{bdb574e3-9437-457f-b219-8495dcac5ced}.pdc create mode 100644 DeltaVRFMOD/Assets/Imported_Ambiences/Robots/242740__marlonhj__engine.wav create mode 100644 DeltaVRFMOD/Assets/Imported_Ambiences/Robots/fastrobot.mp3 create mode 100644 DeltaVRFMOD/Metadata/Asset/{e3c6f794-3db8-47ae-a806-8bec93c3c713}.xml create mode 100644 DeltaVRFMOD/Metadata/AudioFile/{aca59a11-2008-4aa8-b275-81770e355d5b}.xml create mode 100644 DeltaVRFMOD/Metadata/AudioFile/{bdb574e3-9437-457f-b219-8495dcac5ced}.xml create mode 100644 DeltaVRFMOD/Metadata/Event/{6d9f0cbb-17cd-4070-a5af-f267ad35e82f}.xml create mode 100644 DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml create mode 100644 DeltaVRFMOD/Metadata/Event/{9867565d-52c3-40cf-89d0-4040b1498ce2}.xml create mode 100644 DeltaVRFMOD/Metadata/Event/{ffebdbfb-a448-48c1-812e-5467298c8408}.xml create mode 100644 DeltaVRFMOD/Metadata/EventFolder/{492f1f1e-6836-4f89-90a3-c9b795482c9f}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{09acd8cf-4bc5-49b4-8d58-25102d8eb8dd}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{319559ef-04bf-4399-ad4d-f2857201675d}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{35883518-74f9-4941-a6e5-f9ab41a72d4a}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{51d6f185-be2f-4bf5-8d01-304a53f0f787}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{53a0c204-15b9-4549-977f-0e09c7978eca}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{bfc4a4d4-d949-43e0-887f-375ff2ccbb43}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPreset/{c1ce84df-2b09-47f8-ae4d-7c8f6d0a505e}.xml create mode 100644 DeltaVRFMOD/Metadata/ParameterPresetFolder/{676de615-0183-4bd2-a2b9-8e8068db47bf}.xml diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs index ffaca843..2c4b1a9a 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -40,6 +40,7 @@ public class CarDrivingRoutine : MonoBehaviour targetRotationSpeed = rotationSpeed; CarMovement.start(); //starting the car sound here + AudioManager.Instance.SetGlobalParameter("CarPassengerLogic", 0.0f); //change the value of the global parameter in FMOD, initial value } // Update is called once per frame diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs index 7f1b8bd1..6694562a 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Passanger Seat.cs @@ -5,6 +5,7 @@ using Unity.XR.CoreUtils; using UnityEngine; using UnityEngine.XR.Content.Interaction; using UnityEngine.XR.Interaction.Toolkit; +using FMODUnity; public class PassangerSeat : LocomotionProvider { @@ -36,9 +37,9 @@ public class PassangerSeat : LocomotionProvider Transform cameraTransform = cameraChild.transform.parent.transform; Vector3 cameraShift = cameraTransform.localPosition; - - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorOpen, gameObject); - + + AudioManager.Instance.SetGlobalParameter("CarPassengerLogic", 2.0f); //change the value of the global parameter in FMOD, changed value + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorOpen, gameObject); //play 3d oneshot currentPassanger = player; player.transform.SetParent(this.transform); player.transform.localPosition = -cameraShift; @@ -76,8 +77,8 @@ public class PassangerSeat : LocomotionProvider if (cameraChild == null) return; Transform cameraTransform = cameraChild.transform.parent.transform; - - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorClose, gameObject); + AudioManager.Instance.SetGlobalParameter("CarPassengerLogic", 0.0f); //change the value of the global parameter in FMOD, initial value + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.DoorClose, gameObject); //play 3d oneshot // Set the player�s parent to null (making it part of the scene hierarchy) currentPassanger.transform.SetParent(null); diff --git a/Assets/_PROJECT/Components/Drawing/Scripts/SprayGun.cs b/Assets/_PROJECT/Components/Drawing/Scripts/SprayGun.cs index ab18e037..f3c5b3c1 100644 --- a/Assets/_PROJECT/Components/Drawing/Scripts/SprayGun.cs +++ b/Assets/_PROJECT/Components/Drawing/Scripts/SprayGun.cs @@ -19,17 +19,24 @@ namespace _PROJECT.Components.Drawing private float _cooldownTimer = 0f; private bool _isSpraying; - private EventInstance spray_sound; + private EventInstance spray_sound; + + + void Start() + { + spray_sound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Spray); //creating the instance through AudioManager + spray_sound.setParameterByName("SpraySwitcher", 0); //"Spray - 0 in FMOD" + spray_sound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(sprayPoint)); //setting the 3D attributes + } protected override void OnActivated(ActivateEventArgs args) { base.OnActivated(args); StartSpray(); - spray_sound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Spray); + spray_sound.start(); //starting the instance spray_sound.setParameterByName("SpraySwitcher", 0); //"Spray - 0 in FMOD" - spray_sound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(sprayPoint)); - spray_sound.start(); + } protected override void OnDeactivated(DeactivateEventArgs args) @@ -38,7 +45,6 @@ namespace _PROJECT.Components.Drawing StopSpray(); spray_sound.setParameterByName("SpraySwitcher", 1); //"NoSpray - 1 in FMOD" - spray_sound.release(); } private new void Awake() @@ -47,6 +53,7 @@ namespace _PROJECT.Components.Drawing sprayPart.Stop(true, ParticleSystemStopBehavior.StopEmitting); _isSpraying = false; _layerMask = 1 << LayerMask.NameToLayer("Paintable"); + } private void StartSpray() @@ -74,7 +81,7 @@ namespace _PROJECT.Components.Drawing { if (_isSpraying) { - spray_sound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(sprayPoint)); + spray_sound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(sprayPoint)); //changing the attributes } if (!isSelected || !_isSpraying) @@ -83,7 +90,6 @@ namespace _PROJECT.Components.Drawing sprayPart.Stop(true, ParticleSystemStopBehavior.StopEmitting); spray_sound.setParameterByName("SpraySwitcher", 1); //"NoSpray - 1 in FMOD" - spray_sound.release(); _isSpraying = false; return; diff --git a/Assets/_PROJECT/Components/Elevator/Scripts/Elevator outer.cs b/Assets/_PROJECT/Components/Elevator/Scripts/Elevator outer.cs index 7250bee4..f003658d 100644 --- a/Assets/_PROJECT/Components/Elevator/Scripts/Elevator outer.cs +++ b/Assets/_PROJECT/Components/Elevator/Scripts/Elevator outer.cs @@ -53,6 +53,7 @@ public class ElevatorOuter : MonoBehaviour public void OpenDoors() { arrivalBeeper.Play(); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ElevatorArrival, gameObject); Debug.Log("Outer Doors opened"); StartCoroutine(MoveDoors(leftDoor, leftDoorOpenPos, rightDoor, rightDoorOpenPos, doorOpenTime)); diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Continuos locomotion Conf.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Continuos locomotion Conf.cs index 9920c2d4..dfa4b4a7 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Continuos locomotion Conf.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Continuos locomotion Conf.cs @@ -25,6 +25,7 @@ public class ContinuoslocomotionConfigurator : MonoBehaviour private void enableLocomotion() { + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject); //3d oneshot sound locomotion.enabled = true; turnOnButton.gameObject.SetActive(false); turnOffButton.gameObject.SetActive(true); @@ -32,6 +33,7 @@ public class ContinuoslocomotionConfigurator : MonoBehaviour private void disableLocomotion() { + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Click, gameObject); //3d oneshot sound locomotion.enabled = false; turnOnButton.gameObject.SetActive(true); turnOffButton.gameObject.SetActive(false); diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/HoverSlideButton.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/HoverSlideButton.cs index 76d532e3..a0479a6f 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/HoverSlideButton.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/HoverSlideButton.cs @@ -23,6 +23,7 @@ public class HoverSlideButton : MonoBehaviour, IPointerEnterHandler, IPointerExi public void OnPointerEnter(PointerEventData eventData) { SlideToPosition(onPosition); + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject); //3d oneshot sound } public void OnPointerExit(PointerEventData eventData) diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs index a42fe70a..18b859ac 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs @@ -6,6 +6,7 @@ using UnityEngine; using UnityEngine.Rendering; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit; +using FMOD.Studio; public class MenuTeleportButton : MonoBehaviour { @@ -20,6 +21,15 @@ public class MenuTeleportButton : MonoBehaviour private Button button; private TeleportLocation target; // Target teleport position + private EventInstance TeleportingSound; + + private void Awake() + { + TeleportingSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Teleport); //initialise the instance + + } + + void Start() { button = GetComponent