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

- Refactored CameraTimedSwitcher to use an internal timer instead of delays.

Browse Source 
- Added extra switchers to rounds 1 and 2 to better control camera transitions.
- Fixed improper camera switches on incorrect answers during round 2.
This commit is contained in:
ActualHorse
2026-03-24 05:16:30 -04:00
parent 15cf4be640
commit 001be2af0e
20 changed files with 1129 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset
+112 -16
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 10
Data: 12
- Name:
Entry: 7
Data:
@@ -543,19 +543,13 @@ MonoBehaviour:
Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
Data: 1
- Name:
Entry: 7
Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 38|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
@@ -573,19 +567,25 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _NextCameraIndex
Data: _Timer
- Name: $v
Entry: 7
Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _NextCameraIndex
Data: _Timer
- Name: <UserType>k__BackingField
Entry: 9
Data: 21
Entry: 7
Data: 39|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Single, mscorlib
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 21
Data: 39
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -621,13 +621,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _LoopedOnce
Data: _AwaitingNextSwitch
- Name: $v
Entry: 7
Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LoopedOnce
Data: _AwaitingNextSwitch
- Name: <UserType>k__BackingField
Entry: 9
Data: 16
@@ -664,6 +664,102 @@ MonoBehaviour:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _NextCameraIndex
- Name: $v
Entry: 7
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _NextCameraIndex
- Name: <UserType>k__BackingField
Entry: 9
Data: 21
- Name: <SystemType>k__BackingField
Entry: 9
Data: 21
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _LoopedOnce
- Name: $v
Entry: 7
Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _LoopedOnce
- Name: <UserType>k__BackingField
Entry: 9
Data: 16
- Name: <SystemType>k__BackingField
Entry: 9
Data: 16
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs
+62 -25
View File
@@ -1,6 +1,8 @@
using Newtonsoft.Json.Linq;
using UdonSharp;
using UnityEngine;
using VRC.Udon.Common;
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
@@ -18,29 +20,81 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
private UdonSharpBehaviour _FirstLoopCallbackObject = null;
[SerializeField] private string _FirstLoopCallbackFunction = "";
[UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Active = false;
[UdonSynced] private bool _Active = false;
private float _Timer = 0.0f;
private bool _AwaitingNextSwitch = false;
private int _NextCameraIndex = 0;
private bool _LoopedOnce = false;
void Update()
{
if (_Active && _AwaitingNextSwitch)
{
_Timer -= Time.deltaTime;
if (_Timer <= 0.0f)
{
SwitchToNextCamera();
}
}
}
public override void OnDeserialization(DeserializationResult Result)
{
_Activate_Synced();
base.OnDeserialization(Result);
}
public void Activate(bool Activate)
{
_Active = Activate;
_Activate_Synced();
RequestSerialization();
}
private void _Activate_Synced()
{
Debug.Log("[CameraTimedSwitcher] " + gameObject.name + " is now " + (_Active ? "active" : "inactive"));
_AwaitingNextSwitch = false;
if (_Active)
{
_NextCameraIndex = 0;
_LoopedOnce = false;
SwitchToNextCamera();
}
else
{
_Timer = 0.0f;
}
}
public void SwitchToNextCamera()
{
_AwaitingNextSwitch = false;
if (_Active)
{
int CurrentCameraIndex = _NextCameraIndex;
Debug.Log("[CameraTimedSwitcher] Current camera index: " + CurrentCameraIndex);
if (CurrentCameraIndex == _LoopPoint && _LoopedOnce)
{
if (_FirstLoopCallbackObject != null)
{
Debug.Log("[CameraTimedSwitcher] We're on a new loop and a callback is set; running function " + _FirstLoopCallbackFunction + " on object " + _FirstLoopCallbackObject.gameObject.name + " and deactivating");
_FirstLoopCallbackObject.SendCustomEvent(_FirstLoopCallbackFunction);
Activate = false;
Activate(false);
return;
}
if (!_Loop)
{
Activate = false;
Debug.Log("[CameraTimedSwitcher] On a second loop, but looping is disabled; deactivating");
Activate(false);
return;
}
}
@@ -49,6 +103,7 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
if (Function != "")
{
_CameraController.SendCustomEvent(Function);
Debug.Log("[CameraTimedSwitcher] Executing function " + Function);
}
_NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length;
@@ -57,30 +112,12 @@ public class CameraTimedSwitcher : UdonSharpBehaviour
{
_LoopedOnce = true;
_NextCameraIndex = _LoopPoint;
Debug.Log("[CameraTimedSwitcher] Setting next camera index to loop point " + _LoopPoint);
}
SendCustomEventDelayedSeconds(nameof(SwitchToNextCamera),
_TimeBetweenCuts[Mathf.Min(CurrentCameraIndex, _TimeBetweenCuts.Length - 1)]);
_Timer = _TimeBetweenCuts[Mathf.Min(CurrentCameraIndex, _TimeBetweenCuts.Length - 1)];
_AwaitingNextSwitch = true;
Debug.Log("[CameraTimedSwitcher] Camera index " + _NextCameraIndex + " will be activated in " + _Timer + " seconds");
}
}
public bool Activate
{
set
{
if (_Active != value)
{
Debug.Log("[CameraTimedSwitcher] " + gameObject.name + " is now " + (_Active ? "active" : "inactive"));
_Active = value;
_NextCameraIndex = 0;
_LoopedOnce = false;
SwitchToNextCamera();
RequestSerialization();
}
}
get => _Active;
}
}
Assets/UdonSharp/Cameras/CameraControllerBase.cs
+7 -2
View File
@@ -56,14 +56,14 @@ public class CameraControllerBase : UdonSharpBehaviour
if (_ActiveSwitcher != null)
{
_ActiveSwitcher.Activate = false;
_ActiveSwitcher.Activate(false);
}
_ActiveSwitcher = Switcher;
if (_ActiveSwitcher != null)
{
_ActiveSwitcher.Activate = true;
_ActiveSwitcher.Activate(true);
}
}
@@ -78,6 +78,11 @@ public class CameraControllerBase : UdonSharpBehaviour
Debug.LogError("[CameraControllerBase] This function has not been reimplemented, or is called from a child class.");
}
public virtual void ForceDisableAllSwitchers()
{
Debug.LogError("[CameraControllerBase] This function has not been reimplemented, or is called from a child class.");
}
private void _SwitchToLiveCamera_Synced()
{
Assets/UdonSharp/Cameras/CameraControllerRound1.asset
+394 -285
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 35
Data: 37
- Name:
Entry: 7
Data:
@@ -809,13 +809,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: MapToHostAndAllPlayersTimerToggle
Data: HostToMonitorTimerToggle
- Name: $v
Entry: 7
Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: MapToHostAndAllPlayersTimerToggle
Data: HostToMonitorTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -863,13 +863,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: LightningStartToHostAndAllPlayersTimerToggle
Data: MapToHostAndAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: LightningStartToHostAndAllPlayersTimerToggle
Data: MapToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -917,13 +917,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: TheChaseStartToHostAndAllPlayersTimerToggle
Data: LightningStartToHostAndAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: TheChaseStartToHostAndAllPlayersTimerToggle
Data: LightningStartToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -971,13 +971,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: CorrectToHostAndAllPlayersTimerToggle
Data: TheChaseStartToHostAndAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: CorrectToHostAndAllPlayersTimerToggle
Data: TheChaseStartToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1025,13 +1025,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: IncorrectToHostAndAllPlayersTimerToggle
Data: TheChaseMonitorToAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: IncorrectToHostAndAllPlayersTimerToggle
Data: TheChaseMonitorToAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1079,13 +1079,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: ThinkAboutItTimerToggle
Data: CorrectToHostAndAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ThinkAboutItTimerToggle
Data: CorrectToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1133,13 +1133,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: BuzzedInPlayerTimerToggle
Data: IncorrectToHostAndAllPlayersTimerToggle
- Name: $v
Entry: 7
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: BuzzedInPlayerTimerToggle
Data: IncorrectToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1187,25 +1187,19 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _CameraAnimator
Data: ThinkAboutItTimerToggle
- Name: $v
Entry: 7
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CameraAnimator
Data: ThinkAboutItTimerToggle
- Name: <UserType>k__BackingField
Entry: 7
Data: 71|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
- Name:
Entry: 8
Data:
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 71
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1220,13 +1214,127 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: BuzzedInPlayerTimerToggle
- Name: $v
Entry: 7
Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: BuzzedInPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _CameraAnimator
- Name: $v
Entry: 7
Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _CameraAnimator
- Name: <UserType>k__BackingField
Entry: 7
Data: 77|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
- Name:
Entry: 8
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 77
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 79|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@@ -1235,7 +1343,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -1259,13 +1367,13 @@ MonoBehaviour:
Data: Player1CameraAnchor
- Name: $v
Entry: 7
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player1CameraAnchor
- Name: <UserType>k__BackingField
Entry: 7
Data: 76|System.RuntimeType, mscorlib
Data: 82|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraAnchor, Assembly-CSharp
@@ -1289,127 +1397,19 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 84|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Player3CameraAnchor
- Name: $v
Entry: 7
Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player3CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -1433,16 +1433,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: HostCameraAnchor
Data: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: HostCameraAnchor
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1487,16 +1487,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: DefaultWideShotCameraAnchor
Data: Player3CameraAnchor
- Name: $v
Entry: 7
Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: DefaultWideShotCameraAnchor
Data: Player3CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1541,16 +1541,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: VideoPlayerCameraAnchor
Data: HostCameraAnchor
- Name: $v
Entry: 7
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerCameraAnchor
Data: HostCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1595,16 +1595,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: OpeningCameraAnchor
Data: DefaultWideShotCameraAnchor
- Name: $v
Entry: 7
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: OpeningCameraAnchor
Data: DefaultWideShotCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1623,128 +1623,127 @@ MonoBehaviour:
- Name: _fieldAttributes
Entry: 7
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: VideoPlayerCameraAnchor
- Name: $v
Entry: 7
Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 100|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: OpeningCameraAnchor
- Name: $v
Entry: 7
Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: OpeningCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 103|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: AllPlayersViewCameraAnchor
- Name: $v
Entry: 7
Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: AllPlayersViewCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: VideoMusicClueCameraAnchor
- Name: $v
Entry: 7
Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoMusicClueCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -1768,16 +1767,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: ACMECrimenetComputerCameraAnchor
Data: AllPlayersViewCameraAnchor
- Name: $v
Entry: 7
Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ACMECrimenetComputerCameraAnchor
Data: AllPlayersViewCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1823,16 +1822,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: FilingCabinetCameraAnchor
Data: VideoMusicClueCameraAnchor
- Name: $v
Entry: 7
Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: FilingCabinetCameraAnchor
Data: VideoMusicClueCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1878,16 +1877,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: ModemCameraAnchor
Data: ACMECrimenetComputerCameraAnchor
- Name: $v
Entry: 7
Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ModemCameraAnchor
Data: ACMECrimenetComputerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 76
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1933,16 +1932,126 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: _PlayOpening
Data: FilingCabinetCameraAnchor
- Name: $v
Entry: 7
Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: FilingCabinetCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 116|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: ModemCameraAnchor
- Name: $v
Entry: 7
Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ModemCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 82
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: _PlayOpening
- Name: $v
Entry: 7
Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PlayOpening
- Name: <UserType>k__BackingField
Entry: 7
Data: 115|System.RuntimeType, mscorlib
Data: 121|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.Boolean, mscorlib
@@ -1951,7 +2060,7 @@ MonoBehaviour:
Data:
- Name: <SystemType>k__BackingField
Entry: 9
Data: 115
Data: 121
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1966,20 +2075,20 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 117|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 123|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 118|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
Data: 124|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
@@ -2003,16 +2112,16 @@ MonoBehaviour:
Data: _PlayOpeningDoorway
- Name: $v
Entry: 7
Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: _PlayOpeningDoorway
- Name: <UserType>k__BackingField
Entry: 9
Data: 115
Data: 121
- Name: <SystemType>k__BackingField
Entry: 9
Data: 115
Data: 121
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -2027,20 +2136,20 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
Data: 126|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 121|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
Data: 127|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 122|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
Data: 128|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
Assets/UdonSharp/Cameras/CameraControllerRound1.cs
+17 -4
View File
@@ -21,9 +21,11 @@ public class CameraControllerRound1 : CameraControllerBase
[SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher AllPlayersAssignStarterPointsTimerToggle;
[SerializeField] public CameraTimedSwitcher HostToMonitorTimerToggle;
[SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher TheChaseStartToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher TheChaseMonitorToAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher CorrectToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher IncorrectToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle;
@@ -51,6 +53,9 @@ public class CameraControllerRound1 : CameraControllerBase
public override void InitialiseCameras()
{
DisableAllSwitchers();
DisableAllTriggers();
Player1CameraAnchor.AttachCamera(Player1Camera);
Player2CameraAnchor.AttachCamera(Player2Camera);
Player3CameraAnchor.AttachCamera(Player3Camera);
@@ -84,9 +89,11 @@ public class CameraControllerRound1 : CameraControllerBase
Networking.SetOwner(Player, HostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, AllPlayersAssignStarterPointsTimerToggle.gameObject);
Networking.SetOwner(Player, HostToMonitorTimerToggle.gameObject);
Networking.SetOwner(Player, MapToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, LightningStartToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, TheChaseStartToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, TheChaseMonitorToAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, CorrectToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, IncorrectToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject);
@@ -210,7 +217,6 @@ public class CameraControllerRound1 : CameraControllerBase
public void ActivateHostAllPlayersCameraSwitcher()
{
ActivateAllPlayersCamera();
ActivateCameraSwitcher(HostAndAllPlayersTimerToggle);
}
@@ -221,10 +227,14 @@ public class CameraControllerRound1 : CameraControllerBase
public void ActivateAllPlayersAssignStarterPointsCameraSwitcher()
{
ActivateAllPlayersCamera();
ActivateCameraSwitcher(AllPlayersAssignStarterPointsTimerToggle);
}
public void ActivateHostToMonitorCameraSwitcher()
{
ActivateCameraSwitcher(HostToMonitorTimerToggle);
}
public void ActivateMapToHostAllPlayersCameraSwitcher()
{
ActivateCameraSwitcher(MapToHostAndAllPlayersTimerToggle);
@@ -232,16 +242,19 @@ public class CameraControllerRound1 : CameraControllerBase
public void ActivateLightningStartToHostAllPlayersCameraSwitcher()
{
ActivateWideShotCamera();
ActivateCameraSwitcher(LightningStartToHostAndAllPlayersTimerToggle);
}
public void ActivateTheChaseStartToHostAllPlayersCameraSwitcher()
{
ActivateWideShotCamera();
ActivateCameraSwitcher(TheChaseStartToHostAndAllPlayersTimerToggle);
}
public void ActivateTheChaseMonitorToAllPlayersCameraSwitcher()
{
ActivateCameraSwitcher(TheChaseMonitorToAllPlayersTimerToggle);
}
public void ActivateCorrectAnswerToHostAllPlayersCameraSwitcher()
{
ActivateCameraSwitcher(CorrectToHostAndAllPlayersTimerToggle);
Assets/UdonSharp/Cameras/CameraControllerRound2.asset
+138 -84
View File
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
Data: 27
Data: 28
- Name:
Entry: 7
Data:
@@ -1031,13 +1031,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: LocationBoardAndWinningPlayerTimerToggle
Data: LocationBoardAndCurrentPlayerTimerToggle
- Name: $v
Entry: 7
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: LocationBoardAndWinningPlayerTimerToggle
Data: LocationBoardAndCurrentPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1085,13 +1085,13 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: VideoPlayerToWinningPlayerTimerToggle
Data: LocationBoardAndWinningPlayerTimerToggle
- Name: $v
Entry: 7
Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerToWinningPlayerTimerToggle
Data: LocationBoardAndWinningPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
@@ -1139,16 +1139,70 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: Player1CameraAnchor
Data: VideoPlayerToWinningPlayerTimerToggle
- Name: $v
Entry: 7
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerToWinningPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 12
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Player1CameraAnchor
- Name: $v
Entry: 7
Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player1CameraAnchor
- Name: <UserType>k__BackingField
Entry: 7
Data: 69|System.RuntimeType, mscorlib
Data: 72|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: CameraAnchor, Assembly-CSharp
@@ -1172,73 +1226,19 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 71|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 74|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -1262,16 +1262,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: HostAndWinnerCameraAnchor
Data: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: HostAndWinnerCameraAnchor
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1316,16 +1316,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: LocationBoardCameraAnchor
Data: HostAndWinnerCameraAnchor
- Name: $v
Entry: 7
Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: LocationBoardCameraAnchor
Data: HostAndWinnerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1370,16 +1370,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: ModemCameraAnchor
Data: LocationBoardCameraAnchor
- Name: $v
Entry: 7
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ModemCameraAnchor
Data: LocationBoardCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1424,16 +1424,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: VideoPlayerCameraAnchor
Data: ModemCameraAnchor
- Name: $v
Entry: 7
Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerCameraAnchor
Data: ModemCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1478,16 +1478,16 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
Data: WideShotCameraAnchor
Data: VideoPlayerCameraAnchor
- Name: $v
Entry: 7
Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: WideShotCameraAnchor
Data: VideoPlayerCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1506,12 +1506,66 @@ MonoBehaviour:
- Name: _fieldAttributes
Entry: 7
Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 90|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
- Name:
Entry: 13
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 8
Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: WideShotCameraAnchor
- Name: $v
Entry: 7
Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: WideShotCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- Name: <SyncMode>k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- Name:
Entry: 6
Data:
- Name:
Entry: 8
Data:
- Name: <IsSerialized>k__BackingField
Entry: 5
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
Data: 90|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
Data: 93|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@@ -1520,7 +1574,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -1544,13 +1598,13 @@ MonoBehaviour:
Data: AllPlayersCameraAnchor
- Name: $v
Entry: 7
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: AllPlayersCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 69
Data: 72
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
@@ -1568,13 +1622,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule
Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
Assets/UdonSharp/Cameras/CameraControllerRound2.cs
+10
View File
@@ -25,6 +25,7 @@ public class CameraControllerRound2 : CameraControllerBase
[SerializeField] public CameraTimedSwitcher Player2AndLocationBoardTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndShortHostTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndLongHostTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndCurrentPlayerTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndWinningPlayerTimerToggle;
[SerializeField] public CameraTimedSwitcher VideoPlayerToWinningPlayerTimerToggle;
[Space]
@@ -41,6 +42,9 @@ public class CameraControllerRound2 : CameraControllerBase
public override void InitialiseCameras()
{
DisableAllSwitchers();
DisableAllTriggers();
Player1CameraAnchor.AttachCamera(Player1Camera);
Player2CameraAnchor.AttachCamera(Player2Camera);
HostAndWinnerCameraAnchor.AttachCamera(HostAndWinnerCamera);
@@ -66,6 +70,7 @@ public class CameraControllerRound2 : CameraControllerBase
Networking.SetOwner(Player, Player2AndLocationBoardTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndShortHostTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndLongHostTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndCurrentPlayerTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndWinningPlayerTimerToggle.gameObject);
Networking.SetOwner(Player, VideoPlayerToWinningPlayerTimerToggle.gameObject);
@@ -164,6 +169,11 @@ public class CameraControllerRound2 : CameraControllerBase
ActivateCameraSwitcher(LocationBoardAndLongHostTimerToggle);
}
public void ActivateLocationBoardAndCurrentPlayerCameraSwitcher()
{
ActivateCameraSwitcher(LocationBoardAndCurrentPlayerTimerToggle);
}
public void ActivateLocationBoardAndWinningPlayerCameraSwitcher()
{
ActivateCameraSwitcher(LocationBoardAndWinningPlayerTimerToggle);
Assets/UdonSharp/Cameras/CameraControllerRound3.cs
+3
View File
@@ -41,6 +41,9 @@ public class CameraControllerRound3 : CameraControllerBase
public override void InitialiseCameras()
{
DisableAllSwitchers();
DisableAllTriggers();
HostStartingCameraAnchor.AttachCamera(PlayerCamera);
PlayerStartingCameraAnchor.AttachCamera(HostCamera);
OverheadCameraAnchor.AttachCamera(OverheadCamera);
Assets/UdonSharp/Game Managers/GameManagerRound1.cs
+6 -19
View File
@@ -971,8 +971,7 @@ public class GameManagerRound1 : GameManagerBase
}
Interface.OtherButton.interactable = true;
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToVideoPlayerCamera();
_CameraControllerRound1.ActivateTheChaseMonitorToAllPlayersCameraSwitcher();
}
private void TheChaseCheckAnswer(int Answer)
@@ -1004,9 +1003,6 @@ public class GameManagerRound1 : GameManagerBase
}
public void TheChaseEndClue()
{
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToVideoPlayerCamera();
HostCardTheChaseInterface Interface =
(HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase);
@@ -1022,6 +1018,8 @@ public class GameManagerRound1 : GameManagerBase
SendCustomEventDelayedSeconds(nameof(_TheChaseEndClue_AdvanceMap_Private), 0.3333333333333f);
_CameraControllerRound1.ActivateTheChaseMonitorToAllPlayersCameraSwitcher();
AdvanceQuestion();
}
public void _TheChaseEndClue_AdvanceMap_Private()
@@ -1714,19 +1712,15 @@ public class GameManagerRound1 : GameManagerBase
switch (_BuzzedInPlayer)
{
case 1:
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToPlayer1Camera();
break;
case 2:
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToPlayer2Camera();
break;
case 3:
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToPlayer3Camera();
break;
default:
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToAllPlayersCamera();
break;
}
@@ -1898,16 +1892,10 @@ public class GameManagerRound1 : GameManagerBase
private void _PlayVideo()
{
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToHostCamera();
_CameraControllerRound1.ActivateHostToMonitorCameraSwitcher();
_VideoPlayer.PlayVideo = true;
SendCustomEventDelayedSeconds(nameof(SwitchToTVCamera), 2.0f);
}
public void SwitchToTVCamera()
{
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToVideoPlayerCamera();
SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f);
}
public void CheckVideoPlayerTimeToEnd()
@@ -1916,8 +1904,7 @@ public class GameManagerRound1 : GameManagerBase
{
if ((_VideoPlayer.GetVideoDuration() - _VideoPlayer.GetVideoTime()) <= 2.0f)
{
_CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToHostCamera();
_CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher();
}
else
{
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
+6 -4
View File
@@ -271,6 +271,8 @@ public class GameManagerRound2 : GameManagerBase
Interface.SetComment("Nothing there.", COLOR_STANDARD);
Interface.ActivateAllPanelButtons(false);
_CameraControllerRound2.ActivateLocationBoardAndCurrentPlayerCameraSwitcher();
}
public void AlreadyTried()
@@ -280,6 +282,8 @@ public class GameManagerRound2 : GameManagerBase
Interface.SetComment("Already tried that one.", COLOR_STANDARD);
Interface.ActivateAllPanelButtons(false);
_CameraControllerRound2.ActivateLocationBoardAndCurrentPlayerCameraSwitcher();
}
public void NiceStrategy()
@@ -289,6 +293,8 @@ public class GameManagerRound2 : GameManagerBase
Interface.SetComment("Nice strategy.", COLOR_GREEN);
Interface.ActivateAllPanelButtons(false);
_CameraControllerRound2.ActivateLocationBoardAndCurrentPlayerCameraSwitcher();
}
// This is for when a player wins the game. This should disable all inputs,
@@ -397,8 +403,6 @@ public class GameManagerRound2 : GameManagerBase
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.ActivateAllPanelButtons(true, true);
SwitchToCurrentPlayerAndLocationBoardSwitcher();
}
}
@@ -428,8 +432,6 @@ public class GameManagerRound2 : GameManagerBase
HostCardRecoverTheLootInterface Interface =
(HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot);
Interface.ActivateAllPanelButtons(true);
SwitchToCurrentPlayerAndLocationBoardSwitcher();
}
}
Assets/UdonSharp/Game Managers/GameManagerRound3.cs
+1 -1
View File
@@ -253,7 +253,7 @@ public class GameManagerRound3 : GameManagerBase
UpdateInterface();
_CameraControllerRound3.DisableAllSwitchers();
_CameraControllerRound3.HostPlayerTimerToggle.Activate = false;
_CameraControllerRound3.ActivateHostPlayerCameraSwitcher();
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true;
InitialiseGameplayCameraFollowers();
Assets/UdonSharp/UtilityScripts/BoneFollower.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/InteractToggle.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
+1 -1
View File
@@ -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:
Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
+1 -1
View File
@@ -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: