- GameManagerRound2 now uses podium owners to determine players.

- Jail phone now runs its callback as the GameManagerRound2 owner.
- Actually updated the camera system repository this time. Finally.
This commit is contained in:
2026-04-26 18:00:02 -04:00
parent f10f7b6fe7
commit 0a98c69770
13 changed files with 118 additions and 113 deletions
@@ -93,16 +93,13 @@ public class GameManagerRound2 : GameManagerBase
{
if (i < CurrentWinningPlayers.Length)
{
Debug.Log("[GameManagerRound2] Setting player " + (i+1) + " to " + CurrentWinningPlayers[i]);
if (!_PlayerPodiums[i].SetPlayer(CurrentWinningPlayers[i]))
{
Debug.Log("[GameManagerRound2] No valid player found; resetting podium owner...");
_PlayerPodiums[i].ResetOwner(true);
}
}
else
{
Debug.Log("[GameManagerRound2] Resetting podium " + (i+1) + " owner to default.");
_PlayerPodiums[i].ResetOwner(true);
}
}
@@ -239,12 +236,9 @@ public class GameManagerRound2 : GameManagerBase
_CurrentPlayerCounter = 0;
_RoundIsOver = false;
_Players = _CaseManager.GetCurrentWinningPlayers();
if (_Players == null || _Players.Length != 2)
for (int i = 0; i < _PlayerPodiums.Length && i < _Players.Length; i++)
{
_Players = new string[2];
_Players[0] = Networking.GetOwner(gameObject).displayName;
_Players[1] = _Players[0];
_Players[i] = _PlayerPodiums[i].GetPlayer();
}
if (Networking.LocalPlayer == _CaseManager.GetHostOwner())
@@ -269,6 +263,8 @@ public class GameManagerRound2 : GameManagerBase
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.RecoverTheLoot);
RequestSerialization();
}
public void OnTheRightTrack()
@@ -598,6 +594,7 @@ public class GameManagerRound2 : GameManagerBase
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
}
[NetworkCallable]
public void PlayJailCall()
{
_PlayingJailCall = true;
+5 -1
View File
@@ -56,11 +56,15 @@ public class JailPhone : UdonSharpBehaviour
{
if (Activate && !_CallHasBeenPlayed)
{
_GameManager.SendCustomEventDelayedSeconds("PlayJailCall", 0.75f);
SendCustomEventDelayedSeconds(nameof(PlayJailCall_Delayed), 0.75f);
_CallHasBeenPlayed = true;
RequestSerialization();
}
}
public void PlayJailCall_Delayed()
{
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "PlayJailCall");
}
public bool Activate
@@ -82,6 +82,11 @@ public class PlayerPodiumRound2 : UdonSharpBehaviour
return false;
}
public string GetPlayer()
{
return _PlayerName;
}
[NetworkCallable]
public void SetPlayer_NetworkCallable(bool EnableOwnershipInteract)
{
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
type: 2}
udonAssembly:
assemblyError:
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings
m_EditorClassIdentifier:
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
type: 2}
udonAssembly:
assemblyError:
-1
View File
@@ -2,7 +2,6 @@
using UdonSharp;
using UnityEngine;
using VRC.SDKBase;
using VRC.Udon.Common;
[UdonBehaviourSyncMode(BehaviourSyncMode.None)]