diff --git a/Assets/Plugins/SteamAudio/Resources/SteamAudioSettings.asset b/Assets/Plugins/SteamAudio/Resources/SteamAudioSettings.asset index 6d9a7ff7..4604a5c8 100644 --- a/Assets/Plugins/SteamAudio/Resources/SteamAudioSettings.asset +++ b/Assets/Plugins/SteamAudio/Resources/SteamAudioSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a25d614e3f85b6ddda9cfe04b4f3f3a0b9d306effe237cb6f862f0e76b8d0ca4 +oid sha256:42d4f3705afccc0e4c254146cab0b76913cadcdfd028abceb9fe4d7224413814 size 1613 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 64d612a2..162861d0 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -110,8 +110,8 @@ public class CarDrivingRoutine : NetworkBehaviour {; if (other.GetComponentInParent() == null) return; StartCoroutine(SmoothAdjustSpeed(0, 0, haltspeed)); // Smoothly halt in 1 second - _tireSound.Stop(); - _stopSound.Play(); + //_tireSound.Stop(); + //_stopSound.Play(); AudioController.SetRPM(475); AudioController.PlayStopSound(); @@ -122,8 +122,8 @@ public class CarDrivingRoutine : NetworkBehaviour { if (other.GetComponentInParent() == null) return; StartCoroutine(SmoothAdjustSpeed(targetSpeed, targetRotationSpeed, haltspeed)); // Smoothly resume speed in 1 second - _stopSound.Stop(); - _tireSound.Play(); + //_stopSound.Stop(); + //_tireSound.Play(); AudioController.SetRPM(1450); diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index 1110a8d8..e109c0d8 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -694,6 +694,7 @@ GameObject: - component: {fileID: 5331342604379454603} - component: {fileID: 1866864886208815} - component: {fileID: 6596783065788885589} + - component: {fileID: 2714778319450199886} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -820,6 +821,19 @@ MonoBehaviour: minValue: 0 maxValue: 1 slideareaOffsetMultiplier: 0.9 +--- !u!114 &2714778319450199886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829665037849699668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 2 --- !u!1 &829695359259357513 GameObject: m_ObjectHideFlags: 0 @@ -1465,6 +1479,7 @@ GameObject: - component: {fileID: 8149783172932780154} - component: {fileID: 7017778607745474649} - component: {fileID: 2708450618333126782} + - component: {fileID: 6631830758558507073} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -1591,6 +1606,19 @@ MonoBehaviour: minValue: 0 maxValue: 1 slideareaOffsetMultiplier: 0.9 +--- !u!114 &6631830758558507073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1371473744446131600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 3 --- !u!1 &1451224546718335135 GameObject: m_ObjectHideFlags: 0 @@ -4720,6 +4748,7 @@ GameObject: - component: {fileID: 3702309226689803558} - component: {fileID: 6841033323124689675} - component: {fileID: 6619092689880446435} + - component: {fileID: 5831180822224317918} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -4846,6 +4875,19 @@ MonoBehaviour: minValue: 0 maxValue: 1 slideareaOffsetMultiplier: 0.9 +--- !u!114 &5831180822224317918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4757451720330744469} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 0 --- !u!1 &4815518641921404370 GameObject: m_ObjectHideFlags: 0 @@ -6575,6 +6617,7 @@ GameObject: - component: {fileID: 6392076320775958587} - component: {fileID: 8533604835838269795} - component: {fileID: 221982658494184569} + - component: {fileID: 5486814484665002793} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -6701,6 +6744,19 @@ MonoBehaviour: minValue: 0 maxValue: 1 slideareaOffsetMultiplier: 0.9 +--- !u!114 &5486814484665002793 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6661887633723237894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 1 --- !u!1 &6802548334697868303 GameObject: m_ObjectHideFlags: 0 @@ -7952,6 +8008,7 @@ GameObject: - component: {fileID: 7710393525849749537} - component: {fileID: 9065530914213283711} - component: {fileID: 1194791598480229312} + - component: {fileID: 7987415785522350763} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -8078,6 +8135,19 @@ MonoBehaviour: minValue: 0 maxValue: 1 slideareaOffsetMultiplier: 0.9 +--- !u!114 &7987415785522350763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8391231543345548430} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebe1ab889a9bed940995d4f47bc743ef, type: 3} + m_Name: + m_EditorClassIdentifier: + target: 4 --- !u!1 &8436046511908584062 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs index 0fd0c1d8..d0915d04 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs @@ -34,6 +34,18 @@ public class AudioSliderDragHandler : MonoBehaviour, IBeginDragHandler, IDragHan UpdateSlider(eventData); } + public void SetHandlePosition(float normalizedValue) + { + float halfWidth = sliderBackground.rect.width * 0.5f; + float limit = halfWidth * slideareaOffsetMultiplier; + + float x = Mathf.Lerp(-limit, limit, normalizedValue); + handleRect.localPosition = new Vector3(x, handleRect.localPosition.y, 0); + + CurrentValue = normalizedValue; + } + + public void OnDrag(PointerEventData eventData) { UpdateSlider(eventData); @@ -46,6 +58,7 @@ public class AudioSliderDragHandler : MonoBehaviour, IBeginDragHandler, IDragHan } private void UpdateSlider(PointerEventData eventData) { + Debug.Log("UpDating Slider"); Vector2 localPoint; RectTransformUtility.ScreenPointToLocalPointInRectangle(sliderBackground, eventData.position, eventData.pressEventCamera, out localPoint); diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs new file mode 100644 index 00000000..1fb0bf52 --- /dev/null +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs @@ -0,0 +1,80 @@ +using UnityEngine; + +public class SliderToVCA : MonoBehaviour +{ + public enum VCATarget + { + Master, + Ambiences, + Music, + SFX, + UI + } + + public VCATarget target; + private AudioSliderDragHandler slider; + + private void Awake() + { + slider = GetComponent(); + } +private void Start() +{ + float initialValue = GetInitialValueFromAudioManager(); + slider.SetHandlePosition(initialValue); // we will add this function +} + + +private float GetInitialValueFromAudioManager() +{ + switch (target) + { + case VCATarget.Master: + return AudioManager.Instance.MasterVolume; + case VCATarget.Ambiences: + return AudioManager.Instance.AmbienceVolume; + case VCATarget.Music: + return AudioManager.Instance.MusicVolume; + case VCATarget.SFX: + return AudioManager.Instance.SFXVolume; + case VCATarget.UI: + return AudioManager.Instance.UIVolume; + default: + return 1f; + } +} + + private void Update() + { + // Constantly push slider value to the VCA + ApplyVolume(slider.CurrentValue); + Debug.Log("CurrentValue: " + slider.CurrentValue); + } + + private void ApplyVolume(float value) + { + switch (target) + { + case VCATarget.Master: + AudioManager.Instance.SetMasterVCA(value); + Debug.LogError(value); + break; + + case VCATarget.Ambiences: + AudioManager.Instance.SetAmbientVCA(value); + break; + + case VCATarget.Music: + AudioManager.Instance.SetMusicVCA(value); + break; + + case VCATarget.SFX: + AudioManager.Instance.SetSFXVCA(value); + break; + + case VCATarget.UI: + AudioManager.Instance.SetUIVCA(value); + break; + } + } +} diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs.meta b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs.meta new file mode 100644 index 00000000..37a6ccec --- /dev/null +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ebe1ab889a9bed940995d4f47bc743ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Portals2/Portal.prefab b/Assets/_PROJECT/Components/Portals2/Portal.prefab index 5aec1dc1..aee40785 100644 --- a/Assets/_PROJECT/Components/Portals2/Portal.prefab +++ b/Assets/_PROJECT/Components/Portals2/Portal.prefab @@ -123,7 +123,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6021721823031538141} - - component: {fileID: 4707456952479937532} m_Layer: 0 m_Name: Portal m_TagString: Untagged @@ -150,147 +149,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &4707456952479937532 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4777591596180506993} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 4d691c6581003c94bbfe74b21deb8784, type: 3} - m_PlayOnAwake: 1 - m_Volume: 0.8 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 40 - Pan2D: 0 - rolloffMode: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1.0028496 - inSlope: -40.015934 - outSlope: -40.015934 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.03449707 - value: 0.49145508 - inSlope: -10.0039835 - outSlope: -10.0039835 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.25 - inSlope: -2.5009959 - outSlope: -2.5009959 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.125 - inSlope: -0.62524897 - outSlope: -0.62524897 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4348816 - value: 0.03970337 - inSlope: -0.15631224 - outSlope: -0.15631224 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0 - inSlope: -0.03907806 - outSlope: -0.03907806 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.9980469 - value: 0 - inSlope: -0.02500997 - outSlope: -0.02500997 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1 &6014189720456933605 GameObject: m_ObjectHideFlags: 0 @@ -580,4 +438,4 @@ MonoBehaviour: PlayerOcclusionWidening: 1 OcclusionLayer: serializedVersion: 2 - m_Bits: 2048 + m_Bits: 268438528 diff --git a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs.meta b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs.meta index 39580fb8..a3f17219 100644 --- a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs.meta +++ b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBow.cs.meta @@ -3,7 +3,16 @@ guid: 93a8cd8d2c83a1c4da7720c8a59fa706 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - m_InteractionManager: {instanceID: 0} + - m_CustomReticle: {instanceID: 0} + - m_AttachTransform: {instanceID: 0} + - m_SecondaryAttachTransform: {instanceID: 0} + - pullMin: {instanceID: 0} + - pullMax: {instanceID: 0} + - pullSounds: {fileID: 11400000, guid: 3c359cbce1e053d4f97c86ed8998405b, type: 2} + - maxPullSounds: {fileID: 11400000, guid: a052046b894aee042a62bcc609a5afc7, type: 2} + - stringRenderer: {instanceID: 0} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNotch.cs.meta b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNotch.cs.meta index 2cdfb471..cc330d1c 100644 --- a/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNotch.cs.meta +++ b/Assets/_PROJECT/Components/TwoHandedBow/TwoHandedBowNotch.cs.meta @@ -1,3 +1,19 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 5c49785f8ddb436bb890408012c0da7d -timeCreated: 1679237121 \ No newline at end of file +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - m_InteractionManager: {instanceID: 0} + - m_AttachTransform: {instanceID: 0} + - m_StartingSelectedInteractable: {instanceID: 0} + - m_StartingTargetFilter: {instanceID: 0} + - m_InteractableHoverMeshMaterial: {instanceID: 0} + - m_InteractableCantHoverMeshMaterial: {instanceID: 0} + - nockSounds: {fileID: 11400000, guid: 6d1727a79cb00364c8adb70e8396e743, type: 2} + - releaseSounds: {fileID: 11400000, guid: 08fd7432471e0aa40b7a08f6d88b7281, type: 2} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Prefabs/Robotics/Flatrobot Variant.prefab b/Assets/_PROJECT/Prefabs/Robotics/Flatrobot Variant.prefab index 503ec303..0681990b 100644 --- a/Assets/_PROJECT/Prefabs/Robotics/Flatrobot Variant.prefab +++ b/Assets/_PROJECT/Prefabs/Robotics/Flatrobot Variant.prefab @@ -115,4 +115,4 @@ MonoBehaviour: Params: [] OverrideAttenuation: 0 OverrideMinDistance: 1 - OverrideMaxDistance: 5 + OverrideMaxDistance: 8.8 diff --git a/Assets/_PROJECT/Resources/Audio/Bow/Hit.asset b/Assets/_PROJECT/Resources/Audio/Bow/Hit.asset index 4adbc606..38738b8f 100644 --- a/Assets/_PROJECT/Resources/Audio/Bow/Hit.asset +++ b/Assets/_PROJECT/Resources/Audio/Bow/Hit.asset @@ -1,26 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4f2dd8befe0f4a48b0c418911ffa5c0, type: 3} - m_Name: Hit - m_EditorClassIdentifier: - volumeMin: 1 - volumeMax: 1 - pitchMin: 1 - pitchMax: 1 - delay: 0.1 - audioClips: - - {fileID: 8300000, guid: 74068c08db651d34f81de9affa61f55d, type: 3} - - {fileID: 8300000, guid: 0e220b97baa73db4fab6fba879e1b024, type: 3} - - {fileID: 8300000, guid: adaa56b2d3d8ca548a8467326825e514, type: 3} - - {fileID: 8300000, guid: cef9a0102c9fe0c4fad4ebcf9ec72a45, type: 3} - - {fileID: 8300000, guid: beefd4b7702d5874994c17328dc55b24, type: 3} - - {fileID: 8300000, guid: 6e984feb46a04284e8c6ce4ebfd791d0, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:d40923d7525ce8c53f992478443fd92c0a55d86f41ffb6433ddc8b7396fd398a +size 903 diff --git a/Assets/_PROJECT/Resources/Audio/Bow/MaxPull.asset b/Assets/_PROJECT/Resources/Audio/Bow/MaxPull.asset index a66fd89a..4694ad11 100644 --- a/Assets/_PROJECT/Resources/Audio/Bow/MaxPull.asset +++ b/Assets/_PROJECT/Resources/Audio/Bow/MaxPull.asset @@ -1,21 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4f2dd8befe0f4a48b0c418911ffa5c0, type: 3} - m_Name: MaxPull - m_EditorClassIdentifier: - volumeMin: 1 - volumeMax: 1 - pitchMin: 1 - pitchMax: 1 - delay: 0.1 - audioClips: - - {fileID: 8300000, guid: 8a95f5613a17c0f4db5b93318e947568, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:37e2a6a6c888905374ed647b362f426f51b5e0a31b7084020a4425920f50c477 +size 552 diff --git a/Assets/_PROJECT/Resources/Audio/Bow/Nock.asset b/Assets/_PROJECT/Resources/Audio/Bow/Nock.asset index 32a1cebd..e9a49ca7 100644 --- a/Assets/_PROJECT/Resources/Audio/Bow/Nock.asset +++ b/Assets/_PROJECT/Resources/Audio/Bow/Nock.asset @@ -1,37 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4f2dd8befe0f4a48b0c418911ffa5c0, type: 3} - m_Name: Nock - m_EditorClassIdentifier: - volumeMin: 1 - volumeMax: 1 - pitchMin: 1 - pitchMax: 1 - delay: 0.1 - audioClips: - - {fileID: 8300000, guid: 554ae4ff7aa47c0478d95d78e6a9be6b, type: 3} - - {fileID: 8300000, guid: dde0cb3ddafcf014a8c42e805de893e8, type: 3} - - {fileID: 8300000, guid: 36f326ccef0fe5546befe26be5ba337f, type: 3} - - {fileID: 8300000, guid: d5aa741aac337e14398adda80505bf9c, type: 3} - - {fileID: 8300000, guid: 1dfef04d7ab9ced4093c828025f5bf06, type: 3} - - {fileID: 8300000, guid: dd90b53139ec2fb4697f0cf3dceac679, type: 3} - - {fileID: 8300000, guid: 0d18ca862d5d9b743b42348751798528, type: 3} - - {fileID: 8300000, guid: 6ad90a1b9664a154592fabedc7cef551, type: 3} - - {fileID: 8300000, guid: 8f094810949516a41a720a40a87d29cc, type: 3} - - {fileID: 8300000, guid: 37b6eb5cae1aaba4086f32bccf0cb47f, type: 3} - - {fileID: 8300000, guid: 4fee3982c922af44babfca8a11dffaca, type: 3} - - {fileID: 8300000, guid: dfd9b0fa043e3fc43821c159432a045c, type: 3} - - {fileID: 8300000, guid: 6a2a42a4396b3ec4fbe844a811b77445, type: 3} - - {fileID: 8300000, guid: ab9d0c5c3fa27b34685e9b70737e281a, type: 3} - - {fileID: 8300000, guid: f6870f0d62f5a624aabbd4e3e7bff65f, type: 3} - - {fileID: 8300000, guid: 3bad6fb5cb07dd44b88e0e1857e222be, type: 3} - - {fileID: 8300000, guid: ece81cacdab36d745962207a515820a1, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:62eb310d49b41ca6e00b88fab08f928b934f16064361b8051f56997d261dcaa6 +size 1685 diff --git a/Assets/_PROJECT/Resources/Audio/Bow/Pull.asset b/Assets/_PROJECT/Resources/Audio/Bow/Pull.asset index 5f82529d..dd9534cd 100644 --- a/Assets/_PROJECT/Resources/Audio/Bow/Pull.asset +++ b/Assets/_PROJECT/Resources/Audio/Bow/Pull.asset @@ -1,36 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4f2dd8befe0f4a48b0c418911ffa5c0, type: 3} - m_Name: Pull - m_EditorClassIdentifier: - volumeMin: 1 - volumeMax: 1 - pitchMin: 1 - pitchMax: 1 - delay: 0.1 - audioClips: - - {fileID: 8300000, guid: 51747ad9fd4c5564e873dbae5171e257, type: 3} - - {fileID: 8300000, guid: bb1994a9358f0dc4782fe7535a9b384c, type: 3} - - {fileID: 8300000, guid: 1958d9dc4683f204793b607c688da2d7, type: 3} - - {fileID: 8300000, guid: 1b7c76f85bf1034498fefaa3ec8e600f, type: 3} - - {fileID: 8300000, guid: d27732ffed6c52840bb268571f66913e, type: 3} - - {fileID: 8300000, guid: cb68230ab01aab448b476ae3c84ee521, type: 3} - - {fileID: 8300000, guid: b508660da1369664ea4fe1f9987c2150, type: 3} - - {fileID: 8300000, guid: c424271f5a0b34042978648f19f2da8b, type: 3} - - {fileID: 8300000, guid: a8aded2ee3b41f04eaad3a7b9f35e37f, type: 3} - - {fileID: 8300000, guid: aa14911b4b4eb894085dfe426f46ba98, type: 3} - - {fileID: 8300000, guid: 23932eb1f1528d34786ffa3381cb5922, type: 3} - - {fileID: 8300000, guid: 7f632b7ba3e0d004899c46e9d8261c81, type: 3} - - {fileID: 8300000, guid: 48e7e7e907cb4de4e89ebb5f2ecb5674, type: 3} - - {fileID: 8300000, guid: 5930d7d2e705ea74ca30ee6652eb4571, type: 3} - - {fileID: 8300000, guid: 7b9d6636c126a33489ada91fd402f036, type: 3} - - {fileID: 8300000, guid: 4d23d5e2668be9f4b893c46b3802077f, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:980a04b550e2343900026737ed8fdb8fdd97caeb7b9aaa12a1426e610a3c3c2a +size 1618 diff --git a/Assets/_PROJECT/Resources/Audio/Bow/Release.asset b/Assets/_PROJECT/Resources/Audio/Bow/Release.asset index a2bdb92a..f5c82be1 100644 --- a/Assets/_PROJECT/Resources/Audio/Bow/Release.asset +++ b/Assets/_PROJECT/Resources/Audio/Bow/Release.asset @@ -1,29 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4f2dd8befe0f4a48b0c418911ffa5c0, type: 3} - m_Name: Release - m_EditorClassIdentifier: - volumeMin: 1 - volumeMax: 1 - pitchMin: 1 - pitchMax: 1 - delay: 0.1 - audioClips: - - {fileID: 8300000, guid: 5dea26c1298d78149af149b8bd73ff63, type: 3} - - {fileID: 8300000, guid: f9d368eac27f70740bed52d36e0070d8, type: 3} - - {fileID: 8300000, guid: c4212c0047b94924e8982fea80fb6547, type: 3} - - {fileID: 8300000, guid: 220813dc74ddc714fa8b1db1e6416e27, type: 3} - - {fileID: 8300000, guid: 0e4ff6f209abadf45b1c2403b1382cdf, type: 3} - - {fileID: 8300000, guid: 0e1c54b10ce72f640a29eecbfced2363, type: 3} - - {fileID: 8300000, guid: 0858be1afe7ac384698e357be00d670f, type: 3} - - {fileID: 8300000, guid: 14d8c2eed68260f4d82a70201f2f19eb, type: 3} - - {fileID: 8300000, guid: c2b473f54caf2504ba276643282bc0ab, type: 3} +version https://git-lfs.github.com/spec/v1 +oid sha256:d6e8cfafd6462c3b7690da159882e1a24c1c5b0e5ce727eb20b5877d30f36d81 +size 1120 diff --git a/Assets/_PROJECT/Resources/ONSPSettings.asset b/Assets/_PROJECT/Resources/ONSPSettings.asset index e09d8695..3c42a90b 100644 --- a/Assets/_PROJECT/Resources/ONSPSettings.asset +++ b/Assets/_PROJECT/Resources/ONSPSettings.asset @@ -1,15 +1,3 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ad074644ff568a14187a3690cfbd7534, type: 3} - m_Name: ONSPSettings - m_EditorClassIdentifier: - voiceLimit: 64 +version https://git-lfs.github.com/spec/v1 +oid sha256:25e32b4ba5d85d37d89f5f49621c22acf50118978f885787c4024a036619ee5a +size 418 diff --git a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs index 00450820..b0b5ab67 100644 --- a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs +++ b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs @@ -11,26 +11,42 @@ using STOP_MODE = FMOD.Studio.STOP_MODE; public class AudioManager : MonoBehaviour { + + //VCAs (VCA buses) are mainly used for volume control + //Regular routing buses routing are for the remaining logic, for example, within the FMOD itself to put FMOD events inside the Mixer (Mixer Routing). + //Regular routing buses are used when we make some attenuation based on parameters and write the logic in code for Unity. + + private VCA masterVCA; + private VCA musicVCA; + private VCA sfxVCA; + private VCA uiVCA; + private VCA ambienceVCA; + + [SerializeField] [Header("Volume")] [Range(0, 1)] - public float MasterVolume = 1; + public float MasterVolume = 0.5f; [Range(0, 1)] - public float MusicVolume = 1; + public float MusicVolume = 0.5f; [Range(0, 1)] - public float SFXVolume = 1; + public float AmbienceVolume = 0.5f; [Range(0, 1)] - public float UIVolume = 1; + public float SFXVolume = 0.5f; + [Range(0, 1)] + + public float UIVolume = 0.5f; [Range(0, 1)] private Bus masterBus; + private Bus ambientBus; private Bus musicBus; private Bus sfxBus; - private Bus reverbBus; private Bus uiBus; + const string sid = "00000000-0000-0000-0000-000000000000"; static readonly Guid nullGuid = new Guid(sid); @@ -86,15 +102,47 @@ public class AudioManager : MonoBehaviour _instance = instance; DontDestroyOnLoad(_instance.gameObject); _instance.eventInstances = new List(); + + _instance.masterBus = RuntimeManager.GetBus("bus:/"); _instance.musicBus = RuntimeManager.GetBus("bus:/Music"); + _instance.ambientBus = RuntimeManager.GetBus("bus:/Ambiences"); _instance.sfxBus = RuntimeManager.GetBus("bus:/SFX"); _instance.uiBus = RuntimeManager.GetBus("bus:/UI"); - // _instance.MasterVolume = SaveManager.Instance.systemData.MasterVolume / 100f; - // _instance.SFXVolume = SaveManager.Instance.systemData.SFXVolume / 100f; - // _instance.MusicVolume = SaveManager.Instance.systemData.MusicVolume / 100f; - // _instance.UIVolume = SaveManager.Instance.systemData.UIVolume / 100f; + + _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"); + + } + + public void SetMasterVCA(float value) + { + masterVCA.setVolume(value); + } + + public void SetMusicVCA(float value) + { + musicVCA.setVolume(value); + } + + public void SetAmbientVCA(float value) + { + ambienceVCA.setVolume(value); + } + + public void SetSFXVCA(float value) + { + sfxVCA.setVolume(value); + } + + public void SetUIVCA(float value) + { + + uiVCA.setVolume(value); } private void Awake() @@ -116,10 +164,19 @@ public class AudioManager : MonoBehaviour private void Update() { - musicBus.setVolume(MusicVolume); - sfxBus.setVolume(SFXVolume); - uiBus.setVolume(UIVolume); - masterBus.setVolume(MasterVolume); + //musicBus.setVolume(MusicVolume); + //ambientBus.setVolume(AmbienceVolume); + //sfxBus.setVolume(SFXVolume); + //uiBus.setVolume(UIVolume); + //masterBus.setVolume(MasterVolume); + + + //VCA volumes + masterVCA.setVolume(MasterVolume); + ambienceVCA.setVolume(AmbienceVolume); + musicVCA.setVolume(MusicVolume); + sfxVCA.setVolume(SFXVolume); + uiVCA.setVolume(UIVolume); } public static bool IsEventReferenceValid(EventReference eventReference) @@ -190,17 +247,6 @@ public class AudioManager : MonoBehaviour return; } musicEventInstance = CreateInstance(musicEventReference); - timelineInfo = new TimelineInfo(); - - // Explicitly create the delegate object and assign it to a member so it doesn't get freed - // by the garbage collected while it's being used - beatCallback = new EVENT_CALLBACK(BeatEventCallback); - - // Pin the class that will store the data modified during the callback - timelineHandle = GCHandle.Alloc(timelineInfo); - // Pass the object through the userdata of the instance - musicEventInstance.setUserData(GCHandle.ToIntPtr(timelineHandle)); - musicEventInstance.setCallback(beatCallback, EVENT_CALLBACK_TYPE.TIMELINE_BEAT | EVENT_CALLBACK_TYPE.TIMELINE_MARKER); } public void SetMusicParameter(string parameter, float value) @@ -278,45 +324,6 @@ public class AudioManager : MonoBehaviour } } - - // taken from https://www.fmod.com/docs/2.02/unity/examples-timeline-callbacks.html - [AOT.MonoPInvokeCallback(typeof(EVENT_CALLBACK))] - static FMOD.RESULT BeatEventCallback(EVENT_CALLBACK_TYPE type, IntPtr instancePtr, IntPtr parameterPtr) - { - EventInstance instance = new(instancePtr); - - // Retrieve the user data - FMOD.RESULT result = instance.getUserData(out IntPtr timelineInfoPtr); - if (result != FMOD.RESULT.OK) - { - Debug.LogError("Timeline Callback error: " + result); - } - else if (timelineInfoPtr != IntPtr.Zero) - { - // Get the object to store beat and marker details - GCHandle timelineHandle = GCHandle.FromIntPtr(timelineInfoPtr); - TimelineInfo timelineInfo = (TimelineInfo)timelineHandle.Target; - - switch (type) - { - case EVENT_CALLBACK_TYPE.TIMELINE_MARKER: - { - var parameter = (TIMELINE_MARKER_PROPERTIES)Marshal.PtrToStructure(parameterPtr, typeof(TIMELINE_MARKER_PROPERTIES)); - timelineInfo.LastMarker = parameter.name; - OnNewBGMMarker?.Invoke(parameter.name); - break; - } - case EVENT_CALLBACK_TYPE.DESTROYED: - { - // Now the event has been destroyed, unpin the timeline memory so it can be garbage collected - timelineHandle.Free(); - break; - } - } - } - return FMOD.RESULT.OK; - } - private void OnDestroy() { CleanUp(); diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br index b492b516..e79b6f04 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index a9393009..7393df90 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 d4e75815..c7d27d82 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 1b2592c3..349638b9 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/Ambience.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank index 52f99fb0..7b41db35 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index c34d6379..8b267ed6 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 a40cae39..80fed8e6 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 3e782701..ba16f08d 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 1f0cd4d9..8ed63df9 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/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml b/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml index f57f1506..a87ca620 100644 --- a/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml +++ b/DeltaVRFMOD/Metadata/Event/{11bf17f9-9c7d-44f2-b105-627916d832e6}.xml @@ -72,7 +72,7 @@ 2.60000014 - 70 + 80 diff --git a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml index 019cc138..cd0c9252 100644 --- a/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml +++ b/DeltaVRFMOD/Metadata/Event/{3775966a-99f2-44af-92c6-1acbd0ff49ab}.xml @@ -74,7 +74,7 @@ 0.300000012 - 7.5999999 + 8 @@ -92,7 +92,6 @@ {60abf4e9-d905-4870-95be-7cc7256e0ebd} {3193a222-e73f-43ef-baa2-702162771b3d} - {d00b6226-a526-4d33-a9cf-9887b8564904} {48a9f589-80cf-4cee-9075-2fea6e720c8b} @@ -121,7 +120,6 @@ {4aca6c13-361f-4739-a26a-e65479b2650c} - {d00b6226-a526-4d33-a9cf-9887b8564904} {8df8f8fe-bb9d-45f0-90bf-98ca589e2991} {b2f181eb-922d-4228-9e1f-f3ad9f9f36ef} @@ -136,7 +134,7 @@ - -3.5 + 2.5 {f8c15184-15a1-4e9d-95b9-c95327204bfe} @@ -229,14 +227,6 @@ {c3f81003-82b2-40ba-ae3f-58ea779ef4d4} - - - 60.318604166666667 - - - {5dbb0efd-7f4d-4aa7-b6c5-4c42597ceb9f} - - -2 @@ -280,7 +270,7 @@ - -7.5 + -7 Audio 3 @@ -321,7 +311,7 @@ - -13.5 + -12 Audio 4 @@ -492,7 +482,14 @@ - + + + 1 + + + 14.5 + + 19428.2324 diff --git a/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml index 0b32e78d..fc2ce9f6 100644 --- a/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7c800eb6-6ffe-49ac-bdc3-e475aa20c18c}.xml @@ -78,7 +78,6 @@ - {35c155d3-11a5-48b4-ba27-ebdb8b07dbd0} {a3dd34ab-5519-4684-89b1-90ed93b19fc0} {82c380ac-3a25-4e9b-bc81-6dc156330c85} @@ -99,7 +98,6 @@ - {35c155d3-11a5-48b4-ba27-ebdb8b07dbd0} {a8cea37b-82da-43cf-9f42-68ea15f177e4} {98cd4dab-daa1-4146-a436-142a40961319} @@ -114,7 +112,7 @@ - -4.5 + -9 {929b1c3e-951f-4cba-b573-a6725a0b69df} @@ -150,14 +148,6 @@ - - - 58.328526077097507 - - - {68049f79-4a3e-48c1-88c9-b19082a26534} - - 0.16 @@ -237,7 +227,7 @@ - -11 + -8 Audio 2 diff --git a/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml b/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml index a38d6000..55535d7c 100644 --- a/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml +++ b/DeltaVRFMOD/Metadata/Event/{7e2cb674-9881-4577-a8fd-b87f1908a0c9}.xml @@ -47,6 +47,9 @@ + + {6a1a7123-bd44-49b1-9092-22ef5bb105ec} + {aee070c5-4ff2-4594-bd41-12f059ad25d9} diff --git a/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml b/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml index adb65871..ac9b7e0c 100644 --- a/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{904bd9bc-6376-4493-89b2-7926d5bf9c5b}.xml @@ -46,6 +46,9 @@ + + {162960f4-09a2-4526-a61e-7ac7e219d27d} + {b054d434-af8c-4e01-b1ce-bb88f7601e5b} diff --git a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml index ad7c7706..ec74d40d 100644 --- a/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml +++ b/DeltaVRFMOD/Metadata/Event/{ca59a34a-ee6f-46dc-8c48-68580f166894}.xml @@ -71,7 +71,7 @@ - 30 + 50 @@ -130,7 +130,7 @@ - 4 + 7 {26251485-8b8f-4259-bc84-5fbf400ec338} diff --git a/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml b/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml index ad31b0fb..5779617c 100644 --- a/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml +++ b/DeltaVRFMOD/Metadata/Event/{f44b4c9a-41fe-4af7-82f2-c19a65cd39db}.xml @@ -47,6 +47,9 @@ + + {162960f4-09a2-4526-a61e-7ac7e219d27d} + {8b684632-1faa-47ca-b017-08e3cd390e24} diff --git a/DeltaVRFMOD/Metadata/Group/{69ee688f-dc4e-4df2-a125-df79ed93217e}.xml b/DeltaVRFMOD/Metadata/Group/{69ee688f-dc4e-4df2-a125-df79ed93217e}.xml index 25096bf2..5d7ca68a 100644 --- a/DeltaVRFMOD/Metadata/Group/{69ee688f-dc4e-4df2-a125-df79ed93217e}.xml +++ b/DeltaVRFMOD/Metadata/Group/{69ee688f-dc4e-4df2-a125-df79ed93217e}.xml @@ -4,6 +4,9 @@ SFX + + {162960f4-09a2-4526-a61e-7ac7e219d27d} + {f7718f12-2a00-40d4-9061-39b5772aa050} diff --git a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml index 26eadecd..c7b6e7b3 100644 --- a/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml +++ b/DeltaVRFMOD/Metadata/Group/{7a292e97-7d25-47a5-bc9a-d0b6c76125a2}.xml @@ -4,6 +4,9 @@ Voiceovers + + {7db632b8-c5c2-4e3e-ab97-f087b29d2976} + {18fe57ae-4110-48b9-92ff-598d3be28f6c} diff --git a/DeltaVRFMOD/Metadata/Group/{7ec75b45-6865-4d1b-bfab-f8e3ca952cf8}.xml b/DeltaVRFMOD/Metadata/Group/{7ec75b45-6865-4d1b-bfab-f8e3ca952cf8}.xml index f20a0258..bb877c6b 100644 --- a/DeltaVRFMOD/Metadata/Group/{7ec75b45-6865-4d1b-bfab-f8e3ca952cf8}.xml +++ b/DeltaVRFMOD/Metadata/Group/{7ec75b45-6865-4d1b-bfab-f8e3ca952cf8}.xml @@ -4,6 +4,9 @@ Car + + {162960f4-09a2-4526-a61e-7ac7e219d27d} + {02d7cfc6-b23b-419e-b6b0-a0d3ff6f3b37} diff --git a/DeltaVRFMOD/Metadata/Group/{8431e203-753a-4633-bbee-15f9c2412d0a}.xml b/DeltaVRFMOD/Metadata/Group/{8431e203-753a-4633-bbee-15f9c2412d0a}.xml index 119f4080..d078d1c1 100644 --- a/DeltaVRFMOD/Metadata/Group/{8431e203-753a-4633-bbee-15f9c2412d0a}.xml +++ b/DeltaVRFMOD/Metadata/Group/{8431e203-753a-4633-bbee-15f9c2412d0a}.xml @@ -4,6 +4,9 @@ UI + + {6a1a7123-bd44-49b1-9092-22ef5bb105ec} + {e1a3bf76-f263-4ed7-b4a8-6777e50b4123} diff --git a/DeltaVRFMOD/Metadata/Group/{ce68ea24-56d6-4af5-a850-87bda0652ecc}.xml b/DeltaVRFMOD/Metadata/Group/{ce68ea24-56d6-4af5-a850-87bda0652ecc}.xml index def2f5e7..34115316 100644 --- a/DeltaVRFMOD/Metadata/Group/{ce68ea24-56d6-4af5-a850-87bda0652ecc}.xml +++ b/DeltaVRFMOD/Metadata/Group/{ce68ea24-56d6-4af5-a850-87bda0652ecc}.xml @@ -4,6 +4,9 @@ Ambiences + + {7db632b8-c5c2-4e3e-ab97-f087b29d2976} + {bd6035f4-9345-4a65-add5-a89f2d31f082} diff --git a/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml b/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml index 883b5c26..2778d2db 100644 --- a/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml +++ b/DeltaVRFMOD/Metadata/Group/{fc9a9e04-5184-4fe1-9085-da15553b5301}.xml @@ -4,6 +4,9 @@ Music + + {3d7079dd-e886-4e28-bb4b-7466e809d6f0} + {6f63c73c-f73f-479c-9da3-d9c4efc3e3d0} diff --git a/DeltaVRFMOD/Metadata/Master.xml b/DeltaVRFMOD/Metadata/Master.xml index a7b2883d..efcdca27 100644 --- a/DeltaVRFMOD/Metadata/Master.xml +++ b/DeltaVRFMOD/Metadata/Master.xml @@ -4,6 +4,9 @@ Master Bus + + {abdd8187-ee40-4826-82f2-b919c3daf22c} + {5846e992-31e3-4ae3-ae44-d5e16aa2a367} diff --git a/DeltaVRFMOD/Metadata/VCA/{3d7079dd-e886-4e28-bb4b-7466e809d6f0}.xml b/DeltaVRFMOD/Metadata/VCA/{3d7079dd-e886-4e28-bb4b-7466e809d6f0}.xml new file mode 100644 index 00000000..5290f567 --- /dev/null +++ b/DeltaVRFMOD/Metadata/VCA/{3d7079dd-e886-4e28-bb4b-7466e809d6f0}.xml @@ -0,0 +1,11 @@ + + + + + Music + + + {a1197cab-76c8-4da4-a41f-969ff1afdca4} + + + diff --git a/DeltaVRFMOD/Metadata/VCA/{7db632b8-c5c2-4e3e-ab97-f087b29d2976}.xml b/DeltaVRFMOD/Metadata/VCA/{7db632b8-c5c2-4e3e-ab97-f087b29d2976}.xml index fa4ab6cd..720e385d 100644 --- a/DeltaVRFMOD/Metadata/VCA/{7db632b8-c5c2-4e3e-ab97-f087b29d2976}.xml +++ b/DeltaVRFMOD/Metadata/VCA/{7db632b8-c5c2-4e3e-ab97-f087b29d2976}.xml @@ -4,9 +4,6 @@ Ambiences - - {abdd8187-ee40-4826-82f2-b919c3daf22c} - {a1197cab-76c8-4da4-a41f-969ff1afdca4} diff --git a/highscores.json b/highscores.json index 7f492971..e538c619 100644 --- a/highscores.json +++ b/highscores.json @@ -4,6 +4,10 @@ "name": "iopprnbb ,,p", "score": 491.0 }, + { + "name": "mmmoo", + "score": 473.0 + }, { "name": "timmi", "score": 469.0 @@ -36,6 +40,10 @@ "name": "Dabest", "score": 407.0 }, + { + "name": "tgyhn", + "score": 376.0 + }, { "name": "rrc", "score": 372.0 @@ -49,16 +57,8 @@ "score": 332.0 }, { - "name": "er", - "score": 164.0 - }, - { - "name": "fdgdggdd", - "score": 148.0 - }, - { - "name": "aa", - "score": 147.0 + "name": "ftv", + "score": 212.0 } ] } \ No newline at end of file