cgvr/DeltaVR
1
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

occlusion for 5 sounds added, new sounds were added, however the issue with the layer of glass walls has to be resolved

Browse Source
This commit is contained in:
Timur Nizamov
2025-11-09 22:38:07 +02:00
parent 9f2cbe5a1e
commit 02f640218c
128 changed files with 1476 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Oculus/Interaction/Samples/Objects/Props/Locomotion/Materials/MetaLocoTutorialUIMat.mat
View File

@@ -2,20 +2,25 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: MetaLocoTutorialUIMat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 5
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -55,6 +60,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5

10
Assets/_PROJECT/Components/Bow/Scripts/KeyBoardManager.cs
View File

@@ -26,6 +26,7 @@ public class KeyboardManager : NetworkBehaviour
private float _currentScore;
private ShiftMode _shiftMode = ShiftMode.Lowercase;
void Start()
{
foreach (var button in letterButtons)
@@ -77,6 +78,7 @@ public class KeyboardManager : NetworkBehaviour
string letter = label.text;
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
switch (_shiftMode)
{
case ShiftMode.Lowercase:
@@ -97,6 +99,8 @@ public class KeyboardManager : NetworkBehaviour
void OnShiftPressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
_shiftMode = _shiftMode switch
{
ShiftMode.Lowercase => ShiftMode.NextUppercase,
@@ -110,6 +114,8 @@ public class KeyboardManager : NetworkBehaviour
void OnBackspacePressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
if (_input.Length > 0)
_input = _input.Substring(0, _input.Length - 1);
UpdateOutput();
@@ -117,6 +123,8 @@ public class KeyboardManager : NetworkBehaviour
void OnEnterPressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
if (_input.Length > 0)
{
scoreBoard.SaveScore(_input, _currentScore);
@@ -126,6 +134,8 @@ public class KeyboardManager : NetworkBehaviour
void OnSpacePressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, gameObject);
addToInput(" ");
UpdateOutput();
}

1
Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TeleportationListen.cs
View File

@@ -26,7 +26,6 @@ public class TeleportationListen : MonoBehaviour
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.");

86
Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TutorialAudioListener.cs Normal file
View File

@@ -0,0 +1,86 @@
using _PROJECT.NewHandPresence;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.XR.Interaction.Toolkit;
public class TutorialAudioListener : MonoBehaviour
{
[Header("References")]
[SerializeField] private TutorialController tutorialController;
private InputAction moveAction;
private InputAction turnAction;
private TeleportationProvider teleportationProvider;
private float lastStepTime;
[SerializeField] private float stepCooldown = 0.5f; // seconds between steps
private void Awake()
{
if (tutorialController == null)
{
tutorialController = FindObjectOfType<TutorialController>();
}
if (tutorialController != null)
{
moveAction = tutorialController.moveProvider.leftHandMoveAction.action;
turnAction = tutorialController.turnProvider.rightHandSnapTurnAction.action;
teleportationProvider = tutorialController.teleportProvider;
}
else
{
//Debug.LogError("[TutorialAudioListener] No TutorialController found!");
}
}
private void OnEnable()
{
if (moveAction != null)
moveAction.performed += OnMovePerformed;
if (turnAction != null)
turnAction.performed += OnTurnPerformed;
if (teleportationProvider != null)
teleportationProvider.endLocomotion += OnTeleportEnd;
}
private void OnDisable()
{
if (moveAction != null)
moveAction.performed -= OnMovePerformed;
if (turnAction != null)
turnAction.performed -= OnTurnPerformed;
if (teleportationProvider != null)
teleportationProvider.endLocomotion -= OnTeleportEnd;
}
private void OnMovePerformed(InputAction.CallbackContext context)
{
// Only play a sound if enough time has passed since the last one
if (Time.time - lastStepTime < stepCooldown)
return;
lastStepTime = Time.time;
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.StepOverall, gameObject);
}
private void OnTurnPerformed(InputAction.CallbackContext context)
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.StepSpin, gameObject);
//Debug.Log("[TutorialAudioListener] Turn sound played.");
}
private void OnTeleportEnd(LocomotionSystem locomotionSystem)
{
//TeleportationListen plays the required sound. To play it here, unattach the TeleportationListen.cs script.
//AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Steps, gameObject);
//Debug.Log("[TutorialAudioListener] Teleport sound played.");
}
}

11
Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/TutorialAudioListener.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ca400fa6ff24b104190032fa85eedf91
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

38
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab
View File

@@ -7348,14 +7348,50 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 6405559763661037305, guid: d90913a7f0b00844a8c4482b2afc2c66,
type: 3}
insertIndex: -1
addedObject: {fileID: 1904721678972474204}
m_SourcePrefab: {fileID: 100100000, guid: d90913a7f0b00844a8c4482b2afc2c66, type: 3}
--- !u!1 &1810543934080619873 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6405559763661037305, guid: d90913a7f0b00844a8c4482b2afc2c66,
type: 3}
m_PrefabInstance: {fileID: 4739271935568907160}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1904721678972474204
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1810543934080619873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ca400fa6ff24b104190032fa85eedf91, type: 3}
m_Name:
m_EditorClassIdentifier:
tutorialController: {fileID: 7813044962416831722}
stepCooldown: 0.4
--- !u!4 &6597106847793866207 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1894017693134941767, guid: d90913a7f0b00844a8c4482b2afc2c66,
type: 3}
m_PrefabInstance: {fileID: 4739271935568907160}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7813044962416831722 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3290095342561961842, guid: d90913a7f0b00844a8c4482b2afc2c66,
type: 3}
m_PrefabInstance: {fileID: 4739271935568907160}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1810543934080619873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4c0f32501294ab993b15bbaf20b1882, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &6816866112812223496
PrefabInstance:
m_ObjectHideFlags: 0

25
Assets/_PROJECT/Components/Portals2/Portal.prefab
View File

@@ -410,7 +410,7 @@ GameObject:
- component: {fileID: 8089229340536715967}
- component: {fileID: 7305371174892849299}
- component: {fileID: 3068203956378754948}
- component: {fileID: 8075624572819615333}
- component: {fileID: 4895790527008502425}
m_Layer: 0
m_Name: Portal
m_TagString: Untagged
@@ -557,7 +557,7 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &8075624572819615333
--- !u!114 &4895790527008502425
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -566,25 +566,18 @@ MonoBehaviour:
m_GameObject: {fileID: 8507770192447112443}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3}
m_Script: {fileID: 11500000, guid: 6c6205a218222364ca440c740b7a6b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
CollisionTag:
EventReference:
SelectAudio:
Guid:
Data1: 214152321
Data2: 1136432684
Data3: -1979358295
Data4: 727957873
Path: event:/Ambiences/PortalSpacial
Event:
EventPlayTrigger: 1
EventStopTrigger: 2
AllowFadeout: 1
TriggerOnce: 0
Preload: 0
NonRigidbodyVelocity: 0
Params: []
OverrideAttenuation: 0
OverrideMinDistance: 1
OverrideMaxDistance: 35
SoundOcclusionWidening: 1
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 2048

27
Assets/_PROJECT/Components/Server room/Server rack.prefab
View File

@@ -11,7 +11,7 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: ac65e655dd40bcd48b72b3f8ddcf45bd,
type: 3}
propertyPath: m_RootOrder
value: 0
value: -1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: ac65e655dd40bcd48b72b3f8ddcf45bd,
type: 3}
@@ -103,7 +103,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac65e655dd40bcd48b72b3f8ddcf45bd,
type: 3}
insertIndex: -1
addedObject: {fileID: 3366414401841504121}
addedObject: {fileID: 7307865721977554787}
m_SourcePrefab: {fileID: 100100000, guid: ac65e655dd40bcd48b72b3f8ddcf45bd, type: 3}
--- !u!1 &7023167506039495560 stripped
GameObject:
@@ -256,7 +256,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &3366414401841504121
--- !u!114 &7307865721977554787
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -265,25 +265,18 @@ MonoBehaviour:
m_GameObject: {fileID: 7023167506039495560}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9a6610d2e704f1648819acc8d7460285, type: 3}
m_Script: {fileID: 11500000, guid: 6c6205a218222364ca440c740b7a6b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
CollisionTag:
EventReference:
SelectAudio:
Guid:
Data1: 2088767158
Data2: 1236037630
Data3: 1977926589
Data4: -1933500246
Path: event:/Ambiences/Server/OnlyHum
Event:
EventPlayTrigger: 1
EventStopTrigger: 0
AllowFadeout: 1
TriggerOnce: 0
Preload: 0
NonRigidbodyVelocity: 0
Params: []
OverrideAttenuation: 0
OverrideMinDistance: 1
OverrideMaxDistance: 5
SoundOcclusionWidening: 1
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 268441600

58
Assets/_PROJECT/Prefabs/Audio/RoomVentilation.prefab Normal file
View File

@@ -0,0 +1,58 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5440643957300939476
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2085589078496224730}
- component: {fileID: 2377358742638333032}
m_Layer: 0
m_Name: RoomVentilation
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2085589078496224730
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5440643957300939476}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 35
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2377358742638333032
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5440643957300939476}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6c6205a218222364ca440c740b7a6b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
SelectAudio:
Guid:
Data1: 275211900
Data2: 1273447202
Data3: 468497800
Data4: 708548534
Path: event:/Ambiences/RoomAmbiences/Ventilation
SoundOcclusionWidening: 1
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 2048

7
Assets/_PROJECT/Prefabs/Audio/RoomVentilation.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 621bba25219a12341adc8b5c00ba4e95
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

27
Assets/_PROJECT/Prefabs/Furniture_Inside/PC_Stealth.prefab
View File

@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 2690981623017855382}
- component: {fileID: 8531155714358289775}
- component: {fileID: 6431557677915287446}
- component: {fileID: 1238879365852870707}
m_Layer: 0
m_Name: PC_Stealth
m_TagString: Untagged
@@ -32,7 +33,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 180}
--- !u!33 &2690981623017855382
MeshFilter:
@@ -107,3 +108,27 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.0210557, y: 0.50000036, z: 1.0000004}
m_Center: {x: -0.025533749, y: -0.011416676, z: 0.5001732}
--- !u!114 &1238879365852870707
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7951130296140468659}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6c6205a218222364ca440c740b7a6b8f, type: 3}
m_Name:
m_EditorClassIdentifier:
SelectAudio:
Guid:
Data1: 1656893790
Data2: 1296712266
Data3: -1771351642
Data4: 185639795
Path: event:/Ambiences/RoomAmbiences/ComputerNoise2
SoundOcclusionWidening: 1
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 0

BIN
Assets/_PROJECT/Scenes/DeltaBuilding_base.unity LFS
View File

Binary file not shown.

3
Assets/_PROJECT/Scripts/Audio/FMODEvents.cs
View File

@@ -5,6 +5,8 @@ public class FMODEvents : MonoBehaviour
{
[field: Header("SFX")]
[field: SerializeField] public EventReference Steps { get; private set; }
[field: SerializeField] public EventReference StepSpin { get; private set; }
[field: SerializeField] public EventReference StepOverall { get; private set; }
[field: SerializeField] public EventReference Teleport { get; private set; }
[field: SerializeField] public EventReference UFODestroy { get; private set; }
[field: SerializeField] public EventReference PortalEnter { get; private set; }
@@ -19,6 +21,7 @@ public class FMODEvents : MonoBehaviour
[field: SerializeField] public EventReference Click { get; private set; }
[field: SerializeField] public EventReference MapOpen { get; private set; }
[field: SerializeField] public EventReference Hover { get; private set; }
[field: SerializeField] public EventReference LetterEnter { get; private set; }
[field: Header("Initial events")]
[field: SerializeField] public EventReference PortalSpacial { get; private set; }