From fb3106efcb5f0a9541774c3b2da5d60f5a59e9eb Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Mon, 18 Aug 2025 18:22:13 -0400 Subject: [PATCH] - Case list is now only shown for the instance owner or master. - Player teleport buttons disappear when the linked podium has an owner. - Fixed podium interaction setting the wrong owner. - Buzzers get GameManager from podium, rather than directly using the podium's. --- .../ACME Crimenet Computer.prefab | 2 +- Assets/Prefabs/Player Podium.prefab | 26 +- Assets/Scenes/witwics.unity | 113 ++-- .../UdonSharp/Game Managers/CaseManager.asset | 545 ++++++++++-------- Assets/UdonSharp/Game Managers/CaseManager.cs | 17 +- .../Game Managers/CaseManagerListView.cs | 38 +- Assets/UdonSharp/Podium/Buzzer.asset | 56 +- Assets/UdonSharp/Podium/Buzzer.cs | 11 +- Assets/UdonSharp/Podium/PlayerPodium.asset | 518 +++++++++-------- Assets/UdonSharp/Podium/PlayerPodium.cs | 7 +- 10 files changed, 773 insertions(+), 560 deletions(-) diff --git a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab index c72e9b7..0312428 100644 --- a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab +++ b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab @@ -1412,7 +1412,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 131388005b2ec2642baed4dde9ef0e65, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2753820406339078421, guid: 131388005b2ec2642baed4dde9ef0e65, type: 3} diff --git a/Assets/Prefabs/Player Podium.prefab b/Assets/Prefabs/Player Podium.prefab index ec8014a..d321e92 100644 --- a/Assets/Prefabs/Player Podium.prefab +++ b/Assets/Prefabs/Player Podium.prefab @@ -1368,13 +1368,14 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2656281140157091124} PlayerNumber: 0 - GameManager: {fileID: 0} + _GameManager: {fileID: 0} + _TeleportButton: {fileID: 0} _ChoiceCards: {fileID: 4424524232366912296} _RiskCards: {fileID: 5882532645313673403} _Buzzer: {fileID: 1145695079806890482} _AuxiliaryVideoScreen: {fileID: 0} _AuxiliaryMapScreen: {fileID: 0} - _OwnershipInteract: {fileID: 8814897757574724452} + _OwnershipInteract: {fileID: 2288460166211710674} _BuzzedInEffect: {fileID: 6181750060712598379} _ScorecardObject: {fileID: 5278643753074928947} _NameplateUI: {fileID: 5247165531706728442} @@ -1634,8 +1635,8 @@ GameObject: m_Component: - component: {fileID: 6009663483960469181} - component: {fileID: 6651298706543437401} - - component: {fileID: 8814897757574724452} - - component: {fileID: 2291351857899888675} + - component: {fileID: 2288460166211710674} + - component: {fileID: 480585817991929088} m_Layer: 0 m_Name: Ownership Interact m_TagString: Untagged @@ -1679,7 +1680,7 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.78, y: 1.05, z: 0.55} m_Center: {x: 0, y: 0.5, z: -0.25} ---- !u!114 &8814897757574724452 +--- !u!114 &2288460166211710674 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1688,7 +1689,7 @@ MonoBehaviour: m_GameObject: {fileID: 8130541693384049610} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ccb7b052121dcd747a3745ce76f794d5, type: 3} + m_Script: {fileID: 11500000, guid: 0ce295bc35d40dd4c82081275b392c56, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -1700,11 +1701,10 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 2291351857899888675} + _udonSharpBackingUdonBehaviour: {fileID: 480585817991929088} _Target: {fileID: 1226214083704227558} _EventName: SetPlayerName - _NetworkEventTarget: 1 ---- !u!114 &2291351857899888675 +--- !u!114 &480585817991929088 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1717,16 +1717,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: interactTextPlacement: {fileID: 0} - interactText: Take Ownership + interactText: Use interactTextGO: {fileID: 0} - proximity: 0.1 + proximity: 2 SynchronizePosition: 0 AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 0 - serializedProgramAsset: {fileID: 11400000, guid: f4a916bdf8d504742a69d81ce2334391, + serializedProgramAsset: {fileID: 11400000, guid: 788c1198ec928d84ca21dcac058c51eb, type: 2} - programSource: {fileID: 11400000, guid: 7981840ff42c05f4f951e74803bd7452, type: 2} + programSource: {fileID: 11400000, guid: 0d8a2e1bd96144840bbc9095a926631b, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 2de1e57..291f686 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -7264,6 +7264,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 2 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 515404446} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _TeleportButton + value: + objectReference: {fileID: 1345601812} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryMapScreen @@ -7296,6 +7306,12 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -26664,12 +26680,6 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 841163053} - _QuestionURL: - url: https://witwics-dev.github.io/TheWilliamsburglary.json - _Round1Manager: {fileID: 515404446} - _Round2Manager: {fileID: 865296978} - _Round3Manager: {fileID: 969831474} - _HostCard: {fileID: 379391087} CrookPortraits: - {fileID: 2800000, guid: a62e19c8949d6ff40b648cb64023eb59, type: 3} - {fileID: 2800000, guid: 867f4ce5530ce114ca449b7e1d916a17, type: 3} @@ -26681,6 +26691,11 @@ MonoBehaviour: - {fileID: 2800000, guid: a93cc070c3a45ed46a5bea72450a816a, type: 3} - {fileID: 2800000, guid: d53f63ff95d754e43a90e613d06deda5, type: 3} - {fileID: 2800000, guid: 81347045e06c7034b8ec7bbca4575052, type: 3} + _Round1Manager: {fileID: 515404446} + _Round2Manager: {fileID: 865296978} + _Round3Manager: {fileID: 969831474} + _HostCard: {fileID: 379391087} + _CaseManagerList: {fileID: 1145254423} --- !u!4 &841163055 Transform: m_ObjectHideFlags: 0 @@ -28025,6 +28040,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 3 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 515404446} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _TeleportButton + value: + objectReference: {fileID: 415771683} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryMapScreen @@ -28057,6 +28082,12 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -70530,6 +70561,16 @@ PrefabInstance: propertyPath: PlayerNumber value: 1 objectReference: {fileID: 0} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _GameManager + value: + objectReference: {fileID: 515404446} + - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _TeleportButton + value: + objectReference: {fileID: 2139493428} - target: {fileID: 1226214083704227558, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _AuxiliaryMapScreen @@ -70562,6 +70603,12 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2288460166211710674, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: _syncMethod @@ -71432,7 +71479,7 @@ PrefabInstance: - target: {fileID: 5334625421790337684, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5334625421790337684, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} @@ -71785,6 +71832,11 @@ PrefabInstance: value: objectReference: {fileID: 9010345603623065137, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} + - target: {fileID: 9214353908513913944, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: sleepFlag + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9214353908513913944, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: serializationData.Prefab @@ -72723,39 +72775,34 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 68c7d547c0d7542429e36f9a891362ec, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index f50fb61..7bcca24 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -50,19 +50,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _QuestionURL + Data: CrookPortraits - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _QuestionURL + Data: CrookPortraits - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDKBase.VRCUrl, VRCSDKBase + Data: UnityEngine.Texture[], UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -86,10 +86,19 @@ MonoBehaviour: Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 5|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 5|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Global Case Assets + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 6|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -113,13 +122,13 @@ MonoBehaviour: Data: _Round1Manager - Name: $v Entry: 7 - Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Round1Manager - Name: k__BackingField Entry: 7 - Data: 7|System.RuntimeType, mscorlib + Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameManagerRound1, Assembly-CSharp @@ -128,7 +137,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 8|System.RuntimeType, mscorlib + Data: 9|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.Udon.UdonBehaviour, VRC.Udon @@ -149,13 +158,31 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 11|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 12|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Managers + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,13 +206,13 @@ MonoBehaviour: Data: _Round2Manager - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Round2Manager - Name: k__BackingField Entry: 7 - Data: 12|System.RuntimeType, mscorlib + Data: 15|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameManagerRound2, Assembly-CSharp @@ -194,7 +221,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -209,13 +236,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -239,13 +266,13 @@ MonoBehaviour: Data: _Round3Manager - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Round3Manager - Name: k__BackingField Entry: 7 - Data: 16|System.RuntimeType, mscorlib + Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 Data: GameManagerRound3, Assembly-CSharp @@ -254,7 +281,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -269,13 +296,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -299,13 +326,13 @@ MonoBehaviour: Data: _HostCard - Name: $v Entry: 7 - Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _HostCard - Name: k__BackingField Entry: 7 - Data: 20|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 Data: HostCardManager, Assembly-CSharp @@ -314,7 +341,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,13 +356,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -356,25 +383,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: CrookPortraits + Data: _CaseManagerList - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: CrookPortraits + Data: _CaseManagerList - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Texture[], UnityEngine.CoreModule + Data: CaseManagerListView, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 24 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -387,60 +414,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 26|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: _CaseFileCluesURL - - Name: $v - Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseFileCluesURL - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 9 - Data: 3 - - 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: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -449,7 +422,7 @@ MonoBehaviour: Data: 1 - Name: Entry: 7 - Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -470,19 +443,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: $v Entry: 7 Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileLootImage + Data: _CaseFileCluesURL - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl, VRCSDKBase + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -497,13 +476,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -524,25 +503,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileMaps + Data: _CaseFileLootImage - Name: k__BackingField - Entry: 7 - Data: 34|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDKBase.VRCUrl[], VRCSDKBase - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 31 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -584,19 +557,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileVideos + Data: _CaseFileMaps - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileMaps + - Name: k__BackingField + Entry: 7 + Data: 38|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.SDKBase.VRCUrl[], VRCSDKBase + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 38 + - 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: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 40|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _CaseFileVideos + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileVideos - Name: k__BackingField Entry: 9 - Data: 34 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 34 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -611,13 +644,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|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: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -641,76 +674,16 @@ MonoBehaviour: Data: _CaseFileClueImages - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseFileClueImages - Name: k__BackingField Entry: 9 - Data: 34 + Data: 38 - Name: k__BackingField Entry: 9 - Data: 34 - - 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 42|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: 7 - Data: - - Name: $k - Entry: 1 - Data: _CaseTitle - - Name: $v - Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseTitle - - Name: k__BackingField - Entry: 7 - Data: 44|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String, mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 44 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -752,19 +725,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseDescription + Data: _CaseTitle - Name: $v Entry: 7 Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseTitle + - Name: k__BackingField + Entry: 7 + Data: 48|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 48 + - 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: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 50|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _CaseDescription + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseDescription - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -779,13 +812,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 48|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: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 53|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -809,16 +842,16 @@ MonoBehaviour: Data: _CaseIntroVideoTranscript - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CaseIntroVideoTranscript - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -833,13 +866,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 51|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: 52|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -863,16 +896,16 @@ MonoBehaviour: Data: _StolenLoot - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _StolenLoot - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 44 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -887,13 +920,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -917,13 +950,13 @@ MonoBehaviour: Data: _AccusedCrook - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AccusedCrook - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 61|System.RuntimeType, mscorlib - Name: Entry: 1 Data: AccusedCrook, Assembly-CSharp @@ -932,7 +965,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 7 - Data: 58|System.RuntimeType, mscorlib + Data: 62|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -951,66 +984,6 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 60|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: 7 - Data: - - Name: $k - Entry: 1 - Data: _CurrentWinningPlayers - - Name: $v - Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CurrentWinningPlayers - - Name: k__BackingField - Entry: 7 - Data: 62|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.String[], mscorlib - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 62 - - 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: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1040,16 +1013,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CaseFileDictionary + Data: _CurrentWinningPlayers - Name: k__BackingField Entry: 7 Data: 66|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 68|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: 7 + Data: + - Name: $k + Entry: 1 + Data: _CaseFileDictionary + - Name: $v + Entry: 7 + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CaseFileDictionary + - Name: k__BackingField + Entry: 7 + Data: 70|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 @@ -1058,7 +1091,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 @@ -1073,7 +1106,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index f59ca84..9b13929 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -27,15 +27,17 @@ public enum AccusedCrook [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CaseManager : UdonSharpBehaviour { - [SerializeField] protected VRCUrl _QuestionURL; + [Header("Global Case Assets")] + [SerializeField] private Texture[] CrookPortraits; + [Space, Header("Managers")] [SerializeField] private GameManagerRound1 _Round1Manager; [SerializeField] private GameManagerRound2 _Round2Manager; [SerializeField] private GameManagerRound3 _Round3Manager; [SerializeField] private HostCardManager _HostCard; - [SerializeField] private Texture[] CrookPortraits; + [SerializeField] private CaseManagerListView _CaseManagerList; [UdonSynced] private VRCUrl _CaseFileCluesURL; [UdonSynced] private VRCUrl _CaseFileLootImage; @@ -54,6 +56,17 @@ public class CaseManager : UdonSharpBehaviour private DataDictionary _CaseFileDictionary; + public override void OnPlayerJoined(VRCPlayerApi Player) + { + if (Player.isLocal) + { + _CaseManagerList.gameObject.SetActive(Player.isInstanceOwner || Player.isMaster); + } + + base.OnPlayerJoined(Player); + } + + public void LoadCaseFile(CaseManagerListEntry CaseFile) { _CaseFileCluesURL = CaseFile.CaseFileURL; diff --git a/Assets/UdonSharp/Game Managers/CaseManagerListView.cs b/Assets/UdonSharp/Game Managers/CaseManagerListView.cs index ec4a29c..76aca85 100644 --- a/Assets/UdonSharp/Game Managers/CaseManagerListView.cs +++ b/Assets/UdonSharp/Game Managers/CaseManagerListView.cs @@ -10,35 +10,35 @@ using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CaseManagerListView : UdonSharpBehaviour { + //[UdonSynced] private DataDictionary PlayerData = new DataDictionary(); + //[SerializeField] private RectTransform _ListContainer; //[SerializeField] private GameObject _CaseListViewEntryTemplate; - //private DataDictionary PlayerData = new DataDictionary(); - //public override void OnPlayerJoined(VRCPlayerApi Player) //{ - // GameObject NewListItem = Instantiate(_CaseListViewEntryTemplate, _ListContainer, false); - // NewListItem.SetActive(true); - // PermissionsPanelPlayerEntry PlayerListItem = NewListItem.GetComponent(); - // PlayerListItem.PlayerNameUI.text = Player.displayName; + //GameObject NewListItem = Instantiate(_CaseListViewEntryTemplate, _ListContainer, false); + //NewListItem.SetActive(true); + //PermissionsPanelPlayerEntry PlayerListItem = NewListItem.GetComponent(); + //PlayerListItem.PlayerNameUI.text = Player.displayName; - // PlayerData[Player.displayName] = new DataDictionary(); - // PlayerData[Player.displayName].DataDictionary["Admin"] = Player.isInstanceOwner; - // PlayerData[Player.displayName].DataDictionary["Host"] = Player.isInstanceOwner; - // PlayerData[Player.displayName].DataDictionary["Camera"] = Player.isInstanceOwner; + //PlayerData[Player.displayName] = new DataDictionary(); + //PlayerData[Player.displayName].DataDictionary["Admin"] = Player.isInstanceOwner; + //PlayerData[Player.displayName].DataDictionary["Host"] = Player.isInstanceOwner; + //PlayerData[Player.displayName].DataDictionary["Camera"] = Player.isInstanceOwner; - // if (Networking.LocalPlayer.isInstanceOwner) - // { - // PlayerListItem.AdminToggle.interactable = true; - // PlayerListItem.HostToggle.interactable = true; - // PlayerListItem.CameraToggle.interactable = true; + //if (Networking.LocalPlayer.isInstanceOwner) + //{ + // PlayerListItem.AdminToggle.interactable = true; + // PlayerListItem.HostToggle.interactable = true; + // PlayerListItem.CameraToggle.interactable = true; - // PlayerListItem.AdminToggle.SetIsOnWithoutNotify(true); - // PlayerListItem.HostToggle.SetIsOnWithoutNotify(true); - // PlayerListItem.CameraToggle.SetIsOnWithoutNotify(true); - // } + // PlayerListItem.AdminToggle.SetIsOnWithoutNotify(true); + // PlayerListItem.HostToggle.SetIsOnWithoutNotify(true); + // PlayerListItem.CameraToggle.SetIsOnWithoutNotify(true); + //} // base.OnPlayerJoined(Player); //} diff --git a/Assets/UdonSharp/Podium/Buzzer.asset b/Assets/UdonSharp/Podium/Buzzer.asset index 876ac81..d27a824 100644 --- a/Assets/UdonSharp/Podium/Buzzer.asset +++ b/Assets/UdonSharp/Podium/Buzzer.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: @@ -105,6 +105,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _GameManager + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _GameManager + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: GameManagerRound1, Assembly-CSharp + - Name: + Entry: 8 + Data: + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 8|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/Podium/Buzzer.cs b/Assets/UdonSharp/Podium/Buzzer.cs index 9c8713d..2d1dad6 100644 --- a/Assets/UdonSharp/Podium/Buzzer.cs +++ b/Assets/UdonSharp/Podium/Buzzer.cs @@ -10,12 +10,21 @@ public class Buzzer : UdonSharpBehaviour { public PlayerPodium Podium; + private GameManagerRound1 _GameManager; + + + public void SetGameManager(GameManagerRound1 Manager) + { + _GameManager = Manager; + } + public override void OnPickupUseDown() { VRCPlayerApi LocalPlayer = Networking.LocalPlayer; if (Podium.GetPlayerID() == LocalPlayer.playerId) { - NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)Podium.GameManager, NetworkEventTarget.All, "PlayerBuzzedIn", Podium.PlayerNumber); + _GameManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlayerBuzzedIn", Podium.PlayerNumber); } base.OnPickupUseDown(); diff --git a/Assets/UdonSharp/Podium/PlayerPodium.asset b/Assets/UdonSharp/Podium/PlayerPodium.asset index b43f697..9cc32cb 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.asset +++ b/Assets/UdonSharp/Podium/PlayerPodium.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 17 + Data: 18 - Name: Entry: 7 Data: @@ -104,13 +104,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: GameManager + Data: _GameManager - Name: $v Entry: 7 Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: GameManager + Data: _GameManager - Name: k__BackingField Entry: 7 Data: 6|System.RuntimeType, mscorlib @@ -170,19 +170,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerName + Data: _TeleportButton - Name: $v Entry: 7 Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerName + Data: _TeleportButton - Name: k__BackingField Entry: 7 Data: 11|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String, mscorlib + Data: UnityEngine.GameObject, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -193,29 +193,23 @@ MonoBehaviour: 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 13|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 14|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -236,19 +230,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PlayerID + Data: _PlayerName - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PlayerID + Data: _PlayerName - Name: k__BackingField - Entry: 9 - Data: 3 + Entry: 7 + Data: 15|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 3 + Data: 15 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -266,13 +266,73 @@ MonoBehaviour: Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 17|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 18|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: _PlayerID + - Name: $v + Entry: 7 + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayerID + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -293,7 +353,7 @@ MonoBehaviour: Data: _PlayerScore - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayerScore @@ -317,19 +377,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 20|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 24|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 21|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 25|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -353,13 +413,13 @@ MonoBehaviour: Data: _ShowScoreCard - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ShowScoreCard - Name: k__BackingField Entry: 7 - Data: 23|System.RuntimeType, mscorlib + Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -368,67 +428,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 23 - - 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: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 26|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: _EnableOwnershipTransfer - - Name: $v - Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _EnableOwnershipTransfer - - Name: k__BackingField - Entry: 9 - Data: 23 - - Name: k__BackingField - Entry: 9 - Data: 23 + Data: 27 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -476,16 +476,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChoiceCards + Data: _EnableOwnershipTransfer - Name: $v Entry: 7 Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EnableOwnershipTransfer + - Name: k__BackingField + Entry: 9 + Data: 27 + - Name: k__BackingField + Entry: 9 + Data: 27 + - 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: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 34|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: _ChoiceCards + - Name: $v + Entry: 7 + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ChoiceCards - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ChoiceCardGroup, Assembly-CSharp @@ -509,13 +569,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -524,73 +584,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 35|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 39|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Objects - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 36|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: _RiskCards - - Name: $v - Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _RiskCards - - Name: k__BackingField - Entry: 7 - Data: 38|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: RiskCardGroup, Assembly-CSharp - - 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: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -614,19 +614,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Buzzer + Data: _RiskCards - Name: $v Entry: 7 Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Buzzer + Data: _RiskCards - Name: k__BackingField Entry: 7 Data: 42|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Buzzer, Assembly-CSharp + Data: RiskCardGroup, Assembly-CSharp - Name: Entry: 8 Data: @@ -674,25 +674,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AuxiliaryVideoScreen + Data: _Buzzer - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AuxiliaryVideoScreen + Data: _Buzzer - Name: k__BackingField Entry: 7 Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule + Data: Buzzer, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -734,19 +734,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AuxiliaryMapScreen + Data: _AuxiliaryVideoScreen - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AuxiliaryMapScreen + Data: _AuxiliaryVideoScreen - Name: k__BackingField - Entry: 9 - Data: 46 + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -761,13 +767,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|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: 51|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -788,25 +794,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _OwnershipInteract + Data: _AuxiliaryMapScreen - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _OwnershipInteract + Data: _AuxiliaryMapScreen - Name: k__BackingField - Entry: 7 - Data: 53|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CustomNetworkEventInteraction, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 50 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 50 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -848,25 +848,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BuzzedInEffect + Data: _OwnershipInteract - Name: $v Entry: 7 Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _BuzzedInEffect + Data: _OwnershipInteract - Name: k__BackingField Entry: 7 Data: 57|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.GameObject, UnityEngine.CoreModule + Data: CustomEventInteraction, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 7 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -884,28 +884,10 @@ MonoBehaviour: Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 60|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Effects - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -926,19 +908,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ScorecardObject + Data: _BuzzedInEffect - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ScorecardObject + Data: _BuzzedInEffect - Name: k__BackingField Entry: 9 - Data: 57 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 57 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -953,10 +935,28 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 3 + - Name: + Entry: 7 + Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 63|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + - Name: header + Entry: 1 + Data: Effects + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -980,25 +980,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _NameplateUI + Data: _ScorecardObject - Name: $v Entry: 7 Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _NameplateUI + Data: _ScorecardObject - Name: k__BackingField - Entry: 7 - Data: 66|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 11 - Name: k__BackingField Entry: 9 - Data: 66 + Data: 11 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1013,13 +1007,13 @@ MonoBehaviour: 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: 1 - Name: Entry: 7 - Data: 68|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1040,19 +1034,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ScorecardUI + Data: _NameplateUI - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ScorecardUI + Data: _NameplateUI - Name: k__BackingField - Entry: 9 - Data: 66 + Entry: 7 + Data: 69|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 66 + Data: 69 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1089,6 +1089,60 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ScorecardUI + - Name: $v + Entry: 7 + Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ScorecardUI + - Name: k__BackingField + Entry: 9 + Data: 69 + - Name: k__BackingField + Entry: 9 + Data: 69 + - 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: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 74|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: 13 Data: diff --git a/Assets/UdonSharp/Podium/PlayerPodium.cs b/Assets/UdonSharp/Podium/PlayerPodium.cs index 00fb42f..3bd37cb 100644 --- a/Assets/UdonSharp/Podium/PlayerPodium.cs +++ b/Assets/UdonSharp/Podium/PlayerPodium.cs @@ -13,7 +13,8 @@ public class PlayerPodium : UdonSharpBehaviour { public int PlayerNumber = 0; - [SerializeField] public GameManagerRound1 GameManager; + [SerializeField] private GameManagerRound1 _GameManager; + [SerializeField] private GameObject _TeleportButton; [UdonSynced, FieldChangeCallback(nameof(PlayerName))] private string _PlayerName = "Player"; [UdonSynced] private int _PlayerID = -1; @@ -31,7 +32,7 @@ public class PlayerPodium : UdonSharpBehaviour [SerializeField] private Transform _AuxiliaryVideoScreen; [SerializeField] private Transform _AuxiliaryMapScreen; - [SerializeField] private CustomNetworkEventInteraction _OwnershipInteract; + [SerializeField] private CustomEventInteraction _OwnershipInteract; [Space] @@ -47,6 +48,7 @@ public class PlayerPodium : UdonSharpBehaviour void Start() { ResetPodium(); + _Buzzer.SetGameManager(_GameManager); } @@ -257,6 +259,7 @@ public class PlayerPodium : UdonSharpBehaviour { _EnableOwnershipTransfer = value; _OwnershipInteract.gameObject.SetActive(_EnableOwnershipTransfer); + _TeleportButton.SetActive(_EnableOwnershipTransfer); } get => _EnableOwnershipTransfer; }