tschesky/AppleHillsProduction
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug where state machines and auto play audio on awake fucked me

Browse Source
This commit is contained in:
journaliciouz
2025-10-31 11:19:47 +01:00
parent d48b459fea
commit d0da5d76cd
3 changed files with 26 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/Sound/AppleAudioSource.cs
View File

@@ -13,7 +13,7 @@ public class AppleAudioSource : MonoBehaviour
{
public enum AudioSourceType{CriticalVO,VO,Ambience,SFX,Music}
public AudioSourceType audioSourceType;
public AudioSource audioSource;
[HideInInspector] public AudioSource audioSource;
private AudioMixer _audioMixer;
[HideInInspector ] public int clipPriority;
public int sourcePriority;
@@ -25,6 +25,7 @@ public class AppleAudioSource : MonoBehaviour
AudioManager.Instance.RegisterNewAudioSource(this);
_audioMixer = AudioManager.Instance.audioMixer;
InitializeAudioSource();
audioSource.playOnAwake = false;
}

17
Assets/Scripts/Sound/AudioManager.cs
View File

@@ -255,8 +255,23 @@ public class AudioManager : MonoBehaviour, IPausable
private void InterruptAudioSource(AppleAudioSource newAudioSource)
{
wasInterrupted = true;
currentlyPlayingVO.InterruptAudio(newAudioSource.name);
//currentlyPlayingVO.InterruptAudio(newAudioSource.name);
InterruptAllVOSources();
ResetAudioSource();
currentlyPlayingVO = newAudioSource;
}
private void InterruptAllVOSources()
{
foreach (AppleAudioSource source in criticalVOSources)
{
source.InterruptAudio("GlobalInterrupt");
}
foreach (AppleAudioSource source in VOSources)
{
source.InterruptAudio("GlobalInterrupt");
}
}
}