- Fixed animations for the location board after some changes broke them.

- Audio fadeout is now cancelled when a new song is played.
- Interactions are disabled immediately on case load to prevent music fade bug.
- Added a pause and fadeout between round 3 wind-down music and the end theme.
This commit is contained in:
2025-08-17 03:35:03 -04:00
parent 08f38f8a7f
commit c9215f3118
34 changed files with 150 additions and 146 deletions
+1
View File
@@ -161,6 +161,7 @@ public class AudioManager : UdonSharpBehaviour
private void _PlayMusic_Internal(MusicEventType MusicEvent, bool Loop)
{
_MusicPlayer.Stop();
_FadeOutMusic = false;
switch (MusicEvent)
{
@@ -63,12 +63,15 @@ public class GameManagerRound1 : GameManagerBase
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld);
SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f);
DisableInteraction();
RequestSerialization();
base.InitialiseGameMode();
}
public void PlaySecondPartOfThemeMusic()
{
EnableInteraction("Start Game");
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.OpeningLoop);
}
@@ -101,7 +104,6 @@ public class GameManagerRound1 : GameManagerBase
Interface.CommentUI.text = _CaseManager.GetCaseDescription();
_GameHasBegun = false;
EnableInteraction("Start Game");
}
@@ -327,11 +327,16 @@ public class GameManagerRound3 : GameManagerBase
Interface.HeaderUI.text = "Rockin' it acapella";
Interface.CommentUI.text = "";
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.CarmenSandiegoTheme);
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
SendCustomEventDelayedSeconds(nameof(PlayEndingTheme), 1.25f);
EnableInteraction("End Game");
}
public void PlayEndingTheme()
{
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.CarmenSandiegoTheme);
}
private void EndGame()