diff --git a/Assets/Prefabs/Betacam Handheld.prefab b/Assets/Prefabs/Betacam Handheld.prefab index 4367d01..4e9844f 100644 --- a/Assets/Prefabs/Betacam Handheld.prefab +++ b/Assets/Prefabs/Betacam Handheld.prefab @@ -593,6 +593,7 @@ MonoBehaviour: currentlyHeldBy: {fileID: 0} pickupable: 1 proximity: 0.1 + version: 0 --- !u!20 &5542997801820577511 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 5c92a65..24d4e8d 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -974,6 +974,94 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 832323181} m_PrefabAsset: {fileID: 0} +--- !u!1 &35514604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 35514605} + - component: {fileID: 35514607} + - component: {fileID: 35514606} + m_Layer: 0 + m_Name: Host And All Players Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &35514605 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35514604} + 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: 1311764231} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &35514606 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35514604} + 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 &35514607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35514604} + 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: 35514606} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToHostAndWinnerCamera + - SwitchToHostAndWinnerCamera + - SwitchToPlayer1Camera + - SwitchToPlayer2Camera + _TimeBetweenCuts: 2 --- !u!1 &37402018 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1162471344109280769, guid: 40955da061a841841a91c845049f1e11, @@ -1435,7 +1523,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1808255083} + m_TransformParent: {fileID: 1358503112} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1526,7 +1614,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 16.3 + value: 13 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1536,7 +1624,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: far clip plane - value: 8 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1604,12 +1692,12 @@ PrefabInstance: - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 5.88 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -8.275 + value: -41.169 objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -3939,7 +4027,7 @@ Transform: m_GameObject: {fileID: 113982898} serializedVersion: 2 m_LocalRotation: {x: 0.49999982, y: -0.5, z: 0.50000036, w: 0.49999976} - m_LocalPosition: {x: -0.916, y: 1.701, z: -0.484} + m_LocalPosition: {x: -0.916, y: 1.324, z: -0.206} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4897,62 +4985,77 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1331320733} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalPosition.x - value: -2.427 + value: -3.38 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalPosition.z - value: 4.918 + value: 4.92 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_StitchLightmapSeams value: 0 objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - target: {fileID: -7511558181221131132, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_Materials.Array.data[1] value: objectReference: {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - target: {fileID: -7511558181221131132, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: -7511558181221131132, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_Materials.Array.data[2] value: objectReference: {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - - target: {fileID: 919132149155446097, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: 919132149155446097, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_Name - value: SM_DrywallPanel5x5.25 + value: SM_DrywallPanel5x4 (1) objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 75d126655c4b91b4785b8f72421c870e, + - target: {fileID: 919132149155446097, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 @@ -4961,24 +5064,24 @@ PrefabInstance: m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 75d126655c4b91b4785b8f72421c870e, + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} insertIndex: -1 - addedObject: {fileID: 124273111} - m_SourcePrefab: {fileID: 100100000, guid: 75d126655c4b91b4785b8f72421c870e, type: 3} + addedObject: {fileID: 124273108} + m_SourcePrefab: {fileID: 100100000, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} --- !u!4 &124273106 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 75d126655c4b91b4785b8f72421c870e, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} m_PrefabInstance: {fileID: 124273105} m_PrefabAsset: {fileID: 0} --- !u!1 &124273107 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 75d126655c4b91b4785b8f72421c870e, + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bd30a253b4f4d1548aceca49d33d27a8, type: 3} m_PrefabInstance: {fileID: 124273105} m_PrefabAsset: {fileID: 0} ---- !u!65 &124273111 +--- !u!65 &124273108 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4997,8 +5100,8 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 5.2500005, y: 5, z: 0.11429985} - m_Center: {x: -2.6250007, y: 2.5, z: -0.057149448} + m_Size: {x: 4.0000005, y: 5, z: 0.114301175} + m_Center: {x: 1.9999996, y: 2.5, z: 0.057150595} --- !u!1 &124729434 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6458581458612866833, guid: 126991d511ca61841a0ef899b6c038a6, @@ -14472,11 +14575,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1390751085} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &306921568 stripped @@ -15151,7 +15250,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1914584492} + m_TransformParent: {fileID: 593766640} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -15327,6 +15426,31 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.x + value: 11.263925 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.y + value: 996.83997 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.z + value: 15.763637 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.8591459 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.51173085 + objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15350,22 +15474,22 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.x - value: 0 + value: 11.263925 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.y - value: 0 + value: 996.83997 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnPos.z - value: 0 + value: 15.763637 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.w - value: 1 + value: -0.8591459 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -15375,7 +15499,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: -0 + value: 0.51173085 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -16924,7 +17048,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1564239175} + m_TransformParent: {fileID: 783795839} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -17005,7 +17129,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 8.5 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -17053,41 +17177,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -17111,17 +17200,17 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -30142,12 +30231,12 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 458165861} _CameraController: {fileID: 1524477936} - _Cameras: - - {fileID: 1983062415} - - {fileID: 1983062415} - - {fileID: 364742168} - - {fileID: 1832440713} - - {fileID: 1390751086} + _SwitchFunctions: + - SwitchToHostCamera + - SwitchToHostCamera + - SwitchToPlayer1Camera + - SwitchToPlayer2Camera + - SwitchToPlayer3Camera _TimeBetweenCuts: 2.5 --- !u!1 &458823600 stripped GameObject: @@ -31120,6 +31209,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &509818293 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1931140524} + m_PrefabAsset: {fileID: 0} --- !u!1 &511969085 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4036521930382857653, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -32594,7 +32689,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 2110808113} + m_Father: {fileID: 1968710945} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &552861272 MonoBehaviour: @@ -32645,11 +32740,11 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 552861272} _CameraController: {fileID: 1524477936} - _Cameras: - - {fileID: 1983062415} - - {fileID: 1983062415} - - {fileID: 2043045206} - _TimeBetweenCuts: 3 + _SwitchFunctions: + - SwitchToHostCamera + - SwitchToHostCamera + - SwitchToAllPlayersCamera + _TimeBetweenCuts: 2.5 --- !u!1 &554199908 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2883740951159844552, guid: be33bc7f6c414e6409becfa348b9310d, @@ -33148,7 +33243,7 @@ GameObject: - component: {fileID: 563593522} - component: {fileID: 563593521} - component: {fileID: 563593520} - m_Layer: 0 + m_Layer: 22 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} @@ -34321,7 +34416,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 336011330} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &593766640 stripped @@ -37472,7 +37571,7 @@ GameObject: - component: {fileID: 676808534} - component: {fileID: 676808533} - component: {fileID: 676808532} - m_Layer: 0 + m_Layer: 22 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} @@ -39810,7 +39909,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1832440712} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &739684420 stripped @@ -41943,7 +42046,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 364742167} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &783795839 stripped @@ -42206,7 +42313,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 791402705} _CameraController: {fileID: 1691482842} - _SwitchToCamera: {fileID: 1390751086} + _SwitchFunction: SwitchToOverheadCamera --- !u!65 &791402707 BoxCollider: m_ObjectHideFlags: 0 @@ -55551,7 +55658,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1390751085} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1117826904 stripped @@ -57803,6 +57914,94 @@ Transform: - {fileID: 1481802714} m_Father: {fileID: 960509807} m_LocalEulerAnglesHint: {x: 0, y: 71, z: 0} +--- !u!1 &1193018060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1193018061} + - component: {fileID: 1193018063} + - component: {fileID: 1193018062} + m_Layer: 0 + m_Name: Host Players And Wide Shot Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1193018061 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193018060} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.64, y: 0, z: 0.41} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1451322102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1193018062 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193018060} + 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 &1193018063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1193018060} + 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: 1193018062} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToHostAndWinnerCamera + - SwitchToHostAndWinnerCamera + - SwitchToAllPlayersCamera + - SwitchToWideShotCamera + _TimeBetweenCuts: 2.5 --- !u!1 &1193701799 GameObject: m_ObjectHideFlags: 0 @@ -60359,6 +60558,112 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1311764230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1311764231} + - component: {fileID: 1311764234} + - component: {fileID: 1311764233} + - component: {fileID: 1311764232} + m_Layer: 0 + m_Name: Host And All Players Switch Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1311764231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -8.63, y: 0, z: 3.07} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 35514605} + m_Father: {fileID: 1451322102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1311764232 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + 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: bcfe845926156534eb3829e94dfbfd14, + type: 2} + programSource: {fileID: 11400000, guid: d0dcbcd91babecf4eb7fc3933e55d3b7, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1311764233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7b1f46c10efe4454fada90c597c6e038, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1311764232} + _CameraController: {fileID: 1355919010} + _SwitchToCameraTimer: {fileID: 35514607} +--- !u!65 &1311764234 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + 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: 2.5753372, y: 5.9157925, z: 6.3446593} + m_Center: {x: 0.057150777, y: 2.4578972, z: -0.19181636} --- !u!1 &1311828676 GameObject: m_ObjectHideFlags: 0 @@ -61367,7 +61672,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1330590325} _CameraController: {fileID: 1691482842} - _SwitchToCamera: {fileID: 364742168} + _SwitchFunction: SwitchToPlayerCamera --- !u!65 &1330590327 BoxCollider: m_ObjectHideFlags: 0 @@ -62570,7 +62875,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1353480263} _CameraController: {fileID: 1691482842} - _SwitchToCamera: {fileID: 1983062415} + _SwitchFunction: SwitchToFrontCamera --- !u!65 &1353480265 BoxCollider: m_ObjectHideFlags: 0 @@ -62929,11 +63234,17 @@ MonoBehaviour: LocationBoardCamera: {fileID: 1983062415} PrimaryFocusCamera: {fileID: 2043045206} VideoPlayerCamera: {fileID: 1064115356} + HostAndAllPlayersCameraTrigger: {fileID: 1311764233} + HostAllPlayersTimerToggle: {fileID: 35514607} + HostPlayersAndWideShotTimerToggle: {fileID: 1193018063} Player1CameraAnchor: {fileID: 783795840} Player2CameraAnchor: {fileID: 739684421} HostAndWinnerCameraAnchor: {fileID: 1117826905} LocationBoardCameraAnchor: {fileID: 1922829039} + ModemCameraAnchor: {fileID: 1358503113} VideoPlayerCameraAnchor: {fileID: 593766641} + WideShotCameraAnchor: {fileID: 1931140527} + AllPlayersCameraAnchor: {fileID: 1670138121} --- !u!114 &1355919011 MonoBehaviour: m_ObjectHideFlags: 2 @@ -63051,7 +63362,7 @@ Transform: m_GameObject: {fileID: 1355971342} serializedVersion: 2 m_LocalRotation: {x: -0.36687618, y: 0.60448474, z: -0.60448474, w: -0.3668765} - m_LocalPosition: {x: -13.894, y: 2.26, z: 2.175} + m_LocalPosition: {x: -14.83, y: 2.26, z: 1.69} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -63135,7 +63446,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 70805495} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1358503112 stripped @@ -63144,6 +63459,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1358503111} m_PrefabAsset: {fileID: 0} +--- !u!114 &1358503113 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1358503111} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539984432} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1360827957 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1564876747245225317, guid: 40955da061a841841a91c845049f1e11, @@ -63557,7 +63884,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 306921568} + m_TransformParent: {fileID: 1117826904} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -63638,12 +63965,12 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 8.5 + value: 14 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: far clip plane - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -63686,41 +64013,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -63744,17 +64036,17 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -65435,6 +65727,8 @@ Transform: - {fileID: 944796117} - {fileID: 1331320733} - {fileID: 1967712740} + - {fileID: 1311764231} + - {fileID: 1193018061} - {fileID: 115578769} - {fileID: 1583513123} - {fileID: 1449300098} @@ -65636,9 +65930,9 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1459858124} _CameraController: {fileID: 1691482842} - _Cameras: - - {fileID: 364742168} - - {fileID: 1832440713} + _SwitchFunctions: + - SwitchToHostCamera + - SwitchToPlayerCamera _TimeBetweenCuts: 5 --- !u!1 &1461972938 stripped GameObject: @@ -71349,11 +71643,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1983062414} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1519421598 stripped @@ -76163,11 +76453,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 364742167} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1564239175 stripped @@ -77709,13 +77995,13 @@ GameObject: - component: {fileID: 1614278398} - component: {fileID: 1614278397} - component: {fileID: 1614278396} - m_Layer: 0 + m_Layer: 22 m_Name: Screen m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!64 &1614278396 MeshCollider: m_ObjectHideFlags: 0 @@ -79937,6 +80223,108 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1669769486} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1670138120 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1967712740} + m_Modifications: + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FOV + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FarClippingPlane + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_Name + value: All Players Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.3110001 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.8540001 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.93615425 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.3515896 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + 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: 0 + 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!114 &1670138121 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1670138120} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1930672082} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1670138122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1670138120} + m_PrefabAsset: {fileID: 0} --- !u!1 &1671286181 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3093625404220333573, guid: 40955da061a841841a91c845049f1e11, @@ -84423,11 +84811,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 70805495} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1808255083 stripped @@ -84806,7 +85190,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1858619631} + m_TransformParent: {fileID: 739684420} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -84887,7 +85271,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 8.5 + value: 10 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -84935,6 +85319,31 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -86307,11 +86716,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1832440712} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1858619631 stripped @@ -87521,11 +87926,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - insertIndex: -1 - addedObject: {fileID: 336011330} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1914584492 stripped @@ -87780,7 +88181,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1983062414} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &1922829038 stripped @@ -88102,6 +88507,114 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &1930672082 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1670138120} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1931140524 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1967712740} + 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: 10 + 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: Wide Shot Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.7229997 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.729 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.749001 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.2985172 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.01691024 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.9527271 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.053969458 + 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: 0 + 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 &1931140525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1931140524} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1931140527 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1931140524} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 509818293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1931251399 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8172070431878381391, guid: c0e6ac64e5e4b49469f640d83b81c9f7, @@ -89907,6 +90420,8 @@ Transform: - {fileID: 739684420} - {fileID: 1117826904} - {fileID: 1922829038} + - {fileID: 1670138122} + - {fileID: 1931140525} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1968326128 stripped @@ -90079,7 +90594,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 552861271} m_Father: {fileID: 72003558} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1968710948 @@ -90824,7 +91340,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1519421598} + m_TransformParent: {fileID: 1922829038} m_Modifications: - target: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -90905,7 +91421,7 @@ PrefabInstance: - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: field of view - value: 15 + value: 30 objectReference: {fileID: 0} - target: {fileID: 5542997801820577511, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -90953,41 +91469,6 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8055959652257360952, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -91011,17 +91492,17 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: spawnRot.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -95563,7 +96044,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1074804292} - - {fileID: 552861271} - {fileID: 458165860} - {fileID: 431721601} - {fileID: 72003558} @@ -104513,72 +104993,72 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} - - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} - - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} - - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} - - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} - - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 5a56ded101f363e46861c8fe1c4f360e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -109955,6 +110435,26 @@ MonoBehaviour: ID: 1278 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1930672082} + ID: 1279 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1311764230} + ID: 1280 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 35514604} + ID: 1281 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 509818293} + ID: 1282 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1193018060} + ID: 1283 + 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/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 9e28e8e..3bd52bd 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 9164638..57a1b8f 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 3f847d0..562c921 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index b2ea155..96fa5ed 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 601d565..bc9bf8c 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 4d9b97f..628b98a 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index cd67849..4ac367c 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index dd38ab0..1ffc43f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.asset index 05fc846..e12c811 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.asset +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.asset @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _SwitchToCamera + Data: _SwitchFunction - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _SwitchToCamera + Data: _SwitchFunction - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera, UnityEngine.CoreModule + Data: System.String, mscorlib - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.cs index 443b7ea..450e2b4 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraSwitchTrigger.cs @@ -10,14 +10,14 @@ using VRC.Udon.Common.Interfaces; public class CameraSwitchTrigger : UdonSharpBehaviour { [SerializeField] private CameraControllerBase _CameraController; - [SerializeField] private Camera _SwitchToCamera; + [SerializeField] private string _SwitchFunction; public override void OnPlayerTriggerEnter(VRCPlayerApi Player) { if (Networking.GetOwner(_CameraController.gameObject) == Networking.LocalPlayer) { - _CameraController.SwitchToLiveCamera(_SwitchToCamera); + _CameraController.SendCustomEvent(_SwitchFunction); } base.OnPlayerTriggerEnter(Player); diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset index 5fed890..dee377a 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Cameras + Data: _SwitchFunctions - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Cameras + Data: _SwitchFunctions - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Camera[], UnityEngine.CoreModule + Data: System.String[], mscorlib - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs index 468ec9a..f30f28c 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs @@ -11,7 +11,7 @@ using VRC.Udon; public class CameraTimedSwitcher : UdonSharpBehaviour { [SerializeField] private CameraControllerBase _CameraController; - [SerializeField] private Camera[] _Cameras; + [SerializeField] private string[] _SwitchFunctions; [SerializeField] private float _TimeBetweenCuts = 5.0f; @@ -24,8 +24,8 @@ public class CameraTimedSwitcher : UdonSharpBehaviour { if (_Active) { - _CameraController.SwitchToLiveCamera(_Cameras[_NextCameraIndex]); - _NextCameraIndex = (_NextCameraIndex + 1) % _Cameras.Length; + _CameraController.SendCustomEvent(_SwitchFunctions[_NextCameraIndex]); + _NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length; SendCustomEventDelayedSeconds(nameof(SwitchToNextCamera), _TimeBetweenCuts); } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 626d9b4..1c20e0c 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -79,31 +79,26 @@ public class CameraControllerRound1 : CameraControllerBase public void SwitchToPlayer1Camera() { - DisableAllSwitchers(); SwitchToLiveCamera(Player1Camera); } public void SwitchToPlayer2Camera() { - DisableAllSwitchers(); SwitchToLiveCamera(Player2Camera); } public void SwitchToPlayer3Camera() { - DisableAllSwitchers(); SwitchToLiveCamera(Player3Camera); } public void SwitchToHostCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(HostCamera); } public void SwitchToVideoPlayerCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(VideoPlayerCamera); } @@ -114,7 +109,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToWideShotCamera() { - DisableAllSwitchers(); ActivateWideShotCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } @@ -125,7 +119,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToVideoMusicClueCamera() { - DisableAllSwitchers(); ActivateVideoMusicClueCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } @@ -136,7 +129,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToACMECrimenetComputerCamera() { - DisableAllSwitchers(); ActivateACMECrimenetComputerCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } @@ -147,7 +139,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToFilingCabinetCamera() { - DisableAllSwitchers(); ActivateFilingCabinetCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } @@ -158,7 +149,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToAllPlayersCamera() { - DisableAllSwitchers(); ActivateAllPlayersCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } @@ -169,7 +159,6 @@ public class CameraControllerRound1 : CameraControllerBase } public void SwitchToModemCamera() { - DisableAllSwitchers(); ActivateModemCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index b4bb554..36517c0 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 12 + Data: 18 - Name: Entry: 7 Data: @@ -455,19 +455,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: HostAndAllPlayersCameraTrigger - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1CameraAnchor + Data: HostAndAllPlayersCameraTrigger - Name: k__BackingField Entry: 7 Data: 28|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraAnchor, Assembly-CSharp + Data: CameraTimerSwitchTrigger, Assembly-CSharp - Name: Entry: 8 Data: @@ -491,7 +491,7 @@ MonoBehaviour: Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 4 + Data: 2 - Name: Entry: 7 Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule @@ -503,25 +503,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 31|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 31|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -542,16 +524,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2CameraAnchor + Data: HostAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player2CameraAnchor + Data: HostAllPlayersTimerToggle - Name: k__BackingField - Entry: 9 - Data: 28 + Entry: 7 + Data: 33|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraTimedSwitcher, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -569,10 +557,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 + - Name: + Entry: 7 + Data: 35|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: - Name: Entry: 7 Data: 36|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -596,16 +593,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndWinnerCameraAnchor + Data: HostPlayersAndWideShotTimerToggle - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndWinnerCameraAnchor + Data: HostPlayersAndWideShotTimerToggle - Name: k__BackingField Entry: 9 - Data: 28 + Data: 33 - Name: k__BackingField Entry: 9 Data: 4 @@ -650,16 +647,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationBoardCameraAnchor + Data: Player1CameraAnchor - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LocationBoardCameraAnchor + Data: Player1CameraAnchor - Name: k__BackingField - Entry: 9 - Data: 28 + Entry: 7 + Data: 41|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -677,13 +680,238 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 44|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: Player2CameraAnchor + - Name: $v + Entry: 7 + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 47|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: HostAndWinnerCameraAnchor + - Name: $v + Entry: 7 + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostAndWinnerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 50|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: LocationBoardCameraAnchor + - Name: $v + Entry: 7 + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationBoardCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 53|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: ModemCameraAnchor + - Name: $v + Entry: 7 + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 56|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -707,13 +935,13 @@ MonoBehaviour: Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 28 + Data: 41 - Name: k__BackingField Entry: 9 Data: 4 @@ -731,13 +959,130 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 59|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: WideShotCameraAnchor + - Name: $v + Entry: 7 + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: WideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 63|UnityEngine.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: AllPlayersCameraAnchor + - Name: $v + Entry: 7 + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: AllPlayersCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 41 + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 52d289c..fbd8b87 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -17,16 +17,20 @@ public class CameraControllerRound2 : CameraControllerBase [SerializeField] public Camera PrimaryFocusCamera; [SerializeField] public Camera VideoPlayerCamera; [Space] - //[SerializeField] public CameraTimerSwitchTrigger HostCameraTrigger; + [SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger; [Space] - //[SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; - //[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; + [SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle; + [SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle; [Space] [SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor; [SerializeField] public CameraAnchor HostAndWinnerCameraAnchor; [SerializeField] public CameraAnchor LocationBoardCameraAnchor; + [SerializeField] public CameraAnchor ModemCameraAnchor; [SerializeField] public CameraAnchor VideoPlayerCameraAnchor; + [Space] + [SerializeField] public CameraAnchor WideShotCameraAnchor; + [SerializeField] public CameraAnchor AllPlayersCameraAnchor; public override void InitialiseCameras() @@ -47,79 +51,99 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, PrimaryFocusCamera.gameObject); Networking.SetOwner(Player, VideoPlayerCamera.gameObject); + Networking.SetOwner(Player, HostAndAllPlayersCameraTrigger.gameObject); + + Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject); + Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject); + Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject); Networking.SetOwner(Player, HostAndWinnerCameraAnchor.gameObject); Networking.SetOwner(Player, LocationBoardCameraAnchor.gameObject); Networking.SetOwner(Player, VideoPlayerCameraAnchor.gameObject); + Networking.SetOwner(Player, WideShotCameraAnchor.gameObject); + Networking.SetOwner(Player, AllPlayersCameraAnchor.gameObject); + base.OnOwnershipTransferred(Player); } public void SwitchToPlayer1Camera() { - DisableAllSwitchers(); SwitchToLiveCamera(Player1Camera); } public void SwitchToPlayer2Camera() { - DisableAllSwitchers(); SwitchToLiveCamera(Player2Camera); } public void SwitchToHostAndWinnerCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(HostAndWinnerCamera); } public void SwitchToVideoPlayerCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(VideoPlayerCamera); } public void ActivateWideShotCamera() { - //DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); + WideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); } public void SwitchToWideShotCamera() { - //DisableAllSwitchers(); - //ActivateWideShotCamera(); - //SwitchToLiveCamera(PrimaryFocusCamera); + ActivateWideShotCamera(); + SwitchToLiveCamera(PrimaryFocusCamera); + } + + public void ActivateAllPlayersCamera() + { + AllPlayersCameraAnchor.AttachCamera(PrimaryFocusCamera); + } + public void SwitchToAllPlayersCamera() + { + ActivateAllPlayersCamera(); + SwitchToLiveCamera(PrimaryFocusCamera); } public void ActivateHostAllPlayersCameraSwitcher() { - //ActivateAllPlayersCamera(); - //HostAndIndividualPlayersTimerToggle.Activate = false; - //HostAndAllPlayersTimerToggle.Activate = true; + ActivateAllPlayersCamera(); + HostAllPlayersTimerToggle.Activate = true; + HostPlayersAndWideShotTimerToggle.Activate = false; + } + + public void ActivateHostPlayersAndWideShotCameraSwitcher() + { + ActivateWideShotCamera(); + HostAllPlayersTimerToggle.Activate = false; + HostPlayersAndWideShotTimerToggle.Activate = true; } - public void ActivateHostCameraTrigger() + public void ActivateHostAllPlayersCameraTrigger() { - //HostCameraTrigger.gameObject.SetActive(true); + HostAndAllPlayersCameraTrigger.gameObject.SetActive(true); } - public void DeactivateHostCameraTrigger() + public void DeactivateHostAllPlayersCameraTrigger() { - //HostCameraTrigger.gameObject.SetActive(false); + HostAndAllPlayersCameraTrigger.gameObject.SetActive(false); } public override void DisableAllTriggers() { - //HostCameraTrigger.gameObject.SetActive(false); + HostAndAllPlayersCameraTrigger.gameObject.SetActive(false); } public override void DisableAllSwitchers() { - //HostAndAllPlayersTimerToggle.Activate = false; - //HostAndIndividualPlayersTimerToggle.Activate = false; + HostAllPlayersTimerToggle.Activate = false; + HostPlayersAndWideShotTimerToggle.Activate = false; } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index e4231e6..74a8610 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -92,31 +92,26 @@ public class CameraControllerRound3 : CameraControllerBase public void SwitchToPlayerCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(PlayerCamera); } public void SwitchToHostCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(HostCamera); } public void SwitchToOverheadCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(OverheadCamera); } public void SwitchToFrontCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(FrontCamera); } public void SwitchToVideoPlayerCamera() { - DisableAllSwitchers(); SwitchToLiveCamera(VideoPlayerCamera); } @@ -146,14 +141,6 @@ public class CameraControllerRound3 : CameraControllerBase } - public void ChangeMarkerCameraPosition() - { - HostCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(HostCamera); - PlayerCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(PlayerCamera); - RequestSerialization(); - } - - public void PlayIFeelGood(bool Play) { PlayIFeelGoodCallback = Play; @@ -193,10 +180,16 @@ public class CameraControllerRound3 : CameraControllerBase set { _MarkerCameraAnchorPosition = value; - ChangeMarkerCameraPosition(); + _ChangeMarkerCameraPosition(); } get => _MarkerCameraAnchorPosition; } + private void _ChangeMarkerCameraPosition() + { + HostCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(HostCamera); + PlayerCameraAnchorSequence[MarkerCameraAnchorPosition].AttachCamera(PlayerCamera); + RequestSerialization(); + } private bool PlayIFeelGoodCallback { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 710cad2..3c4c932 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -169,6 +169,7 @@ public class GameManagerRound1 : GameManagerBase private void PlayIntroVideo() { _CameraControllerRound1.DeactivateHostCameraTrigger(); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToHostCamera(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); @@ -313,6 +314,7 @@ public class GameManagerRound1 : GameManagerBase { case 0: { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoMusicClueCamera(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.VideoMusicClue); @@ -540,6 +542,7 @@ public class GameManagerRound1 : GameManagerBase _QuestionCorrectResponse = (int)_CurrentQuestion["Correct Response"].Number; + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Reveal Choice 1"); @@ -557,6 +560,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.As5); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Reveal Choice 2"); @@ -574,6 +578,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.C6); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Reveal Choice 3"); @@ -619,10 +624,11 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); _CameraControllerRound1.SendCustomEventDelayedSeconds("ActivateHostAllPlayersCameraSwitcher", 2.0f); - EnableInteraction("Lock Answers"); + EnableInteraction("Get Player 1's Response"); } private void MultipleChoiceLockAnswers() @@ -650,46 +656,40 @@ public class GameManagerRound1 : GameManagerBase } } - EnableInteraction("Focus On Player 1"); + EnableInteraction("Get Player 1's Response"); } - private void MultipleChoiceFocusOnPlayer1() + private void MultipleChoiceFocusOnPlayer(int PlayerNumber) { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "LockInChoice"); + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.Owner, "ShowAuxiliaryMapScreen", false); + } + + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.CommentUI.text = "What did you pick?"; + for (int i = 0; i < _PlayerPodiums.Length; i++) { _PlayerPodiums[i].HighlightPodium(false); } - _PlayerPodiums[0].HighlightPodium(true); + int PlayerIndex = PlayerNumber - 1; + _PlayerPodiums[PlayerIndex].HighlightPodium(true); + Interface.HeaderUI.text = _PlayerPodiums[PlayerIndex].PlayerName; - _CameraControllerRound1.SwitchToPlayer1Camera(); + _CameraControllerRound1.DisableAllSwitchers(); + _CameraControllerRound1.SendCustomEvent("SwitchToPlayer" + PlayerNumber + "Camera"); - EnableInteraction("Focus On Player 2"); - } - - private void MultipleChoiceFocusOnPlayer2() - { - for (int i = 0; i < _PlayerPodiums.Length; i++) + if (PlayerNumber < _PlayerPodiums.Length) { - _PlayerPodiums[i].HighlightPodium(false); + EnableInteraction("Get Player " + (PlayerNumber + 1) + "'s Response"); } - _PlayerPodiums[1].HighlightPodium(true); - - _CameraControllerRound1.SwitchToPlayer2Camera(); - - EnableInteraction("Focus On Player 3"); - } - - private void MultipleChoiceFocusOnPlayer3() - { - for (int i = 0; i < _PlayerPodiums.Length; i++) + else { - _PlayerPodiums[i].HighlightPodium(false); + EnableInteraction("Reveal Correct Answer"); } - _PlayerPodiums[2].HighlightPodium(true); - - _CameraControllerRound1.SwitchToPlayer3Camera(); - - EnableInteraction("Reveal Answers And Assign Points"); } private void MultipleChoiceRevealAnswersAndAssignPoints() @@ -725,6 +725,7 @@ public class GameManagerRound1 : GameManagerBase _VideoPlayer.FlashCorrectAnswer = true; + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Next Question"); @@ -733,6 +734,7 @@ public class GameManagerRound1 : GameManagerBase private void BeginLightningRound() { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToWideShotCamera(); SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayLightningRoundAnimation)); _CameraControllerRound1.SendCustomEventDelayedSeconds("ActivateHostAllPlayersCameraSwitcher", 3.0f); @@ -885,6 +887,7 @@ public class GameManagerRound1 : GameManagerBase private void PlayTheChaseMusic() { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToWideShotCamera(); _CameraControllerRound1.SendCustomEventDelayedSeconds("ActivateHostAllPlayersCameraSwitcher", 5.0f); @@ -947,6 +950,7 @@ public class GameManagerRound1 : GameManagerBase { _VideoPlayer.SubMapIndex = _QuestionSubstage * 2; + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); } @@ -979,6 +983,7 @@ public class GameManagerRound1 : GameManagerBase } public void TheChaseEndClue() { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, @@ -1015,8 +1020,7 @@ public class GameManagerRound1 : GameManagerBase "- Now it's time for the final clue of this round, which means you have to decide how many of your ACME Crimebucks you want to risk.\n" + "- If you're right, we'll add that amount to your score.\n" + "- If you're not right, we'll subtract that amount from your score.\n" + - "- You can risk 0, 10, 20, 30, 40, or 50 ACME Crimebucks.\n\n" + - "- Choose how much to risk by placing your wager to the other side of your podium."; + "- You can risk 0, 10, 20, 30, 40, or 50 ACME Crimebucks."; LoadMapsIntoQueue(); @@ -1055,6 +1059,7 @@ public class GameManagerRound1 : GameManagerBase "PlayMusic", MusicEventType.ThinkAboutIt); SendCustomEventDelayedSeconds(nameof(ThinkAboutItCountdownFinished), 15.0f); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SendCustomEventDelayedSeconds("SwitchToVideoPlayerCamera", 2.0f); _CameraControllerRound1.SendCustomEventDelayedSeconds("SwitchToPlayer1Camera", 4.5f); _CameraControllerRound1.SendCustomEventDelayedSeconds("SwitchToPlayer2Camera", 7.0f); @@ -1117,6 +1122,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.As5); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Reveal Choice 2"); @@ -1132,6 +1138,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.C6); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); EnableInteraction("Reveal Choice 3"); @@ -1176,6 +1183,7 @@ public class GameManagerRound1 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); _CameraControllerRound1.SendCustomEventDelayedSeconds("ActivateHostAllPlayersCameraSwitcher", 2.0f); @@ -1242,6 +1250,7 @@ public class GameManagerRound1 : GameManagerBase { int PlayerNumber = _FinalRoundPlayersSortedByScore[PlayerPlace - 1]; + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SendCustomEvent("SwitchToPlayer" + PlayerNumber + "Camera"); HostCardBetweenRoundsInterface Interface = @@ -1274,6 +1283,7 @@ public class GameManagerRound1 : GameManagerBase EnableInteraction("Reveal Next Player Answer"); } + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SendCustomEventDelayedSeconds("SwitchToAllPlayersCamera", 1.5f); _CameraControllerRound1.SendCustomEventDelayedSeconds("ActivateHostAllPlayersCameraSwitcher", 4.0f); } @@ -1438,6 +1448,7 @@ public class GameManagerRound1 : GameManagerBase { _Modem.Teleport(); SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 2.5f); + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToModemCamera(); } public void _ContinueToRound2_Private() @@ -1683,15 +1694,19 @@ public class GameManagerRound1 : GameManagerBase switch (_BuzzedInPlayer) { case 1: + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToPlayer1Camera(); break; case 2: + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToPlayer2Camera(); break; case 3: + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToPlayer3Camera(); break; default: + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToAllPlayersCamera(); break; } @@ -1766,16 +1781,16 @@ public class GameManagerRound1 : GameManagerBase { switch (_QuestionStage) { - case 1: InitialiseCluePresentation(); break; - case 2: MultipleChoiceRevealChoice1(); break; - case 3: MultipleChoiceRevealChoice2(); break; - case 4: MultipleChoiceRevealChoice3(); break; - case 5: MultipleChoiceLockAnswers(); break; - case 6: MultipleChoiceFocusOnPlayer1(); break; - case 7: MultipleChoiceFocusOnPlayer2(); break; - case 8: MultipleChoiceFocusOnPlayer3(); break; - case 9: MultipleChoiceRevealAnswersAndAssignPoints(); break; - case 10: AdvanceToNextQuestion(); break; + case 1: InitialiseCluePresentation(); break; + case 2: MultipleChoiceRevealChoice1(); break; + case 3: MultipleChoiceRevealChoice2(); break; + case 4: MultipleChoiceRevealChoice3(); break; + //case 5: MultipleChoiceLockAnswers(); break; + case 5: MultipleChoiceFocusOnPlayer(1); break; + case 6: MultipleChoiceFocusOnPlayer(2); break; + case 7: MultipleChoiceFocusOnPlayer(3); break; + case 8: MultipleChoiceRevealAnswersAndAssignPoints(); break; + case 9: AdvanceToNextQuestion(); break; default: break; } } @@ -1863,14 +1878,15 @@ public class GameManagerRound1 : GameManagerBase private void _PlayVideo() { - _CameraControllerRound1.SwitchToHostCamera(); _CameraControllerRound1.DisableAllSwitchers(); + _CameraControllerRound1.SwitchToHostCamera(); _VideoPlayer.PlayVideo = true; SendCustomEventDelayedSeconds(nameof(SwitchToTVCamera), 2.0f); } public void SwitchToTVCamera() { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToVideoPlayerCamera(); SendCustomEventDelayedSeconds(nameof(CheckVideoPlayerTimeToEnd), 0.25f); } @@ -1880,6 +1896,7 @@ public class GameManagerRound1 : GameManagerBase { if ((_VideoPlayer.GetVideoDuration() - _VideoPlayer.GetVideoTime()) <= 2.0f) { + _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToHostCamera(); } else diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index c061e57..c587190 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -71,6 +71,8 @@ public class GameManagerRound2 : GameManagerBase SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), true); _CameraControllerRound2.InitialiseCameras(); + _CameraControllerRound2.DisableAllSwitchers(); + _CameraControllerRound2.ActivateHostAllPlayersCameraTrigger(); RequestSerialization(); } @@ -162,6 +164,9 @@ public class GameManagerRound2 : GameManagerBase private void DisplayBriefing() { + _CameraControllerRound2.DeactivateHostAllPlayersCameraTrigger(); + _CameraControllerRound2.ActivateHostPlayersAndWideShotCameraSwitcher(); + HostCardRecoverTheLootExplainerInterface RecoverTheLootInterface = (HostCardRecoverTheLootExplainerInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLootExplainer); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index eb2b39c..4176ef2 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -190,6 +190,7 @@ public class GameManagerRound3 : GameManagerBase _GameStatus = GameStatus.Begin; UpdateInterface(); + _CameraControllerRound3.DisableAllSwitchers(); _CameraControllerRound3.HostPlayerTimerToggle.Activate = false; _CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true; GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); @@ -323,8 +324,7 @@ public class GameManagerRound3 : GameManagerBase GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); } - //_HostCameraAnchors[ActiveMarker].AttachCamera(_HostCamera); - //_PlayerCameraAnchors[ActiveMarker].AttachCamera(_PlayerCamera); + _CameraControllerRound3.MarkerCameraAnchorPosition = ActiveMarker; } [NetworkCallable] diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem index 46de010..7145f5a 160000 --- a/Assets/VRChatCameraSystem +++ b/Assets/VRChatCameraSystem @@ -1 +1 @@ -Subproject commit 46de01003348b6535b1caec676413ef2570916f8 +Subproject commit 7145f5a5dd1781ea98cd3df9bc96655803c07ccd