From e52ab0d43ddd83695eaadcaddb594fa613de25b8 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Wed, 6 May 2026 19:01:13 -0400 Subject: [PATCH] Fixed the round 1 video timer continuing to run when a video was skipped. --- .../ACME Crimenet Computer.prefab | 207 ++++- Assets/Prefabs/Filing Cabinet.prefab | 227 +++++- Assets/Scenes/witwics.unity | 762 ++++++++++++------ .../Filing Cabinet/FilingCabinet.asset | 8 +- .../UdonSharp/Filing Cabinet/FilingCabinet.cs | 8 +- .../Game Managers/GameManagerRound1.cs | 11 +- 6 files changed, 946 insertions(+), 277 deletions(-) diff --git a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab index a9aab57..b10e095 100644 --- a/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab +++ b/Assets/Prefabs/ACME Crimenet Computer/ACME Crimenet Computer.prefab @@ -683,6 +683,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8486626383483289016} - {fileID: 6697273822060760520} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1476,6 +1477,206 @@ Transform: - {fileID: 5788746246064083641} m_Father: {fileID: 6697273822060760520} m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!1 &8952199059656852950 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2861988156682277291} + - component: {fileID: 769922536613037405} + - component: {fileID: 8946899879826710894} + - component: {fileID: 2320482393305432288} + m_Layer: 0 + m_Name: Modem Camera Trigger (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2861988156682277291 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8952199059656852950} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.493, z: -0.54} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6697273822060760520} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &769922536613037405 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8952199059656852950} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.3217603, y: 1.2965493, z: 0.5490893} + m_Center: {x: -0.004229122, y: 0.14827466, z: -0.04311371} +--- !u!114 &8946899879826710894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8952199059656852950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 2320482393305432288} + _CameraController: {fileID: 0} + _SwitchFunction: ActivateACMECrimenetComputerCameraSwitcher +--- !u!114 &2320482393305432288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8952199059656852950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558, + type: 2} + programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1001 &4473931141689906385 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2986715522671662182} + m_Modifications: + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FOV + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FarClippingPlane + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: CameraSystemManager + value: + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_Name + value: ACME Crimenet Computer Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.2354312 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.227 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.6014023 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.38155252 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.013669328 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9236535 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.033090387 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} +--- !u!4 &8486626383483289016 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 4473931141689906385} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5931982346311858490 PrefabInstance: m_ObjectHideFlags: 0 @@ -1768,7 +1969,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} @@ -1874,6 +2075,10 @@ PrefabInstance: type: 3} insertIndex: 4 addedObject: {fileID: 2758305394034538769} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 131388005b2ec2642baed4dde9ef0e65, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2861988156682277291} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 131388005b2ec2642baed4dde9ef0e65, type: 3} insertIndex: -1 diff --git a/Assets/Prefabs/Filing Cabinet.prefab b/Assets/Prefabs/Filing Cabinet.prefab index e309758..9acee45 100644 --- a/Assets/Prefabs/Filing Cabinet.prefab +++ b/Assets/Prefabs/Filing Cabinet.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 8149708359916494966} - component: {fileID: 2821258658302923081} m_Layer: 0 - m_Name: Camera Switcher + m_Name: Cabinet Camera Switcher m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -53,8 +53,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 3.8281446, y: 3.40099, z: 1.9502451} - m_Center: {x: -1.4140725, y: 1.200495, z: -0.6036841} + m_Size: {x: 5.091723, y: 3.40099, z: 1.9502451} + m_Center: {x: -0.782283, y: 1.200495, z: -0.6036841} --- !u!114 &8149708359916494966 MonoBehaviour: m_ObjectHideFlags: 0 @@ -77,8 +77,8 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2821258658302923081} - _CameraConsole: {fileID: 0} - _SwitchToCamera: {fileID: 0} + _CameraController: {fileID: 0} + _SwitchFunction: SwitchToFilingCabinetCamera --- !u!114 &2821258658302923081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -211,6 +211,216 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1 &4624767546058946117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7534069038575900742} + - component: {fileID: 2793623448169594938} + - component: {fileID: 815953579851278257} + - component: {fileID: 3564055080605867826} + m_Layer: 0 + m_Name: All Players Camera Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7534069038575900742 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624767546058946117} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.11, y: 0, z: -4.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5113755177093265511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2793623448169594938 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624767546058946117} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 5.404081, y: 3.40099, z: 0.90966254} + m_Center: {x: -0.6261058, y: 1.200495, z: -0.36529055} +--- !u!114 &815953579851278257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624767546058946117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 3564055080605867826} + _CameraController: {fileID: 0} + _SwitchFunction: SwitchToAllPlayersCamera +--- !u!114 &3564055080605867826 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4624767546058946117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558, + type: 2} + programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &5286154055750405705 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4111976257918810795} + - component: {fileID: 8821176300297623577} + - component: {fileID: 8403059195379976075} + - component: {fileID: 4437526345909829704} + m_Layer: 0 + m_Name: Host Camera Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4111976257918810795 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286154055750405705} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.88, y: 0, z: -3.18} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5113755177093265511} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8821176300297623577 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286154055750405705} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 6.403112, y: 3.40099, z: 2.1724367} + m_Center: {x: -0.12658893, y: 1.200495, z: 0.10850132} +--- !u!114 &8403059195379976075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286154055750405705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 4437526345909829704} + _CameraController: {fileID: 0} + _SwitchFunction: SwitchToHostCamera +--- !u!114 &4437526345909829704 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5286154055750405705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558, + type: 2} + programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &6433862435333071631 GameObject: m_ObjectHideFlags: 0 @@ -244,6 +454,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7117933776458209241} + - {fileID: 4111976257918810795} + - {fileID: 7534069038575900742} - {fileID: 6612750374785729663} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -302,7 +514,10 @@ MonoBehaviour: - {fileID: 3913204954530748888} - {fileID: 4217573374578043776} - {fileID: 6274089036449431452} - _CameraSwitcher: {fileID: 8149708359916494966} + _CameraSwitchers: + - {fileID: 8149708359916494966} + - {fileID: 8403059195379976075} + - {fileID: 815953579851278257} ClueNotes: - - diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index bdd80ff..6447f7d 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -579,12 +579,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 12138828} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &12163667 stripped GameObject: @@ -2525,12 +2525,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59893113} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &59893115 MonoBehaviour: @@ -22353,6 +22353,49 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &400783450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 400783451} + m_Layer: 0 + m_Name: Main Switchers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &400783451 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 400783450} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: 8.889008, y: 0, z: -3.5950048} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 552861271} + - {fileID: 458165860} + - {fileID: 59893114} + - {fileID: 633978916} + - {fileID: 1108468551} + - {fileID: 1573395196} + - {fileID: 12138831} + - {fileID: 2037132292} + - {fileID: 1170815124} + - {fileID: 1574468602} + - {fileID: 1129163086} + - {fileID: 1238250495} + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &401031186 GameObject: m_ObjectHideFlags: 0 @@ -24851,12 +24894,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 458165859} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &458165861 MonoBehaviour: @@ -24958,99 +25001,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} ---- !u!1 &465018033 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 465018034} - - component: {fileID: 465018036} - - component: {fileID: 465018035} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &465018034 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465018033} - serializedVersion: 2 - m_LocalRotation: {x: -0.0000000066918804, y: 0.00000011920925, z: 0.0000000054094094, - w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1827497431} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &465018035 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465018033} - m_Enabled: 1 ---- !u!20 &465018036 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 465018033} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 8 - field of view: 10 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &468510744 stripped GameObject: m_CorrespondingSourceObject: {fileID: 140931611703344165, guid: be33bc7f6c414e6409becfa348b9310d, @@ -25452,11 +25402,7 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3734833528524997519, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1018148851} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5066b3b269b691d458beae6cb7911193, type: 3} --- !u!198 &481893950 stripped @@ -28191,6 +28137,38 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547548764} m_CullTransparentMesh: 1 +--- !u!1 &548075169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 548075170} + m_Layer: 0 + m_Name: Alternate Switchers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &548075170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 548075169} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: 8.8890085, y: 0, z: -3.5950058} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 671628781} + m_Father: {fileID: 1882024111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &549602626 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9213222445483219211, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -28229,12 +28207,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 552861270} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.4617485, z: -0, w: 0.88701093} - m_LocalPosition: {x: 8.889002, y: 0, z: -3.595002} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &552861272 MonoBehaviour: @@ -31689,12 +31667,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 633978913} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &635617283 PrefabInstance: @@ -33116,6 +33094,97 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &671628780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 671628781} + - component: {fileID: 671628783} + - component: {fileID: 671628782} + m_Layer: 0 + m_Name: ACME Crimenet Computer Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &671628781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 671628780} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.153672, y: 0, z: 9.343459} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 548075170} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &671628782 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 671628780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: b84f3dc1edf53b846a172badddd49737, + type: 2} + programSource: {fileID: 11400000, guid: 1fc8e4389a71e5640b656e2c7fbabeed, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &671628783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 671628780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c74cc2036e37f74b874180a8ad0235f, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 671628782} + _CameraController: {fileID: 1524477936} + _SwitchFunctions: + - SwitchToACMECrimenetComputerCamera + _TimeBetweenCuts: + - 5 + _AlwaysReactivate: 0 + _Loop: 1 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 0} + _FirstLoopCallbackFunction: --- !u!1 &671964993 GameObject: m_ObjectHideFlags: 0 @@ -39646,6 +39715,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &813503242 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4624767546058946117, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + m_PrefabInstance: {fileID: 4953860686005405531} + m_PrefabAsset: {fileID: 0} --- !u!1 &815229500 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1736848885676943230, guid: e9914385266bca24db809c39e395f03c, @@ -41515,7 +41590,7 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: Filing Cabinet + value: Filing Cabinet Camera Anchor objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -47476,98 +47551,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1016737136} m_CullTransparentMesh: 1 ---- !u!1 &1018148850 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1018148851} - - component: {fileID: 1018148853} - - component: {fileID: 1018148852} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1018148851 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018148850} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1450129840} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &1018148852 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018148850} - m_Enabled: 1 ---- !u!20 &1018148853 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1018148850} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 8 - field of view: 10 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1001 &1018401441 PrefabInstance: m_ObjectHideFlags: 0 @@ -54650,12 +54633,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108468550} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1108468552 MonoBehaviour: @@ -55361,12 +55344,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129163083} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1132689485 stripped GameObject: @@ -56854,12 +56837,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1170815123} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1170815125 MonoBehaviour: @@ -58301,12 +58284,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1238250494} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1238250496 MonoBehaviour: @@ -65616,6 +65599,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1413659217 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5286154055750405705, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + m_PrefabInstance: {fileID: 4953860686005405531} + m_PrefabAsset: {fileID: 0} --- !u!1 &1418121844 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4637207414564558123, guid: be33bc7f6c414e6409becfa348b9310d, @@ -67022,12 +67011,6 @@ ReflectionProbe: m_Importance: 2 m_CustomBakedTexture: {fileID: 8900000, guid: 9f698044801396841bdc0c9837364ce7, type: 3} ---- !u!4 &1450129840 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3734833528524997519, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - m_PrefabInstance: {fileID: 481893949} - m_PrefabAsset: {fileID: 0} --- !u!1 &1451018076 GameObject: m_ObjectHideFlags: 0 @@ -74378,6 +74361,7 @@ MonoBehaviour: IncorrectToHostAndAllPlayersTimerToggle: {fileID: 1574468604} ThinkAboutItTimerToggle: {fileID: 1129163084} BuzzedInPlayerTimerToggle: {fileID: 1238250497} + ACMECrimenetComputerTimerToggle: {fileID: 671628783} _CameraAnimator: {fileID: 1115429856} Player1CameraAnchor: {fileID: 1564239176} Player2CameraAnchor: {fileID: 1858619632} @@ -80110,12 +80094,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1573395193} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1574052100 stripped GameObject: @@ -80149,12 +80133,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1574468601} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1574468603 MonoBehaviour: @@ -87622,7 +87606,7 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: ACME Crimenet Computer + value: ACME Crimenet Computer Camera Anchor objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -87632,7 +87616,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.5286945 + value: 1.763 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -89690,6 +89674,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1801735036} m_CullTransparentMesh: 1 +--- !u!1 &1802711235 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8952199059656852950, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + m_PrefabInstance: {fileID: 5448599223445625650} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1804159804 PrefabInstance: m_ObjectHideFlags: 0 @@ -90142,12 +90132,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} ---- !u!4 &1827497431 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3734833528524997519, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - m_PrefabInstance: {fileID: 6332640093748342308} - m_PrefabAsset: {fileID: 0} --- !u!1 &1830741981 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6502577009924928951, guid: 126991d511ca61841a0ef899b6c038a6, @@ -92881,18 +92865,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1289569932} - - {fileID: 552861271} - - {fileID: 458165860} - - {fileID: 59893114} - - {fileID: 633978916} - - {fileID: 1108468551} - - {fileID: 1573395196} - - {fileID: 12138831} - - {fileID: 2037132292} - - {fileID: 1170815124} - - {fileID: 1574468602} - - {fileID: 1129163086} - - {fileID: 1238250495} + - {fileID: 400783451} + - {fileID: 548075170} m_Father: {fileID: 2110808113} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1882069443 stripped @@ -100865,12 +100839,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2037132289} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: 0.4617485, z: -0, w: 0.88701093} + m_LocalPosition: {x: -2.1536715, y: 0, z: 9.343459} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1882024111} + m_Father: {fileID: 400783451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2037946458 GameObject: @@ -110827,6 +110801,17 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 815953579851278257, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: _CameraController + value: + objectReference: {fileID: 1524477936} + - target: {fileID: 815953579851278257, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 815953579851278257, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 1015601904965085104, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -110949,6 +110934,26 @@ PrefabInstance: propertyPath: _syncMethod value: 2 objectReference: {fileID: 0} + - target: {fileID: 2793623448169594938, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Size.x + value: 3.5409899 + objectReference: {fileID: 0} + - target: {fileID: 2793623448169594938, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Size.z + value: 0.4032994 + objectReference: {fileID: 0} + - target: {fileID: 2793623448169594938, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.x + value: 0.30544108 + objectReference: {fileID: 0} + - target: {fileID: 2793623448169594938, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.z + value: -0.6246809 + objectReference: {fileID: 0} - target: {fileID: 2821258658302923081, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializedProgramAsset @@ -111077,6 +111082,41 @@ PrefabInstance: propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.63 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.39 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.97383636 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.22725062 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4111976257918810795, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 26.271 + objectReference: {fileID: 0} - target: {fileID: 4127964025273293390, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: m_Enabled @@ -111133,6 +111173,26 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 4849376392017286557, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Size.x + value: 6.0757284 + objectReference: {fileID: 0} + - target: {fileID: 4849376392017286557, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Size.z + value: 1.7188658 + objectReference: {fileID: 0} + - target: {fileID: 4849376392017286557, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.x + value: -0.29027593 + objectReference: {fileID: 0} + - target: {fileID: 4849376392017286557, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.z + value: 0.19922784 + objectReference: {fileID: 0} - target: {fileID: 4876535358910585744, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -111415,6 +111475,41 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.37 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.69 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.98245025 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.186525 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7117933776458209241, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 21.5 + objectReference: {fileID: 0} - target: {fileID: 7122924259360788373, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -111461,6 +111556,41 @@ PrefabInstance: propertyPath: _syncMethod value: 1 objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.71 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.37 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8912605 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.45349178 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7534069038575900742, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 53.936 + objectReference: {fileID: 0} - target: {fileID: 7538853171534729325, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: _syncMethod @@ -111562,6 +111692,17 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8403059195379976075, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: _CameraController + value: + objectReference: {fileID: 1524477936} + - target: {fileID: 8403059195379976075, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8403059195379976075, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} - target: {fileID: 8661575988827493430, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: sleepFlag @@ -111647,6 +111788,21 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 8821176300297623577, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Size.z + value: 1.8246099 + objectReference: {fileID: 0} + - target: {fileID: 8821176300297623577, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.x + value: -0.12658884 + objectReference: {fileID: 0} + - target: {fileID: 8821176300297623577, guid: c37ec0a412d585049af93f09e1c82ec7, + type: 3} + propertyPath: m_Center.z + value: -0.0013152899 + objectReference: {fileID: 0} - target: {fileID: 8988944271241464879, guid: c37ec0a412d585049af93f09e1c82ec7, type: 3} propertyPath: serializationData.Prefab @@ -112101,6 +112257,17 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 3240134567735872550, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: CameraSystemManager + value: + objectReference: {fileID: 674142366} + - target: {fileID: 3240134567735872550, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3240134567735872550, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} - target: {fileID: 3242531540388335572, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: _syncMethod @@ -112349,11 +112516,6 @@ PrefabInstance: value: objectReference: {fileID: 6023267236643729197, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} - - target: {fileID: 6321558138055300978, guid: e510a624c9e607c4bb702fa1259a213c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6353091236350794994, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: m_Enabled @@ -112556,6 +112718,46 @@ PrefabInstance: value: objectReference: {fileID: 8302098746068360791, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.213 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.402 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalPosition.z + value: 8.801 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.16112639 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.98693377 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8486626383483289016, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 161.455 + objectReference: {fileID: 0} - target: {fileID: 8525084428042673623, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: serializationData.Prefab @@ -112600,6 +112802,27 @@ PrefabInstance: value: objectReference: {fileID: 8936879782383798973, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} + - target: {fileID: 8946899879826710894, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: _CameraController + value: + objectReference: {fileID: 1524477936} + - target: {fileID: 8946899879826710894, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8946899879826710894, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + - target: {fileID: 8952199059656852950, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_Name + value: ACME Crimenet Computer Switch Trigger + objectReference: {fileID: 0} + - target: {fileID: 8952199059656852950, guid: e510a624c9e607c4bb702fa1259a213c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9010345603623065137, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} propertyPath: serializationData.Prefab @@ -112628,6 +112851,7 @@ PrefabInstance: - {fileID: 7382308476003787314, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} - {fileID: 2588634168345619603, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} - {fileID: 2761890154373762706, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} + - {fileID: 569087733985658658, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e510a624c9e607c4bb702fa1259a213c, type: 3} @@ -113580,11 +113804,7 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 3734833528524997519, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - insertIndex: -1 - addedObject: {fileID: 465018034} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5066b3b269b691d458beae6cb7911193, type: 3} --- !u!1001 &6597279250610392207 @@ -119481,6 +119701,22 @@ MonoBehaviour: ID: 1367 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 813503242} + ID: 1368 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1413659217} + ID: 1369 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1802711235} + ID: 1370 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 671628780} + 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/Filing Cabinet/FilingCabinet.asset b/Assets/UdonSharp/Filing Cabinet/FilingCabinet.asset index 034fdbc..5a900f3 100644 --- a/Assets/UdonSharp/Filing Cabinet/FilingCabinet.asset +++ b/Assets/UdonSharp/Filing Cabinet/FilingCabinet.asset @@ -302,25 +302,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraSwitcher + Data: _CameraSwitchers - Name: $v Entry: 7 Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraSwitcher + Data: _CameraSwitchers - Name: k__BackingField Entry: 7 Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraSwitchTrigger, Assembly-CSharp + Data: CameraSwitchTrigger[], Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 17 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib diff --git a/Assets/UdonSharp/Filing Cabinet/FilingCabinet.cs b/Assets/UdonSharp/Filing Cabinet/FilingCabinet.cs index b2800a0..0cc3ddb 100644 --- a/Assets/UdonSharp/Filing Cabinet/FilingCabinet.cs +++ b/Assets/UdonSharp/Filing Cabinet/FilingCabinet.cs @@ -12,7 +12,7 @@ public class FilingCabinet : UdonSharpBehaviour [SerializeField] private Animator _Animator; [SerializeField] private GameObject[] _DrawerHandleTriggers; [SerializeField] private FilingCabinetNoteDispenser[] _NoteDispensers; - [SerializeField] private CameraSwitchTrigger _CameraSwitcher; + [SerializeField] private CameraSwitchTrigger[] _CameraSwitchers; [UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Activate = false; @@ -176,7 +176,11 @@ public class FilingCabinet : UdonSharpBehaviour { Trigger.SetActive(_Activate); } - _CameraSwitcher.gameObject.SetActive(_Activate); + + foreach (CameraSwitchTrigger Trigger in _CameraSwitchers) + { + Trigger.gameObject.SetActive(_Activate); + } if (!_Activate) { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 5f298ff..0dd3d8e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -429,6 +429,7 @@ public class GameManagerRound1 : GameManagerBase HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.ActivateACMECrimenetComputerCamera(); string UntranslatedText = ""; @@ -512,7 +513,8 @@ public class GameManagerRound1 : GameManagerBase { HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - + + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.ActivateFilingCabinetCamera(); if (Presentation.ContainsKey("Clue Notes") && Presentation["Clue Notes"].TokenType == TokenType.DataList) @@ -567,6 +569,8 @@ public class GameManagerRound1 : GameManagerBase private void MultipleChoiceRevealQuestion() { + _StopVideo(); + _QuestionSubstage = 0; _VideoPlayer.SubMapIndex = 0; for (int i = 0; i < _PlayerPodiums.Length; i++) @@ -1945,8 +1949,13 @@ public class GameManagerRound1 : GameManagerBase _VideoPlayerTimer = _VideoPlayer.GetVideoDuration() - _CameraControllerRound1.HostToMonitorTimerToggle.GetTimeBetweenCuts(0); } + private void _StopVideo() + { + _VideoPlayerTimer = -1.0f; + } public void EndVideoPlayerCameraSwitch() { + _StopVideo(); _CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher(); }