diff --git a/Assets/Prefabs/Jail Chain.prefab b/Assets/Prefabs/Jail Chain.prefab index 6c00e58..d74efbc 100644 --- a/Assets/Prefabs/Jail Chain.prefab +++ b/Assets/Prefabs/Jail Chain.prefab @@ -497,7 +497,7 @@ MonoBehaviour: ThrowVelocityBoostScale: 1 currentlyHeldBy: {fileID: 0} pickupable: 1 - proximity: 0.5 + proximity: 0.75 version: 0 --- !u!114 &4279963186528276829 MonoBehaviour: @@ -592,6 +592,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2705142496176794513} _GameManager: {fileID: 0} + _Pickup: {fileID: 3592705773749276922} _ChainPivot: {fileID: 3590657470899212667} _ChainHome: {fileID: 2554891250381025553} _PullTarget: {fileID: 4967056217235796773} @@ -707,7 +708,7 @@ Transform: m_GameObject: {fileID: 4994299810440057811} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0, z: -0.3} + m_LocalPosition: {x: 0, y: -0, z: -0.215} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 856ef98..d308af9 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1594,7 +1594,7 @@ PrefabInstance: - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1707,7 +1707,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -40282,6 +40282,92 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &741456679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 741456680} + - component: {fileID: 741456682} + - component: {fileID: 741456681} + m_Layer: 0 + m_Name: Player 2 And Wide Shot Switcher (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &741456680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741456679} + 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 &741456681 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741456679} + 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 &741456682 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 741456679} + 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: 741456681} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToPlayer2Camera + - SwitchToWideShotCamera + _TimeBetweenCuts: 3 --- !u!1 &741728900 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6713020845915447554, guid: fac4aa7abd3ecbe44a9eaf7f05275244, @@ -43106,7 +43192,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} propertyPath: m_Name - value: Player 1 Podium + value: Player 2 Podium objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -57012,7 +57098,7 @@ GameObject: m_Component: - component: {fileID: 1149080868} m_Layer: 0 - m_Name: Player 1 Spawn Point + m_Name: Player 2 Spawn Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -59170,8 +59256,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 808969078} - {fileID: 2134288142} + - {fileID: 808969078} m_Father: {fileID: 1583513123} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1231090884 stripped @@ -63400,6 +63486,8 @@ MonoBehaviour: HostAndAllPlayersCameraTrigger: {fileID: 1311764233} HostAllPlayersTimerToggle: {fileID: 35514607} HostPlayersAndWideShotTimerToggle: {fileID: 1193018063} + Player1AndWideShotTimerToggle: {fileID: 1377550932} + Player2AndWideShotTimerToggle: {fileID: 741456682} Player1CameraAnchor: {fileID: 783795840} Player2CameraAnchor: {fileID: 739684421} HostAndWinnerCameraAnchor: {fileID: 1117826905} @@ -63842,6 +63930,92 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1377550929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1377550930} + - component: {fileID: 1377550932} + - component: {fileID: 1377550931} + m_Layer: 0 + m_Name: Player 1 And Wide Shot Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1377550930 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377550929} + 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 &1377550931 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377550929} + 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 &1377550932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377550929} + 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: 1377550931} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToPlayer1Camera + - SwitchToWideShotCamera + _TimeBetweenCuts: 3 --- !u!1 &1378992343 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5677162063728742216, guid: c3b6993d13023194d904d6353e18944f, @@ -65892,6 +66066,8 @@ Transform: - {fileID: 1967712740} - {fileID: 1311764231} - {fileID: 1193018061} + - {fileID: 1377550930} + - {fileID: 741456680} - {fileID: 115578769} - {fileID: 1583513123} - {fileID: 1449300098} @@ -81826,7 +82002,7 @@ GameObject: m_Component: - component: {fileID: 1707600714} m_Layer: 0 - m_Name: Player 2 Spawn Point + m_Name: Player 1 Spawn Point m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -97009,7 +97185,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} propertyPath: m_Name - value: Player 2 Podium + value: Player 1 Podium objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -105284,21 +105460,26 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2} - {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} @@ -105307,18 +105488,11 @@ MonoBehaviour: - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} - - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} - {fileID: 2100000, guid: 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} @@ -105329,23 +105503,25 @@ MonoBehaviour: - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} - {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} - - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} - - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} @@ -105353,7 +105529,8 @@ MonoBehaviour: - {fileID: 2100000, guid: bd33b7e8a1d3cd74b8059a1a4602033a, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: b4ebc3728120eee449696f9b988eebcb, type: 2} - - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -110754,6 +110931,14 @@ MonoBehaviour: ID: 1284 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1377550929} + ID: 1285 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 741456679} + ID: 1286 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -110883,11 +111068,31 @@ PrefabInstance: propertyPath: serializationData.Prefab value: objectReference: {fileID: 0} + - target: {fileID: 3592705773749276922, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} + propertyPath: version + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3592705773749276922, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} + propertyPath: pickupable + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: sleepFlag value: 0 objectReference: {fileID: 0} + - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} + propertyPath: lastPickupable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, + type: 3} + propertyPath: pickupableFlag + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4279963186528276829, guid: a631a07c8ce3bed4cbc15b339c28a7a4, type: 3} propertyPath: serializationData.Prefab diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index 36517c0..92d37f2 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 18 + Data: 20 - Name: Entry: 7 Data: @@ -647,16 +647,124 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: Player1AndWideShotTimerToggle - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player1AndWideShotTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 33 + - 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 42|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: Player2AndWideShotTimerToggle + - Name: $v + Entry: 7 + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2AndWideShotTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 33 + - 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|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: Player1CameraAnchor + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 41|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -680,127 +788,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 49|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: 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 @@ -824,16 +824,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationBoardCameraAnchor + Data: Player2CameraAnchor - Name: $v Entry: 7 Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LocationBoardCameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 41 + Data: 47 - Name: k__BackingField Entry: 9 Data: 4 @@ -878,16 +878,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ModemCameraAnchor + Data: HostAndWinnerCameraAnchor - Name: $v Entry: 7 Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: HostAndWinnerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 41 + Data: 47 - Name: k__BackingField Entry: 9 Data: 4 @@ -932,16 +932,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCameraAnchor + Data: LocationBoardCameraAnchor - Name: $v Entry: 7 Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: LocationBoardCameraAnchor - Name: k__BackingField Entry: 9 - Data: 41 + Data: 47 - Name: k__BackingField Entry: 9 Data: 4 @@ -986,16 +986,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: WideShotCameraAnchor + Data: ModemCameraAnchor - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: WideShotCameraAnchor + Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 41 + Data: 47 - Name: k__BackingField Entry: 9 Data: 4 @@ -1014,12 +1014,120 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 62|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: VideoPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 47 + - 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: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 65|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: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: WideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 47 + - 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 68|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1028,7 +1136,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1052,13 +1160,13 @@ MonoBehaviour: Data: AllPlayersCameraAnchor - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 41 + Data: 47 - Name: k__BackingField Entry: 9 Data: 4 @@ -1076,13 +1184,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index fbd8b87..89fa7c5 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -21,6 +21,8 @@ public class CameraControllerRound2 : CameraControllerBase [Space] [SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle; + [SerializeField] public CameraTimedSwitcher Player1AndWideShotTimerToggle; + [SerializeField] public CameraTimedSwitcher Player2AndWideShotTimerToggle; [Space] [SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor; @@ -55,6 +57,8 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject); + Networking.SetOwner(Player, Player1AndWideShotTimerToggle.gameObject); + Networking.SetOwner(Player, Player2AndWideShotTimerToggle.gameObject); Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject); @@ -84,6 +88,11 @@ public class CameraControllerRound2 : CameraControllerBase SwitchToLiveCamera(HostAndWinnerCamera); } + public void SwitchToLocationBoardCamera() + { + SwitchToLiveCamera(LocationBoardCamera); + } + public void SwitchToVideoPlayerCamera() { SwitchToLiveCamera(VideoPlayerCamera); @@ -113,16 +122,34 @@ public class CameraControllerRound2 : CameraControllerBase public void ActivateHostAllPlayersCameraSwitcher() { - ActivateAllPlayersCamera(); HostAllPlayersTimerToggle.Activate = true; HostPlayersAndWideShotTimerToggle.Activate = false; + Player1AndWideShotTimerToggle.Activate = false; + Player2AndWideShotTimerToggle.Activate = false; } public void ActivateHostPlayersAndWideShotCameraSwitcher() { - ActivateWideShotCamera(); HostAllPlayersTimerToggle.Activate = false; HostPlayersAndWideShotTimerToggle.Activate = true; + Player1AndWideShotTimerToggle.Activate = false; + Player2AndWideShotTimerToggle.Activate = false; + } + + public void ActivatePlayer1AndWideShotCameraSwitcher() + { + HostAllPlayersTimerToggle.Activate = false; + HostPlayersAndWideShotTimerToggle.Activate = false; + Player1AndWideShotTimerToggle.Activate = true; + Player2AndWideShotTimerToggle.Activate = false; + } + + public void ActivatePlayer2AndWideShotCameraSwitcher() + { + HostAllPlayersTimerToggle.Activate = false; + HostPlayersAndWideShotTimerToggle.Activate = false; + Player1AndWideShotTimerToggle.Activate = false; + Player2AndWideShotTimerToggle.Activate = true; } @@ -145,5 +172,7 @@ public class CameraControllerRound2 : CameraControllerBase { HostAllPlayersTimerToggle.Activate = false; HostPlayersAndWideShotTimerToggle.Activate = false; + Player1AndWideShotTimerToggle.Activate = false; + Player2AndWideShotTimerToggle.Activate = false; } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index c24ec1d..b674f58 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -206,6 +206,8 @@ public class GameManagerRound2 : GameManagerBase _JailPlayer.VideoIndex = (int)_CaseManager.GetCrook(); + _CameraControllerRound2.ActivatePlayer1AndWideShotCameraSwitcher(); + NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.RecoverTheLoot); } @@ -309,6 +311,18 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Show = true; + _CameraControllerRound2.DisableAllSwitchers(); + switch (_CurrentPlayerCounter % 2) + { + case 0: + _CameraControllerRound2.SwitchToPlayer1Camera(); + break; + case 1: + _CameraControllerRound2.SwitchToPlayer2Camera(); + break; + } + + EnableInteraction("Phone Call"); } @@ -344,10 +358,7 @@ public class GameManagerRound2 : GameManagerBase { _CurrentPlayerCounter++; - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_LocationBoard, - NetworkEventTarget.All, - "ResetPanelBoard"); + _LocationBoard.ResetPanelBoard(); if (UpdateHostCardInterface) { @@ -420,10 +431,10 @@ public class GameManagerRound2 : GameManagerBase { ((HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot)) .DisablePanelButton(Panel); - NetworkCalling.SendCustomNetworkEvent( - (IUdonEventReceiver)_LocationBoard, - NetworkEventTarget.All, - "RevealPanel", Panel); + _LocationBoard.RevealPanel(Panel); + + _CameraControllerRound2.DisableAllSwitchers(); + _CameraControllerRound2.SwitchToLocationBoardCamera(); } [NetworkCallable] @@ -436,12 +447,6 @@ public class GameManagerRound2 : GameManagerBase { _JailPlayer.PlayVideo = true; _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook()); - - SendCustomEventDelayedSeconds(nameof(HideJailChain), 1.5f); - } - public void HideJailChain() - { - _JailChain.Show = false; } public void PhoneRing() diff --git a/Assets/UdonSharp/JailChain.asset b/Assets/UdonSharp/JailChain.asset index f7473a1..8555484 100644 --- a/Assets/UdonSharp/JailChain.asset +++ b/Assets/UdonSharp/JailChain.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 9 + Data: 10 - Name: Entry: 7 Data: @@ -116,19 +116,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChainPivot + Data: _Pickup - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ChainPivot + Data: _Pickup - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule + Data: VRC.SDK3.Components.VRCPickup, VRCSDK3 - Name: Entry: 8 Data: @@ -185,19 +185,79 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ChainHome + Data: _ChainPivot - Name: $v Entry: 7 Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ChainPivot + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 15|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: _ChainHome + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ChainHome - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -212,13 +272,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -242,76 +302,16 @@ MonoBehaviour: Data: _PullTarget - Name: $v Entry: 7 - Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PullTarget - Name: k__BackingField Entry: 9 - Data: 8 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 8 - - 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: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 17|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: _JailChainAnimator - - Name: $v - Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _JailChainAnimator - - Name: k__BackingField - Entry: 7 - Data: 19|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 19 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -329,19 +329,10 @@ MonoBehaviour: Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 - Data: 21|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -362,25 +353,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ReturnSpeedMultiplier + Data: _JailChainAnimator - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ReturnSpeedMultiplier + Data: _JailChainAnimator - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Single, mscorlib + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 24 + Data: 23 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -395,13 +386,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 3 + Data: 2 - Name: Entry: 7 - Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -410,7 +401,76 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 27|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 26|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ReturnSpeedMultiplier + - Name: $v + Entry: 7 + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ReturnSpeedMultiplier + - Name: k__BackingField + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 28 + - 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 31|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Speed at which the chain returns to its neutral pose. @@ -419,7 +479,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -443,13 +503,13 @@ MonoBehaviour: Data: _Show - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Show - Name: k__BackingField Entry: 7 - Data: 30|System.RuntimeType, mscorlib + Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -458,67 +518,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 30 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 3 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 33|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _PullChain - - Name: $v - Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PullChain - - Name: k__BackingField - Entry: 9 - Data: 30 - - Name: k__BackingField - Entry: 9 - Data: 30 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -536,13 +536,73 @@ MonoBehaviour: Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 37|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PullChain + - Name: $v + Entry: 7 + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PullChain + - Name: k__BackingField + Entry: 9 + Data: 34 + - Name: k__BackingField + Entry: 9 + Data: 34 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -563,16 +623,16 @@ MonoBehaviour: Data: _HasBeenActivated - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _HasBeenActivated - Name: k__BackingField Entry: 9 - Data: 30 + Data: 34 - Name: k__BackingField Entry: 9 - Data: 30 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -587,13 +647,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/JailChain.cs b/Assets/UdonSharp/JailChain.cs index 4939c75..8ffd83f 100644 --- a/Assets/UdonSharp/JailChain.cs +++ b/Assets/UdonSharp/JailChain.cs @@ -1,8 +1,7 @@  using UdonSharp; using UnityEngine; -using VRC.SDKBase; -using VRC.Udon; +using VRC.SDK3.Components; using VRC.Udon.Common.Interfaces; @@ -11,6 +10,7 @@ public class JailChain : UdonSharpBehaviour { [SerializeField] private GameManagerRound2 _GameManager; [Space] + [SerializeField] private VRCPickup _Pickup; [SerializeField] private Transform _ChainPivot; [SerializeField] private Transform _ChainHome; [SerializeField] private Transform _PullTarget; @@ -34,10 +34,7 @@ public class JailChain : UdonSharpBehaviour _HasBeenActivated = true; RequestSerialization(); - if (Networking.IsOwner(gameObject)) - { - _GameManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayInJailAnimation"); - } + _GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "PlayInJailAnimation"); } } else @@ -60,9 +57,18 @@ public class JailChain : UdonSharpBehaviour public override void OnDrop() { _PullChain = false; + if (_HasBeenActivated) + { + _Pickup.pickupable = false; + SendCustomEventDelayedSeconds(nameof(HideJailChain), 3.0f); + } RequestSerialization(); base.OnDrop(); } + public void HideJailChain() + { + Show = false; + } public void Initialise() @@ -82,9 +88,8 @@ public class JailChain : UdonSharpBehaviour { set { - Debug.Log("[JailChain] " + (value ? "Showing" : "Hiding") + " jail chain..."); - _Show = value; + if (_Show) _Pickup.pickupable = true; _JailChainAnimator.SetBool("Show", _Show); RequestSerialization(); } diff --git a/Assets/UdonSharp/Location Board/LocationBoard.asset b/Assets/UdonSharp/Location Board/LocationBoard.asset index 0a2a3d6..a18f811 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.asset +++ b/Assets/UdonSharp/Location Board/LocationBoard.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 21 + Data: 22 - Name: Entry: 7 Data: @@ -902,13 +902,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ActiveSpinners + Data: _RevealedPanel - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ActiveSpinners + Data: _RevealedPanel - Name: k__BackingField Entry: 9 Data: 33 @@ -932,13 +932,19 @@ MonoBehaviour: Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -959,13 +965,13 @@ MonoBehaviour: Data: _OrderIsCorrect - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _OrderIsCorrect - Name: k__BackingField Entry: 7 - Data: 64|System.RuntimeType, mscorlib + Data: 65|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean[], mscorlib @@ -974,7 +980,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 64 + Data: 65 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -989,13 +995,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1019,16 +1025,16 @@ MonoBehaviour: Data: _HasBeenCheckedBefore - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _HasBeenCheckedBefore - Name: k__BackingField Entry: 9 - Data: 64 + Data: 65 - Name: k__BackingField Entry: 9 - Data: 64 + Data: 65 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1043,13 +1049,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1073,13 +1079,13 @@ MonoBehaviour: Data: _LootMaterial - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LootMaterial - Name: k__BackingField Entry: 7 - Data: 71|System.RuntimeType, mscorlib + Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Material, UnityEngine.CoreModule @@ -1088,7 +1094,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 71 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1103,13 +1109,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1133,13 +1139,13 @@ MonoBehaviour: Data: _LocationSheetMaterialSelections - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LocationSheetMaterialSelections - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Material[], UnityEngine.CoreModule @@ -1148,7 +1154,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 75 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1163,13 +1169,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 77|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1193,13 +1199,13 @@ MonoBehaviour: Data: _Animator - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Animator - Name: k__BackingField Entry: 7 - Data: 79|System.RuntimeType, mscorlib + Data: 80|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1208,7 +1214,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 79 + Data: 80 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1223,7 +1229,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1247,13 +1253,13 @@ MonoBehaviour: Data: _LootImageDownloader - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LootImageDownloader - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 83|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 @@ -1262,7 +1268,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 82 + Data: 83 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1277,7 +1283,55 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ActiveSpinners + - Name: $v + Entry: 7 + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ActiveSpinners + - Name: k__BackingField + Entry: 9 + Data: 33 + - Name: k__BackingField + Entry: 9 + Data: 33 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Location Board/LocationBoard.cs b/Assets/UdonSharp/Location Board/LocationBoard.cs index 2868bb9..df12ae8 100644 --- a/Assets/UdonSharp/Location Board/LocationBoard.cs +++ b/Assets/UdonSharp/Location Board/LocationBoard.cs @@ -30,7 +30,8 @@ public class LocationBoard : UdonSharpBehaviour [UdonSynced, FieldChangeCallback(nameof(Landmarks))] private string[] _Landmarks; [UdonSynced, FieldChangeCallback(nameof(RandomMaterialSettings))] private int[] _RandomMaterialSettings; - [UdonSynced] private int _ActiveSpinners = 0; + [UdonSynced, FieldChangeCallback(nameof(RevealedPanel))] private int _RevealedPanel = 0; + [UdonSynced] private bool[] _OrderIsCorrect = new bool[3]; [UdonSynced] private bool[] _HasBeenCheckedBefore; @@ -40,6 +41,8 @@ public class LocationBoard : UdonSharpBehaviour private Animator _Animator; private VRCImageDownloader _LootImageDownloader; + private int _ActiveSpinners = 0; + void Start() { @@ -87,32 +90,41 @@ public class LocationBoard : UdonSharpBehaviour } - [NetworkCallable] public void RevealPanel(int Panel) { + RevealedPanel = Panel; + RequestSerialization(); + } + + private void _RevealPanel_Private() + { + Debug.Log("[LocationBoard] Revealing panel " + RevealedPanel); + if (_ActiveSpinners < 3) { - _Animator.SetBool("Flip " + Panel, true); + Debug.Log("[LocationBoard] Active spinners is currently less than three"); + + _Animator.SetBool("Flip " + RevealedPanel, true); switch (_ActiveSpinners) { case 0: { - _OrderIsCorrect[0] = (Panel == LootLocation); + _OrderIsCorrect[0] = (RevealedPanel == LootLocation); if (_OrderIsCorrect[0]) { _GameManager.OnTheRightTrack(); } - else if (Panel == WarrantLocation) + else if (RevealedPanel == WarrantLocation) { _GameManager.OutOfOrder(PanelType.Warrant); } - else if (Panel == CrookLocation) + else if (RevealedPanel == CrookLocation) { _GameManager.OutOfOrder(PanelType.Crook); } - else if (_HasBeenCheckedBefore[Panel - 1]) + else if (_HasBeenCheckedBefore[RevealedPanel - 1]) { _GameManager.AlreadyTried(); SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 1.0f); @@ -125,7 +137,7 @@ public class LocationBoard : UdonSharpBehaviour } break; case 1: { - _OrderIsCorrect[1] = (Panel == WarrantLocation); + _OrderIsCorrect[1] = (RevealedPanel == WarrantLocation); if (_OrderIsCorrect[1]) { @@ -138,15 +150,15 @@ public class LocationBoard : UdonSharpBehaviour _GameManager.AlmostThere(); } } - else if (Panel == LootLocation) + else if (RevealedPanel == LootLocation) { _GameManager.OutOfOrder(PanelType.Loot); } - else if (Panel == CrookLocation) + else if (RevealedPanel == CrookLocation) { _GameManager.OutOfOrder(PanelType.Crook); } - else if (_HasBeenCheckedBefore[Panel - 1]) + else if (_HasBeenCheckedBefore[RevealedPanel - 1]) { if (!_OrderIsCorrect[0]) { @@ -166,7 +178,7 @@ public class LocationBoard : UdonSharpBehaviour } break; case 2: { - _OrderIsCorrect[2] = (Panel == CrookLocation); + _OrderIsCorrect[2] = (RevealedPanel == CrookLocation); if (_OrderIsCorrect[2]) { @@ -176,17 +188,17 @@ public class LocationBoard : UdonSharpBehaviour SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f); } } - else if (Panel == LootLocation) + else if (RevealedPanel == LootLocation) { _GameManager.OutOfOrder(PanelType.Loot); SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f); } - else if (Panel == WarrantLocation) + else if (RevealedPanel == WarrantLocation) { _GameManager.OutOfOrder(PanelType.Warrant); SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f); } - else if (_HasBeenCheckedBefore[Panel - 1]) + else if (_HasBeenCheckedBefore[RevealedPanel - 1]) { if (!_OrderIsCorrect[0] || !_OrderIsCorrect[1]) { @@ -208,20 +220,17 @@ public class LocationBoard : UdonSharpBehaviour _ActiveSpinners++; - if (Panel == LootLocation || Panel == WarrantLocation || Panel == CrookLocation) + if (RevealedPanel == LootLocation) { - if (Panel == LootLocation) - { - _GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f); - } - else if (Panel == WarrantLocation) - { - _GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f); - } - else if (Panel == CrookLocation) - { - _GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f); - } + _GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f); + } + else if (RevealedPanel == WarrantLocation) + { + _GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f); + } + else if (RevealedPanel == CrookLocation) + { + _GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f); } if (_OrderIsCorrect[0] && _OrderIsCorrect[1] && _OrderIsCorrect[2]) @@ -230,14 +239,18 @@ public class LocationBoard : UdonSharpBehaviour } } - _HasBeenCheckedBefore[Panel - 1] = true; + _HasBeenCheckedBefore[RevealedPanel - 1] = true; } public void InitiateBoardReset() { _GameManager.LocationBoardReset(true); } - [NetworkCallable] public void ResetPanelBoard() + { + RevealedPanel = 0; + RequestSerialization(); + } + private void _ResetPanelBoard_Private() { for (int i = 1; i <= 15; i++) { @@ -425,4 +438,22 @@ public class LocationBoard : UdonSharpBehaviour } get => _RandomMaterialSettings; } + + + private int RevealedPanel + { + set + { + _RevealedPanel = value; + if (_RevealedPanel > 0) + { + _RevealPanel_Private(); + } + else + { + _ResetPanelBoard_Private(); + } + } + get => _RevealedPanel; + } } diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 0de06a1..06fc599 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -10,13 +10,13 @@ "version": "1.5.0" }, "dev.onevr.vrworldtoolkit": { - "version": "3.3.1" + "version": "3.3.2" }, "com.vrchat.base": { - "version": "3.9.0" + "version": "3.10.1" }, "com.vrchat.worlds": { - "version": "3.9.0" + "version": "3.10.1" } }, "locked": { @@ -35,17 +35,17 @@ } }, "dev.onevr.vrworldtoolkit": { - "version": "3.3.1", + "version": "3.3.2", "dependencies": {} }, "com.vrchat.base": { - "version": "3.9.0", + "version": "3.10.1", "dependencies": {} }, "com.vrchat.worlds": { - "version": "3.9.0", + "version": "3.10.1", "dependencies": { - "com.vrchat.base": "3.9.0" + "com.vrchat.base": "3.10.1" } } } diff --git a/UdonSharp.Editor.csproj b/UdonSharp.Editor.csproj index 96c8e41..3a7c875 100644 --- a/UdonSharp.Editor.csproj +++ b/UdonSharp.Editor.csproj @@ -72,6 +72,7 @@ + diff --git a/VRC.ClientSim.csproj b/VRC.ClientSim.csproj index c20c4be..51197bb 100644 --- a/VRC.ClientSim.csproj +++ b/VRC.ClientSim.csproj @@ -76,7 +76,6 @@ - @@ -124,7 +123,6 @@ - diff --git a/VRC.SDK3.Editor.csproj b/VRC.SDK3.Editor.csproj index 73b3dff..ebe45a0 100644 --- a/VRC.SDK3.Editor.csproj +++ b/VRC.SDK3.Editor.csproj @@ -75,6 +75,7 @@ + diff --git a/VRC.SDK3.csproj b/VRC.SDK3.csproj index 83e2836..171b6fc 100644 --- a/VRC.SDK3.csproj +++ b/VRC.SDK3.csproj @@ -77,6 +77,7 @@ + diff --git a/VRC.SDKBase.Editor.csproj b/VRC.SDKBase.Editor.csproj index 63027b6..a328b99 100644 --- a/VRC.SDKBase.Editor.csproj +++ b/VRC.SDKBase.Editor.csproj @@ -117,7 +117,6 @@ - @@ -133,6 +132,7 @@ + diff --git a/VRC.SDKBase.csproj b/VRC.SDKBase.csproj index 48720b4..1386374 100644 --- a/VRC.SDKBase.csproj +++ b/VRC.SDKBase.csproj @@ -73,7 +73,6 @@ - @@ -1186,6 +1185,10 @@ Library\ScriptAssemblies\Unity.Timeline.dll False + + Library\ScriptAssemblies\Unity.Mathematics.dll + False + Library\ScriptAssemblies\UnityEditor.UI.dll False diff --git a/VRC.Udon.csproj b/VRC.Udon.csproj index 343c1a1..b01a7a6 100644 --- a/VRC.Udon.csproj +++ b/VRC.Udon.csproj @@ -72,12 +72,14 @@ + +