diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 54a5d98..7154c73 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -56,13 +56,6 @@ public class GameManagerRound1 : GameManagerBase _QuestionIndex = 0; _QuestionStage = 0; - for (int i = 0; i < _PlayerPodiums.Length; i++) - { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ShowAuxiliaryVideoScreen", false); - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ShowAuxiliaryMapScreen", false); - } - _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); @@ -625,6 +618,11 @@ public class GameManagerRound1 : GameManagerBase private void TheChaseCluesLoop() { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", true); + } + DataList CluesList = _CurrentQuestion["Clues"].DataList; if (_QuestionSubstage >= CluesList.Count) { @@ -753,6 +751,11 @@ public class GameManagerRound1 : GameManagerBase } public void ThinkAboutItCountdownFinished() { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); + } + HostCardMultipleChoiceInterface Interface = (HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.FinalRound); @@ -1028,11 +1031,6 @@ public class GameManagerRound1 : GameManagerBase DisableRiskCards(); DisableBuzzers(); - for (int i = 0; i < _PlayerPodiums.Length; i++) - { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); - } - _VideoPlayer.SendCustomNetworkEvent(NetworkEventTarget.All, "ClearScreen"); _QuestionIndex++; @@ -1070,6 +1068,11 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CapitalLoop); + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); + } + _CaseManager.ContinueToRound2(); EnableInteraction("End Game"); diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index a536a66..78e2be5 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -87,6 +87,9 @@ public class PlayerPodium : UdonSharpBehaviour EnableChoiceCards(false); EnableBuzzer(false); EnableBuzzInEffect(false); + ShowAuxiliaryVideoScreen(false); + ShowAuxiliaryMapScreen(false); + PlayerScore = 50; ShowScoreCard = false; }