From 001be2af0eb9d25e0dae8fdcedf5a5f67b983129 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Tue, 24 Mar 2026 05:16:30 -0400 Subject: [PATCH] - Refactored CameraTimedSwitcher to use an internal timer instead of delays. - Added extra switchers to rounds 1 and 2 to better control camera transitions. - Fixed improper camera switches on incorrect answers during round 2. --- .../Materials/Timer/M_TimerCrosshairs_UI.mat | 2 +- Assets/Scenes/witwics.unity | 438 +++++++++-- .../CameraTimedSwitcher.asset | 128 +++- .../Camera Switchers/CameraTimedSwitcher.cs | 87 ++- .../UdonSharp/Cameras/CameraControllerBase.cs | 9 +- .../Cameras/CameraControllerRound1.asset | 679 ++++++++++-------- .../Cameras/CameraControllerRound1.cs | 21 +- .../Cameras/CameraControllerRound2.asset | 222 +++--- .../Cameras/CameraControllerRound2.cs | 10 + .../Cameras/CameraControllerRound3.cs | 3 + .../Game Managers/GameManagerRound1.cs | 25 +- .../Game Managers/GameManagerRound2.cs | 10 +- .../Game Managers/GameManagerRound3.cs | 2 +- .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- 20 files changed, 1129 insertions(+), 521 deletions(-) diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat index f90fc6d..ab902b9 100644 --- a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat +++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat @@ -93,7 +93,7 @@ Material: - _Thickness: 0.07 - _UVSec: 0 - _VerticalLineCorrection: 0 - - _WiperProgress: 1 + - _WiperProgress: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index b320562..bf40fc9 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -6237,7 +6237,7 @@ Transform: m_GameObject: {fileID: 129997576} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.556, y: 0.741, z: 0} + m_LocalPosition: {x: -4.6666665, y: 0.741, z: 0} m_LocalScale: {x: 1.3333333, y: 1.3333334, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -17148,6 +17148,96 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &345058000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 345058001} + - component: {fileID: 345058003} + - component: {fileID: 345058002} + m_Layer: 0 + m_Name: Location Board And Current Player Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &345058001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345058000} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1483356975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &345058002 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345058000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &345058003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345058000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 345058002} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToLocationBoardCamera + _TimeBetweenCuts: + - 2 + _Loop: 0 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 865296978} + _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher --- !u!1 &345367811 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4301269147793223301, guid: aef94cccd27652f4ab0f5934d68e3f4f, @@ -24449,7 +24539,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 3 - _Loop: 1 + _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher @@ -28482,6 +28572,98 @@ Transform: type: 3} m_PrefabInstance: {fileID: 633609066} m_PrefabAsset: {fileID: 0} +--- !u!1 &633978913 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633978916} + - component: {fileID: 633978914} + - component: {fileID: 633978915} + m_Layer: 0 + m_Name: Host To Monitor Timed Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &633978914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633978913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 633978915} + _CameraController: {fileID: 1524477936} + _SwitchFunctions: + - SwitchToHostCamera + - SwitchToVideoPlayerCamera + _TimeBetweenCuts: + - 2 + - 0 + _Loop: 0 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 0} + _FirstLoopCallbackFunction: +--- !u!114 &633978915 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633978913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!4 &633978916 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633978913} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &635617283 PrefabInstance: m_ObjectHideFlags: 0 @@ -55944,6 +56126,7 @@ MonoBehaviour: Player2AndLocationBoardTimerToggle: {fileID: 741456682} LocationBoardAndShortHostTimerToggle: {fileID: 529984888} LocationBoardAndLongHostTimerToggle: {fileID: 1875043588} + LocationBoardAndCurrentPlayerTimerToggle: {fileID: 345058003} LocationBoardAndWinningPlayerTimerToggle: {fileID: 905819759} VideoPlayerToWinningPlayerTimerToggle: {fileID: 604764489} Player1CameraAnchor: {fileID: 783795840} @@ -60779,6 +60962,7 @@ Transform: - {fileID: 741456680} - {fileID: 529984886} - {fileID: 1875043586} + - {fileID: 345058001} - {fileID: 905819757} - {fileID: 604764487} m_Father: {fileID: 1451322102} @@ -65677,9 +65861,11 @@ MonoBehaviour: HostAndAllPlayersTimerToggle: {fileID: 552861273} HostAndIndividualPlayersTimerToggle: {fileID: 458165862} AllPlayersAssignStarterPointsTimerToggle: {fileID: 59893116} + HostToMonitorTimerToggle: {fileID: 633978914} MapToHostAndAllPlayersTimerToggle: {fileID: 1108468553} LightningStartToHostAndAllPlayersTimerToggle: {fileID: 1573395194} TheChaseStartToHostAndAllPlayersTimerToggle: {fileID: 12138829} + TheChaseMonitorToAllPlayersTimerToggle: {fileID: 2037132290} CorrectToHostAndAllPlayersTimerToggle: {fileID: 1170815126} IncorrectToHostAndAllPlayersTimerToggle: {fileID: 1574468604} ThinkAboutItTimerToggle: {fileID: 1129163084} @@ -78389,7 +78575,7 @@ Transform: m_GameObject: {fileID: 1788772011} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.005, y: 1.499, z: -0} + m_LocalPosition: {x: -1.25, y: 1.499, z: -0} m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -81381,7 +81567,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 4.5 - _Loop: 1 + _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher @@ -81533,9 +81719,11 @@ Transform: - {fileID: 552861271} - {fileID: 458165860} - {fileID: 59893114} + - {fileID: 633978916} - {fileID: 1108468551} - {fileID: 1573395196} - {fileID: 12138831} + - {fileID: 2037132292} - {fileID: 1170815124} - {fileID: 1574468602} - {fileID: 1129163086} @@ -88048,6 +88236,98 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &2037132289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2037132292} + - component: {fileID: 2037132290} + - component: {fileID: 2037132291} + m_Layer: 0 + m_Name: The Chase Monitor To All Players Timed Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2037132290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037132289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 2037132291} + _CameraController: {fileID: 1524477936} + _SwitchFunctions: + - SwitchToVideoPlayerCamera + - SwitchToAllPlayersCamera + _TimeBetweenCuts: + - 5 + - 3 + _Loop: 1 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 0} + _FirstLoopCallbackFunction: +--- !u!114 &2037132291 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037132289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!4 &2037132292 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2037132289} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2037946458 GameObject: m_ObjectHideFlags: 0 @@ -99965,94 +100245,94 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -105585,6 +105865,18 @@ MonoBehaviour: ID: 1322 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 633978913} + ID: 1323 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2037132289} + ID: 1324 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 345058000} + ID: 1325 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset index d458ff4..192e0fc 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset @@ -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: k__BackingField Entry: 1 - Data: _NextCameraIndex + Data: _Timer - Name: 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: k__BackingField Entry: 9 - Data: 21 + Data: 39 - Name: 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: k__BackingField Entry: 1 - Data: _LoopedOnce + Data: _AwaitingNextSwitch - Name: 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: k__BackingField + Entry: 1 + Data: _NextCameraIndex + - Name: k__BackingField + Entry: 9 + Data: 21 + - Name: k__BackingField + Entry: 9 + Data: 21 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField + Entry: 1 + Data: _LoopedOnce + - Name: k__BackingField + Entry: 9 + Data: 16 + - Name: k__BackingField + Entry: 9 + Data: 16 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs index 552201c..4043a2c 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs @@ -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; - } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerBase.cs b/Assets/UdonSharp/Cameras/CameraControllerBase.cs index 11cac01..08f6945 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.cs @@ -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() { diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index 6c36e83..94aba0b 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -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: k__BackingField Entry: 1 - Data: MapToHostAndAllPlayersTimerToggle + Data: HostToMonitorTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: LightningStartToHostAndAllPlayersTimerToggle + Data: MapToHostAndAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: TheChaseStartToHostAndAllPlayersTimerToggle + Data: LightningStartToHostAndAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: CorrectToHostAndAllPlayersTimerToggle + Data: TheChaseStartToHostAndAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: IncorrectToHostAndAllPlayersTimerToggle + Data: TheChaseMonitorToAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: ThinkAboutItTimerToggle + Data: CorrectToHostAndAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: BuzzedInPlayerTimerToggle + Data: IncorrectToHostAndAllPlayersTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: _CameraAnimator + Data: ThinkAboutItTimerToggle - Name: 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: k__BackingField Entry: 9 - Data: 71 + Data: 4 - Name: 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: k__BackingField + Entry: 1 + Data: BuzzedInPlayerTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField + Entry: 1 + Data: _CameraAnimator + - Name: k__BackingField + Entry: 7 + Data: 77|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 77 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: 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: k__BackingField - Entry: 1 - Data: Player2CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: 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: k__BackingField - Entry: 1 - Data: Player3CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: 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: k__BackingField Entry: 1 - Data: HostCameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField Entry: 1 - Data: DefaultWideShotCameraAnchor + Data: Player3CameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: HostCameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField Entry: 1 - Data: OpeningCameraAnchor + Data: DefaultWideShotCameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField + Entry: 1 + Data: OpeningCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField - Entry: 1 - Data: AllPlayersViewCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: 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: k__BackingField - Entry: 1 - Data: VideoMusicClueCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 76 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: 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: k__BackingField Entry: 1 - Data: ACMECrimenetComputerCameraAnchor + Data: AllPlayersViewCameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField Entry: 1 - Data: FilingCabinetCameraAnchor + Data: VideoMusicClueCameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: ACMECrimenetComputerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 76 + Data: 82 - Name: 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: k__BackingField + Entry: 1 + Data: FilingCabinetCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 82 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField Entry: 1 Data: _PlayOpening - Name: 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: k__BackingField Entry: 9 - Data: 115 + Data: 121 - Name: 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: k__BackingField Entry: 1 Data: _PlayOpeningDoorway - Name: k__BackingField Entry: 9 - Data: 115 + Data: 121 - Name: k__BackingField Entry: 9 - Data: 115 + Data: 121 - Name: 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: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 711ff0c..0346229 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -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); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index 426730d..72b052b 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -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: k__BackingField Entry: 1 - Data: LocationBoardAndWinningPlayerTimerToggle + Data: LocationBoardAndCurrentPlayerTimerToggle - Name: 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: k__BackingField Entry: 1 - Data: VideoPlayerToWinningPlayerTimerToggle + Data: LocationBoardAndWinningPlayerTimerToggle - Name: 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: k__BackingField + Entry: 1 + Data: VideoPlayerToWinningPlayerTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 12 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: 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: k__BackingField - Entry: 1 - Data: Player2CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 69 - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: 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: k__BackingField Entry: 1 - Data: HostAndWinnerCameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: k__BackingField Entry: 1 - Data: LocationBoardCameraAnchor + Data: HostAndWinnerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: LocationBoardCameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: k__BackingField Entry: 1 - Data: WideShotCameraAnchor + Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: k__BackingField + Entry: 1 + Data: WideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 72 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: 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: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 69 + Data: 72 - Name: 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: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 65bfdba..1bf5e66 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -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); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index b577972..bce7a7b 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -41,6 +41,9 @@ public class CameraControllerRound3 : CameraControllerBase public override void InitialiseCameras() { + DisableAllSwitchers(); + DisableAllTriggers(); + HostStartingCameraAnchor.AttachCamera(PlayerCamera); PlayerStartingCameraAnchor.AttachCamera(HostCamera); OverheadCameraAnchor.AttachCamera(OverheadCamera); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 16a4d39..f2bc8eb 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -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 { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index bfd746c..696408b 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -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(); } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 625e497..5f2dfaa 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -253,7 +253,7 @@ public class GameManagerRound3 : GameManagerBase UpdateInterface(); _CameraControllerRound3.DisableAllSwitchers(); - _CameraControllerRound3.HostPlayerTimerToggle.Activate = false; + _CameraControllerRound3.ActivateHostPlayerCameraSwitcher(); _CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true; InitialiseGameplayCameraFollowers(); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -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: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -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: