diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index fc1b0c4..12c6a7d 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -1058,10 +1058,13 @@ MonoBehaviour: _CameraController: {fileID: 1355919010} _SwitchFunctions: - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - SwitchToPlayer1Camera - SwitchToPlayer2Camera - _TimeBetweenCuts: 2 + _TimeBetweenCuts: + - 5 + - 2.5 + - 2.5 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -30256,11 +30259,15 @@ MonoBehaviour: _CameraController: {fileID: 1524477936} _SwitchFunctions: - SwitchToHostCamera - - SwitchToHostCamera - SwitchToPlayer1Camera - SwitchToPlayer2Camera - SwitchToPlayer3Camera - _TimeBetweenCuts: 2.5 + _TimeBetweenCuts: + - 5 + - 2.5 + - 2.5 + - 2.5 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -32207,11 +32214,11 @@ Transform: m_GameObject: {fileID: 529984885} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.64, y: 0, z: 0.41} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &529984887 MonoBehaviour: @@ -32265,9 +32272,10 @@ MonoBehaviour: _SwitchFunctions: - SwitchToLocationBoardCamera - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - _TimeBetweenCuts: 1.5 + _TimeBetweenCuts: + - 2 + - 3 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher @@ -32859,9 +32867,11 @@ MonoBehaviour: _CameraController: {fileID: 1524477936} _SwitchFunctions: - SwitchToHostCamera - - SwitchToHostCamera - SwitchToAllPlayersCamera - _TimeBetweenCuts: 2.5 + _TimeBetweenCuts: + - 5 + - 3 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -40399,11 +40409,11 @@ Transform: 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_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &741456681 MonoBehaviour: @@ -40457,7 +40467,10 @@ MonoBehaviour: _SwitchFunctions: - SwitchToPlayer2Camera - SwitchToLocationBoardCamera - _TimeBetweenCuts: 3 + _TimeBetweenCuts: + - 2 + - 3 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -45284,6 +45297,96 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &905819756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 905819757} + - component: {fileID: 905819759} + - component: {fileID: 905819758} + m_Layer: 0 + m_Name: Location Board And Winning Player Switcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &905819757 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 905819756} + 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: 1483356975} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &905819758 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 905819756} + 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 &905819759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 905819756} + 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: 905819758} + _CameraController: {fileID: 1355919010} + _SwitchFunctions: + - SwitchToLocationBoardCamera + _TimeBetweenCuts: + - 1.5 + _Loop: 1 + _LoopPoint: 0 + _FirstLoopCallbackObject: {fileID: 865296978} + _FirstLoopCallbackFunction: SwitchToCurrentPlayerCamera --- !u!1 &906252250 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6494273791062881839, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -58273,11 +58376,11 @@ Transform: 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_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1193018062 MonoBehaviour: @@ -58330,10 +58433,13 @@ MonoBehaviour: _CameraController: {fileID: 1355919010} _SwitchFunctions: - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - SwitchToAllPlayersCamera - SwitchToWideShotCamera - _TimeBetweenCuts: 2.5 + _TimeBetweenCuts: + - 5 + - 3 + - 3 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -60910,13 +61016,13 @@ Transform: 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_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.9899974, y: 0, z: 2.6599994} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 35514605} - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1311764232 MonoBehaviour: @@ -63566,6 +63672,7 @@ MonoBehaviour: Player2AndLocationBoardTimerToggle: {fileID: 741456682} LocationBoardAndShortHostTimerToggle: {fileID: 529984888} LocationBoardAndLongHostTimerToggle: {fileID: 1875043588} + LocationBoardAndWinningPlayerTimerToggle: {fileID: 905819759} Player1CameraAnchor: {fileID: 783795840} Player2CameraAnchor: {fileID: 739684421} HostAndWinnerCameraAnchor: {fileID: 1117826905} @@ -64035,11 +64142,11 @@ Transform: 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_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1377550931 MonoBehaviour: @@ -64093,7 +64200,10 @@ MonoBehaviour: _SwitchFunctions: - SwitchToPlayer1Camera - SwitchToLocationBoardCamera - _TimeBetweenCuts: 3 + _TimeBetweenCuts: + - 2 + - 3 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -66145,12 +66255,7 @@ Transform: - {fileID: 944796117} - {fileID: 1331320733} - {fileID: 1967712740} - - {fileID: 1311764231} - - {fileID: 1193018061} - - {fileID: 1377550930} - - {fileID: 741456680} - - {fileID: 529984886} - - {fileID: 1875043586} + - {fileID: 1483356975} - {fileID: 115578769} - {fileID: 1583513123} - {fileID: 1449300098} @@ -66355,7 +66460,8 @@ MonoBehaviour: _SwitchFunctions: - SwitchToHostCamera - SwitchToPlayerCamera - _TimeBetweenCuts: 5 + _TimeBetweenCuts: [] + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} _FirstLoopCallbackFunction: @@ -67567,6 +67673,44 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1483356974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1483356975} + m_Layer: 0 + m_Name: Camera Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1483356975 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1483356974} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -6.6400037, y: 0, z: 0.41000128} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1311764231} + - {fileID: 1193018061} + - {fileID: 1377550930} + - {fileID: 741456680} + - {fileID: 529984886} + - {fileID: 1875043586} + - {fileID: 905819757} + m_Father: {fileID: 1451322102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1485928489 GameObject: m_ObjectHideFlags: 0 @@ -87999,11 +88143,11 @@ Transform: m_GameObject: {fileID: 1875043585} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6.64, y: 0, z: 0.41} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1451322102} + m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1875043587 MonoBehaviour: @@ -88057,10 +88201,10 @@ MonoBehaviour: _SwitchFunctions: - SwitchToLocationBoardCamera - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - - SwitchToHostAndWinnerCamera - _TimeBetweenCuts: 1.5 + _TimeBetweenCuts: + - 2 + - 4.5 + _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} _FirstLoopCallbackFunction: SwitchToCurrentPlayerAndLocationBoardSwitcher @@ -96689,9 +96833,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1074804292} - - {fileID: 458165860} - {fileID: 431721601} - {fileID: 72003558} + - {fileID: 458165860} - {fileID: 167305400} - {fileID: 1115429855} - {fileID: 2136439120} @@ -105638,76 +105782,76 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2} - - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2} + - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2} + - {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2} + - {fileID: 2100000, guid: 98438748f07992c4a9eca84eb166591b, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: c5480627ec99c8a45bbd5dfe52d1dea7, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + - {fileID: 2100000, guid: 1eb2f964062497347b887d2c940e79c5, type: 2} - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} + - {fileID: 2100000, guid: f1807abb25a22fb4fb9a796796ec55cb, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2} + - {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2} + - {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2} + - {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} + - {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2} + - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2} + - {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2} + - {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2} + - {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2} + - {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2} + - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2} + - {fileID: 2100000, guid: a55c6cba78f87d1499a304b41036f758, type: 2} + - {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2} - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2} - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2} - - {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} - - {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} + - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, 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: 82f2961c9baa48a45ac897be257fd655, 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} - {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: e45d02bbf7268504ca58513c548a58e7, 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: 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: 462153a63867ae44596b4d0413a039bc, type: 2} - - {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - - {fileID: 2100000, guid: 9d4baac78c2042b47b42fc9c92d87767, type: 2} - - {fileID: 2100000, guid: db9b2b735115eb248a189b1fdc721a50, type: 2} - {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2} - {fileID: 2100000, guid: a94d8fe1854504e47a64e023cecaa130, type: 2} - - {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} - - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, 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} - - {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: c4382cc6d54262b46913ae6fe8a3740e, type: 2} LightMapsNear: [] LightMapsFar: [] @@ -111125,6 +111269,10 @@ MonoBehaviour: ID: 1288 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 905819756} + ID: 1289 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset index 3dc2cbb..d458ff4 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 8 + Data: 10 - Name: Entry: 7 Data: @@ -188,7 +188,7 @@ MonoBehaviour: Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Single, mscorlib + Data: System.Single[], mscorlib - Name: Entry: 8 Data: @@ -210,12 +210,72 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 14|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: _Loop + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Loop + - Name: k__BackingField + Entry: 7 + Data: 16|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 14|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 18|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -224,7 +284,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -248,13 +308,13 @@ MonoBehaviour: Data: _LoopPoint - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LoopPoint - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 21|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -263,7 +323,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 21 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -278,19 +338,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 20|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 24|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Loop to this point in the camera sequence. Default is index 0 (the beginning) @@ -317,13 +377,13 @@ MonoBehaviour: Data: _FirstLoopCallbackObject - Name: $v Entry: 7 - Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FirstLoopCallbackObject - Name: k__BackingField Entry: 7 - Data: 22|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime @@ -347,13 +407,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 24|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -362,13 +422,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 26|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 30|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Set this to call a function on an UdonSharpBehaviour instead of looping @@ -396,13 +456,13 @@ MonoBehaviour: Data: _FirstLoopCallbackFunction - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FirstLoopCallbackFunction - Name: k__BackingField Entry: 7 - Data: 28|System.RuntimeType, mscorlib + Data: 32|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -411,7 +471,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 28 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -426,13 +486,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -456,22 +516,16 @@ MonoBehaviour: Data: _Active - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Active - Name: k__BackingField - Entry: 7 - Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 16 - Name: k__BackingField Entry: 9 - Data: 32 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -486,19 +540,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 35|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 38|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -522,16 +576,16 @@ MonoBehaviour: Data: _NextCameraIndex - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _NextCameraIndex - Name: k__BackingField Entry: 9 - Data: 17 + Data: 21 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 21 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -546,7 +600,55 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|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: _LoopedOnce + - Name: $v + Entry: 7 + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LoopedOnce + - Name: k__BackingField + Entry: 9 + Data: 16 + - Name: k__BackingField + Entry: 9 + Data: 16 + - 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: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs index 5c9a7ab..db51b8e 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs @@ -1,10 +1,6 @@  -using CameraSystem; using UdonSharp; using UnityEngine; -using VRC.SDK3.UdonNetworkCalling; -using VRC.SDKBase; -using VRC.Udon; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] @@ -12,8 +8,9 @@ public class CameraTimedSwitcher : UdonSharpBehaviour { [SerializeField] private CameraControllerBase _CameraController; [SerializeField] private string[] _SwitchFunctions; + [SerializeField] private float[] _TimeBetweenCuts = { 5.0f }; [Space] - [SerializeField] private float _TimeBetweenCuts = 5.0f; + [SerializeField] private bool _Loop = true; [SerializeField, Tooltip("Loop to this point in the camera sequence. Default is index 0 (the beginning)")] private int _LoopPoint = 0; [Space] @@ -24,29 +21,46 @@ public class CameraTimedSwitcher : UdonSharpBehaviour [UdonSynced, FieldChangeCallback(nameof(Activate))] private bool _Active = false; private int _NextCameraIndex = 0; + private bool _LoopedOnce = false; public void SwitchToNextCamera() { if (_Active) { - _CameraController.SendCustomEvent(_SwitchFunctions[_NextCameraIndex]); - _NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length; - if (_NextCameraIndex == 0) + int CurrentCameraIndex = _NextCameraIndex; + + if (CurrentCameraIndex == _LoopPoint && _LoopedOnce) { if (_FirstLoopCallbackObject != null) { - Activate = false; _FirstLoopCallbackObject.SendCustomEvent(_FirstLoopCallbackFunction); + Activate = false; return; } - else + if (!_Loop) { - _NextCameraIndex = _LoopPoint; + Activate = false; + return; } } - SendCustomEventDelayedSeconds(nameof(SwitchToNextCamera), _TimeBetweenCuts); + string Function = _SwitchFunctions[_NextCameraIndex]; + if (Function != "") + { + _CameraController.SendCustomEvent(Function); + } + + _NextCameraIndex = (_NextCameraIndex + 1) % _SwitchFunctions.Length; + + if (_NextCameraIndex == 0) + { + _LoopedOnce = true; + _NextCameraIndex = _LoopPoint; + } + + SendCustomEventDelayedSeconds(nameof(SwitchToNextCamera), + _TimeBetweenCuts[Mathf.Min(CurrentCameraIndex, _TimeBetweenCuts.Length - 1)]); } } @@ -59,6 +73,7 @@ public class CameraTimedSwitcher : UdonSharpBehaviour { _Active = value; _NextCameraIndex = 0; + _LoopedOnce = false; SwitchToNextCamera(); RequestSerialization(); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index bb79011..17d00d5 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 22 + Data: 23 - Name: Entry: 7 Data: @@ -863,16 +863,70 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: LocationBoardAndWinningPlayerTimerToggle - Name: $v Entry: 7 Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationBoardAndWinningPlayerTimerToggle + - 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: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 54|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: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -896,73 +950,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 55|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 58|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 56|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: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: Player2CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 53 - - 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: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 59|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -986,16 +986,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndWinnerCameraAnchor + Data: Player2CameraAnchor - Name: $v Entry: 7 Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndWinnerCameraAnchor + Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1040,16 +1040,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LocationBoardCameraAnchor + Data: HostAndWinnerCameraAnchor - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LocationBoardCameraAnchor + Data: HostAndWinnerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1094,16 +1094,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ModemCameraAnchor + Data: LocationBoardCameraAnchor - Name: $v Entry: 7 Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: LocationBoardCameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1148,16 +1148,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: VideoPlayerCameraAnchor + Data: ModemCameraAnchor - Name: $v Entry: 7 Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: VideoPlayerCameraAnchor + Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1202,16 +1202,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: WideShotCameraAnchor + Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: WideShotCameraAnchor + Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1230,12 +1230,66 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: WideShotCameraAnchor + - Name: $v + Entry: 7 + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: WideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 56 + - 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: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 74|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 77|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1244,7 +1298,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1268,13 +1322,13 @@ MonoBehaviour: Data: AllPlayersCameraAnchor - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 53 + Data: 56 - Name: k__BackingField Entry: 9 Data: 4 @@ -1292,13 +1346,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 7934536..7db898f 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -25,6 +25,7 @@ public class CameraControllerRound2 : CameraControllerBase [SerializeField] public CameraTimedSwitcher Player2AndLocationBoardTimerToggle; [SerializeField] public CameraTimedSwitcher LocationBoardAndShortHostTimerToggle; [SerializeField] public CameraTimedSwitcher LocationBoardAndLongHostTimerToggle; + [SerializeField] public CameraTimedSwitcher LocationBoardAndWinningPlayerTimerToggle; [Space] [SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor; @@ -63,6 +64,7 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, Player2AndLocationBoardTimerToggle.gameObject); Networking.SetOwner(Player, LocationBoardAndShortHostTimerToggle.gameObject); Networking.SetOwner(Player, LocationBoardAndLongHostTimerToggle.gameObject); + Networking.SetOwner(Player, LocationBoardAndWinningPlayerTimerToggle.gameObject); Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject); @@ -132,6 +134,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } public void ActivateHostPlayersAndWideShotCameraSwitcher() @@ -142,6 +145,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } public void ActivatePlayer1AndLocationBoardCameraSwitcher() @@ -152,6 +156,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } public void ActivatePlayer2AndLocationBoardCameraSwitcher() @@ -162,6 +167,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = true; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } public void ActivateLocationBoardAndShortHostCameraSwitcher() @@ -172,6 +178,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = true; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } public void ActivateLocationBoardAndLongHostCameraSwitcher() @@ -182,6 +189,18 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = true; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; + } + + public void ActivateLocationBoardAndWinningPlayerCameraSwitcher() + { + HostAllPlayersTimerToggle.Activate = false; + HostPlayersAndWideShotTimerToggle.Activate = false; + Player1AndLocationBoardTimerToggle.Activate = false; + Player2AndLocationBoardTimerToggle.Activate = false; + LocationBoardAndShortHostTimerToggle.Activate = false; + LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = true; } @@ -208,5 +227,6 @@ public class CameraControllerRound2 : CameraControllerBase Player2AndLocationBoardTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false; + LocationBoardAndWinningPlayerTimerToggle.Activate = false; } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 3332c49..7e1625c 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -302,7 +302,7 @@ public class GameManagerRound2 : GameManagerBase NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "StopMusic"); - _CameraControllerRound2.DisableAllSwitchers(); + _CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher(); AdvanceRound(); } @@ -321,8 +321,6 @@ public class GameManagerRound2 : GameManagerBase _JailChain.Show = true; - SwitchToCurrentPlayerCamera(); - EnableInteraction("Phone Call"); } diff --git a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs index 3c26f3d..03611e6 100644 --- a/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs +++ b/Assets/UdonSharp/Video Players/MultiRoundVideoPlayer.cs @@ -77,10 +77,7 @@ public class MultiRoundVideoPlayer : UdonSharpBehaviour public override void OnVideoReady() { - foreach (UdonSharpBehaviour Object in _RoundCallbacks) - { - _ExecuteCurrentRoundCallback_Private("VideoIsReady"); - } + _ExecuteCurrentRoundCallback_Private("VideoIsReady"); base.OnVideoReady(); }