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 2c4b1a9a..039ea55e 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -30,6 +30,12 @@ public class CarDrivingRoutine : MonoBehaviour private void Awake() { + Debug.LogError("AUDIO MANAGER:"); + Debug.LogError(AudioManager.Instance); + Debug.LogError("FMOD EVENTS INSTANCE:"); + Debug.LogError(FMODEvents.Instance); + Debug.LogError("Car Simple Driving:"); + Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); CarMovement = AudioManager.Instance.CreateInstance(FMODEvents.Instance.BoltCarSimpleDriving); //initialising the variable CarMovement.setParameterByName("EasyBoltLogic", 0); //"Driving - 0 in FMOD" CarMovement.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //setting 3d attributes 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 18b859ac..3da44645 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs @@ -7,6 +7,7 @@ using UnityEngine.Rendering; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit; using FMOD.Studio; +using FMODUnity; public class MenuTeleportButton : MonoBehaviour { @@ -22,10 +23,12 @@ public class MenuTeleportButton : MonoBehaviour private TeleportLocation target; // Target teleport position private EventInstance TeleportingSound; + FMOD.Studio.Bus SpecialBus; //FMOD bus variable private void Awake() { TeleportingSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.Teleport); //initialise the instance + SpecialBus = FMODUnity.RuntimeManager.GetBus("bus:/LogicalMute"); } @@ -102,6 +105,21 @@ public class MenuTeleportButton : MonoBehaviour button.interactable = false; button.interactable = true; + StartCoroutine(MuteBusForSeconds(1.5f)); + TeleportingSound.start(); //playing 2d oneshot } + + private IEnumerator MuteBusForSeconds(float duration) + { + // Lower volume to 0 instantly + SpecialBus.setVolume(0f); + Debug.Log("[MenuTeleportButton] Muting LogicalMute bus..."); + + yield return new WaitForSeconds(duration); + + // Restore volume + SpecialBus.setVolume(1f); + Debug.Log("[MenuTeleportButton] Unmuted LogicalMute bus."); + } } diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs new file mode 100644 index 00000000..2104ab41 --- /dev/null +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit; +using FMOD.Studio; + +[RequireComponent(typeof(TeleportationProvider))] +public class TeleportationListen : MonoBehaviour +{ + private TeleportationProvider teleportationProvider; + + void Awake() + { + teleportationProvider = GetComponent(); + + } + + void OnEnable() + { + // Subscribe to the event that fires when teleportation actually ends + teleportationProvider.endLocomotion += OnTeleportEnd; + } + + void OnDisable() + { + teleportationProvider.endLocomotion -= OnTeleportEnd; + } + + private void OnTeleportEnd(LocomotionSystem locomotionSystem) + { + // ✅ Fires ONLY when teleportation successfully completes + AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Steps, gameObject); //oneshot 3d event + + Debug.Log("[TeleportationListen] Teleport sound played."); + } +} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs.meta b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs.meta new file mode 100644 index 00000000..88b9292e --- /dev/null +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6bdaa08e302fd9a4ab0f386f25762231 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Teleport Reticle.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Teleport Reticle.prefab index 3fd708f0..44286088 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Teleport Reticle.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/Teleport Reticle.prefab @@ -28,6 +28,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.05, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7931660231731467089} m_RootOrder: 1 @@ -51,6 +52,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -109,6 +111,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.555, z: 0} m_LocalScale: {x: 0.7, y: 0.5, z: 0.7} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7931660231731467089} m_RootOrder: 0 @@ -132,6 +135,7 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -188,6 +192,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -76.37219, y: 4.513916, z: -12.719563} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7931660231006572051} - {fileID: 7931660229594303655} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 3107f895..ad6631f4 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -3322,6 +3322,7 @@ GameObject: - component: {fileID: 3674974860896573708} - component: {fileID: 4796162426222032203} - component: {fileID: 3021947512568437509} + - component: {fileID: 2252173189162072442} m_Layer: 0 m_Name: Locomotion Providers m_TagString: Untagged @@ -3514,6 +3515,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 027065c8bd8579b4db62c9b5da6bafb6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &2252173189162072442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5652728867526489159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6bdaa08e302fd9a4ab0f386f25762231, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5816804138171263384 GameObject: m_ObjectHideFlags: 0 @@ -8030,7 +8043,8 @@ PrefabInstance: propertyPath: m_InteractionLayers.m_Bits value: 2164612983 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 6816438231733672453, guid: b0b2b7e0bfc3c6347b6aa4f25e1f4901, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] diff --git a/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab b/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab index 04b6c6fd..e6a8bab6 100644 --- a/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab +++ b/Assets/_PROJECT/Components/Overlay UI/NetworkManagerUI.prefab @@ -1691,8 +1691,8 @@ GameObject: - component: {fileID: 2403481060362975301} - component: {fileID: 150987804393607111} - component: {fileID: 2849620166313326850} - - component: {fileID: 5954151782133518590} - component: {fileID: 3623653364064856318} + - component: {fileID: 7579737766687674392} m_Layer: 0 m_Name: NetworkManagerUI m_TagString: Untagged @@ -1783,7 +1783,15 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!114 &5954151782133518590 +--- !u!81 &3623653364064856318 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920648335286241163} + m_Enabled: 1 +--- !u!114 &7579737766687674392 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1806,14 +1814,6 @@ MonoBehaviour: networkDiscovery: {fileID: 0} uiCamera: {fileID: 0} placeholderAudioListener: {fileID: 0} ---- !u!81 &3623653364064856318 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8920648335286241163} - m_Enabled: 1 --- !u!1 &8930421849167053048 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 7983df71..93f55f32 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:b71ae9a3566c81beb681a88b9b0f1e1b438e4e734e02f35ec33a261b1a2ee56f -size 63292752 +oid sha256:9c8c367db575e9b27783c864486b7c705a56eae14212012b26e2c82695e1b21d +size 63287090 diff --git a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs.meta b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs.meta index 88cdb7dd..3a15b2f1 100644 --- a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs.meta +++ b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -20 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs.meta b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs.meta index 64d2c584..e6c93ab4 100644 --- a/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs.meta +++ b/Assets/_PROJECT/Scripts/Audio/FMODEvents.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -10 icon: {instanceID: 0} userData: assetBundleName: diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index 66cd88ea..403bf5c2 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 807fb521..57c67cf9 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 50916d32..81d998ee 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 75d33764..43f960ac 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/Master.strings.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank index 133abfdb..946dd880 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index b1b2e588..38fcd938 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 6c7e8c1a..841ae4fe 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/{0345befd-8f71-4bc2-acd0-e5b9d7f899e8}.xml b/DeltaVRFMOD/Metadata/Event/{0345befd-8f71-4bc2-acd0-e5b9d7f899e8}.xml index f565f896..d18abb5c 100644 --- a/DeltaVRFMOD/Metadata/Event/{0345befd-8f71-4bc2-acd0-e5b9d7f899e8}.xml +++ b/DeltaVRFMOD/Metadata/Event/{0345befd-8f71-4bc2-acd0-e5b9d7f899e8}.xml @@ -94,7 +94,7 @@ - 0.76500000000000012 + 0.53500000000000003 0.35999999999999999 @@ -102,14 +102,14 @@ -2 + + {fc820266-27f8-4a69-b5eb-2d20f12e06e3} + {68ea2f26-b7f9-404f-80bd-02f96e1b80a9} - - 6.5 - Audio 1 @@ -131,6 +131,14 @@ + + + {c073b87a-876b-40a5-ae37-bb1bc8931e7f} + + + {273113b4-182d-4ba3-99ef-fa76dffb5bab} + + {e31f3f50-3151-43d4-b3a0-84398cf8a67d} @@ -139,5 +147,24 @@ + + + 0.31 + + + 1 + + + 0.0204151645 + + + + + 0.53500000000000003 + + + 0 + + diff --git a/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml b/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml index 49b8c885..ebe9b457 100644 --- a/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml +++ b/DeltaVRFMOD/Metadata/Event/{18954117-2365-48c6-b968-d8f2f7b6b04d}.xml @@ -109,7 +109,7 @@ - 8 + 7 Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml b/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml index 58d4c536..0f310b70 100644 --- a/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3e2f2f36-9988-4981-81d5-b83afdd853a2}.xml @@ -115,6 +115,9 @@ + + -7 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml index 4ea30d48..c8a03dd6 100644 --- a/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml +++ b/DeltaVRFMOD/Metadata/Event/{6360411a-8ba1-4d05-895f-3731610e36bf}.xml @@ -105,7 +105,7 @@ - 5.5 + -1 Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml b/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml index 79796c43..c41ced45 100644 --- a/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7cf821cf-9b5c-43c9-b1b5-70e80fd1d3b7}.xml @@ -118,7 +118,7 @@ - 1 + -1 Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml b/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml index f23fd032..e9d6a49e 100644 --- a/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml @@ -97,17 +97,14 @@ - 0.97999999999999998 + 0.13400000000000001 - 0.5 + 0.53815963298580316 - 0.800000012 + 2 - - {84485a80-bb20-49e1-9c58-fb83829e6434} - {f00edea1-7bed-4fc6-adc5-e9d727191e42} @@ -117,7 +114,7 @@ - 6.5 + 4 Audio 1 @@ -140,14 +137,6 @@ - - - {13347443-bbca-41ca-941f-fee754d7d95d} - - - {943b5816-48a9-4fd1-9171-f5367157954a} - - {86567622-eff2-4e65-b5cd-55c5cde8621b} @@ -164,39 +153,20 @@ - - - 0 - - - 0 - - - -0.00769630447 - - - - - 0.029999999999999999 - - - 1 - - - 0.5 + 0.040000000000000001 1 - 0.0366943926 + 0.150172114 - 0.97999999999999998 + 0.13400000000000001 0 diff --git a/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml b/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml index e90eb48d..419aba77 100644 --- a/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml @@ -53,7 +53,7 @@ {b883c971-d553-41c9-8d37-3b20092b7741} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {69ee688f-dc4e-4df2-a125-df79ed93217e} @@ -110,6 +110,9 @@ + + -2.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml b/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml index 5c0115f7..d12d8614 100644 --- a/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml +++ b/DeltaVRFMOD/Metadata/Event/{95df996b-940a-44ce-b51c-409fea8d9ddd}.xml @@ -113,6 +113,9 @@ + + -7.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml b/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml index 976face0..3a59cfdd 100644 --- a/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml +++ b/DeltaVRFMOD/Metadata/Event/{af15be7d-d2b1-4b03-9e5a-a609f5948419}.xml @@ -56,7 +56,7 @@ {6721f316-4c14-42f0-abed-906731885df2} - {69ee688f-dc4e-4df2-a125-df79ed93217e} + {9f27e443-4657-4fe2-9f99-cb50bf4bb534} @@ -100,6 +100,9 @@ + + 10 + {93d8cf80-0194-4af9-92e7-03838fa454ec} {368dc7c6-19a4-4018-b86e-b345eb9f125e} @@ -111,7 +114,7 @@ - -6.5 + -1 Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml b/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml index d4c7c145..92e8ba5b 100644 --- a/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ce89abc5-417e-4800-9b30-18883a321145}.xml @@ -73,7 +73,7 @@ - 40 + 60 @@ -529,22 +529,12 @@ {8d183079-30c4-4cbb-837b-5db8c493ed3b} - {6f324c50-2544-45f2-ae03-c32e6ba77f47} {50d95503-71eb-40cd-bf3c-9c81df86ce9c} {dd976ac6-fd76-433d-9529-838cfc6b729f} + {271ac30f-9855-4d8d-9c3f-e9decd599a63} + {ca5c5e24-641a-4abe-a446-fb75c5add4a8} - - - 26 - - - 320 - - - -0.272252083 - - 0 @@ -553,7 +543,7 @@ 22000 - 0.5 + 1 true @@ -564,7 +554,23 @@ 39.604519774011301 - 20 + 30 + + + + + 25.5 + + + 35 + + + + + 14.5 + + + 3500 diff --git a/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml b/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml index 837a6cec..37ce6cba 100644 --- a/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml +++ b/DeltaVRFMOD/Metadata/Event/{d8cab979-82dd-41e0-ae17-4d3654bf58b8}.xml @@ -105,6 +105,9 @@ + + -7.5 + Audio 1 diff --git a/DeltaVRFMOD/Metadata/Event/{debd0048-f7da-4ea8-8e42-084262639fd0}.xml b/DeltaVRFMOD/Metadata/Event/{debd0048-f7da-4ea8-8e42-084262639fd0}.xml index fe4c4683..746b4a60 100644 --- a/DeltaVRFMOD/Metadata/Event/{debd0048-f7da-4ea8-8e42-084262639fd0}.xml +++ b/DeltaVRFMOD/Metadata/Event/{debd0048-f7da-4ea8-8e42-084262639fd0}.xml @@ -94,10 +94,10 @@ - 0.68499999999999994 + 0.16 - 0.065000000000000002 + 0.08500000000000002 {450e3d8d-9555-4c4e-b73f-a01b4f52115a} @@ -108,7 +108,7 @@ - 8 + 6 Audio 1 @@ -149,18 +149,18 @@ - 0.33499999999999985 + 0 1 - 0.550617158 + 0.0188847203 - 0.68499999999999983 + 0.16 0 diff --git a/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml b/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml new file mode 100644 index 00000000..39f0c84c --- /dev/null +++ b/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml @@ -0,0 +1,318 @@ + + + + + StepsSingular + + + 2 + + + {bb0dfa19-2848-45c1-b83a-f212448dc5ad} + + + {fac01901-8944-4e55-8303-a8f6c0876893} + + + {e4f86e39-9ec4-4890-8531-cda264ef0f0b} + + + {4ee1c73d-3cc2-4ac6-86cc-1f23993a656e} + + + {bd51c199-96b8-453e-8673-cfce84c2c90f} + + + {c674ecef-fe9a-4a66-944c-69dba5a3cc72} + + + {a73bb0a9-f59c-4510-b71c-2fcdd2a4acf8} + {a7462eb5-fbaa-41af-a50b-abd719e09528} + + + {dd5d438d-e04e-4dc6-8301-e2eefe5f5569} + + + {9d1145b0-e099-4ee4-ab1d-23cc274af901} + + + + + {7b5a0b07-8fec-4444-9dca-3f0988ab2f8f} + + + + + {7b5a0b07-8fec-4444-9dca-3f0988ab2f8f} + + + + + {8b684632-1faa-47ca-b017-08e3cd390e24} + + + {181f0012-cfa3-4bea-9f67-c0e07aa6c6c2} + + + {9f27e443-4657-4fe2-9f99-cb50bf4bb534} + + + + + 800 + + + + + + {30537d92-4a99-4d17-8b54-c575a233a660} + + + {68b7821f-353e-4ddc-a8f5-993ac97bbdfc} + + + + + {f677a788-ea46-40f1-9791-609dc4c702fa} + + + {bbff5bdb-b665-406c-a179-8a3d137d312e} + + + + + {30537d92-4a99-4d17-8b54-c575a233a660} + {f677a788-ea46-40f1-9791-609dc4c702fa} + + + + + {2ba58871-ac5a-471c-a556-5d7317fff71b} + + + {84529668-c4db-45b6-8b36-603e151a5b99} + + + {fac01901-8944-4e55-8303-a8f6c0876893} + + + + + {c71d8224-fc53-4dd8-a095-9b044be68069} + + + + + + 0.76000000000000001 + + + 10 + + + 1 + + + {3864d274-9bd6-42fc-bfd2-0ed6fd0f8536} + {7d8aeb23-126b-423e-9a6c-d252088457b6} + {dea2cea8-6e7f-48f5-9c9d-f6d290ecbe87} + {7018f33a-92c0-4e9c-9fbf-765d2deef17a} + {4f993415-4e77-4cf0-865a-5d9db054624a} + {5d515b0e-80ee-46d6-b8a3-037ad1052db0} + + + + + Audio 1 + + + {8091f639-5d8c-463b-9caf-f88517ef06d8} + + + {9136487c-e1a5-4cd7-8459-c8c605736f6f} + + + {7b5a0b07-8fec-4444-9dca-3f0988ab2f8f} + + + + + 0.40000000000000002 + + + 0.71999999999999997 + + + 10 + + + 1 + + + {004a855b-5efa-4967-ba43-3e95a61a668f} + {cca00e11-8e98-4902-9f7a-589815188bde} + {2511fef9-0729-4eb5-8de5-bc400a7db982} + {faae01a9-18b9-455e-92fc-d84c73422ae3} + {d7de2926-5a35-4570-8b51-7094f30edd3b} + {c1c7fd04-72e2-4c0e-8b7b-af73f1953c4e} + + + + + Audio 2 + + + {9ae628f7-f22e-47e1-9460-8845a9c2f8d6} + + + {564d0070-273d-4740-ad02-33e0b5cda6c9} + + + {7b5a0b07-8fec-4444-9dca-3f0988ab2f8f} + + + + + {153b4c60-9f63-4e52-9127-0488fad6c4e9} + {f57b045d-8779-4611-ab5c-7dce0bab948d} + + + + + + + 33.5 + + + -1 + + + {b66f69e1-3e37-4809-8529-f696d0162666} + + + + + 21.5 + + + -2 + + + {646fa3fb-f48c-44a9-b9be-7a24bbfe1f45} + + + + + 20.5 + + + -3.5 + + + {0ac8e061-a2bd-46d6-b43a-17109bf96e1c} + + + + + 22.5 + + + -2.5 + + + {cf043a3e-b2bd-4458-9c59-deea3e8e2678} + + + + + 14.5 + + + {54cf477f-074e-4326-baac-fcadd4bed9f4} + + + + + 13.5 + + + {360c7928-7504-45f0-aa1b-8be0e5552767} + + + + + {866b9533-bd1c-49da-ace4-cfb1333c302f} + + + + + + 33.5 + + + -1 + + + {b66f69e1-3e37-4809-8529-f696d0162666} + + + + + 21.5 + + + -2 + + + {646fa3fb-f48c-44a9-b9be-7a24bbfe1f45} + + + + + 20.5 + + + -3.5 + + + {0ac8e061-a2bd-46d6-b43a-17109bf96e1c} + + + + + 22.5 + + + -2.5 + + + {cf043a3e-b2bd-4458-9c59-deea3e8e2678} + + + + + 14.5 + + + {54cf477f-074e-4326-baac-fcadd4bed9f4} + + + + + 13.5 + + + {360c7928-7504-45f0-aa1b-8be0e5552767} + + + + + {5ffd3a9b-bcc8-48f4-8c0c-041823845747} + + + + + + + + diff --git a/DeltaVRFMOD/Metadata/Event/{ffebdbfb-a448-48c1-812e-5467298c8408}.xml b/DeltaVRFMOD/Metadata/Event/{ffebdbfb-a448-48c1-812e-5467298c8408}.xml index c6266f8b..e996b4a6 100644 --- a/DeltaVRFMOD/Metadata/Event/{ffebdbfb-a448-48c1-812e-5467298c8408}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ffebdbfb-a448-48c1-812e-5467298c8408}.xml @@ -53,7 +53,7 @@ {7e2ac30b-be63-44ef-a305-8fff647325f1} - {c751273e-6b77-46b1-8c19-a99f6f08e61e} + {69ee688f-dc4e-4df2-a125-df79ed93217e} diff --git a/DeltaVRFMOD/Metadata/Group/{9f27e443-4657-4fe2-9f99-cb50bf4bb534}.xml b/DeltaVRFMOD/Metadata/Group/{9f27e443-4657-4fe2-9f99-cb50bf4bb534}.xml new file mode 100644 index 00000000..d9b60ecf --- /dev/null +++ b/DeltaVRFMOD/Metadata/Group/{9f27e443-4657-4fe2-9f99-cb50bf4bb534}.xml @@ -0,0 +1,24 @@ + + + + + LogicalMute + + + {671f50a8-e4e4-4a01-a0de-51957c3ca422} + + + {7e36a1da-f223-4c9b-a38d-d37df1ac9c1d} + + + {c751273e-6b77-46b1-8c19-a99f6f08e61e} + + + + + {97f35844-dc82-400f-ae7a-7d8c1dd51ac3} + + + + + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e29bfaf2..896d8bb2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b0c8187989f051f17c8176a08dd62c09e6144fe6accce74a1dc37fbf1413599 -size 26632 +oid sha256:58745c9321381389f20738b32b3dc4544842f32ad2e3992ddd439651246906a2 +size 26323