ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

Ownership changes now apply to the filing cabinet and its note dispensers.

Browse Source
This commit is contained in:
Jamie Greunbaum 2025-12-07 00:39:10 -05:00
parent 92bb182d27
commit bc56353e25
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/UdonSharp/Filing Cabinet/FilingCabinet.cs
View File

@ -59,6 +59,15 @@ public class FilingCabinet : UdonSharpBehaviour
base.OnDeserialization(Result); base.OnDeserialization(Result);
} }
public override void OnOwnershipTransferred(VRCPlayerApi Player)
{
foreach (FilingCabinetNoteDispenser NoteDispenser in _NoteDispensers)
{
Networking.SetOwner(Player, NoteDispenser.gameObject);
}
base.OnOwnershipTransferred(Player);
}
public void OpenDrawer1() public void OpenDrawer1()
{ {

45
Assets/UdonSharp/Game Managers/GameManagerRound3.cs
View File

@ -165,10 +165,11 @@ public class GameManagerRound3 : GameManagerBase
public void BeginRound() public void BeginRound()
{ {
GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); _GameStatus = GameStatus.Begin;
UpdateInterface(); UpdateInterface();
GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true);
_EndingPlayer.LoadRandomVideo(); _EndingPlayer.LoadRandomVideo();
StartTimer(); StartTimer();
@ -179,7 +180,6 @@ public class GameManagerRound3 : GameManagerBase
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All,
"PlayMusicLoop", MusicEventType.CarmenChaseMusic); "PlayMusicLoop", MusicEventType.CarmenChaseMusic);
_GameStatus = GameStatus.Begin;
_Timer = TIMER_LENGTH; _Timer = TIMER_LENGTH;
SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(BeginTimerTick)); SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(BeginTimerTick));
@ -432,25 +432,28 @@ public class GameManagerRound3 : GameManagerBase
private void UpdateInterface() private void UpdateInterface()
{ {
HostCardCaptureCarmenInterface CaptureCarmenInterface = if (_GameStatus == GameStatus.Begin)
(HostCardCaptureCarmenInterface)GetHostCardInterface(RoundSegmentType.CaptureCarmen);
CaptureCarmenInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmen);
string City = GetCurrentCity();
string Region = GetCurrentRegion();
string Country = GetCurrentCountry();
if (Region == "" || Region.Contains(City) || Region == Country)
{ {
Region = ""; HostCardCaptureCarmenInterface CaptureCarmenInterface =
} (HostCardCaptureCarmenInterface)GetHostCardInterface(RoundSegmentType.CaptureCarmen);
else
{
Region += ", ";
}
CaptureCarmenInterface.CommentUI.text = City + ", " + Region + Country; CaptureCarmenInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmen);
string City = GetCurrentCity();
string Region = GetCurrentRegion();
string Country = GetCurrentCountry();
if (Region == "" || Region.Contains(City) || Region == Country)
{
Region = "";
}
else
{
Region += ", ";
}
CaptureCarmenInterface.CommentUI.text = City + ", " + Region + Country;
}
} }
private string GetRound3PlayerName() private string GetRound3PlayerName()
@ -458,7 +461,7 @@ public class GameManagerRound3 : GameManagerBase
string[] CurrentWinner = _CaseManager.GetCurrentWinningPlayers(); string[] CurrentWinner = _CaseManager.GetCurrentWinningPlayers();
if (CurrentWinner == null || CurrentWinner.Length != 1) if (CurrentWinner == null || CurrentWinner.Length != 1)
{ {
return "The player"; return Networking.GetOwner(GetCurrentMarker().gameObject).displayName;
} }
return CurrentWinner[0]; return CurrentWinner[0];
} }