From bc2ca5cc2f829d68ad85579f941fc3169bd91e1f Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sun, 22 Mar 2026 20:40:48 -0400 Subject: [PATCH] Added an overhead scoreboard so players can see the final round timer. --- Assembly-CSharp.csproj | 1 + .../Materials/Timer/M_TimerCrosshairs_UI.mat | 2 +- Assets/Scenes/witwics.unity | 508 ++++++++++++++++-- .../Game Managers/GameManagerRound3.asset | 314 ++++++----- .../Game Managers/GameManagerRound3.cs | 5 +- Assets/UdonSharp/SimpleEnable.asset | 173 ++++++ Assets/UdonSharp/SimpleEnable.asset.meta | 8 + Assets/UdonSharp/SimpleEnable.cs | 33 ++ Assets/UdonSharp/SimpleEnable.cs.meta | 11 + .../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 +- 16 files changed, 883 insertions(+), 186 deletions(-) create mode 100644 Assets/UdonSharp/SimpleEnable.asset create mode 100644 Assets/UdonSharp/SimpleEnable.asset.meta create mode 100644 Assets/UdonSharp/SimpleEnable.cs create mode 100644 Assets/UdonSharp/SimpleEnable.cs.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 15a35c5..a212f73 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -148,6 +148,7 @@ + diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat index 1be75bd..eedb8ea 100644 --- a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat +++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat @@ -93,7 +93,7 @@ Material: - _Thickness: 0.07 - _UVSec: 0 - _VerticalLineCorrection: 0 - - _WiperProgress: 0.95555556 + - _WiperProgress: 0.82222223 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 4a9ac52..5ff71ff 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -8971,6 +8971,112 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &135196311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135196312} + - component: {fileID: 135196315} + - component: {fileID: 135196314} + - component: {fileID: 135196313} + m_Layer: 0 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &135196312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135196311} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.3659481, y: 0, z: -0.0001} + m_LocalScale: {x: 0.2345821, y: 0.87458456, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2116879946} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!64 &135196313 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135196311} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &135196314 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135196311} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 39976bce5d49cbf42912dee6e930edb1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &135196315 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 135196311} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &136046106 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2335793318059188687, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -23694,6 +23800,89 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &520085223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520085224} + - component: {fileID: 520085226} + - component: {fileID: 520085225} + m_Layer: 0 + m_Name: Scoreboard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &520085224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520085223} + serializedVersion: 2 + m_LocalRotation: {x: -0.13645251, y: 0.69381607, z: 0.13645254, w: 0.69381607} + m_LocalPosition: {x: -14.08, y: 7.66, z: 2.4100003} + m_LocalScale: {x: 0.63479, y: 0.63479, z: 0.63479} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2116879946} + m_Father: {fileID: 1276291775} + m_LocalEulerAnglesHint: {x: -22.253, y: 90, z: 0} +--- !u!114 &520085225 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520085223} + 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: a09f238482b841d43b348f6abbcc1fe1, + type: 2} + programSource: {fileID: 11400000, guid: e58fc9ffa576cd84a8447f007c9fbaae, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &520085226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520085223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4dff40a52ffd0c49a995c2ee074bebf, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 520085225} + _ToggledObject: {fileID: 2116879945} --- !u!1 &521074337 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1564876747245225317, guid: 40955da061a841841a91c845049f1e11, @@ -39869,6 +40058,7 @@ MonoBehaviour: _CaptureCarmenNewspaper: {fileID: 2128547811} _NewspaperPublicDisplay: {fileID: 107399075} _TimerPublicDisplay: {fileID: 1472688267} + _Scoreboard: {fileID: 520085226} _TimerCameraOverlays: - {fileID: 1498879997} - {fileID: 699852686} @@ -51931,6 +52121,7 @@ Transform: - {fileID: 772205214} - {fileID: 107399073} - {fileID: 1472688265} + - {fileID: 520085224} - {fileID: 1762618933} - {fileID: 1657587667} - {fileID: 1264786912} @@ -53221,6 +53412,112 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1 &1321451805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1321451806} + - component: {fileID: 1321451809} + - component: {fileID: 1321451808} + - component: {fileID: 1321451807} + m_Layer: 0 + m_Name: Counter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1321451806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321451805} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.3659481, y: 0, z: -0.0001} + m_LocalScale: {x: 0.2345821, y: 0.87458456, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2116879946} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!64 &1321451807 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321451805} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1321451808 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321451805} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 7972f00661b47a448a7252e73486dd75, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1321451809 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321451805} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1323181828 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6607539995070823780, guid: be33bc7f6c414e6409becfa348b9310d, @@ -89836,6 +90133,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &2116879945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2116879946} + - component: {fileID: 2116879949} + - component: {fileID: 2116879948} + - component: {fileID: 2116879947} + m_Layer: 0 + m_Name: Backboard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 0 +--- !u!4 &2116879946 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116879945} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 4.2629, y: 1.1434, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1321451806} + - {fileID: 135196312} + m_Father: {fileID: 520085224} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &2116879947 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116879945} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2116879948 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116879945} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2116879949 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2116879945} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2117121112 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5528668082601892028, guid: e9914385266bca24db809c39e395f03c, @@ -99293,85 +99698,84 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, 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: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} + - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} - - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} + - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} @@ -104890,6 +105294,10 @@ MonoBehaviour: ID: 1316 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 520085223} + ID: 1317 + 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/Game Managers/GameManagerRound3.asset b/Assets/UdonSharp/Game Managers/GameManagerRound3.asset index f70e861..ce3b2b7 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: 25 + Data: 26 - Name: Entry: 7 Data: @@ -848,25 +848,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _TimerCameraOverlays + Data: _Scoreboard - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _TimerCameraOverlays + Data: _Scoreboard - Name: k__BackingField Entry: 7 Data: 57|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: TimerOverlay[], Assembly-CSharp + Data: SimpleEnable, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 36 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -908,25 +908,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _EndingPlayer + Data: _TimerCameraOverlays - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _EndingPlayer + Data: _TimerCameraOverlays - Name: k__BackingField Entry: 7 Data: 61|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: RandomVideoPlayer, Assembly-CSharp + Data: TimerOverlay[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -968,58 +968,46 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentlyActiveMap + Data: _EndingPlayer - Name: $v Entry: 7 Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentlyActiveMap + Data: _EndingPlayer - Name: k__BackingField Entry: 7 Data: 65|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ContinentMap, Assembly-CSharp + Data: RandomVideoPlayer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField - Entry: 7 - Data: 66|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Int32, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 69|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1040,19 +1028,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ActiveMarker + Data: _CurrentlyActiveMap - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ActiveMarker + Data: _CurrentlyActiveMap - Name: k__BackingField - Entry: 9 - Data: 66 + Entry: 7 + Data: 69|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ContinentMap, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField - Entry: 9 - Data: 66 + Entry: 7 + Data: 70|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1100,19 +1100,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: $v Entry: 7 Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _ActiveMarker - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1130,13 +1130,73 @@ MonoBehaviour: Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 77|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: _StageIndex + - Name: $v + Entry: 7 + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _StageIndex + - Name: k__BackingField + Entry: 9 + Data: 70 + - Name: k__BackingField + Entry: 9 + Data: 70 + - 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: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -1157,13 +1217,13 @@ MonoBehaviour: Data: _ContinentData - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ContinentData - Name: k__BackingField Entry: 7 - Data: 78|System.RuntimeType, mscorlib + Data: 82|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1172,7 +1232,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 78 + Data: 82 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1187,7 +1247,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1211,13 +1271,13 @@ MonoBehaviour: Data: _GameStatus - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _GameStatus - Name: k__BackingField Entry: 7 - Data: 81|System.RuntimeType, mscorlib + Data: 85|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameStatus, Assembly-CSharp @@ -1226,7 +1286,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1241,13 +1301,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|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: 83|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 87|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1271,7 +1331,7 @@ MonoBehaviour: Data: _RunTimer - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _RunTimer @@ -1295,13 +1355,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 90|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1325,16 +1385,16 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1349,13 +1409,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 89|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 93|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1377,78 +1437,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _SuccessCounter - - Name: $v - Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _SuccessCounter - - Name: k__BackingField - Entry: 9 - Data: 66 - - Name: k__BackingField - Entry: 9 - Data: 66 - - 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 92|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 93|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: 94|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _FailureCounter + Data: _SuccessCounter - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 70 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1496,16 +1496,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound3 + Data: _FailureCounter - Name: $v Entry: 7 Data: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FailureCounter + - Name: k__BackingField + Entry: 9 + Data: 70 + - Name: k__BackingField + Entry: 9 + Data: 70 + - 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: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 100|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 101|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: _CameraControllerRound3 + - Name: $v + Entry: 7 + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraControllerRound3 - Name: k__BackingField Entry: 7 - Data: 99|System.RuntimeType, mscorlib + Data: 103|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound3, Assembly-CSharp @@ -1529,7 +1589,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 104|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 9828e2e..38e8a14 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -39,6 +39,7 @@ public class GameManagerRound3 : GameManagerBase [SerializeField] private CaptureCarmenNewspaper _CaptureCarmenNewspaper; [SerializeField] private NewspaperDisplay _NewspaperPublicDisplay; [SerializeField] private TimerDisplay _TimerPublicDisplay; + [SerializeField] private SimpleEnable _Scoreboard; [SerializeField] private TimerOverlay[] _TimerCameraOverlays; [SerializeField] private RandomVideoPlayer _EndingPlayer; @@ -93,6 +94,7 @@ public class GameManagerRound3 : GameManagerBase _CaptureCarmenNewspaper.ResetAnimation(); _NewspaperPublicDisplay.Activate(false); _TimerPublicDisplay.Initialise(); + _Scoreboard.Enable(false); SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false); @@ -208,6 +210,7 @@ public class GameManagerRound3 : GameManagerBase BetweenRoundsInterface.HeaderUI.text = RoundSegmentTypeToString(RoundSegmentType.CaptureCarmen); BetweenRoundsInterface.CommentUI.text = "On your mark...\nGet set..."; + _Scoreboard.Enable(true); foreach (TimerOverlay Overlay in _TimerCameraOverlays) { Overlay.EnableOverlayElements(true); @@ -479,7 +482,7 @@ public class GameManagerRound3 : GameManagerBase Interface.CommentUI.text = ""; _NewspaperPublicDisplay.Activate(false); - + _Scoreboard.Enable(false); foreach (TimerOverlay Overlay in _TimerCameraOverlays) { Overlay.EnableOverlayElements(false); diff --git a/Assets/UdonSharp/SimpleEnable.asset b/Assets/UdonSharp/SimpleEnable.asset new file mode 100644 index 0000000..1467952 --- /dev/null +++ b/Assets/UdonSharp/SimpleEnable.asset @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: SimpleEnable + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: a09f238482b841d43b348f6abbcc1fe1, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: a4dff40a52ffd0c49a995c2ee074bebf, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 4942863876421551108 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ToggledObject + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ToggledObject + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: _Enabled + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Enabled + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/SimpleEnable.asset.meta b/Assets/UdonSharp/SimpleEnable.asset.meta new file mode 100644 index 0000000..f7819a7 --- /dev/null +++ b/Assets/UdonSharp/SimpleEnable.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e58fc9ffa576cd84a8447f007c9fbaae +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/SimpleEnable.cs b/Assets/UdonSharp/SimpleEnable.cs new file mode 100644 index 0000000..64464e6 --- /dev/null +++ b/Assets/UdonSharp/SimpleEnable.cs @@ -0,0 +1,33 @@ + +using UdonSharp; +using UnityEngine; +using VRC.Udon.Common; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class SimpleEnable : UdonSharpBehaviour +{ + [SerializeField] private GameObject _ToggledObject; + + [UdonSynced] private bool _Enabled = false; + + + public override void OnDeserialization(DeserializationResult Result) + { + _EnableObject_Synced(); + + base.OnDeserialization(Result); + } + + + public void Enable(bool Enable) + { + _Enabled = Enable; + _EnableObject_Synced(); + RequestSerialization(); + } + private void _EnableObject_Synced() + { + _ToggledObject.SetActive(_Enabled); + } +} diff --git a/Assets/UdonSharp/SimpleEnable.cs.meta b/Assets/UdonSharp/SimpleEnable.cs.meta new file mode 100644 index 0000000..d528e44 --- /dev/null +++ b/Assets/UdonSharp/SimpleEnable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4dff40a52ffd0c49a995c2ee074bebf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: