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

fixes, portal sound changed, faders

Browse Source
This commit is contained in:
Timur Nizamov
2025-12-08 00:06:28 +02:00
parent f414e10d94
commit 647d247c81
81 changed files with 963 additions and 885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs
View File

@@ -21,6 +21,9 @@ public class CarDrivingRoutine : NetworkBehaviour
private float targetSpeed;
private float targetRotationSpeed;
private bool stopSoundPlayed = false;
private float stopThreshold = 0.05f; // consider speed "0" when below this
[Header("Tires")]
public List<GameObject> FrontTires;
public List<GameObject> BackTires;
@@ -79,6 +82,16 @@ public class CarDrivingRoutine : NetworkBehaviour
// Proceed to the next waypoint
_waypoint = _waypoint.Next;
}
if (StraightSpeed <= stopThreshold && !stopSoundPlayed)
{
stopSoundPlayed = true;
// Play the sound normally from your audio controller
//AudioController.SetRPM(475);
AudioController.PlayStopSound();
}
}
private void rollTires()
@@ -114,7 +127,7 @@ public class CarDrivingRoutine : NetworkBehaviour
//_stopSound.Play();
AudioController.SetRPM(475);
AudioController.PlayStopSound();
//AudioController.PlayStopSound();
}
@@ -126,6 +139,7 @@ public class CarDrivingRoutine : NetworkBehaviour
//_tireSound.Play();
AudioController.SetRPM(1450);
stopSoundPlayed = false;
}
@@ -150,5 +164,12 @@ public class CarDrivingRoutine : NetworkBehaviour
// Ensure final values are set
StraightSpeed = targetStraightSpeed;
rotationSpeed = targetRotationSpeed;
// If we just came to a full stop, mark for sound playback
if (StraightSpeed == 0)
{
stopSoundPlayed = false; // allow stop sound to fire
}
}
}

7
Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs
View File

@@ -44,11 +44,8 @@ public class CarAudioController : MonoBehaviour
public void PlayStopSound()
{
carMovementInstance.getParameterByName("RPM", out float currentRPM);
if (currentRPM == 475)
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BoltCarStopSound, gameObject);
}
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BoltCarStopSound, gameObject);
}
}

55
Assets/_PROJECT/Components/Bow/Scoring/LetterButton.prefab
View File

@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 3622985744187477872}
- component: {fileID: 4889582830418939434}
- component: {fileID: 4334268454398699518}
- component: {fileID: 1040399542938643003}
- component: {fileID: 7898671522480671537}
m_Layer: 5
m_Name: LetterButton
m_TagString: Untagged
@@ -122,6 +124,59 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1040399542938643003
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1943907191875735250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 0
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7898671522480671537}
m_TargetAssemblyTypeName: ButtonHoverSound, Assembly-CSharp
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7898671522480671537}
m_TargetAssemblyTypeName: ButtonHoverSound, Assembly-CSharp
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &7898671522480671537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1943907191875735250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb2f1526149f8b44cad00bbed8424a37, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7747026983332875138
GameObject:
m_ObjectHideFlags: 0

15
Assets/_PROJECT/Components/Bow/Scripts/ButtonHoverSound.cs Normal file
View File

@@ -0,0 +1,15 @@
using UnityEngine;
using UnityEngine.EventSystems;
using FMODUnity;
public class ButtonHoverSound : MonoBehaviour, ISelectHandler, IDeselectHandler
{
public void OnSelect(BaseEventData eventData)
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterHover, gameObject);
}
public void OnDeselect(BaseEventData eventData)
{
// Nothing needed here, unless you want a deselect effect
}
}

2
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TeleportationListen.cs.meta → Assets/_PROJECT/Components/Bow/Scripts/ButtonHoverSound.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6bdaa08e302fd9a4ab0f386f25762231
guid: cb2f1526149f8b44cad00bbed8424a37
MonoImporter:
externalObjects: {}
serializedVersion: 2

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

@@ -4152,8 +4152,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 9130699439852735294}
m_TargetAssemblyTypeName: FloorButtonVisualizer, Assembly-CSharp
m_MethodName: Activate
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -4168,8 +4168,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 9130699439852735294}
m_TargetAssemblyTypeName: FloorButtonVisualizer, Assembly-CSharp
m_MethodName: Deactivate
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -4552,8 +4552,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 2993125651756248496}
m_TargetAssemblyTypeName: FloorButtonVisualizer, Assembly-CSharp
m_MethodName: Activate
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -4568,8 +4568,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 2993125651756248496}
m_TargetAssemblyTypeName: FloorButtonVisualizer, Assembly-CSharp
m_MethodName: Deactivate
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -7256,7 +7256,6 @@ GameObject:
- component: {fileID: 1677224634519878501}
- component: {fileID: 4903940503297061428}
- component: {fileID: 556640037899741409}
- component: {fileID: 5626229604264113817}
m_Layer: 0
m_Name: Locomotion Providers
m_TagString: Untagged
@@ -7449,18 +7448,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 027065c8bd8579b4db62c9b5da6bafb6, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &5626229604264113817
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7615682635912035768}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6bdaa08e302fd9a4ab0f386f25762231, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7768604360596598954
GameObject:
m_ObjectHideFlags: 0
@@ -8921,8 +8908,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 6868433985520195351}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateDefault
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -8937,8 +8924,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 6868433985520195351}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateSelected
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -9255,8 +9242,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1105759556239984562}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateSelected
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -9271,8 +9258,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1105759556239984562}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateDefault
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -9986,7 +9973,7 @@ PrefabInstance:
- target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
type: 3}
@@ -10220,8 +10207,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 2839451055893527412}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateDefault
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -10229,15 +10216,15 @@ MonoBehaviour:
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_CallState: 1
- eventID: 0
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2839451055893527412}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateSelected
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -10245,7 +10232,7 @@ MonoBehaviour:
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_CallState: 1
--- !u!1001 &7842999936337970732
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10539,8 +10526,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 2869102958742088796}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateSelected
m_Mode: 1
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -10555,8 +10542,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 2869102958742088796}
m_TargetAssemblyTypeName: MenuTeleportButton, Assembly-CSharp
m_MethodName: SetStateDefault
m_Mode: 1
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine

2
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs
View File

@@ -59,7 +59,7 @@ public class AudioSliderDragHandler : MonoBehaviour, IBeginDragHandler, IDragHan
private void UpdateSlider(PointerEventData eventData)
{
Debug.Log("UpDating Slider");
//Debug.Log("UpDating Slider");
Vector2 localPoint;
RectTransformUtility.ScreenPointToLocalPointInRectangle(sliderBackground, eventData.position, eventData.pressEventCamera, out localPoint);

24
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Floor Button Visualizer.cs
View File

@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class FloorButtonVisualizer : MonoBehaviour
@@ -10,10 +11,6 @@ public class FloorButtonVisualizer : MonoBehaviour
public bool ActiveState;
private Image buttonImage;
// --- Static tracking for selection change ---
private static FloorButtonVisualizer lastActiveButton = null;
private static bool initialized = false;
void Start()
{
buttonImage = gameObject.GetComponent<Image>();
@@ -23,15 +20,7 @@ public class FloorButtonVisualizer : MonoBehaviour
{
this.ActiveState = true;
buttonImage.sprite = ActiveSprite;
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
// --- Only play hover if selection actually changed ---
//if (initialized && lastActiveButton != this)
//{
// AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
//}
//lastActiveButton = this;
//initialized = true;
}
public void Deactivate()
@@ -39,4 +28,15 @@ public class FloorButtonVisualizer : MonoBehaviour
this.ActiveState = false;
buttonImage.sprite = InactiveSprite;
}
public void OnSelect(BaseEventData eventData) // joystick hover/select
{
buttonImage.sprite = ActiveSprite;
// Play FMOD sound here
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
}
public void OnDeselect(BaseEventData eventData) // joystick moves away
{
buttonImage.sprite = InactiveSprite;
}
}

40
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Menu Teleport Button.cs
View File

@@ -26,9 +26,6 @@ public class MenuTeleportButton : MonoBehaviour
private EventInstance TeleportingSound;
FMOD.Studio.Bus SpecialBus; //FMOD bus variable
private static MenuTeleportButton lastSelectedButton = null;
private static bool initialized = false;
// External state: map must be held/visible
public static bool MapIsOpen = false;
private Menu menu;
@@ -70,20 +67,7 @@ public class MenuTeleportButton : MonoBehaviour
if (button != null && HoverSprite != null)
{
button.targetGraphic.GetComponent<Image>().sprite = HoverSprite;
// --- Only play hover sound if selection actually changed ---
//if (initialized && lastSelectedButton != this)
//{
// if (!Menu.IsMapOpen) return;
// if (!menu.MapTab.activeSelf) return; // ensures only map page buttons make sound
// AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
//}
if (!Menu.IsMapOpen) return;
if (!menu.MapTab.activeSelf) return; // ensures only map page buttons make sound
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
//lastSelectedButton = this;
//initialized = true;
//AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
}
}
@@ -99,8 +83,29 @@ public class MenuTeleportButton : MonoBehaviour
}
}
// Player-driven hover (joystick or controller)
public void OnSelect(BaseEventData eventData)
{
if (HoverSprite != null)
{
button.targetGraphic.GetComponent<Image>().sprite = HoverSprite;
}
// Play FMOD hover sound
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Hover, gameObject);
}
public void OnDeselect(BaseEventData eventData)
{
if (NormalSprite != null)
{
button.targetGraphic.GetComponent<Image>().sprite = NormalSprite;
}
}
private void TeleportPlayer()
{
TutorialAudioListener.SuppressNextTeleportSound = true;
if (target == null || Player == null || teleportationProvider == null)
{
Debug.LogWarning("Teleportation failed: Target, Player, or TeleportationProvider is missing.");
@@ -127,6 +132,7 @@ public class MenuTeleportButton : MonoBehaviour
button.interactable = false;
button.interactable = true;
//muting teleportation when not needed
StartCoroutine(MuteBusForSeconds(2.0f));
TeleportingSound.start(); //playing 2d oneshot

4
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs
View File

@@ -48,7 +48,7 @@ private float GetInitialValueFromAudioManager()
{
// Constantly push slider value to the VCA
ApplyVolume(slider.CurrentValue);
Debug.Log("CurrentValue: " + slider.CurrentValue);
//Debug.Log("CurrentValue: " + slider.CurrentValue);
}
private void ApplyVolume(float value)
@@ -57,7 +57,7 @@ private float GetInitialValueFromAudioManager()
{
case VCATarget.Master:
AudioManager.Instance.SetMasterVCA(value);
Debug.LogError(value);
//Debug.LogError(value);
break;
case VCATarget.Ambiences:

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

@@ -1,33 +0,0 @@
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;
using FMOD.Studio;
[RequireComponent(typeof(TeleportationProvider))]
public class TeleportationListen : MonoBehaviour
{
private TeleportationProvider teleportationProvider;
void Awake()
{
teleportationProvider = GetComponent<TeleportationProvider>();
}
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)
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Steps, gameObject); //oneshot 3d event
Debug.Log("[TeleportationListen] Teleport sound played.");
}
}

17
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/TutorialAudioListener.cs
View File

@@ -24,6 +24,8 @@ public class TutorialAudioListener : MonoBehaviour
private Vector2 currentMoveVector;
public static bool SuppressNextTeleportSound = false;
private void Awake()
{
if (tutorialController == null)
@@ -118,11 +120,9 @@ public class TutorialAudioListener : MonoBehaviour
if (joystickMagnitude < joystickThreshold)
return; // Not moving enough to walk
// --- NEW: Slider influence (very light touch) ---
float sliderInfluence = 1f + (settingsSpeedMultiplier) * 0.25f;
float effectiveMagnitude = joystickMagnitude * sliderInfluence;
// --- NEW: Step cooldown ---
float dynamicCooldown = baseStepRate / Mathf.Max(effectiveMagnitude, 0.01f);
dynamicCooldown = Mathf.Clamp(dynamicCooldown, 0.33f, 0.65f);
@@ -145,6 +145,17 @@ public class TutorialAudioListener : MonoBehaviour
private void OnTeleportEnd(LocomotionSystem locomotionSystem)
{
// Optional teleport sound
// If magnitude above threshold = walking don't play the "teleportaion" step sound
if (currentMoveVector.magnitude > joystickThreshold)
return;
if (SuppressNextTeleportSound)
{
SuppressNextTeleportSound = false; // reset
return; // Skip playing landing step
}
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.Steps, gameObject);
Debug.Log("[TeleportationListen] Teleport sound played.");
}
}

7
Assets/_PROJECT/Components/Server room/Alarm Trigger.cs
View File

@@ -16,6 +16,8 @@ public class AlarmTrigger : MonoBehaviour
private EventInstance AlarmSound;
private EventInstance ServerButton;
private FirstPersonOcclusion occlusion;
private bool hasAlarm = false;
private void Awake()
@@ -26,6 +28,11 @@ public class AlarmTrigger : MonoBehaviour
AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); //initialise the instance
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
occlusion = GetComponent<FirstPersonOcclusion>();
if (occlusion != null)
occlusion.InitialiseWithInstance(RoomHum);
occlusion.InitialiseWithInstance(AlarmSound);
}
void Start()
{

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

@@ -279,4 +279,4 @@ MonoBehaviour:
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 268441600
m_Bits: 268442624

25
Assets/_PROJECT/Prefabs/Robotics/Flatrobot Variant.prefab
View File

@@ -77,7 +77,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b3d89325bbec0ea45971ae56eceb6a19,
type: 3}
insertIndex: -1
addedObject: {fileID: 6207385351492341968}
addedObject: {fileID: 4059759114160661754}
m_SourcePrefab: {fileID: 100100000, guid: b3d89325bbec0ea45971ae56eceb6a19, type: 3}
--- !u!1 &9183735049506620104 stripped
GameObject:
@@ -85,7 +85,7 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 8336804541285056409}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6207385351492341968
--- !u!114 &4059759114160661754
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -94,25 +94,18 @@ MonoBehaviour:
m_GameObject: {fileID: 9183735049506620104}
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: -1738058147
Data2: 1087328963
Data3: 1077989513
Data4: -494122575
Path: event:/Ambiences/Robots/Jackal
Event:
EventPlayTrigger: 1
EventStopTrigger: 0
AllowFadeout: 1
TriggerOnce: 0
Preload: 0
NonRigidbodyVelocity: 0
Params: []
OverrideAttenuation: 0
OverrideMinDistance: 1
OverrideMaxDistance: 8.8
SoundOcclusionWidening: 1
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 268438528

25
Assets/_PROJECT/Prefabs/Robotics/Robot Variant.prefab
View File

@@ -5269,7 +5269,7 @@ GameObject:
- component: {fileID: 289104878}
- component: {fileID: 289104879}
- component: {fileID: 2994358071638057641}
- component: {fileID: 557218169713076685}
- component: {fileID: 697208528905587574}
m_Layer: 0
m_Name: Robot Variant
m_TagString: Untagged
@@ -5356,7 +5356,7 @@ MonoBehaviour:
startNavPoint: {fileID: 0}
rotationSpeed: 4
speed: 3
--- !u!114 &557218169713076685
--- !u!114 &697208528905587574
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -5365,28 +5365,21 @@ MonoBehaviour:
m_GameObject: {fileID: 5544299416681119408}
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: 1839140027
Data2: 1081087949
Data3: 1743957925
Data4: 803747245
Path: event:/Ambiences/Robots/Robotont
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: 268438528
--- !u!1 &5553018911760177217
GameObject:
m_ObjectHideFlags: 0

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

Binary file not shown.

1
Assets/_PROJECT/Scripts/Audio/AudioManager.cs
View File

@@ -61,7 +61,6 @@ public class AudioManager : MonoBehaviour
EVENT_CALLBACK beatCallback;
private static AudioManager _instance { get; set; }
public static event Action<string> OnNewBGMMarker;
// public static AudioManager instance;
private static EventInstance musicEventInstance;