From 8b6604da2409e67ebebe3d12e0d97813fa2b55c6 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sat, 9 May 2026 13:59:29 -0400 Subject: [PATCH] - Modem now has markers for where players should stand to be teleported. - Jail call camera overlay now syncs crook portraits properly. - Ownership of wanted/missing posters and jail call overlay is properly set. --- Assembly-CSharp.csproj | 1 + Assets/Prefabs/Modem.prefab | 330 +++++++++ .../Prefabs/Overlays/Jail Call Overlay.prefab | 28 +- Assets/Scenes/witwics.unity | 211 +++--- .../UdonSharp/Game Managers/CaseManager.asset | 8 +- Assets/UdonSharp/Game Managers/CaseManager.cs | 16 +- .../Game Managers/GameManagerRound1.cs | 2 + .../Game Managers/GameManagerRound2.asset | 2 +- .../Game Managers/GameManagerRound2.cs | 4 +- Assets/UdonSharp/Modem/Modem.asset | 282 ++++--- Assets/UdonSharp/Modem/Modem.cs | 29 + .../UdonSharp/Overlay/JailCallOverlay.asset | 686 ++++++++++++++++++ .../Overlay/JailCallOverlay.asset.meta | 8 + Assets/UdonSharp/Overlay/JailCallOverlay.cs | 42 ++ .../UdonSharp/Overlay/JailCallOverlay.cs.meta | 11 + 15 files changed, 1461 insertions(+), 199 deletions(-) create mode 100644 Assets/UdonSharp/Overlay/JailCallOverlay.asset create mode 100644 Assets/UdonSharp/Overlay/JailCallOverlay.asset.meta create mode 100644 Assets/UdonSharp/Overlay/JailCallOverlay.cs create mode 100644 Assets/UdonSharp/Overlay/JailCallOverlay.cs.meta diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 36d3d31..28ea8f0 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -61,6 +61,7 @@ + diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab index fd18b7a..d5478a0 100644 --- a/Assets/Prefabs/Modem.prefab +++ b/Assets/Prefabs/Modem.prefab @@ -65,6 +65,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5113010192470520902} - {fileID: 6417972481979237589} - {fileID: 5664439777900644494} m_Father: {fileID: 0} @@ -134,6 +135,10 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 932720169245821887} _AudioManager: {fileID: 0} + _PlayerMarkers: + - {fileID: 6364106817889796126} + - {fileID: 2371735753228346433} + - {fileID: 5761029497447045568} _ModemAnimator: {fileID: 0} _ModemDestinationAnimator: {fileID: 0} _ModemDestination: {fileID: 0} @@ -163,6 +168,137 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1 &3031792550299041408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5113010192470520902} + m_Layer: 0 + m_Name: Placement Markers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5113010192470520902 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3031792550299041408} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1171927592946638812} + - {fileID: 7563872108214909827} + - {fileID: 567758446452426242} + m_Father: {fileID: 6538633228974114170} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &3293144966656600366 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5113010192470520902} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.24999999 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.25000003 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.25 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000017881388 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Host Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &1171927592946638812 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 3293144966656600366} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6364106817889796126 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 3293144966656600366} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4062484603720421009 PrefabInstance: m_ObjectHideFlags: 0 @@ -237,6 +373,103 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4062484603720421009} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4184135722715377904 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5113010192470520902} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.24999999 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.25000003 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.3 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000017881388 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Winner 2 Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!4 &567758446452426242 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 4184135722715377904} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5761029497447045568 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 4184135722715377904} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &5266564533062807397 PrefabInstance: m_ObjectHideFlags: 0 @@ -336,3 +569,100 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5266564533062807397} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6127245778984160625 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5113010192470520902} + m_Modifications: + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.x + value: 0.24999999 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalScale.z + value: 0.25000003 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000017881388 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5533035425597213559, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: m_Name + value: Winner 1 Position Marker + objectReference: {fileID: 0} + - target: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5834382dc9989b6408c88553754e4fa8, type: 3} +--- !u!114 &2371735753228346433 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8494422802375911728, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 6127245778984160625} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &7563872108214909827 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4463098059789612786, guid: 5834382dc9989b6408c88553754e4fa8, + type: 3} + m_PrefabInstance: {fileID: 6127245778984160625} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab index d057ee0..49ce06f 100644 --- a/Assets/Prefabs/Overlays/Jail Call Overlay.prefab +++ b/Assets/Prefabs/Overlays/Jail Call Overlay.prefab @@ -41,8 +41,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2547552435459685462} - - component: {fileID: 4428283700046431671} - - component: {fileID: 6848885185798096049} + - component: {fileID: 4644490914051128181} + - component: {fileID: 973916259212778209} m_Layer: 23 m_Name: Jail Call Overlay m_TagString: Untagged @@ -66,7 +66,7 @@ Transform: - {fileID: 5469398094120495767} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4428283700046431671 +--- !u!114 &4644490914051128181 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -75,7 +75,7 @@ MonoBehaviour: m_GameObject: {fileID: 1215114096519939564} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Script: {fileID: 11500000, guid: e01521821dde888489644d0ee0ed9b6c, type: 3} m_Name: m_EditorClassIdentifier: serializationData: @@ -87,12 +87,24 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 6848885185798096049} + _udonSharpBackingUdonBehaviour: {fileID: 973916259212778209} _Animator: {fileID: 0} _OverlayElements: {fileID: 27227279282360470} _AspectRatio: 1.7777778 _OverlayFit: 1 ---- !u!114 &6848885185798096049 + _CrookMaterial: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + _CrookPortraits: + - {fileID: 2800000, guid: a62e19c8949d6ff40b648cb64023eb59, type: 3} + - {fileID: 2800000, guid: 867f4ce5530ce114ca449b7e1d916a17, type: 3} + - {fileID: 2800000, guid: 11b7e354c4279c74aa080e580d0a938c, type: 3} + - {fileID: 2800000, guid: 60b125c1d7b06dd439bacc9a3af6b3e0, type: 3} + - {fileID: 2800000, guid: a9b59914da5ed7046b6ec6712d0782d9, type: 3} + - {fileID: 2800000, guid: e8fd2ebf1296e7b41a212944ad0036bd, type: 3} + - {fileID: 2800000, guid: d99fce257e19ba94e9b1d9aea6dbe87f, type: 3} + - {fileID: 2800000, guid: a93cc070c3a45ed46a5bea72450a816a, type: 3} + - {fileID: 2800000, guid: d53f63ff95d754e43a90e613d06deda5, type: 3} + - {fileID: 2800000, guid: 81347045e06c7034b8ec7bbca4575052, type: 3} +--- !u!114 &973916259212778209 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -112,9 +124,9 @@ MonoBehaviour: AllowCollisionOwnershipTransfer: 0 Reliable: 0 _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: 6e1c5cb02e885ca42ba9cbe7b5796eaf, + serializedProgramAsset: {fileID: 11400000, guid: a16664f3770f8e54fbde22258bcc9a30, type: 2} - programSource: {fileID: 11400000, guid: 2923fcd444bb991459686ced4864c9bf, type: 2} + programSource: {fileID: 11400000, guid: dbbe646c957abd14988705a5dd05949f, type: 2} serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 756b9f5..5421a06 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -40207,8 +40207,7 @@ MonoBehaviour: - {fileID: 925493523} _MissingPosters: - {fileID: 1673503615} - _JailCallOverlay_CrookMaterial: {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, - type: 2} + _JailCallOverlay: {fileID: 1155978252} _LocationBoard: {fileID: 1748199014} _CaseManagerList: {fileID: 1145254423} _HostTeleportButton: {fileID: 600640153} @@ -41145,7 +41144,7 @@ MonoBehaviour: - {fileID: 2013644315} - {fileID: 1776587609} _WinningPlayerPositionMarker: {fileID: 1528301667} - _JailCallCameraOverlay: {fileID: 1155978249} + _JailCallCameraOverlay: {fileID: 1155978252} _JailPlayer: {fileID: 115578771} --- !u!1001 &867006604 PrefabInstance: @@ -56299,16 +56298,16 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3420206679586331503} m_PrefabAsset: {fileID: 0} ---- !u!114 &1155978249 stripped +--- !u!114 &1155978252 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4428283700046431671, guid: 9c9a05ebcbdcf91469287ad048d5341d, + m_CorrespondingSourceObject: {fileID: 4644490914051128181, guid: 9c9a05ebcbdcf91469287ad048d5341d, type: 3} m_PrefabInstance: {fileID: 3420206679586331503} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1155978246} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9d644aadcdc06b74aa51fe63b67e74f8, type: 3} + m_Script: {fileID: 11500000, guid: e01521821dde888489644d0ee0ed9b6c, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1156256174 stripped @@ -107190,6 +107189,12 @@ PrefabInstance: value: objectReference: {fileID: 4428283700046431671, guid: 9c9a05ebcbdcf91469287ad048d5341d, type: 3} + - target: {fileID: 4644490914051128181, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4644490914051128181, guid: 9c9a05ebcbdcf91469287ad048d5341d, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -113806,51 +113811,76 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} - - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} - - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} - - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} - - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} - - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} - - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} - - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} - - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} - - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} - - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} - - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} - - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} - - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} - - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} - - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} + - {fileID: 2100000, guid: c3dd5e8fccdad6a46a32b54ace01f525, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: eaf8bf8d1e07a2441be3e434c78375a8, type: 2} + - {fileID: 2100000, guid: 466afcbe84b3e94459de1e28e0b26e8a, type: 2} + - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} + - {fileID: 2100000, guid: 13bdd523c81044447a951a8a69c474a1, type: 2} + - {fileID: 2100000, guid: 02c7236e085962d4581e686e88bbb28d, type: 2} + - {fileID: 2100000, guid: f8d93419468a06a48bf9c6c73aff7e36, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 441ff2025ea5541489f065d8b653e692, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} + - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 69228227a9e257549a58eb39e32c695c, type: 2} + - {fileID: 2100000, guid: 77b16945d3aad454fb793d2f16c64249, type: 2} + - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 20293e1762c586648a0e8d1efc60b30b, type: 2} + - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} + - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} + - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} + - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} + - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} + - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} + - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} + - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} + - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} + - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: cbc15475e78367045bc0909379ac97f3, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: fad82813fbe526340832cd1e33244566, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 0da83a16cbf2f704594ba64c96200537, type: 2} + - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} + - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} + - {fileID: 2100000, guid: f568d5671e4d65741b9715e69a753869, type: 2} + - {fileID: 2100000, guid: 73a2ec678ab61104d971005336784b32, type: 2} + - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} + - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: 9fc84244963146c4e98b1fde1f95b5ec, type: 2} + - {fileID: 2100000, guid: 870aa705e76282840a88ab777cbdfb59, type: 2} - {fileID: 2100000, guid: 1fca675d84143ee4cbc9cc7e830a1e84, type: 2} - {fileID: 2100000, guid: c1a13522d86649c4fa6009ae3c1df7a1, type: 2} - {fileID: 2100000, guid: 890906aa898c05544ace2f98794740c2, type: 2} @@ -113858,25 +113888,12 @@ MonoBehaviour: - {fileID: 2100000, guid: bfecf9fce24c1594da25d824b7f3cd0f, type: 2} - {fileID: 2100000, guid: e906284b99d80584b9ef1772424ae26b, type: 2} - {fileID: 2100000, guid: 6471999af7ee3174f97c25370f32166d, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} - - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} - - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} - - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, 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} @@ -113885,64 +113902,56 @@ MonoBehaviour: - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - - {fileID: 2100000, guid: 80f2b6f3bfbc50240b0765a56e8a837e, type: 2} - - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 744980436e22f2c44bd454d320586a53, type: 2} + - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} + - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} + - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} + - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - {fileID: 2100000, guid: cc50b68eaabf3b84cad9a23b7eab8d9f, type: 2} - {fileID: 2100000, guid: ff445412d16ee6e45916bccc68d62aee, type: 2} - {fileID: 2100000, guid: de3fae6511ce1c94ebea5c8d415079dd, type: 2} - {fileID: 2100000, guid: 16eae5e38ba6186429997b1dfacc8517, type: 2} - - {fileID: 2100000, guid: 7b2202d15bf99e9448eb4bf9442c92bc, type: 2} - {fileID: 2100000, guid: fc8a12d19cc40984b8be0a6d9889eb41, type: 2} - - {fileID: 2100000, guid: d4ecea58a2df3974e8f7d4fcaba16ec6, type: 2} - {fileID: 2100000, guid: 1814c9f2312983141826daa1c472c881, type: 2} - {fileID: 2100000, guid: d1b80c0437189d64bb20dc185f2a6797, type: 2} - {fileID: 2100000, guid: 64f09e1728ba15641a7bc0424f8a60f0, type: 2} - {fileID: 2100000, guid: f17bb8737aabc9d4990488f7ccd87693, type: 2} - {fileID: 2100000, guid: bd56d6cf0f2fa36418ba719ef8ab4e84, type: 2} - {fileID: 2100000, guid: 5dcc23d6a7fa8e34990a27f3edfb0ac1, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: f2d04047f1e90f34293134ea43fee656, type: 2} + - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} + - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} + - {fileID: 2100000, guid: 6924ed010b86e02488fa9173e5405519, type: 2} + - {fileID: 2100000, guid: 33ddb8dc0417d7a46a7bacee4ef78781, type: 2} + - {fileID: 2100000, guid: b23fb87b65cd2c4408ca7d02e2670e85, type: 2} + - {fileID: 2100000, guid: 124d743ecfefd8744877866a040b6374, type: 2} + - {fileID: 2100000, guid: 8e7652d0d7dcf884285ffae607c7c4aa, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: cad30d30c6413634891f1783211ed82b, type: 2} - {fileID: 2100000, guid: 93beab2420a2b634daa2d15fd24fbaa2, type: 2} - {fileID: 2100000, guid: 10b1411819262e7439e3721e092319bd, type: 2} - - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - {fileID: 2100000, guid: 6e46af2a8ea906f43a14a03b96294ecc, type: 2} - - {fileID: 2100000, guid: f67cc259c7dee13419a06e369863bcf9, type: 2} - - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} - - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} - - {fileID: 2100000, guid: fe90be54e303efe419a122683668383b, type: 2} - - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} - - {fileID: 2100000, guid: fc0750ef89ab53149ba2fadc20b2cfd6, type: 2} - - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} - - {fileID: 2100000, guid: a60ee32d2ee008a419eafd03826f2584, type: 2} - - {fileID: 2100000, guid: b998704dadedee847823e57fa1540e57, type: 2} - - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} - - {fileID: 2100000, guid: 3c107c925ecfe8b48bb1ad6bb1f3fc2a, type: 2} - - {fileID: 2100000, guid: e633280d5439fd24cbf88344782787d3, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 73628f5b1dd9b6644ac5c555dd2889c7, type: 2} - - {fileID: 2100000, guid: cccd733f87402b04d86b23239836ec5d, type: 2} + - {fileID: 2100000, guid: a7cc990a7c448ca4db29f85ce6945d4e, type: 2} + - {fileID: 2100000, guid: 51fa5fa392620814cb6c526977429d66, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: e938c08786a400b4eac8b275aec1eabf, type: 2} - - {fileID: 2100000, guid: 71ede89a28bd60e4ca2918572046ba90, type: 2} + - {fileID: 2100000, guid: cfdf96419f53d43429f86079e987a0d7, type: 2} + - {fileID: 2100000, guid: 03943341e30772e44ba4bbd3d57d75ee, type: 2} - {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 52bf82e7bd694ae44b45ce6f356fa6d2, type: 2} - {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} - {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 1c9f356d03200724ebe71041de8339e2, type: 2} + - {fileID: 2100000, guid: 350ecb0c81e7153409a828cb0984bf76, type: 2} + - {fileID: 2100000, guid: e633280d5439fd24cbf88344782787d3, type: 2} + - {fileID: 2100000, guid: ecb032a524ca13b44bfd08d26711a69a, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -119595,10 +119604,6 @@ MonoBehaviour: ID: 1370 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1155978246} - ID: 1371 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 1487381243} ID: 1372 SerializedTypeNames: @@ -119639,6 +119644,10 @@ MonoBehaviour: ID: 1381 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1155978246} + ID: 1371 + 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/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index deb044a..0334e01 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -707,25 +707,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _JailCallOverlay_CrookMaterial + Data: _JailCallOverlay - Name: $v Entry: 7 Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _JailCallOverlay_CrookMaterial + Data: _JailCallOverlay - Name: k__BackingField Entry: 7 Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Material, UnityEngine.CoreModule + Data: JailCallOverlay, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 50 + Data: 9 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 9f3be1b..6dfa0a2 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -44,7 +44,7 @@ public class CaseManager : UdonSharpBehaviour [SerializeField] private MultiRoundVideoPlayer _MultiRoundVideoPlayer; [SerializeField] private WantedPoster[] _WantedPosters; [SerializeField] private MissingPoster[] _MissingPosters; - [SerializeField] private Material _JailCallOverlay_CrookMaterial; + [SerializeField] private JailCallOverlay _JailCallOverlay; [SerializeField] private LocationBoard _LocationBoard; [Space, Header("Host UI")] [SerializeField] private CaseManagerListView _CaseManagerList; @@ -132,6 +132,18 @@ public class CaseManager : UdonSharpBehaviour Networking.SetOwner(Networking.LocalPlayer, _HostCard.gameObject); Networking.SetOwner(Networking.LocalPlayer, _LiveIndicator.gameObject); + foreach (WantedPoster Poster in _WantedPosters) + { + Networking.SetOwner(Networking.LocalPlayer, Poster.gameObject); + } + + foreach (MissingPoster Poster in _MissingPosters) + { + Networking.SetOwner(Networking.LocalPlayer, Poster.gameObject); + } + + Networking.SetOwner(Networking.LocalPlayer, _JailCallOverlay.gameObject); + _CaseFileCluesURL = CaseFile.CaseFileURL; _CaseFileLootImage = CaseFile.LootImage; _CaseFileMaps = CaseFile.MapFiles; @@ -244,7 +256,7 @@ public class CaseManager : UdonSharpBehaviour Poster.SetNewCrook(_AccusedCrook, GetCrookName()); } - _JailCallOverlay_CrookMaterial.SetTexture("_MainTex", CrookPortraits[(int)_AccusedCrook]); + _JailCallOverlay.SetCrook(_AccusedCrook); SendCustomNetworkEvent(NetworkEventTarget.All, nameof(DownloadLootImage), _CaseFileLootImage); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index ed6d27d..1a53c54 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -1488,6 +1488,8 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CapitalLoop); + _Modem.SetHost(_CaseManager.GetHostOwner().displayName); + _Modem.SetWinningPlayers(_CaseManager.GetCurrentWinningPlayers()); _Modem.Activate(true); foreach (ArrivalDisplay Display in _ArrivalDisplays) diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index d73bd23..5e93d29 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -1214,7 +1214,7 @@ MonoBehaviour: Data: 79|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraOverlay, Assembly-CSharp + Data: JailCallOverlay, Assembly-CSharp - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 72a1aa5..e6fcc61 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -33,7 +33,7 @@ public class GameManagerRound2 : GameManagerBase [SerializeField] private ArrivalDisplay[] _ArrivalDisplays; [SerializeField] private PositionMarker _WinningPlayerPositionMarker; - [SerializeField] private CameraOverlay _JailCallCameraOverlay; + [SerializeField] private JailCallOverlay _JailCallCameraOverlay; [SerializeField] private RandomVideoPlayer _JailPlayer; [UdonSynced, FieldChangeCallback(nameof(Location))] private string _Location = ""; @@ -462,7 +462,7 @@ public class GameManagerRound2 : GameManagerBase { HostCardRecoverTheLootInterface Interface = (HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot); - Interface.SetComment(_PlayerPodiums[_CurrentPlayerCounter % _PlayerPodiums.Length] + ", your turn.", COLOR_STANDARD); + Interface.SetComment(_PlayerPodiums[_CurrentPlayerCounter % _PlayerPodiums.Length].GetPlayer() + ", your turn.", COLOR_STANDARD); SendCustomEventDelayedSeconds(nameof(ActivateAllPanelButtons_DelayFunction), 0.5f); } diff --git a/Assets/UdonSharp/Modem/Modem.asset b/Assets/UdonSharp/Modem/Modem.asset index 00c2a1b..16d762d 100644 --- a/Assets/UdonSharp/Modem/Modem.asset +++ b/Assets/UdonSharp/Modem/Modem.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 9 - Name: Entry: 7 Data: @@ -116,16 +116,82 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ModemAnimator + Data: _PlayerMarkers - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ModemAnimator + Data: _PlayerMarkers - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PositionMarker[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Component[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 11|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: _ModemAnimator + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ModemAnimator + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -134,7 +200,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -149,13 +215,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 10|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -179,16 +245,16 @@ MonoBehaviour: Data: _ModemDestinationAnimator - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ModemDestinationAnimator - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -203,13 +269,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 13|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -233,13 +299,13 @@ MonoBehaviour: Data: _ModemDestination - Name: $v Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ModemDestination - Name: k__BackingField Entry: 7 - Data: 15|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: Modem, Assembly-CSharp @@ -263,13 +329,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -293,13 +359,13 @@ MonoBehaviour: Data: _ActivateModem - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ActivateModem - Name: k__BackingField Entry: 7 - Data: 19|System.RuntimeType, mscorlib + Data: 24|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -308,7 +374,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 19 + Data: 24 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -323,13 +389,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 21|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 26|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -350,70 +416,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _BeginTeleport + Data: _PlayerNames - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _BeginTeleport - - Name: k__BackingField - Entry: 9 - Data: 19 - - Name: k__BackingField - Entry: 9 - Data: 19 - - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 24|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: _EnteredPlayers - - Name: $v - Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _EnteredPlayers + Data: _PlayerNames - Name: k__BackingField Entry: 7 - Data: 26|System.RuntimeType, mscorlib + Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -422,7 +434,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 26 + Data: 28 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -437,13 +449,121 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 28|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 30|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: _BeginTeleport + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _BeginTeleport + - Name: k__BackingField + Entry: 9 + Data: 24 + - Name: k__BackingField + Entry: 9 + Data: 24 + - 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: 1 + - Name: + Entry: 7 + Data: 33|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: _EnteredPlayers + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EnteredPlayers + - Name: k__BackingField + Entry: 9 + Data: 28 + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Modem/Modem.cs b/Assets/UdonSharp/Modem/Modem.cs index 9cf1e47..2df85cf 100644 --- a/Assets/UdonSharp/Modem/Modem.cs +++ b/Assets/UdonSharp/Modem/Modem.cs @@ -11,11 +11,13 @@ using VRC.Udon.Common.Interfaces; public class Modem : UdonSharpBehaviour { [SerializeField] private AudioManager _AudioManager; + [SerializeField] private PositionMarker[] _PlayerMarkers; [SerializeField] private Animator _ModemAnimator; [SerializeField] private Animator _ModemDestinationAnimator; [SerializeField] private Modem _ModemDestination; [UdonSynced] private bool _ActivateModem = false; + [UdonSynced] private string[] _PlayerNames = new string[3]; [UdonSynced] private bool _BeginTeleport = false; [UdonSynced] private string[] _EnteredPlayers = new string[MAX_PLAYERS_IN_MODEM]; @@ -63,6 +65,17 @@ public class Modem : UdonSharpBehaviour } + public void SetHost(string Host) + { + _PlayerNames[0] = Host; + } + + public void SetWinningPlayers(string[] WinningPlayers) + { + _PlayerNames[1] = WinningPlayers[0]; + _PlayerNames[2] = WinningPlayers[1]; + } + public void Activate(bool Active) { _ActivateModem = Active; @@ -71,6 +84,22 @@ public class Modem : UdonSharpBehaviour } private void _Activate_Synced() { + if (_ActivateModem) + { + for (int i = 0; i < _PlayerMarkers.Length; i++) + { + _PlayerMarkers[i].SetPlayer((i < _PlayerNames.Length) ? _PlayerNames[i] : ""); + } + } + else + { + for (int i = 0; i < _PlayerMarkers.Length && i < _PlayerNames.Length; i++) + { + _PlayerMarkers[i].ClearPlayer(); + _PlayerNames[i] = ""; + } + } + _ModemAnimator.SetBool("Enter", _ActivateModem); } diff --git a/Assets/UdonSharp/Overlay/JailCallOverlay.asset b/Assets/UdonSharp/Overlay/JailCallOverlay.asset new file mode 100644 index 0000000..7a27fb3 --- /dev/null +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.asset @@ -0,0 +1,686 @@ +%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: JailCallOverlay + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: a16664f3770f8e54fbde22258bcc9a30, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: e01521821dde888489644d0ee0ed9b6c, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 345087137285046744 + 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: 10 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Animator + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Animator + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - 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: _OverlayElements + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OverlayElements + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.GameObject, UnityEngine.CoreModule + - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|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: _AspectRatio + - Name: $v + Entry: 7 + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AspectRatio + - Name: k__BackingField + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 13|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 15|UnityEngine.RangeAttribute, UnityEngine.CoreModule + - Name: min + Entry: 4 + Data: 0 + - Name: max + Entry: 4 + Data: 2.5 + - 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: _OverlayFit + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OverlayFit + - Name: k__BackingField + Entry: 7 + Data: 17|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: OverlayFit, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 18|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 + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 20|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: _OverlayElementsEnabled + - Name: $v + Entry: 7 + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _OverlayElementsEnabled + - Name: k__BackingField + Entry: 7 + Data: 22|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 22 + - 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: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 24|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: _FadeOutAnimation + - Name: $v + Entry: 7 + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _FadeOutAnimation + - Name: k__BackingField + Entry: 9 + Data: 22 + - Name: k__BackingField + Entry: 9 + Data: 22 + - 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: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 27|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: _Camera + - Name: $v + Entry: 7 + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Camera + - Name: k__BackingField + Entry: 7 + Data: 29|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 29 + - 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: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _CrookMaterial + - Name: $v + Entry: 7 + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookMaterial + - Name: k__BackingField + Entry: 7 + Data: 32|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Material, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 32 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 34|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 35|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: _CrookPortraits + - Name: $v + Entry: 7 + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CrookPortraits + - Name: k__BackingField + Entry: 7 + Data: 37|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Texture[], UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 37 + - 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: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 39|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 40|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: _AccusedCrook + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AccusedCrook + - Name: k__BackingField + Entry: 7 + Data: 42|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AccusedCrook, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 18 + - 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: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 44|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/Overlay/JailCallOverlay.asset.meta b/Assets/UdonSharp/Overlay/JailCallOverlay.asset.meta new file mode 100644 index 0000000..52fd146 --- /dev/null +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbbe646c957abd14988705a5dd05949f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Overlay/JailCallOverlay.cs b/Assets/UdonSharp/Overlay/JailCallOverlay.cs new file mode 100644 index 0000000..c51a338 --- /dev/null +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.cs @@ -0,0 +1,42 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; +using VRC.Udon.Common; + + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class JailCallOverlay : CameraOverlay +{ + [Space] + [SerializeField] private Material _CrookMaterial; + [Space] + [SerializeField] private Texture[] _CrookPortraits; + + [UdonSynced] private AccusedCrook _AccusedCrook = AccusedCrook.INDEX_MAX; + + + public override void OnDeserialization(DeserializationResult Result) + { + _SetCrook_Synced(); + base.OnDeserialization(Result); + } + + + public void SetCrook(AccusedCrook Crook) + { + _AccusedCrook = Crook; + _SetCrook_Synced(); + RequestSerialization(); + } + private void _SetCrook_Synced() + { + int Crook = (int)_AccusedCrook; + if (Crook >= 0 && Crook < _CrookPortraits.Length) + { + _CrookMaterial.SetTexture("_MainTex", _CrookPortraits[Crook]); + } + } +} diff --git a/Assets/UdonSharp/Overlay/JailCallOverlay.cs.meta b/Assets/UdonSharp/Overlay/JailCallOverlay.cs.meta new file mode 100644 index 0000000..e278371 --- /dev/null +++ b/Assets/UdonSharp/Overlay/JailCallOverlay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e01521821dde888489644d0ee0ed9b6c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: