diff --git a/Assets/Audio Mixers/MainMixer.mixer b/Assets/Audio Mixers/MainMixer.mixer index d1dbaf2..0b872d7 100644 --- a/Assets/Audio Mixers/MainMixer.mixer +++ b/Assets/Audio Mixers/MainMixer.mixer @@ -116,6 +116,7 @@ AudioMixerGroupController: - {fileID: -2967980135314984734} - {fileID: 586271417499195193} - {fileID: -8989905642984639358} + - {fileID: 3021271114819013623} m_Volume: 3b873ffd7476b574ab79c605a05a50ff m_Pitch: db09271ae0508dd4fab1979ce5ca6572 m_Send: 00000000000000000000000000000000 @@ -216,6 +217,7 @@ AudioMixerSnapshotController: d3d28f4b939c15c4fb46575e1562c52b: 9 6dc2be7b017f6454a88a82cf0827df64: -2565 8abcd1dbe0a90d24c82e3c8fe1b5b768: 15.7 + 78fcf9db4a62d1b488ab94c688e1a688: -5.7224774 f19752ebc23b70b42aecce984551e28b: 0 df94a53c2f1911543a5abb9a08a837dd: 77 05a3cc7c5a9b4e4448c07125cb163320: 0.424 @@ -358,6 +360,7 @@ AudioMixerController: - f26d1353f522d5a4abfb02f874e440de - ac0a65986de6a5b45bdff4b59428473c - 6961d089bee042245b1a41fd433dd5b1 + - ed8e7bc2a822c2945864a90f2068f011 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: -3105936107480203619} @@ -451,6 +454,25 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!243 &3021271114819013623 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Teleports + m_AudioMixer: {fileID: 24100000} + m_GroupID: ed8e7bc2a822c2945864a90f2068f011 + m_Children: [] + m_Volume: 78fcf9db4a62d1b488ab94c688e1a688 + m_Pitch: c22bad4abdd63ad448837811e1c0d0bb + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 7817586353743292321} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!244 &3581666672454972537 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -582,6 +604,20 @@ AudioMixerSnapshotController: a1407a7e6f887dd4eac4400887eda079: 3481 a4d77b9ef282ebe4eb06eb9cc341881d: 0.175 m_TransitionOverrides: {} +--- !u!244 &7817586353743292321 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: ac6aafeb3a7a50342b15c3107b670719 + m_EffectName: Attenuation + m_MixLevel: 0352edf609a453f44b93e6731c416fe7 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &8562860506994544243 AudioMixerEffectController: m_ObjectHideFlags: 3 diff --git a/Assets/Scenes/VRScene.unity b/Assets/Scenes/VRScene.unity index 22fa4bb..dbde098 100644 --- a/Assets/Scenes/VRScene.unity +++ b/Assets/Scenes/VRScene.unity @@ -9903,6 +9903,30 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8252162, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3021271114819013623, guid: 032de345950918c4e89684078c6a7213, + type: 2} + - target: {fileID: 8261204, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 586271417499195193, guid: 032de345950918c4e89684078c6a7213, + type: 2} + - target: {fileID: 8265126, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3021271114819013623, guid: 032de345950918c4e89684078c6a7213, + type: 2} + - target: {fileID: 8269332, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3021271114819013623, guid: 032de345950918c4e89684078c6a7213, + type: 2} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.size + value: 10 + objectReference: {fileID: 0} - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} propertyPath: traceLayerMask.m_Bits value: 69633 @@ -9915,6 +9939,50 @@ PrefabInstance: propertyPath: arcDistance value: 8 objectReference: {fileID: 0} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSound + value: + objectReference: {fileID: 8300000, guid: 3e307d22d58319f458ba09d796ad7649, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[0] + value: + objectReference: {fileID: 8300000, guid: c92b3484b26d18a4c86c115c987baea2, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[1] + value: + objectReference: {fileID: 8300000, guid: 6ee0ec5c010245240a88327b2125b4ad, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[2] + value: + objectReference: {fileID: 8300000, guid: 8d2867b5448d3f8429c1842a5a404ea3, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[3] + value: + objectReference: {fileID: 8300000, guid: e89bb2aa1af07f249bb8f41770a5ead0, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[4] + value: + objectReference: {fileID: 8300000, guid: 591c00be04f77d64985257e52a71b1c0, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[5] + value: + objectReference: {fileID: 8300000, guid: b9719981d9d94fa44bc7e71b89d94235, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[6] + value: + objectReference: {fileID: 8300000, guid: ccb965fdbe7d94d41b5a100db50c66b5, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[7] + value: + objectReference: {fileID: 8300000, guid: 0081506f5c0be9a43bad8a45ad196489, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[8] + value: + objectReference: {fileID: 8300000, guid: 65932210a5db99d44963e46e19d19d22, type: 3} + - target: {fileID: 11445746, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} + propertyPath: teleportSounds.Array.data[9] + value: + objectReference: {fileID: 8300000, guid: 598c5a1ed658e1344910dbf5a96063b2, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a135b1a2cb9c8f488d4dd00c55ab283, type: 3} --- !u!4 &875782498 stripped diff --git a/Assets/SteamVR/InteractionSystem/Teleport/Scripts/Teleport.cs b/Assets/SteamVR/InteractionSystem/Teleport/Scripts/Teleport.cs index 078bb79..cf754fc 100644 --- a/Assets/SteamVR/InteractionSystem/Teleport/Scripts/Teleport.cs +++ b/Assets/SteamVR/InteractionSystem/Teleport/Scripts/Teleport.cs @@ -51,7 +51,7 @@ namespace Valve.VR.InteractionSystem public AudioSource reticleAudioSource; [Header( "Sounds" )] - public AudioClip teleportSound; + public AudioClip[] teleportSounds; public AudioClip pointerStartSound; public AudioClip pointerLoopSound; public AudioClip pointerStopSound; @@ -843,7 +843,7 @@ namespace Valve.VR.InteractionSystem headAudioSource.transform.SetParent( player.hmdTransform ); headAudioSource.transform.localPosition = Vector3.zero; - PlayAudioClip( headAudioSource, teleportSound ); + PlayAudioClip( headAudioSource, teleportSounds[Random.Range(0, teleportSounds.Length)] ); Invoke( "TeleportPlayer", currentFadeTime ); }