cailean/drecon-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

camera switch sound update

Browse Source
This commit is contained in:
Cailean Finn
2024-06-03 13:09:14 +01:00
parent 89bc001bb9
commit 5480dcae56
10 changed files with 5377 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/8_Scripts/1_Managers/AudioManager.cs
View File

@@ -9,6 +9,8 @@ public class AudioManager : MonoBehaviour
public static AudioManager instance { get; private set; }
[SerializeField] public EventReference m_Soundtrack;
[SerializeField] public EventReference m_CameraSwitch;
private void Awake()
{
if (instance != null)
@@ -40,12 +42,12 @@ public class AudioManager : MonoBehaviour
// Physic's based sounds
public void PlayOneShotAttached(EventReference sound, GameObject obj, float force)
{
RuntimeManager.PlayOneShotAttached(sound, obj, 1f, 0.01f);
RuntimeManager.PlayOneShotAttached(sound, obj, 1f, force * 0.005f);
}
public void PlayOneShotAttachedBreathing(EventReference sound, GameObject obj, float force)
{
//RuntimeManager.PlayOneShotAttached(sound, obj, force, 0.05f);
RuntimeManager.PlayOneShotAttached(sound, obj, force, 0.05f);
}
public void StopSound(EventInstance soundInst)
@@ -57,6 +59,6 @@ public class AudioManager : MonoBehaviour
public void PlaySoundOnCameraSwitch()
{
Debug.Log("Halo");
PlaySound(m_CameraSwitch);
}
}

5
Assets/8_Scripts/1_Managers/CameraManager.cs
View File

@@ -200,8 +200,6 @@ public class CameraManager : MonoBehaviour
private void SetCamera(GameObject camera)
{
AudioManager.instance.PlaySoundOnCameraSwitch();
SetCameraBlend(camera);
// Set all camera to active, and set all priorities to 0, bar the first camera
@@ -227,7 +225,8 @@ public class CameraManager : MonoBehaviour
if(!pastCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut
|| !m_ActiveCamera.GetComponent<VirtualCameraSettings>().m_CameraSettings.cut){
blendtime = 0;
}
AudioManager.instance.PlaySoundOnCameraSwitch();
}
// if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
// || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Actuations", "vc_Body")