diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index f8cd9b3..dedc7c5 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -1,7 +1,9 @@  +using System.Runtime.InteropServices; using UdonSharp; using UnityEngine; using VRC.SDK3.Data; +using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; using VRC.Udon.Common.Interfaces; @@ -111,19 +113,21 @@ public class GameManagerBase : UdonSharpBehaviour _AllowInteractionFromHostCard = true; - EnablePlayerMicrophone(true); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), true); } public virtual void DeinitialiseGameMode() { - EnablePlayerMicrophone(false); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), false); } + [NetworkCallable] public void EnablePlayerMicrophone(bool Enable) { _PlayerMicrophone.gameObject.SetActive(Enable); } + [NetworkCallable] public void EnableAudienceSilencer(bool Enable) { _AudienceSilencer.gameObject.SetActive(Enable); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 96e38ba..615b5d0 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -72,7 +72,7 @@ public class GameManagerRound1 : GameManagerBase _Modem.Activate(false); _ArrivalDisplay.Activate(false); - EnableAudienceSilencer(true); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index c7c8df1..0caf928 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -56,7 +56,7 @@ public class GameManagerRound2 : GameManagerBase _JailPlayer.PlayVideo = false; - EnableAudienceSilencer(true); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); RequestSerialization(); } @@ -65,6 +65,7 @@ public class GameManagerRound2 : GameManagerBase { _JailPlayer.PlayVideo = false; _JailPhone.Activate = false; + _JailChain.Show = false; base.DeinitialiseGameMode(); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 9beb130..0091696 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -74,7 +74,7 @@ public class GameManagerRound3 : GameManagerBase InitialiseMarkers(); GetCurrentMap().RandomiseCountries(); - EnableAudienceSilencer(false); + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); RequestSerialization(); }