From 0092bf076780ea6b85f606bdb7e17b05a0adb232 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Tue, 14 Apr 2026 22:36:27 -0400 Subject: [PATCH] - Fixed line thicknesses for floor maps. - Fixed a camera issue with reloading a round while round 1 is playing video. - Modem now uses a slightly rougher metal material. - Round 1 and 3 have better handling for switching cameras from video players. - Added a method for checking if a GameManager is initialised. - Added camera switch timers for round 3 ending video and game end. - Added CameraAnchor tracking for waist-down targeting. - Added a method to CameraTimedSwitcher to retrieve a defined switch time. --- Assets/Materials/Maps/M_SDF_Africa.mat | 2 +- Assets/Materials/Maps/M_SDF_Asia.mat | 4 +- Assets/Materials/Maps/M_SDF_Europe.mat | 2 +- Assets/Materials/Maps/M_SDF_NorthAmerica.mat | 4 +- Assets/Materials/Maps/M_SDF_SouthAmerica.mat | 2 +- Assets/Prefabs/Modem.prefab | 5 +- Assets/Scenes/witwics.unity | 399 +++++++++++--- .../Camera Switchers/CameraTimedSwitcher.cs | 18 +- Assets/UdonSharp/Cameras/CameraAnchor.cs | 10 + .../UdonSharp/Cameras/CameraControllerBase.cs | 2 - .../Cameras/CameraControllerRound3.asset | 488 +++++++++++------- .../Cameras/CameraControllerRound3.cs | 14 + .../Game Managers/GameManagerBase.asset | 54 +- .../Game Managers/GameManagerBase.cs | 12 +- .../Game Managers/GameManagerRound1.asset | 431 ++++++++++------ .../Game Managers/GameManagerRound1.cs | 37 +- .../Game Managers/GameManagerRound2.asset | 335 +++++++----- .../Game Managers/GameManagerRound3.asset | 398 ++++++++------ .../Game Managers/GameManagerRound3.cs | 50 +- .../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 +- 26 files changed, 1492 insertions(+), 789 deletions(-) diff --git a/Assets/Materials/Maps/M_SDF_Africa.mat b/Assets/Materials/Maps/M_SDF_Africa.mat index 4c8b38a..d7b7743 100644 --- a/Assets/Materials/Maps/M_SDF_Africa.mat +++ b/Assets/Materials/Maps/M_SDF_Africa.mat @@ -81,7 +81,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _LightmapType: 0 - - _LineThickness: 0.15 + - _LineThickness: 0.2 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/Materials/Maps/M_SDF_Asia.mat b/Assets/Materials/Maps/M_SDF_Asia.mat index ef8d89b..04b76b5 100644 --- a/Assets/Materials/Maps/M_SDF_Asia.mat +++ b/Assets/Materials/Maps/M_SDF_Asia.mat @@ -81,7 +81,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _LightmapType: 0 - - _LineThickness: 0.07 + - _LineThickness: 0.13 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -92,7 +92,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _VerticalLineCorrection: 0.24 + - _VerticalLineCorrection: 0.09 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Materials/Maps/M_SDF_Europe.mat b/Assets/Materials/Maps/M_SDF_Europe.mat index fb6b8c4..479864c 100644 --- a/Assets/Materials/Maps/M_SDF_Europe.mat +++ b/Assets/Materials/Maps/M_SDF_Europe.mat @@ -81,7 +81,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _LightmapType: 0 - - _LineThickness: 0.175 + - _LineThickness: 0.2 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/Materials/Maps/M_SDF_NorthAmerica.mat b/Assets/Materials/Maps/M_SDF_NorthAmerica.mat index d95110d..89c2c0b 100644 --- a/Assets/Materials/Maps/M_SDF_NorthAmerica.mat +++ b/Assets/Materials/Maps/M_SDF_NorthAmerica.mat @@ -81,7 +81,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _LightmapType: 0 - - _LineThickness: 0.07 + - _LineThickness: 0.13 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 @@ -92,7 +92,7 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _VerticalLineCorrection: 0.24 + - _VerticalLineCorrection: 0.09 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Materials/Maps/M_SDF_SouthAmerica.mat b/Assets/Materials/Maps/M_SDF_SouthAmerica.mat index 55de815..2847da4 100644 --- a/Assets/Materials/Maps/M_SDF_SouthAmerica.mat +++ b/Assets/Materials/Maps/M_SDF_SouthAmerica.mat @@ -81,7 +81,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _LightmapType: 0 - - _LineThickness: 0.15 + - _LineThickness: 0.2 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab index b230f8b..fd18b7a 100644 --- a/Assets/Prefabs/Modem.prefab +++ b/Assets/Prefabs/Modem.prefab @@ -133,11 +133,10 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 932720169245821887} - _ModemActivationObject: {fileID: 497488136702045868} - _ModemDestination: {fileID: 0} _AudioManager: {fileID: 0} _ModemAnimator: {fileID: 0} _ModemDestinationAnimator: {fileID: 0} + _ModemDestination: {fileID: 0} --- !u!114 &932720169245821887 MonoBehaviour: m_ObjectHideFlags: 0 @@ -216,7 +215,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[2] value: - objectReference: {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + objectReference: {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - target: {fileID: -7511558181221131132, guid: a6dcae11ef99ada46bed911b4bb79af6, type: 3} propertyPath: m_Materials.Array.data[3] diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 8b585b7..6859478 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -2006,6 +2006,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 30 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: CameraSystemManager @@ -10672,13 +10677,18 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FollowMethod - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane value: 30 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: CameraSystemManager @@ -20167,15 +20177,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 380717942} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -21.78, y: 0, z: 2.16} + 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: - {fileID: 1330590324} - {fileID: 791402704} - {fileID: 1353480262} - m_Father: {fileID: 1276291775} + m_Father: {fileID: 1839713002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &381284108 stripped GameObject: @@ -50976,6 +50986,99 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1096139481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1096139484} + - component: {fileID: 1096139482} + - component: {fileID: 1096139483} + m_Layer: 0 + m_Name: Front Overhead Camera Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1096139482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096139481} + 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: 1096139483} + _CameraController: {fileID: 1691482842} + _SwitchFunctions: + - SwitchToFrontCamera + - SwitchToOverheadCamera + _TimeBetweenCuts: + - 4 + - 4 + _AlwaysReactivate: 0 + _Loop: 1 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 0} + _FirstLoopCallbackFunction: +--- !u!114 &1096139483 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096139481} + 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 &1096139484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1096139481} + 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: 1839713002} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1098045919 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3127691418082346418, guid: be33bc7f6c414e6409becfa348b9310d, @@ -56281,8 +56384,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1757939442} - - {fileID: 1459858123} - - {fileID: 380717943} + - {fileID: 1839713002} - {fileID: 1699893630} - {fileID: 772205214} - {fileID: 107399073} @@ -61364,6 +61466,99 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1384052556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1384052557} + - component: {fileID: 1384052559} + - component: {fileID: 1384052558} + m_Layer: 0 + m_Name: Map To Ending Camera Toggle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1384052557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384052556} + 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: 1839713002} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1384052558 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384052556} + 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 &1384052559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384052556} + 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: 1384052558} + _CameraController: {fileID: 1691482842} + _SwitchFunctions: + - + - SwitchToVideoPlayerCamera + _TimeBetweenCuts: + - 2 + - 0 + _AlwaysReactivate: 1 + _Loop: 0 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 0} + _FirstLoopCallbackFunction: --- !u!1 &1384916691 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8208523460328446239, guid: e9914385266bca24db809c39e395f03c, @@ -63833,11 +64028,11 @@ Transform: m_GameObject: {fileID: 1459858122} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -21.78, y: 0, z: 2.1599998} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1276291775} + m_Father: {fileID: 1839713002} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1459858124 MonoBehaviour: @@ -80837,6 +81032,8 @@ MonoBehaviour: VideoPlayerCamera: {fileID: 1064115356} PlayfieldSwitchTriggerGroup: {fileID: 380717942} HostPlayerTimerToggle: {fileID: 1459858125} + MapToEndingTimerToggle: {fileID: 1384052559} + FrontOverheadTimerToggle: {fileID: 1096139482} _CameraAnimator: {fileID: 1699893631} HostStartingCameraAnchor: {fileID: 1353942936} PlayerStartingCameraAnchor: {fileID: 1329816342} @@ -85809,6 +86006,41 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1839713001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1839713002} + m_Layer: 0 + m_Name: Camera Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1839713002 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839713001} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -21.78, y: 0, z: 2.1599998} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 380717943} + - {fileID: 1459858123} + - {fileID: 1384052557} + - {fileID: 1096139484} + m_Father: {fileID: 1276291775} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1840921145 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6922665752566753051, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -106880,104 +107112,105 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, 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: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, 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: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, 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: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, 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: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} + - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} + - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, 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: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -112542,6 +112775,14 @@ MonoBehaviour: ID: 1335 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1384052556} + ID: 1336 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1096139481} + ID: 1337 + 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.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs index c3a4e41..cbd8467 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs @@ -74,6 +74,16 @@ public class CameraTimedSwitcher : UdonSharpBehaviour _Timer = 0.0f; } } + + public float GetTimeBetweenCuts(int Index) + { + if (Index >= 0 && Index < _TimeBetweenCuts.Length) + { + return _TimeBetweenCuts[Index]; + } + + return 0.0f; + } public void SwitchToNextCamera() @@ -83,20 +93,17 @@ public class CameraTimedSwitcher : UdonSharpBehaviour 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); return; } if (!_Loop) { - Debug.Log("[CameraTimedSwitcher] On a second loop, but looping is disabled; deactivating"); Activate(false); return; } @@ -106,7 +113,6 @@ public class CameraTimedSwitcher : UdonSharpBehaviour if (Function != "") { _CameraController.SendCustomEvent(Function); - Debug.Log("[CameraTimedSwitcher] Executing function " + Function); } _NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length; @@ -115,12 +121,10 @@ public class CameraTimedSwitcher : UdonSharpBehaviour { _LoopedOnce = true; _NextCameraIndex = _LoopPoint; - Debug.Log("[CameraTimedSwitcher] Setting next camera index to loop point " + _LoopPoint); } _Timer = _TimeBetweenCuts[Mathf.Min(CurrentCameraIndex, _TimeBetweenCuts.Length - 1)]; _AwaitingNextSwitch = true; - Debug.Log("[CameraTimedSwitcher] Camera index " + _NextCameraIndex + " will be activated in " + _Timer + " seconds"); } } } diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.cs b/Assets/UdonSharp/Cameras/CameraAnchor.cs index c330226..5915548 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.cs +++ b/Assets/UdonSharp/Cameras/CameraAnchor.cs @@ -12,6 +12,7 @@ public enum PossibleFollowMethods CloseUp, HeadAndShoulders, HipsUp, + HipsDown, FullBody }; @@ -120,6 +121,15 @@ public class CameraAnchor : UdonSharpBehaviour BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightUpperLeg); return BonesToTrack; } + case PossibleFollowMethods.HipsDown: + { + Vector3[] BonesToTrack = new Vector3[4]; + BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.LeftUpperLeg); + BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightUpperLeg); + BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftFoot); + BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightFoot); + return BonesToTrack; + } case PossibleFollowMethods.FullBody: { Vector3[] BonesToTrack = new Vector3[4]; diff --git a/Assets/UdonSharp/Cameras/CameraControllerBase.cs b/Assets/UdonSharp/Cameras/CameraControllerBase.cs index 3d8acd7..8d65a1e 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.cs @@ -2,8 +2,6 @@ using CameraSystem; using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; using VRC.Udon.Common; diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.asset b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset index b5a65b7..c566417 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 24 + Data: 26 - Name: Entry: 7 Data: @@ -701,25 +701,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraAnimator + Data: MapToEndingTimerToggle - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraAnimator + Data: MapToEndingTimerToggle - Name: k__BackingField - Entry: 7 - Data: 44|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: 44 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -734,13 +728,127 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|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: FrontOverheadTimerToggle + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: FrontOverheadTimerToggle + - 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: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|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: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraAnimator + - Name: k__BackingField + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 46|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 52|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -749,7 +857,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -773,13 +881,13 @@ MonoBehaviour: Data: HostStartingCameraAnchor - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostStartingCameraAnchor - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -803,127 +911,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 51|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 57|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 52|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: PlayerStartingCameraAnchor - - Name: $v - Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: PlayerStartingCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 49 - - 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: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 55|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: OverheadCameraAnchor - - Name: $v - Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: OverheadCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 49 - - 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: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -947,16 +947,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FrontCameraAnchor + Data: PlayerStartingCameraAnchor - Name: $v Entry: 7 Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FrontCameraAnchor + Data: PlayerStartingCameraAnchor - Name: k__BackingField Entry: 9 - Data: 49 + Data: 55 - Name: k__BackingField Entry: 9 Data: 4 @@ -1001,16 +1001,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: NewspaperCameraAnchor + Data: OverheadCameraAnchor - Name: $v Entry: 7 Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: NewspaperCameraAnchor + Data: OverheadCameraAnchor - Name: k__BackingField Entry: 9 - Data: 49 + Data: 55 - Name: k__BackingField Entry: 9 Data: 4 @@ -1055,16 +1055,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCameraAnchor + Data: FrontCameraAnchor - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: FrontCameraAnchor - Name: k__BackingField Entry: 9 - Data: 49 + Data: 55 - Name: k__BackingField Entry: 9 Data: 4 @@ -1109,31 +1109,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostCameraAnchorSequence + Data: NewspaperCameraAnchor - Name: $v Entry: 7 Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostCameraAnchorSequence + Data: NewspaperCameraAnchor - Name: k__BackingField - Entry: 7 - Data: 69|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraAnchor[], Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 55 - Name: k__BackingField - Entry: 7 - Data: 70|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Component[], UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1148,19 +1136,64 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 72|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 + 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: VideoPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 55 + - 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: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 - Name: Entry: 7 Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1184,19 +1217,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PlayerCameraAnchorSequence + Data: HostCameraAnchorSequence - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PlayerCameraAnchorSequence + Data: HostCameraAnchorSequence - Name: k__BackingField - Entry: 9 - Data: 69 + Entry: 7 + Data: 75|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor[], Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField - Entry: 9 - Data: 70 + Entry: 7 + Data: 76|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1211,13 +1256,76 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 78|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: PlayerCameraAnchorSequence + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: PlayerCameraAnchorSequence + - Name: k__BackingField + Entry: 9 + Data: 75 + - Name: k__BackingField + Entry: 9 + Data: 76 + - 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: 76|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1241,13 +1349,13 @@ MonoBehaviour: Data: _ActivatePlayfieldSwitchTriggerGroup - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActivatePlayfieldSwitchTriggerGroup - Name: k__BackingField Entry: 7 - Data: 78|System.RuntimeType, mscorlib + Data: 84|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1256,7 +1364,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 78 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1271,19 +1379,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 81|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1307,7 +1415,7 @@ MonoBehaviour: Data: _MarkerCameraAnchorPosition - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _MarkerCameraAnchorPosition @@ -1331,19 +1439,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 85|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 91|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1367,16 +1475,16 @@ MonoBehaviour: Data: _PlayIFeelGood - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayIFeelGood - Name: k__BackingField Entry: 9 - Data: 78 + Data: 84 - Name: k__BackingField Entry: 9 - Data: 78 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1391,19 +1499,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 94|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 89|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 95|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1427,16 +1535,16 @@ MonoBehaviour: Data: _PlayDoItRockapella - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayDoItRockapella - Name: k__BackingField Entry: 9 - Data: 78 + Data: 84 - Name: k__BackingField Entry: 9 - Data: 78 + Data: 84 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1451,19 +1559,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 98|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 93|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 99|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index bce7a7b..7b3d380 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -19,6 +19,8 @@ public class CameraControllerRound3 : CameraControllerBase [SerializeField] public GameObject PlayfieldSwitchTriggerGroup; [Space] [SerializeField] public CameraTimedSwitcher HostPlayerTimerToggle; + [SerializeField] public CameraTimedSwitcher MapToEndingTimerToggle; + [SerializeField] public CameraTimedSwitcher FrontOverheadTimerToggle; [Space] [SerializeField] public Animator _CameraAnimator; [Space] @@ -80,6 +82,8 @@ public class CameraControllerRound3 : CameraControllerBase Networking.SetOwner(Player, PlayfieldSwitchTriggerGroup); Networking.SetOwner(Player, HostPlayerTimerToggle.gameObject); + Networking.SetOwner(Player, MapToEndingTimerToggle.gameObject); + Networking.SetOwner(Player, FrontOverheadTimerToggle.gameObject); Networking.SetOwner(Player, _CameraAnimator.gameObject); @@ -163,6 +167,16 @@ public class CameraControllerRound3 : CameraControllerBase ActivateCameraSwitcher(HostPlayerTimerToggle); } + public void ActivateMapToEndingCameraSwitcher() + { + ActivateCameraSwitcher(MapToEndingTimerToggle); + } + + public void ActivateFrontOverheadCameraSwitcher() + { + ActivateCameraSwitcher(FrontOverheadTimerToggle); + } + public void PlayIFeelGood(bool Play) { diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.asset b/Assets/UdonSharp/Game Managers/GameManagerBase.asset index c466f50..fa2448e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 8 + Data: 9 - Name: Entry: 7 Data: @@ -479,13 +479,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib @@ -528,6 +528,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - 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: 35|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/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 090726b..e069239 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -5,6 +5,7 @@ using UnityEngine; using VRC.SDK3.Data; using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; +using VRC.SDKBase.Midi; using VRC.Udon.Common.Interfaces; @@ -53,7 +54,7 @@ public class GameManagerBase : UdonSharpBehaviour [SerializeField] protected CameraControllerBase _CameraController; - + private bool _Initialised = false; private bool _AllowInteractionFromHostCard = false; @@ -110,11 +111,20 @@ public class GameManagerBase : UdonSharpBehaviour _AllowInteractionFromHostCard = true; SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), true); + + _Initialised = true; } public virtual void DeinitialiseGameMode() { SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnablePlayerMicrophone), false); + + _Initialised = false; + } + + public bool IsRoundInitialised() + { + return _Initialised; } [NetworkCallable] diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 7080313..5443ea4 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 33 + Data: 35 - Name: Entry: 7 Data: @@ -479,13 +479,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib @@ -533,16 +533,64 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TiebreakerData + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - 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: 35|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: _TiebreakerData + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerData - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCUrl, VRCSDKBase @@ -551,7 +599,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -566,13 +614,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -581,7 +629,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -605,7 +653,7 @@ MonoBehaviour: Data: _GameHasBegun - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameHasBegun @@ -629,13 +677,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 41|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -659,13 +707,13 @@ MonoBehaviour: Data: _QuestionIndex - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionIndex - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -674,7 +722,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -689,13 +737,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -719,16 +767,16 @@ MonoBehaviour: Data: _QuestionStage - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionStage - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -743,13 +791,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -773,16 +821,16 @@ MonoBehaviour: Data: _QuestionSubstage - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionSubstage - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -797,13 +845,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 51|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -827,16 +875,16 @@ MonoBehaviour: Data: _QuestionCorrectResponse - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionCorrectResponse - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -851,13 +899,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -881,13 +929,13 @@ MonoBehaviour: Data: _CurrentQuestionType - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestionType - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RoundSegmentType, Assembly-CSharp @@ -896,7 +944,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -911,13 +959,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -941,13 +989,13 @@ MonoBehaviour: Data: _QuestionsList - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _QuestionsList - Name: k__BackingField Entry: 7 - Data: 60|System.RuntimeType, mscorlib + Data: 62|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataList, VRCSDK3 @@ -956,7 +1004,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 60 + Data: 62 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -971,7 +1019,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -995,13 +1043,13 @@ MonoBehaviour: Data: _CurrentQuestion - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentQuestion - Name: k__BackingField Entry: 7 - Data: 63|System.RuntimeType, mscorlib + Data: 65|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1010,7 +1058,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 63 + Data: 65 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1023,63 +1071,63 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 64|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: _BuzzInAllowed - - Name: $v - Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _BuzzInAllowed - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - Name: _fieldAttributes Entry: 7 Data: 66|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: _BuzzInAllowed + - Name: $v + Entry: 7 + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BuzzInAllowed + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1103,13 +1151,13 @@ MonoBehaviour: Data: _PlayerBuzzInAllowed - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerBuzzInAllowed - Name: k__BackingField Entry: 7 - Data: 69|System.RuntimeType, mscorlib + Data: 71|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -1118,7 +1166,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 69 + Data: 71 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1133,13 +1181,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 73|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1163,16 +1211,16 @@ MonoBehaviour: Data: _BuzzedInPlayer - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _BuzzedInPlayer - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 45 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,13 +1235,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1217,13 +1265,13 @@ MonoBehaviour: Data: _FinalRoundPlayersSortedByScore - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundPlayersSortedByScore - Name: k__BackingField Entry: 7 - Data: 76|System.RuntimeType, mscorlib + Data: 78|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -1232,7 +1280,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1247,13 +1295,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1277,16 +1325,16 @@ MonoBehaviour: Data: _TiebreakerPlayerNumbers - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TiebreakerPlayerNumbers - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 9 - Data: 76 + Data: 78 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,13 +1349,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1331,13 +1379,13 @@ MonoBehaviour: Data: _PlayerPodiums - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPodiums - Name: k__BackingField Entry: 7 - Data: 83|System.RuntimeType, mscorlib + Data: 85|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PlayerPodium[], Assembly-CSharp @@ -1346,7 +1394,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 84|System.RuntimeType, mscorlib + Data: 86|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -1367,13 +1415,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 86|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 88|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1382,7 +1430,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 87|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1406,13 +1454,13 @@ MonoBehaviour: Data: _VideoPlayer - Name: $v Entry: 7 - Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayer - Name: k__BackingField Entry: 7 - Data: 89|System.RuntimeType, mscorlib + Data: 91|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaseVideoSyncPlayer, Assembly-CSharp @@ -1436,13 +1484,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 91|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 93|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1451,7 +1499,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 92|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 94|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1460,7 +1508,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1484,13 +1532,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 95|System.RuntimeType, mscorlib + Data: 97|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1514,13 +1562,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1544,13 +1592,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 99|System.RuntimeType, mscorlib + Data: 101|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1574,14 +1622,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 103|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1605,13 +1653,13 @@ MonoBehaviour: Data: _DetectiveNoirEffect - Name: $v Entry: 7 - Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 104|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _DetectiveNoirEffect - Name: k__BackingField Entry: 7 - Data: 103|System.RuntimeType, mscorlib + Data: 105|System.RuntimeType, mscorlib - Name: Entry: 1 Data: DetectiveNoirEffect, Assembly-CSharp @@ -1635,14 +1683,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 105|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1666,13 +1714,13 @@ MonoBehaviour: Data: _FilingCabinet - Name: $v Entry: 7 - Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FilingCabinet - Name: k__BackingField Entry: 7 - Data: 107|System.RuntimeType, mscorlib + Data: 109|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FilingCabinet, Assembly-CSharp @@ -1696,14 +1744,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 109|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 111|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1727,13 +1775,13 @@ MonoBehaviour: Data: _Modem - Name: $v Entry: 7 - Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Modem - Name: k__BackingField Entry: 7 - Data: 111|System.RuntimeType, mscorlib + Data: 113|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -1757,14 +1805,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 115|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1788,13 +1836,13 @@ MonoBehaviour: Data: _ArrivalDisplay - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 115|System.RuntimeType, mscorlib + Data: 117|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -1818,14 +1866,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 117|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1849,13 +1897,13 @@ MonoBehaviour: Data: _LightningRoundAnimator - Name: $v Entry: 7 - Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 - Data: 119|System.RuntimeType, mscorlib + Data: 121|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1864,7 +1912,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 119 + Data: 121 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1879,14 +1927,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 120|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 121|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 123|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1895,7 +1943,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 122|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 124|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1904,7 +1952,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 125|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1928,16 +1976,16 @@ MonoBehaviour: Data: _TheChaseAnimator - Name: $v Entry: 7 - Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 126|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TheChaseAnimator - Name: k__BackingField Entry: 9 - Data: 119 + Data: 121 - Name: k__BackingField Entry: 9 - Data: 119 + Data: 121 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1952,14 +2000,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 125|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 127|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 126|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 128|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1983,13 +2031,13 @@ MonoBehaviour: Data: _CameraControllerRound1 - Name: $v Entry: 7 - Data: 127|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound1 - Name: k__BackingField Entry: 7 - Data: 128|System.RuntimeType, mscorlib + Data: 130|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound1, Assembly-CSharp @@ -2013,7 +2061,62 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 129|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 131|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: _VideoPlayerTimer + - Name: $v + Entry: 7 + Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayerTimer + - Name: k__BackingField + Entry: 7 + Data: 133|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 133 + - 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: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index a9462b1..dac1760 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -59,8 +59,11 @@ public class GameManagerRound1 : GameManagerBase [SerializeField] private Animator _LightningRoundAnimator; [SerializeField] private Animator _TheChaseAnimator; + private CameraControllerRound1 _CameraControllerRound1 = null; + private float _VideoPlayerTimer = -1.0f; + void Start() { @@ -71,6 +74,21 @@ public class GameManagerRound1 : GameManagerBase } } + void Update() + { + if (IsRoundInitialised()) + { + if (_VideoPlayerTimer > 0.0f) + { + _VideoPlayerTimer -= Time.deltaTime; + if (_VideoPlayerTimer <= 0.0f) + { + EndVideoPlayerCameraSwitch(); + } + } + } + } + public override void InitialiseGameMode() { @@ -79,6 +97,7 @@ public class GameManagerRound1 : GameManagerBase _GameHasBegun = false; _QuestionIndex = 0; _QuestionStage = 0; + _VideoPlayerTimer = -1.0f; _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; @@ -114,6 +133,8 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1.PlayOpeningDoorway(false); _CameraControllerRound1.PlayModemZoom(false); + _VideoPlayerTimer = -1.0f; + base.DeinitialiseGameMode(); } @@ -1905,21 +1926,11 @@ public class GameManagerRound1 : GameManagerBase _VideoPlayer.PlayVideo = true; - SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f); + _VideoPlayerTimer = _VideoPlayer.GetVideoDuration() - _CameraControllerRound1.HostToMonitorTimerToggle.GetTimeBetweenCuts(0); } - public void CheckVideoPlayerTimeToEnd() + public void EndVideoPlayerCameraSwitch() { - if (_VideoPlayer.PlayVideo == true) - { - if ((_VideoPlayer.GetVideoDuration() - _VideoPlayer.GetVideoTime()) <= 2.0f) - { - _CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher(); - } - else - { - SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f); - } - } + _CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher(); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index 9ecd1a0..0bd554e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 28 + Data: 29 - Name: Entry: 7 Data: @@ -479,13 +479,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib @@ -533,16 +533,64 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ArrivalDisplay + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - 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: 35|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: _ArrivalDisplay + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ArrivalDisplay, Assembly-CSharp @@ -566,13 +614,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 37|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -581,7 +629,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -605,13 +653,13 @@ MonoBehaviour: Data: _LocationBoard - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationBoard - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 42|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LocationBoard, Assembly-CSharp @@ -635,13 +683,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 44|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -665,13 +713,13 @@ MonoBehaviour: Data: _JailChain - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailChain - Name: k__BackingField Entry: 7 - Data: 44|System.RuntimeType, mscorlib + Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailChain, Assembly-CSharp @@ -695,13 +743,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -725,13 +773,13 @@ MonoBehaviour: Data: _JailPhone - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPhone - Name: k__BackingField Entry: 7 - Data: 48|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: JailPhone, Assembly-CSharp @@ -755,13 +803,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -785,13 +833,13 @@ MonoBehaviour: Data: _PlayerConfettiCannons - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerConfettiCannons - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 54|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.ParticleSystem[], UnityEngine.ParticleSystemModule @@ -800,7 +848,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 52 + Data: 54 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -815,13 +863,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -845,13 +893,13 @@ MonoBehaviour: Data: _PlayerPositionMarkers - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerPositionMarkers - Name: k__BackingField Entry: 7 - Data: 56|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 Data: PositionMarker[], Assembly-CSharp @@ -860,7 +908,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 59|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -881,13 +929,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -911,13 +959,13 @@ MonoBehaviour: Data: _JailPlayer - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _JailPlayer - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 63|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -941,13 +989,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -971,13 +1019,13 @@ MonoBehaviour: Data: _Location - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Location - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -986,7 +1034,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 65 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1001,19 +1049,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 68|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 70|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1037,13 +1085,13 @@ MonoBehaviour: Data: _Landmarks - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Landmarks - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -1052,7 +1100,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 70 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1067,13 +1115,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1097,13 +1145,13 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 7 - Data: 74|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1112,7 +1160,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 74 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1127,13 +1175,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1157,16 +1205,16 @@ MonoBehaviour: Data: _CurrentPlayerCounter - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 74 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 74 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1181,13 +1229,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1211,16 +1259,16 @@ MonoBehaviour: Data: _Players - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Players - Name: k__BackingField Entry: 9 - Data: 70 + Data: 72 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1235,13 +1283,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1265,7 +1313,7 @@ MonoBehaviour: Data: _RoundIsOver - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RoundIsOver @@ -1289,13 +1337,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1319,13 +1367,13 @@ MonoBehaviour: Data: _CameraControllerRound2 - Name: $v Entry: 7 - Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound2 - Name: k__BackingField Entry: 7 - Data: 87|System.RuntimeType, mscorlib + Data: 89|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound2, Assembly-CSharp @@ -1347,54 +1395,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 88|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: _PlayingJailCall - - Name: $v - Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayingJailCall - - Name: k__BackingField - Entry: 9 - Data: 32 - - Name: k__BackingField - Entry: 9 - Data: 32 - - 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: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1418,19 +1418,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PanelToReveal_Cache + Data: _PlayingJailCall - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PanelToReveal_Cache + Data: _PlayingJailCall - Name: k__BackingField Entry: 9 - Data: 74 + Data: 32 - Name: k__BackingField Entry: 9 - Data: 74 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1466,25 +1466,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD + Data: _PanelToReveal_Cache - Name: $v Entry: 7 Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_STANDARD + Data: _PanelToReveal_Cache - Name: k__BackingField - Entry: 7 - Data: 94|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 94 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1499,7 +1493,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1520,19 +1514,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 94 + Entry: 7 + Data: 96|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 94 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1568,19 +1568,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_RED - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 94 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 94 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1616,19 +1616,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_GREEN + Data: COLOR_YELLOW - Name: $v Entry: 7 Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_GREEN + Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 94 + Data: 96 - Name: k__BackingField Entry: 9 - Data: 94 + Data: 96 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1660,6 +1660,55 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_GREEN + - Name: $v + Entry: 7 + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 96 + - Name: k__BackingField + Entry: 9 + Data: 96 + - 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: 103|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/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index 595d5fd..a502e58 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 27 + Data: 29 - Name: Entry: 7 Data: @@ -479,13 +479,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AllowInteractionFromHostCard + Data: _Initialised - Name: k__BackingField Entry: 7 Data: 32|System.RuntimeType, mscorlib @@ -533,16 +533,64 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Maps + Data: _AllowInteractionFromHostCard - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AllowInteractionFromHostCard + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 9 + Data: 32 + - 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: 35|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: _Maps + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Maps - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMap[], Assembly-CSharp @@ -551,7 +599,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 36|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Component[], UnityEngine.CoreModule @@ -572,13 +620,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 40|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -587,7 +635,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -611,13 +659,13 @@ MonoBehaviour: Data: _Markers - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Markers - Name: k__BackingField Entry: 7 - Data: 41|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: FloorMapMarker[], Assembly-CSharp @@ -626,7 +674,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -641,13 +689,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -671,13 +719,13 @@ MonoBehaviour: Data: _CaptureCarmenNewspaper - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaptureCarmenNewspaper - Name: k__BackingField Entry: 7 - Data: 45|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CaptureCarmenNewspaper, Assembly-CSharp @@ -701,13 +749,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -731,13 +779,13 @@ MonoBehaviour: Data: _NewspaperPublicDisplay - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NewspaperPublicDisplay - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 51|System.RuntimeType, mscorlib - Name: Entry: 1 Data: NewspaperDisplay, Assembly-CSharp @@ -761,13 +809,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -791,13 +839,13 @@ MonoBehaviour: Data: _TimerPublicDisplay - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerPublicDisplay - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 55|System.RuntimeType, mscorlib - Name: Entry: 1 Data: TimerDisplay, Assembly-CSharp @@ -821,13 +869,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -851,13 +899,13 @@ MonoBehaviour: Data: _Scoreboard - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Scoreboard - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 59|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SimpleEnable, Assembly-CSharp @@ -881,13 +929,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -911,13 +959,13 @@ MonoBehaviour: Data: _TimerCameraOverlays - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _TimerCameraOverlays - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 63|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraOverlay[], Assembly-CSharp @@ -926,7 +974,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -941,13 +989,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 65|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -971,16 +1019,16 @@ MonoBehaviour: Data: _NewspaperCameraOverlays - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NewspaperCameraOverlays - Name: k__BackingField Entry: 9 - Data: 61 + Data: 63 - Name: k__BackingField Entry: 9 - Data: 36 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -995,13 +1043,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1025,13 +1073,13 @@ MonoBehaviour: Data: _EndingPlayer - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _EndingPlayer - Name: k__BackingField Entry: 7 - Data: 68|System.RuntimeType, mscorlib + Data: 70|System.RuntimeType, mscorlib - Name: Entry: 1 Data: RandomVideoPlayer, Assembly-CSharp @@ -1055,13 +1103,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|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: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1085,13 +1133,13 @@ MonoBehaviour: Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentlyActiveMap - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 74|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1100,7 +1148,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 73|System.RuntimeType, mscorlib + Data: 75|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1121,19 +1169,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 76|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 78|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1157,16 +1205,16 @@ MonoBehaviour: Data: _ActiveMarker - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1181,19 +1229,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 80|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 82|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1217,16 +1265,16 @@ MonoBehaviour: Data: _StageIndex - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StageIndex - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1241,13 +1289,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 85|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1271,13 +1319,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 87|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1286,7 +1334,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 85 + Data: 87 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,7 +1349,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1325,13 +1373,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 88|System.RuntimeType, mscorlib + Data: 90|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1340,7 +1388,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1355,13 +1403,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1385,7 +1433,7 @@ MonoBehaviour: Data: _RunTimer - Name: $v Entry: 7 - Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RunTimer @@ -1409,13 +1457,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 93|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 95|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1439,16 +1487,16 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1463,13 +1511,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 96|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 98|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1493,16 +1541,16 @@ MonoBehaviour: Data: _SuccessCounter - Name: $v Entry: 7 - Data: 97|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 75 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1517,80 +1565,81 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 98|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 99|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 100|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - 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: _FailureCounter - - Name: $v - Entry: 7 - Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _FailureCounter - - Name: k__BackingField - Entry: 9 - Data: 73 - - Name: k__BackingField - Entry: 9 - Data: 73 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 103|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 101|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 104|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 102|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - 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: _FailureCounter + - Name: $v + Entry: 7 + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 75 + - Name: k__BackingField + Entry: 9 + Data: 75 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 106|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1614,13 +1663,13 @@ MonoBehaviour: Data: _CameraControllerRound3 - Name: $v Entry: 7 - Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound3 - Name: k__BackingField Entry: 7 - Data: 106|System.RuntimeType, mscorlib + Data: 108|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound3, Assembly-CSharp @@ -1644,7 +1693,62 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 109|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: _VideoPlayerTimer + - Name: $v + Entry: 7 + Data: 110|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _VideoPlayerTimer + - Name: k__BackingField + Entry: 7 + Data: 111|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 111 + - 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: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index daa337d..a05eb8a 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -1,6 +1,7 @@  using UdonSharp; using UnityEngine; +using UnityEngine.Video; using VRC.SDK3.Data; using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; @@ -63,6 +64,8 @@ public class GameManagerRound3 : GameManagerBase private CameraControllerRound3 _CameraControllerRound3 = null; + private float _VideoPlayerTimer = -1.0f; + void Start() { @@ -73,6 +76,21 @@ public class GameManagerRound3 : GameManagerBase } } + void Update() + { + if (IsRoundInitialised()) + { + if (_VideoPlayerTimer > 0.0f) + { + _VideoPlayerTimer -= Time.deltaTime; + if (_VideoPlayerTimer <= 0.0f) + { + EndVideoPlayerCameraSwitch(); + } + } + } + } + public override void InitialiseGameMode() { @@ -87,6 +105,7 @@ public class GameManagerRound3 : GameManagerBase _Timer = TIMER_LENGTH; _RunTimer = false; + _VideoPlayerTimer = -1.0f; InitialiseMarkers(); GetCurrentMap().RandomiseCountries(); @@ -125,6 +144,8 @@ public class GameManagerRound3 : GameManagerBase _NewspaperPublicDisplay.Activate(false); _TimerPublicDisplay.Activate(false); + _VideoPlayerTimer = -1.0f; + base.DeinitialiseGameMode(); } @@ -545,32 +566,15 @@ public class GameManagerRound3 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CarmenSandiegoTheme); - SendCustomEventDelayedSeconds(nameof(ShowEndingVideo), 2.0f); + _CameraControllerRound3.ActivateMapToEndingCameraSwitcher(); _EndingPlayer.PlayVideo = true; - } - public void ShowEndingVideo() - { - _CameraControllerRound3.DisableAllSwitchers(); - _CameraControllerRound3.SwitchToVideoPlayerCamera(); - _CameraControllerRound3.PlayDoItRockapella(false); - SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f); + _VideoPlayerTimer = _EndingPlayer.GetDuration() - _CameraControllerRound3.MapToEndingTimerToggle.GetTimeBetweenCuts(0); } - public void CheckVideoPlayerTimeToEnd() + public void EndVideoPlayerCameraSwitch() { - if (_EndingPlayer.PlayVideo == true) - { - if ((_EndingPlayer.GetDuration() - _EndingPlayer.GetTime()) <= 2.0f) - { - _CameraControllerRound3.DisableAllSwitchers(); - _CameraControllerRound3.SwitchToOverheadCamera(); - } - else - { - SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f); - } - } + _CameraControllerRound3.ActivateFrontOverheadCameraSwitcher(); } @@ -586,8 +590,8 @@ public class GameManagerRound3 : GameManagerBase _CameraControllerRound3.SwitchToFrontCamera(); _CameraControllerRound3.DeinitialiseCameras(); - DeinitialiseGameplayCameraFollowers(); - DeinitialiseEndingCameraFollowers(); + _CameraControllerRound3.PlayIFeelGood(false); + _CameraControllerRound3.PlayDoItRockapella(false); _CaseManager.EndGame(); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 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: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 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: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 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: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 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: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 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: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 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: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 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: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: