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

- Replaced placeholder podiums in round 2 with velvet rope.

Browse Source 
- Video player more reliably loads videos on restarts.
This commit is contained in:
ActualHorse
2026-04-16 03:21:06 -04:00
parent ace89dc62d
commit 3a68516eaf
23 changed files with 898 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Game Managers/GameManagerRound1.asset
+4 -4
View File
@@ -1964,25 +1964,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ArrivalDisplay
Data: _ArrivalDisplays
- Name: $v
Entry: 7
Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ArrivalDisplay
Data: _ArrivalDisplays
- Name: <UserType>k__BackingField
Entry: 7
Data: 126|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: ArrivalDisplay, Assembly-CSharp
Data: ArrivalDisplay[], Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
Data: 33
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
Assets/UdonSharp/Game Managers/GameManagerRound1.cs
+19 -6
View File
@@ -53,7 +53,8 @@ public class GameManagerRound1 : GameManagerBase
[SerializeField] private DetectiveNoirEffect _DetectiveNoirEffect;
[SerializeField] private FilingCabinet _FilingCabinet;
[SerializeField] private Modem _Modem;
[SerializeField] private ArrivalDisplay _ArrivalDisplay;
[SerializeField] private ArrivalDisplay[] _ArrivalDisplays;
[Space, Header("Effects")]
[SerializeField] private Animator _LightningRoundAnimator;
@@ -100,7 +101,11 @@ public class GameManagerRound1 : GameManagerBase
_PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length];
_Modem.Activate(false);
_ArrivalDisplay.Activate(false);
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(false);
}
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true);
@@ -114,6 +119,8 @@ public class GameManagerRound1 : GameManagerBase
DisableInteraction();
_VideoPlayer.PrepareMapsAndVideos(_CaseManager);
base.InitialiseGameMode();
RequestSerialization();
@@ -146,7 +153,11 @@ public class GameManagerRound1 : GameManagerBase
Networking.SetOwner(NewOwner, _DetectiveNoirEffect.gameObject);
Networking.SetOwner(NewOwner, _FilingCabinet.gameObject);
Networking.SetOwner(NewOwner, _Modem.gameObject);
Networking.SetOwner(NewOwner, _ArrivalDisplay.gameObject);
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Networking.SetOwner(NewOwner, Display.gameObject);
}
Networking.SetOwner(NewOwner, _CameraController.gameObject);
Networking.SetOwner(NewOwner, _CameraControllerRound1.gameObject);
@@ -198,8 +209,6 @@ public class GameManagerRound1 : GameManagerBase
Interface.CommentUI.text = _CaseManager.GetCaseDescription();
_GameHasBegun = false;
_VideoPlayer.PrepareMapsAndVideos(_CaseManager);
}
@@ -1487,7 +1496,11 @@ public class GameManagerRound1 : GameManagerBase
"PlayMusicLoop", MusicEventType.CapitalLoop);
_Modem.Activate(true);
_ArrivalDisplay.Activate(true);
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.Activate(true);
}
_CameraControllerRound1.ActivateModemCameraTrigger();
Assets/UdonSharp/Game Managers/GameManagerRound2.asset
+17 -17
View File
@@ -716,19 +716,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _ArrivalDisplay
Data: _LocationBoard
- Name: $v
Entry: 7
Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _ArrivalDisplay
Data: _LocationBoard
- Name: <UserType>k__BackingField
Entry: 7
Data: 47|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: ArrivalDisplay, Assembly-CSharp
Data: LocationBoard, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -785,19 +785,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _LocationBoard
Data: _JailChain
- Name: $v
Entry: 7
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LocationBoard
Data: _JailChain
- Name: <UserType>k__BackingField
Entry: 7
Data: 52|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: LocationBoard, Assembly-CSharp
Data: JailChain, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -845,19 +845,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _JailChain
Data: _JailPhone
- Name: $v
Entry: 7
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _JailChain
Data: _JailPhone
- Name: <UserType>k__BackingField
Entry: 7
Data: 56|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: JailChain, Assembly-CSharp
Data: JailPhone, Assembly-CSharp
- Name:
Entry: 8
Data:
@@ -905,25 +905,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _JailPhone
Data: _PlayerConfettiCannons
- Name: $v
Entry: 7
Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _JailPhone
Data: _PlayerConfettiCannons
- Name: <UserType>k__BackingField
Entry: 7
Data: 60|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: JailPhone, Assembly-CSharp
Data: UnityEngine.ParticleSystem[], UnityEngine.ParticleSystemModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
Data: 60
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -965,25 +965,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _PlayerConfettiCannons
Data: _ArrivalDisplays
- Name: $v
Entry: 7
Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PlayerConfettiCannons
Data: _ArrivalDisplays
- Name: <UserType>k__BackingField
Entry: 7
Data: 64|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.ParticleSystem[], UnityEngine.ParticleSystemModule
Data: ArrivalDisplay[], Assembly-CSharp
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 64
Data: 33
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
+11 -3
View File
@@ -21,12 +21,13 @@ public class GameManagerRound2 : GameManagerBase
{
[Space]
[SerializeField] private ArrivalDisplay _ArrivalDisplay;
[SerializeField] private LocationBoard _LocationBoard;
[SerializeField] private JailChain _JailChain;
[SerializeField] private JailPhone _JailPhone;
[SerializeField] private ParticleSystem[] _PlayerConfettiCannons;
[SerializeField] private ArrivalDisplay[] _ArrivalDisplays;
[SerializeField] private RandomVideoPlayer _JailPlayer;
[UdonSynced, FieldChangeCallback(nameof(Location))] private string _Location = "";
@@ -104,12 +105,16 @@ public class GameManagerRound2 : GameManagerBase
public override void SetOwnershipOfObjects(VRCPlayerApi NewOwner)
{
Networking.SetOwner(NewOwner, _ArrivalDisplay.gameObject);
Networking.SetOwner(NewOwner, _LocationBoard.gameObject);
Networking.SetOwner(NewOwner, _JailChain.gameObject);
Networking.SetOwner(NewOwner, _JailPlayer.gameObject);
Networking.SetOwner(NewOwner, _JailPhone.gameObject);
foreach(ArrivalDisplay Display in _ArrivalDisplays)
{
Networking.SetOwner(NewOwner, Display.gameObject);
}
Networking.SetOwner(NewOwner, _CameraController.gameObject);
Networking.SetOwner(NewOwner, _CameraControllerRound2.gameObject);
@@ -611,7 +616,10 @@ public class GameManagerRound2 : GameManagerBase
set
{
_Location = value;
_ArrivalDisplay.SetDisplayText(_Location);
foreach (ArrivalDisplay Display in _ArrivalDisplays)
{
Display.SetDisplayText(_Location);
}
}
get => _Location;
}