From e485d0d9929cdb6748b1ae755dab6fa79365a2cb Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Wed, 25 Mar 2026 04:08:23 -0400 Subject: [PATCH] - Modem camera transition now has zoom animations. - Added a CameraAnchor and follower for the winning player in round 2. - Round 2 now has a more reliable check for when the call ends. - CameraAnchor can now follow different areas of a player's body. - CameraTimedSwitcher can now choose to always reactivate when asked. - Glass shatter effect now only works for hosts. - CaseVideoSyncPlayer will no longer crash when skipping too fast in round 1. - Fixed an erroneous camera switcher activation in round 3. - Made a minor wording change to Eartha Brute's wanted poster. --- .../Round 1 Cameras/Crane Shots.controller | 147 ++ .../Camera/Round 1 Cameras/Modem Zoom.anim | 135 ++ .../Round 1 Cameras/Modem Zoom.anim.meta | 8 + Assets/Animations/Camera/Round 2 Cameras.meta | 8 + .../Round 2 Cameras/Crane Shots.controller | 159 +++ .../Crane Shots.controller.meta | 8 + .../Camera/Round 2 Cameras/Modem Zoom.anim | 135 ++ .../Round 2 Cameras/Modem Zoom.anim.meta | 8 + .../Materials/Timer/M_TimerCrosshairs_UI.mat | 2 +- .../Eartha Brute Static Wanted Poster.prefab | 2 +- Assets/Prefabs/Glass Shatter Collision.prefab | 7 +- Assets/Prefabs/Modem.prefab | 4 +- Assets/Scenes/witwics.unity | 699 +++++++--- Assets/UdonSharp/AudioManager.cs | 10 + .../CameraTimedSwitcher.asset | 314 +++-- .../Camera Switchers/CameraTimedSwitcher.cs | 15 +- Assets/UdonSharp/Cameras/CameraAnchor.asset | 126 +- Assets/UdonSharp/Cameras/CameraAnchor.cs | 79 +- .../UdonSharp/Cameras/CameraControllerBase.cs | 5 - .../Cameras/CameraControllerRound1.asset | 1183 +++++++++-------- .../Cameras/CameraControllerRound1.cs | 34 + .../Cameras/CameraControllerRound2.asset | 764 +++++++---- .../Cameras/CameraControllerRound2.cs | 52 + .../Game Managers/GameManagerRound1.cs | 6 +- .../Game Managers/GameManagerRound2.asset | 110 +- .../Game Managers/GameManagerRound2.cs | 30 +- .../Game Managers/GameManagerRound3.cs | 1 - .../UtilityScripts/BoneFollower.asset | 2 +- .../UtilityScripts/InteractToggle.asset | 2 +- .../UtilityScripts/PlayerModSetter.asset | 2 +- .../Synced/GlobalToggleObject.asset | 2 +- .../Synced/MasterToggleObject.asset | 2 +- .../UtilityScripts/TrackingDataFollower.asset | 2 +- .../UtilityScripts/WorldAudioSettings.asset | 2 +- .../Video Players/CaseVideoSyncPlayer.cs | 9 +- Assets/UdonSharp/Window/GlassShatter.asset | 82 +- Assets/UdonSharp/Window/GlassShatter.cs | 20 +- 37 files changed, 2939 insertions(+), 1237 deletions(-) create mode 100644 Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim create mode 100644 Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim.meta create mode 100644 Assets/Animations/Camera/Round 2 Cameras.meta create mode 100644 Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller create mode 100644 Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller.meta create mode 100644 Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim create mode 100644 Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim.meta diff --git a/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller index 2e7a973..a8e3188 100644 --- a/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller +++ b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller @@ -79,6 +79,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-6280466133180026465 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Play Modem Zoom + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-4692977000017523001 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -107,6 +132,56 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-4497211960507618134 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Play Modem Zoom + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3981581014303723563} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2782546570068550446 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem Zoom + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -247449588978411056} + m_Position: {x: 30, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3981581014303723563} + m_Position: {x: 420, y: 180, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -247449588978411056} --- !u!1107 &-1992508409679594653 AnimatorStateMachine: serializedVersion: 6 @@ -135,6 +210,33 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 5448109171515969289} +--- !u!1102 &-247449588978411056 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4497211960507618134} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -156,6 +258,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Play Modem Zoom + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -169,6 +277,18 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Modem Zoom + m_StateMachine: {fileID: -2782546570068550446} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1101 &2481516024324196914 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -194,6 +314,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &3981581014303723563 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem Zoom + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6280466133180026465} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 9be85097f96097f4e898b102a1770bef, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &5448109171515969289 AnimatorState: serializedVersion: 6 diff --git a/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim new file mode 100644 index 0000000..b975038 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem Zoom + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: -0.06256307} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16145308} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: -0} + outSlope: {x: 0, y: 0, z: -0.06256307} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16145308} + - serializedVersion: 3 + time: 1.3333334 + value: {x: 1, y: 1, z: 0.4} + inSlope: {x: 0, y: 0, z: -1.507404} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.13569385} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Alternate Camera Anchors/Modem Camera Anchor/Camera FOV Scaler + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 2239202214 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.3333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -0.06256307 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.16145308 + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: -0 + outSlope: -0.06256307 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.16145308 + - serializedVersion: 3 + time: 1.3333334 + value: 0.4 + inSlope: -1.507404 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.13569385 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Alternate Camera Anchors/Modem Camera Anchor/Camera FOV Scaler + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim.meta b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim.meta new file mode 100644 index 0000000..f4cca03 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9be85097f96097f4e898b102a1770bef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 2 Cameras.meta b/Assets/Animations/Camera/Round 2 Cameras.meta new file mode 100644 index 0000000..bc814cc --- /dev/null +++ b/Assets/Animations/Camera/Round 2 Cameras.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3517efe8a372a1a4eb317b8ebb3b3498 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller b/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller new file mode 100644 index 0000000..989936d --- /dev/null +++ b/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6391960637646752134 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -660029159047093215} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-6230653784246420962 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem Zoom + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1479535747733134398} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7de83170e57ce5e42984a86f60fdb419, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-1479535747733134398 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Play Modem Zoom + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-660029159047093215 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Play Modem Zoom + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6230653784246420962} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Crane Shots + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Play Modem Zoom + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2856781494482922342} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &2856781494482922342 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6391960637646752134} + m_Position: {x: 30, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: -6230653784246420962} + m_Position: {x: 420, y: 180, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6391960637646752134} diff --git a/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller.meta b/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller.meta new file mode 100644 index 0000000..a51c8db --- /dev/null +++ b/Assets/Animations/Camera/Round 2 Cameras/Crane Shots.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 75c3053924998594b9fc924fa2ca3d7b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim new file mode 100644 index 0000000..88a619a --- /dev/null +++ b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem Zoom + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 0.4} + inSlope: {x: 0, y: 0, z: -0.5630838} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.11660179} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 1, y: 1, z: 0.4} + inSlope: {x: 0, y: 0, z: -0} + outSlope: {x: 0, y: 0, z: 0.07339278} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16056776} + - serializedVersion: 3 + time: 2.1666667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0.5994971} + outSlope: {x: 0, y: 0, z: 0.5994971} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.112327576} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Modem Camera Anchor/Camera FOV Scaler + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1570307574 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.1666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4 + inSlope: -0.5630838 + outSlope: 0 + tangentMode: 65 + weightedMode: 0 + inWeight: 0.11660179 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.4 + inSlope: -0 + outSlope: 0.07339278 + tangentMode: 5 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.16056776 + - serializedVersion: 3 + time: 2.1666667 + value: 1 + inSlope: 0.5994971 + outSlope: 0.5994971 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.112327576 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Modem Camera Anchor/Camera FOV Scaler + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim.meta b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim.meta new file mode 100644 index 0000000..13401fb --- /dev/null +++ b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7de83170e57ce5e42984a86f60fdb419 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat index ab902b9..d3e96ce 100644 --- a/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat +++ b/Assets/Materials/Timer/M_TimerCrosshairs_UI.mat @@ -93,7 +93,7 @@ Material: - _Thickness: 0.07 - _UVSec: 0 - _VerticalLineCorrection: 0 - - _WiperProgress: 0 + - _WiperProgress: 0.8666667 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Prefabs/Decorations/Static Wanted Posters/Eartha Brute Static Wanted Poster.prefab b/Assets/Prefabs/Decorations/Static Wanted Posters/Eartha Brute Static Wanted Poster.prefab index 950dfb6..edd202e 100644 --- a/Assets/Prefabs/Decorations/Static Wanted Posters/Eartha Brute Static Wanted Poster.prefab +++ b/Assets/Prefabs/Decorations/Static Wanted Posters/Eartha Brute Static Wanted Poster.prefab @@ -26,7 +26,7 @@ PrefabInstance: - target: {fileID: 7875515815342178887, guid: 7b68b414f7f0a9f4299d29d7d06f81df, type: 3} propertyPath: m_text - value: "\u2022 STRONG AS OX\n\u2022 LARGE AS HOUSE\n\u2022 DUMB AS BRICKS" + value: "\u2022 STRONG AS OX\n\u2022 LARGE AS HOUSE\n\u2022 DUMB AS ROCKS" objectReference: {fileID: 0} - target: {fileID: 8855430315479899827, guid: 7b68b414f7f0a9f4299d29d7d06f81df, type: 3} diff --git a/Assets/Prefabs/Glass Shatter Collision.prefab b/Assets/Prefabs/Glass Shatter Collision.prefab index 44c2b20..f50280c 100644 --- a/Assets/Prefabs/Glass Shatter Collision.prefab +++ b/Assets/Prefabs/Glass Shatter Collision.prefab @@ -58,6 +58,9 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1566564563436244780} _AudioManager: {fileID: 0} + _Colliders: + - {fileID: 5918708424213131158} + - {fileID: 4855268702929540186} --- !u!114 &1566564563436244780 MonoBehaviour: m_ObjectHideFlags: 0 @@ -102,7 +105,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3581063314187638010 Transform: m_ObjectHideFlags: 0 @@ -208,7 +211,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2000544568636214420 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab index e062938..033b7e7 100644 --- a/Assets/Prefabs/Modem.prefab +++ b/Assets/Prefabs/Modem.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6417972481979237589 Transform: m_ObjectHideFlags: 0 @@ -250,7 +250,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 2609ab7..c1e6aea 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -540,6 +540,7 @@ MonoBehaviour: _TimeBetweenCuts: - 0.5 - 4.5 + _AlwaysReactivate: 0 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -1364,6 +1365,7 @@ MonoBehaviour: - 5 - 2.5 - 2.5 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -1423,6 +1425,11 @@ PrefabInstance: propertyPath: FOV value: 35.8 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FollowMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane @@ -1808,6 +1815,7 @@ MonoBehaviour: - SwitchToAllPlayersCamera _TimeBetweenCuts: - 2 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -9991,6 +9999,11 @@ PrefabInstance: propertyPath: FOV value: 25 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FollowMethod + value: 3 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane @@ -17234,6 +17247,7 @@ MonoBehaviour: - SwitchToLocationBoardCamera _TimeBetweenCuts: - 2 + _AlwaysReactivate: 1 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} @@ -18003,7 +18017,6 @@ GameObject: m_Component: - component: {fileID: 359000343} - component: {fileID: 359000345} - - component: {fileID: 359000344} m_Layer: 0 m_Name: Newspaper Camera m_TagString: Untagged @@ -18026,14 +18039,6 @@ Transform: m_Children: [] m_Father: {fileID: 107399073} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &359000344 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359000342} - m_Enabled: 1 --- !u!20 &359000345 Camera: m_ObjectHideFlags: 0 @@ -22424,6 +22429,7 @@ MonoBehaviour: - 2.5 - 2.5 - 2.5 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -22588,6 +22594,39 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1 &472846498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 472846499} + m_Layer: 0 + m_Name: Glass Shatter Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &472846499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 472846498} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.000000059604638} + m_LocalPosition: {x: -3.886003, y: 0, z: -0.052001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 570548973} + - {fileID: 508235243} + m_Father: {fileID: 1427476863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &472947359 GameObject: m_ObjectHideFlags: 0 @@ -23332,6 +23371,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6157097060019438105} m_PrefabAsset: {fileID: 0} +--- !u!114 &508235244 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 6157097060019438105} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 508235242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &509296276 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8094191378400714075, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -24539,6 +24590,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 3 + _AlwaysReactivate: 1 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} @@ -25145,6 +25197,7 @@ MonoBehaviour: _TimeBetweenCuts: - 5 - 3 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -25720,7 +25773,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1427476863} + m_TransformParent: {fileID: 472846499} m_Modifications: - target: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} @@ -25753,23 +25806,33 @@ PrefabInstance: - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalPosition.x - value: -3.8860016 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.052000046 - objectReference: {fileID: 0} - - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, - type: 3} - propertyPath: m_LocalRotation.w value: 0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -25796,6 +25859,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 570548972} m_PrefabAsset: {fileID: 0} +--- !u!114 &570548974 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1566564563436244780, guid: aef94cccd27652f4ab0f5934d68e3f4f, + type: 3} + m_PrefabInstance: {fileID: 570548972} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 345367811} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &572517049 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3654857534179495643, guid: c37ec0a412d585049af93f09e1c82ec7, @@ -27135,6 +27210,7 @@ MonoBehaviour: - SwitchToVideoPlayerCamera _TimeBetweenCuts: - 5 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1355919010} @@ -27744,12 +27820,12 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: Modem + value: Modem Camera Anchor objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: 5.1816745 + value: 5.181637 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -27759,17 +27835,17 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: -5.875307 + value: -5.8753138 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: -0.76493686 + value: -0.764937 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: -0.027404279 + value: -0.027404282 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -27779,7 +27855,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: 0.023039734 + value: 0.023039736 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -28619,6 +28695,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 0 + _AlwaysReactivate: 0 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -30346,12 +30423,6 @@ Transform: m_Children: [] m_Father: {fileID: 760334291} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &683841852 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - m_PrefabInstance: {fileID: 1072779559} - m_PrefabAsset: {fileID: 0} --- !u!1001 &687105344 PrefabInstance: m_ObjectHideFlags: 0 @@ -32539,6 +32610,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 3 + _AlwaysReactivate: 1 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -32898,38 +32970,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} ---- !u!1 &758768598 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 758768599} - m_Layer: 0 - m_Name: Alternate Camera Anchors - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &758768599 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 758768598} - 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: - - {fileID: 1358503112} - m_Father: {fileID: 1967712740} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &759078070 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9006868906988065029, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -36584,6 +36624,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &864338143 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1424705574} + m_PrefabAsset: {fileID: 0} --- !u!1 &865296975 GameObject: m_ObjectHideFlags: 0 @@ -37395,6 +37441,7 @@ MonoBehaviour: - SwitchToLocationBoardCamera _TimeBetweenCuts: - 1.5 + _AlwaysReactivate: 1 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} @@ -46634,8 +46681,8 @@ Camera: m_GameObject: {fileID: 1069902874} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -46763,76 +46810,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1072779559 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1276291775} - m_Modifications: - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalPosition.x - value: -16.45 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalPosition.z - value: 2.03 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 2551137153161031695, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_Name - value: Newspaper Overlay (1) - objectReference: {fileID: 0} - - target: {fileID: 8073544392714602498, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: abf495bec3a7cf64c98c5e7a25fd446e, type: 3} ---- !u!4 &1072779560 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1949222043524572353, guid: abf495bec3a7cf64c98c5e7a25fd446e, - type: 3} - m_PrefabInstance: {fileID: 1072779559} - m_PrefabAsset: {fileID: 0} --- !u!1 &1074789658 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6882989511465335218, guid: bf667ba13e10e0c48a06066e3e1a29ae, @@ -48127,6 +48104,7 @@ MonoBehaviour: - SwitchToVideoPlayerCamera _TimeBetweenCuts: - 2 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 1 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -48738,6 +48716,7 @@ MonoBehaviour: - 2.75 - 2.75 - 2.25 + _AlwaysReactivate: 0 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -48874,6 +48853,11 @@ PrefabInstance: propertyPath: NearClippingPlane value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: CameraSystemManager + value: + objectReference: {fileID: 674142366} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -50238,6 +50222,7 @@ MonoBehaviour: _TimeBetweenCuts: - 1 - 3 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 2 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -50666,6 +50651,7 @@ MonoBehaviour: - 5 - 3 - 3 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -51742,6 +51728,7 @@ MonoBehaviour: - _TimeBetweenCuts: - 0.75 + _AlwaysReactivate: 0 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 515404446} @@ -52071,6 +52058,12 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!4 &1252584789 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6417972481979237589, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 2041044807715436007} + m_PrefabAsset: {fileID: 0} --- !u!1 &1252600773 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7206411773959490822, guid: be33bc7f6c414e6409becfa348b9310d, @@ -52543,7 +52536,6 @@ Transform: - {fileID: 2063457642} - {fileID: 1658730386} - {fileID: 579108364} - - {fileID: 1072779560} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1277454218 stripped @@ -52903,6 +52895,111 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &1289569928 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1289569932} + - component: {fileID: 1289569931} + - component: {fileID: 1289569929} + - component: {fileID: 1289569930} + m_Layer: 0 + m_Name: Camera Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1289569929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1289569928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1289569930} + _CameraController: {fileID: 1524477936} + _SwitchFunction: SwitchToModemCamera +--- !u!114 &1289569930 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1289569928} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558, + type: 2} + programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!135 &1289569931 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1289569928} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &1289569932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1289569928} + 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: 1252584789} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1294807477 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6981955255910490986, guid: 126991d511ca61841a0ef899b6c038a6, @@ -56128,6 +56225,7 @@ MonoBehaviour: LocationBoardAndCurrentPlayerTimerToggle: {fileID: 345058003} LocationBoardAndWinningPlayerTimerToggle: {fileID: 905819759} VideoPlayerToWinningPlayerTimerToggle: {fileID: 604764489} + _CameraAnimator: {fileID: 1967712741} Player1CameraAnchor: {fileID: 783795840} Player2CameraAnchor: {fileID: 739684421} HostAndWinnerCameraAnchor: {fileID: 1117826905} @@ -56136,6 +56234,7 @@ MonoBehaviour: VideoPlayerCameraAnchor: {fileID: 593766641} WideShotCameraAnchor: {fileID: 1931140527} AllPlayersCameraAnchor: {fileID: 1670138121} + WinningPlayerCameraAnchor: {fileID: 1424705577} --- !u!114 &1355919011 MonoBehaviour: m_ObjectHideFlags: 2 @@ -56251,7 +56350,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 758768599} + m_TransformParent: {fileID: 1967712740} m_Modifications: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -56277,12 +56376,12 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: Modem + value: Modem Camera Anchor objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -2.0480034 + value: -2.047977 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -56292,12 +56391,12 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 7.704004 + value: 7.703977 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: -0.9232874 + value: -0.9232873 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -56307,7 +56406,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: 0.38243777 + value: 0.38243783 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -56730,6 +56829,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 3 + _AlwaysReactivate: 1 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -58004,6 +58104,118 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1424188481} m_CullTransparentMesh: 1 +--- !u!1001 &1424705574 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1967712740} + m_Modifications: + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FOV + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FollowMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FarClippingPlane + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: CameraSystemManager + value: + objectReference: {fileID: 674142366} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_Name + value: Winning Player Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.35600019 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.536 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: 3.4010015 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.58902323 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.80811614 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} +--- !u!4 &1424705575 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1424705574} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1424705577 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1424705574} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 864338143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1425200331 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8232294033196949623, guid: 126991d511ca61841a0ef899b6c038a6, @@ -58161,11 +58373,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4209ba9c393af2458ad4629a4196850, type: 3} insertIndex: -1 - addedObject: {fileID: 570548973} - - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4209ba9c393af2458ad4629a4196850, - type: 3} - insertIndex: -1 - addedObject: {fileID: 508235243} + addedObject: {fileID: 472846499} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4209ba9c393af2458ad4629a4196850, type: 3} insertIndex: -1 @@ -59195,6 +59403,7 @@ MonoBehaviour: _TimeBetweenCuts: - 4 - 4 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -65857,6 +66066,7 @@ MonoBehaviour: PrimaryFocusCamera: {fileID: 2043045206} VideoPlayerCamera: {fileID: 1064115356} HostCameraTrigger: {fileID: 1968710950} + ModemCameraTrigger: {fileID: 1289569929} HostAndAllPlayersTimerToggle: {fileID: 552861273} HostAndIndividualPlayersTimerToggle: {fileID: 458165862} AllPlayersAssignStarterPointsTimerToggle: {fileID: 59893116} @@ -70977,6 +71187,7 @@ MonoBehaviour: - SwitchToWideShotCamera _TimeBetweenCuts: - 3 + _AlwaysReactivate: 0 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -71114,6 +71325,7 @@ MonoBehaviour: - _TimeBetweenCuts: - 1 + _AlwaysReactivate: 0 _Loop: 1 _LoopPoint: 1 _FirstLoopCallbackObject: {fileID: 1524477936} @@ -71381,6 +71593,7 @@ Transform: - {fileID: 51189180} - {fileID: 7240854401870329234} - {fileID: 295257087} + - {fileID: 1713757808} - {fileID: 1230983058} - {fileID: 1468229609714695595} - {fileID: 1470660571} @@ -76152,6 +76365,110 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1713757807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1583513123} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.x + value: 0.8470499 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.y + value: 0.84705013 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalScale.z + value: 0.84705 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.899 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.832 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.4526633 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.4526632 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.54322726 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5432275 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 100.392 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_Name + value: SpawnMarker (2) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + propertyPath: m_TagString + value: EditorOnly + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8a0236a6fb2773f46b033e383a3f4f55, type: 3} +--- !u!4 &1713757808 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 8a0236a6fb2773f46b033e383a3f4f55, + type: 3} + m_PrefabInstance: {fileID: 1713757807} + m_PrefabAsset: {fileID: 0} --- !u!1 &1714284228 stripped GameObject: m_CorrespondingSourceObject: {fileID: 164377805661239424, guid: be33bc7f6c414e6409becfa348b9310d, @@ -81566,6 +81883,7 @@ MonoBehaviour: _TimeBetweenCuts: - 2 - 4.5 + _AlwaysReactivate: 1 _Loop: 0 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 865296978} @@ -81598,7 +81916,6 @@ GameObject: m_Component: - component: {fileID: 1880742077} - component: {fileID: 1880742079} - - component: {fileID: 1880742078} m_Layer: 0 m_Name: Timer Camera m_TagString: Untagged @@ -81621,14 +81938,6 @@ Transform: m_Children: [] m_Father: {fileID: 1472688265} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!81 &1880742078 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1880742076} - m_Enabled: 1 --- !u!20 &1880742079 Camera: m_ObjectHideFlags: 0 @@ -84818,6 +85127,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1967712740} + - component: {fileID: 1967712741} m_Layer: 0 m_Name: Camera Anchors m_TagString: Untagged @@ -84842,9 +85152,31 @@ Transform: - {fileID: 1922829038} - {fileID: 1670138122} - {fileID: 1931140525} - - {fileID: 758768599} + - {fileID: 1424705575} + - {fileID: 1358503112} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1967712741 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1967712739} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 75c3053924998594b9fc924fa2ca3d7b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1968326128 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5647187940288418182, guid: be33bc7f6c414e6409becfa348b9310d, @@ -88282,6 +88614,7 @@ MonoBehaviour: _TimeBetweenCuts: - 5 - 3 + _AlwaysReactivate: 1 _Loop: 1 _LoopPoint: 0 _FirstLoopCallbackObject: {fileID: 0} @@ -93286,11 +93619,6 @@ PrefabInstance: value: objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} - - target: {fileID: 497488136702045868, guid: 597de72e4385c0d498ba1475ac5ef4f7, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: _AudioManager @@ -93323,11 +93651,6 @@ PrefabInstance: propertyPath: m_Name value: Modem objectReference: {fileID: 0} - - target: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: _Target @@ -93427,7 +93750,11 @@ PrefabInstance: objectReference: {fileID: 1034723246} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6417972481979237589, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1289569932} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!1001 &2357104409142985571 @@ -100118,7 +100445,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1427476863} + m_TransformParent: {fileID: 472846499} m_Modifications: - target: {fileID: 284550684963164945, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} @@ -100151,7 +100478,7 @@ PrefabInstance: - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalPosition.x - value: -3.886 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} @@ -100161,27 +100488,27 @@ PrefabInstance: - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalPosition.z - value: -0.052 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8323492466987083631, guid: aef94cccd27652f4ab0f5934d68e3f4f, type: 3} @@ -105860,10 +106187,6 @@ MonoBehaviour: ID: 1321 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 683841852} - ID: 1322 - SerializedTypeNames: - - VRC.Udon.UdonBehaviour - gameObject: {fileID: 633978913} ID: 1323 SerializedTypeNames: @@ -105876,6 +106199,14 @@ MonoBehaviour: ID: 1325 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1289569928} + ID: 1326 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 864338143} + ID: 1327 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] @@ -106343,7 +106674,7 @@ PrefabInstance: - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.size - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} @@ -106384,12 +106715,12 @@ PrefabInstance: type: 3} propertyPath: _HostEventListeners.Array.data[6] value: - objectReference: {fileID: 1264786911} + objectReference: {fileID: 570548974} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _HostEventListeners.Array.data[7] value: - objectReference: {fileID: 1264786911} + objectReference: {fileID: 508235244} - target: {fileID: 4952117166513200865, guid: d0081ba0c86469447b4742edcbf39017, type: 3} propertyPath: _CameraEventListeners.Array.data[0] diff --git a/Assets/UdonSharp/AudioManager.cs b/Assets/UdonSharp/AudioManager.cs index c287d42..25bdc74 100644 --- a/Assets/UdonSharp/AudioManager.cs +++ b/Assets/UdonSharp/AudioManager.cs @@ -328,6 +328,16 @@ public class AudioManager : UdonSharpBehaviour return _SFXPlayer.isPlaying; } + public float CurrentSFXLength() + { + if (_SFXPlayer.clip) + { + return _SFXPlayer.clip.length; + } + + return 0.0f; + } + private void _PlaySFX_Internal(SFXEventType SFXEvent, bool Loop = false, float Pitch = 1.0f) { _SFXPlayer.Stop(); diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.asset index 192e0fc..2ad45dd 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: 12 + Data: 13 - Name: Entry: 7 Data: @@ -236,13 +236,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Loop + Data: _AlwaysReactivate - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Loop + Data: _AlwaysReactivate - Name: k__BackingField Entry: 7 Data: 16|System.RuntimeType, mscorlib @@ -272,7 +272,7 @@ MonoBehaviour: Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 + Data: 3 - Name: Entry: 7 Data: 18|UnityEngine.SpaceAttribute, UnityEngine.CoreModule @@ -288,6 +288,70 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 20|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: When enabled, switcher will reset when activated, even if it wasn't deactivated + first. + - 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: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Loop + - 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: true + - Name: _fieldAttributes + Entry: 7 + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -308,13 +372,13 @@ MonoBehaviour: Data: _LoopPoint - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LoopPoint - Name: k__BackingField Entry: 7 - Data: 21|System.RuntimeType, mscorlib + Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -323,7 +387,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 21 + Data: 25 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -338,19 +402,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 23|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 24|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 28|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Loop to this point in the camera sequence. Default is index 0 (the beginning) @@ -377,13 +441,13 @@ MonoBehaviour: Data: _FirstLoopCallbackObject - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FirstLoopCallbackObject - Name: k__BackingField Entry: 7 - Data: 26|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime @@ -407,13 +471,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 28|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 32|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -422,13 +486,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 33|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 30|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + Data: 34|UnityEngine.TooltipAttribute, UnityEngine.CoreModule - Name: tooltip Entry: 1 Data: Set this to call a function on an UdonSharpBehaviour instead of looping @@ -456,13 +520,13 @@ MonoBehaviour: Data: _FirstLoopCallbackFunction - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FirstLoopCallbackFunction - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 36|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -471,7 +535,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -486,13 +550,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -516,7 +580,7 @@ MonoBehaviour: Data: _Active - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Active @@ -540,13 +604,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 37|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 41|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -570,13 +634,13 @@ MonoBehaviour: Data: _Timer - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Timer - Name: k__BackingField Entry: 7 - Data: 39|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -585,103 +649,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 39 - - 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: 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: _AwaitingNextSwitch - - Name: $v - Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _AwaitingNextSwitch - - 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 - - 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: _NextCameraIndex - - Name: $v - Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _NextCameraIndex - - Name: k__BackingField - Entry: 9 - Data: 21 - - Name: k__BackingField - Entry: 9 - Data: 21 + Data: 43 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -717,13 +685,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LoopedOnce + Data: _AwaitingNextSwitch - Name: $v Entry: 7 Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LoopedOnce + Data: _AwaitingNextSwitch - Name: k__BackingField Entry: 9 Data: 16 @@ -760,6 +728,102 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _NextCameraIndex + - Name: $v + Entry: 7 + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _NextCameraIndex + - Name: k__BackingField + Entry: 9 + Data: 25 + - Name: k__BackingField + Entry: 9 + Data: 25 + - 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: 48|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: 49|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: 50|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: 13 Data: diff --git a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs index 4043a2c..c3a4e41 100644 --- a/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs +++ b/Assets/UdonSharp/Cameras/Camera Switchers/CameraTimedSwitcher.cs @@ -12,6 +12,8 @@ public class CameraTimedSwitcher : UdonSharpBehaviour [SerializeField] private string[] _SwitchFunctions; [SerializeField] private float[] _TimeBetweenCuts = { 5.0f }; [Space] + [SerializeField, Tooltip("When enabled, switcher will reset when activated, even if it wasn't deactivated first.")] + private bool _AlwaysReactivate = false; [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; @@ -20,7 +22,7 @@ public class CameraTimedSwitcher : UdonSharpBehaviour private UdonSharpBehaviour _FirstLoopCallbackObject = null; [SerializeField] private string _FirstLoopCallbackFunction = ""; - [UdonSynced] private bool _Active = false; + [UdonSynced] private bool _Active = false; private float _Timer = 0.0f; private bool _AwaitingNextSwitch = false; @@ -50,14 +52,15 @@ public class CameraTimedSwitcher : UdonSharpBehaviour public void Activate(bool Activate) { - _Active = Activate; - _Activate_Synced(); - RequestSerialization(); + if (_Active != Activate || _AlwaysReactivate) + { + _Active = Activate; + _Activate_Synced(); + RequestSerialization(); + } } private void _Activate_Synced() { - Debug.Log("[CameraTimedSwitcher] " + gameObject.name + " is now " + (_Active ? "active" : "inactive")); - _AwaitingNextSwitch = false; if (_Active) diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.asset b/Assets/UdonSharp/Cameras/CameraAnchor.asset index 349aa9c..9934e89 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.asset +++ b/Assets/UdonSharp/Cameras/CameraAnchor.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 12 + Data: 13 - Name: Entry: 7 Data: @@ -426,25 +426,103 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _AttachedCameraIndex + Data: FollowMethod - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _AttachedCameraIndex + Data: FollowMethod - Name: k__BackingField Entry: 7 Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: PossibleFollowMethods, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib - Name: Entry: 8 Data: + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 31|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 32|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: How the camera should follow players, if it's set to do so. + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 33|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: _AttachedCameraIndex + - Name: $v + Entry: 7 + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AttachedCameraIndex + - Name: k__BackingField + Entry: 9 + Data: 29 - Name: k__BackingField Entry: 9 - Data: 28 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -459,13 +537,13 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 30|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -489,13 +567,13 @@ MonoBehaviour: Data: _AttachedCamera - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _AttachedCamera - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Camera, UnityEngine.CoreModule @@ -504,7 +582,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 38 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -519,7 +597,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -543,13 +621,13 @@ MonoBehaviour: Data: _FollowedPlayerNames - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FollowedPlayerNames - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -558,7 +636,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 35 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -573,7 +651,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -597,16 +675,16 @@ MonoBehaviour: Data: _FollowedPlayerNames_Cache - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FollowedPlayerNames_Cache - Name: k__BackingField Entry: 9 - Data: 35 + Data: 41 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 41 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -621,7 +699,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -645,13 +723,13 @@ MonoBehaviour: Data: _FollowedPlayers - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FollowedPlayers - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VRC.SDKBase.VRCPlayerApi[], VRCSDKBase @@ -660,7 +738,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 40 + Data: 46 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -675,7 +753,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -699,7 +777,7 @@ MonoBehaviour: Data: _CameraFollowSpeed - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraFollowSpeed @@ -723,7 +801,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.cs b/Assets/UdonSharp/Cameras/CameraAnchor.cs index 0156017..c330226 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.cs +++ b/Assets/UdonSharp/Cameras/CameraAnchor.cs @@ -7,9 +7,19 @@ using VRC.SDKBase; using VRC.Udon.Common; +public enum PossibleFollowMethods +{ + CloseUp, + HeadAndShoulders, + HipsUp, + FullBody +}; + + [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class CameraAnchor : UdonSharpBehaviour { + [SerializeField] private CameraSystem_Console CameraSystemManager; [Space] [SerializeField] private float FOV = 60.0f; @@ -19,6 +29,9 @@ public class CameraAnchor : UdonSharpBehaviour [SerializeField] private Transform CameraRoot; [Tooltip("Changing the Z scale of this object will change the FOV of the attached camera.")] [SerializeField] private Transform CameraFOVScaler; + [Space] + [Tooltip("How the camera should follow players, if it's set to do so.")] + [SerializeField] private PossibleFollowMethods FollowMethod; [UdonSynced] private int _AttachedCameraIndex = -1; @@ -51,15 +64,14 @@ public class CameraAnchor : UdonSharpBehaviour Vector3 CentroidSum = Vector3.zero; for (int i = 0; i < _FollowedPlayers.Length; i++) { - Vector3 LeftEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftEye); - Vector3 RightEyePosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightEye); - Vector3 LeftFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.LeftFoot); - Vector3 RightFootPosition = _FollowedPlayers[i].GetBonePosition(HumanBodyBones.RightFoot); - - CentroidSum += new Vector3( - (LeftEyePosition.x + RightEyePosition.x + LeftFootPosition.x + RightFootPosition.x) / 4.0f, - (LeftEyePosition.y + RightEyePosition.y + LeftFootPosition.y + RightFootPosition.y) / 4.0f, - (LeftEyePosition.z + RightEyePosition.z + LeftFootPosition.z + RightFootPosition.z) / 4.0f); + Vector3[] BonePositions = _BonesFromFollowMethod(_FollowedPlayers[i]); + Vector3 CentroidPointsAverage = Vector3.zero; + for (int j = 0; j < BonePositions.Length; j++) + { + CentroidPointsAverage += BonePositions[j]; + } + CentroidPointsAverage /= BonePositions.Length; + CentroidSum += CentroidPointsAverage; } Vector3 CentroidAverage = CentroidSum / _FollowedPlayers.Length; @@ -77,6 +89,55 @@ public class CameraAnchor : UdonSharpBehaviour } } + private Vector3[] _BonesFromFollowMethod(VRCPlayerApi Player) + { + + switch(FollowMethod) + { + case PossibleFollowMethods.CloseUp: + { + Vector3[] BonesToTrack = new Vector3[3]; + BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftEye); + BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightEye); + BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.Neck); + return BonesToTrack; + } + case PossibleFollowMethods.HeadAndShoulders: + { + Vector3[] BonesToTrack = new Vector3[4]; + BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftEye); + BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightEye); + BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.LeftShoulder); + BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightShoulder); + return BonesToTrack; + } + case PossibleFollowMethods.HipsUp: + { + Vector3[] BonesToTrack = new Vector3[4]; + BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftEye); + BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightEye); + BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.LeftUpperLeg); + BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightUpperLeg); + return BonesToTrack; + } + case PossibleFollowMethods.FullBody: + { + Vector3[] BonesToTrack = new Vector3[4]; + BonesToTrack[0] = Player.GetBonePosition(HumanBodyBones.LeftEye); + BonesToTrack[1] = Player.GetBonePosition(HumanBodyBones.RightEye); + BonesToTrack[2] = Player.GetBonePosition(HumanBodyBones.LeftFoot); + BonesToTrack[3] = Player.GetBonePosition(HumanBodyBones.RightFoot); + return BonesToTrack; + } + default: + { + Vector3[] BonesToTrack = new Vector3[1]; + BonesToTrack[0] = Player.GetPosition(); + return BonesToTrack; + } + } + } + public override void OnDeserialization(DeserializationResult Result) { diff --git a/Assets/UdonSharp/Cameras/CameraControllerBase.cs b/Assets/UdonSharp/Cameras/CameraControllerBase.cs index 08f6945..3d8acd7 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerBase.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerBase.cs @@ -49,11 +49,6 @@ public class CameraControllerBase : UdonSharpBehaviour public void ActivateCameraSwitcher(CameraTimedSwitcher Switcher = null) { - if (_ActiveSwitcher == Switcher) - { - return; - } - if (_ActiveSwitcher != null) { _ActiveSwitcher.Activate(false); diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index 94aba0b..b23ac72 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 37 + Data: 39 - Name: Entry: 7 Data: @@ -638,16 +638,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndAllPlayersTimerToggle + Data: ModemCameraTrigger - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndAllPlayersTimerToggle + Data: ModemCameraTrigger - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 40|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraSwitchTrigger, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -665,19 +671,10 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 41|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: + Data: 1 - Name: Entry: 7 Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -701,13 +698,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndIndividualPlayersTimerToggle + Data: HostAndAllPlayersTimerToggle - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndIndividualPlayersTimerToggle + Data: HostAndAllPlayersTimerToggle - Name: k__BackingField Entry: 9 Data: 12 @@ -729,12 +726,75 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 45|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 46|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: HostAndIndividualPlayersTimerToggle + - Name: $v + Entry: 7 + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostAndIndividualPlayersTimerToggle + - Name: k__BackingField + Entry: 9 + Data: 12 + - 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: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -758,7 +818,7 @@ MonoBehaviour: Data: AllPlayersAssignStarterPointsTimerToggle - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersAssignStarterPointsTimerToggle @@ -782,13 +842,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -812,7 +872,7 @@ MonoBehaviour: Data: HostToMonitorTimerToggle - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostToMonitorTimerToggle @@ -836,13 +896,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -866,7 +926,7 @@ MonoBehaviour: Data: MapToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MapToHostAndAllPlayersTimerToggle @@ -890,13 +950,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -920,7 +980,7 @@ MonoBehaviour: Data: LightningStartToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LightningStartToHostAndAllPlayersTimerToggle @@ -944,13 +1004,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -974,7 +1034,7 @@ MonoBehaviour: Data: TheChaseStartToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: TheChaseStartToHostAndAllPlayersTimerToggle @@ -998,13 +1058,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1028,7 +1088,7 @@ MonoBehaviour: Data: TheChaseMonitorToAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: TheChaseMonitorToAllPlayersTimerToggle @@ -1052,13 +1112,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|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: 63|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1082,7 +1142,7 @@ MonoBehaviour: Data: CorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: CorrectToHostAndAllPlayersTimerToggle @@ -1106,13 +1166,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|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: 66|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1136,7 +1196,7 @@ MonoBehaviour: Data: IncorrectToHostAndAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: IncorrectToHostAndAllPlayersTimerToggle @@ -1160,13 +1220,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1190,7 +1250,7 @@ MonoBehaviour: Data: ThinkAboutItTimerToggle - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ThinkAboutItTimerToggle @@ -1214,13 +1274,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1244,7 +1304,7 @@ MonoBehaviour: Data: BuzzedInPlayerTimerToggle - Name: $v Entry: 7 - Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: BuzzedInPlayerTimerToggle @@ -1266,75 +1326,75 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 75|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: _CameraAnimator - - Name: $v - Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CameraAnimator - - Name: k__BackingField - Entry: 7 - Data: 77|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 77 - - 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: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 79|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: _CameraAnimator + - Name: $v + Entry: 7 + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraAnimator + - Name: k__BackingField + Entry: 7 + Data: 81|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 81 + - 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 79|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 83|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1343,7 +1403,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1367,13 +1427,13 @@ MonoBehaviour: Data: Player1CameraAnchor - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 82|System.RuntimeType, mscorlib + Data: 86|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -1395,355 +1455,293 @@ MonoBehaviour: - Name: k__BackingField Entry: 5 Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 84|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 85|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: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: Player2CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 88|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: Player3CameraAnchor - - Name: $v - Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: Player3CameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 91|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: HostCameraAnchor - - Name: $v - Entry: 7 - Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: HostCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 94|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: DefaultWideShotCameraAnchor - - Name: $v - Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: DefaultWideShotCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 97|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: 98|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: VideoPlayerCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 99|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 100|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: OpeningCameraAnchor - - Name: $v - Entry: 7 - Data: 101|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: OpeningCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 82 - - 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: 102|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 103|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 88|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 89|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: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 92|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: Player3CameraAnchor + - Name: $v + Entry: 7 + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player3CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 95|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: HostCameraAnchor + - Name: $v + Entry: 7 + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 98|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: DefaultWideShotCameraAnchor + - Name: $v + Entry: 7 + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: DefaultWideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 101|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: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 - Name: Entry: 7 Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -1767,16 +1765,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: $v Entry: 7 Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: k__BackingField Entry: 9 - Data: 82 + Data: 86 - Name: k__BackingField Entry: 9 Data: 4 @@ -1796,12 +1794,76 @@ MonoBehaviour: Entry: 7 Data: 106|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 107|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 108|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: AllPlayersViewCameraAnchor + - Name: $v + Entry: 7 + Data: 109|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: AllPlayersViewCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 86 + - 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: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 107|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 111|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1825,13 +1887,13 @@ MonoBehaviour: Data: VideoMusicClueCameraAnchor - Name: $v Entry: 7 - Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoMusicClueCameraAnchor - Name: k__BackingField Entry: 9 - Data: 82 + Data: 86 - Name: k__BackingField Entry: 9 Data: 4 @@ -1849,14 +1911,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 110|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 114|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1880,13 +1942,13 @@ MonoBehaviour: Data: ACMECrimenetComputerCameraAnchor - Name: $v Entry: 7 - Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ACMECrimenetComputerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 82 + Data: 86 - Name: k__BackingField Entry: 9 Data: 4 @@ -1904,14 +1966,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 112|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 116|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 113|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 117|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1935,13 +1997,13 @@ MonoBehaviour: Data: FilingCabinetCameraAnchor - Name: $v Entry: 7 - Data: 114|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 118|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: FilingCabinetCameraAnchor - Name: k__BackingField Entry: 9 - Data: 82 + Data: 86 - Name: k__BackingField Entry: 9 Data: 4 @@ -1959,14 +2021,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 115|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 119|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 116|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 120|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1990,13 +2052,13 @@ MonoBehaviour: Data: ModemCameraAnchor - Name: $v Entry: 7 - Data: 117|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 121|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 82 + Data: 86 - Name: k__BackingField Entry: 9 Data: 4 @@ -2014,14 +2076,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 118|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 119|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 123|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -2045,13 +2107,13 @@ MonoBehaviour: Data: _PlayOpening - Name: $v Entry: 7 - Data: 120|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayOpening - Name: k__BackingField Entry: 7 - Data: 121|System.RuntimeType, mscorlib + Data: 125|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -2060,68 +2122,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 121 - - 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: 122|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 123|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 124|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: _PlayOpeningDoorway - - Name: $v - Entry: 7 - Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _PlayOpeningDoorway - - Name: k__BackingField - Entry: 9 - Data: 121 - - Name: k__BackingField - Entry: 9 - Data: 121 + Data: 125 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2165,6 +2166,128 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _PlayOpeningDoorway + - Name: $v + Entry: 7 + Data: 129|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayOpeningDoorway + - Name: k__BackingField + Entry: 9 + Data: 125 + - Name: k__BackingField + Entry: 9 + Data: 125 + - 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: 130|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 131|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 132|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: _PlayModemZoom + - Name: $v + Entry: 7 + Data: 133|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayModemZoom + - Name: k__BackingField + Entry: 9 + Data: 125 + - Name: k__BackingField + Entry: 9 + Data: 125 + - 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: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 135|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 136|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: 13 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index 0346229..b9c2907 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -17,6 +17,7 @@ public class CameraControllerRound1 : CameraControllerBase [SerializeField] public Camera VideoPlayerCamera; [Space] [SerializeField] public CameraTimerSwitchTrigger HostCameraTrigger; + [SerializeField] public CameraSwitchTrigger ModemCameraTrigger; [Space] [SerializeField] public CameraTimedSwitcher HostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; @@ -49,6 +50,7 @@ public class CameraControllerRound1 : CameraControllerBase [UdonSynced, FieldChangeCallback(nameof(_PlayOpeningCallback))] private bool _PlayOpening = false; [UdonSynced, FieldChangeCallback(nameof(_PlayOpeningDoorwayCallback))] private bool _PlayOpeningDoorway = false; + [UdonSynced, FieldChangeCallback(nameof(_PlayModemZoomCallback))] private bool _PlayModemZoom = false; public override void InitialiseCameras() @@ -85,6 +87,7 @@ public class CameraControllerRound1 : CameraControllerBase Networking.SetOwner(Player, VideoPlayerCamera.gameObject); Networking.SetOwner(Player, HostCameraTrigger.gameObject); + Networking.SetOwner(Player, ModemCameraTrigger.gameObject); Networking.SetOwner(Player, HostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject); @@ -285,6 +288,15 @@ public class CameraControllerRound1 : CameraControllerBase HostCameraTrigger.gameObject.SetActive(false); } + public void ActivateModemCameraTrigger() + { + ModemCameraTrigger.gameObject.SetActive(true); + } + public void DeactivateModemCameraTrigger() + { + ModemCameraTrigger.gameObject.SetActive(false); + } + public void PlayOpening(bool Play) { @@ -312,6 +324,18 @@ public class CameraControllerRound1 : CameraControllerBase RequestSerialization(); } + public void PlayModemZoom(bool Play) + { + if (Play) + { + SwitchToModemCamera(); + } + + _PlayModemZoomCallback = Play; + + RequestSerialization(); + } + public override void DisableAllTriggers() @@ -345,4 +369,14 @@ public class CameraControllerRound1 : CameraControllerBase } get => _PlayOpeningDoorway; } + + private bool _PlayModemZoomCallback + { + set + { + _PlayModemZoom = value; + _CameraAnimator.SetBool("Play Modem Zoom", _PlayModemZoom); + } + get => _PlayModemZoom; + } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index 72b052b..a04ebc5 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 28 + Data: 31 - Name: Entry: 7 Data: @@ -1193,25 +1193,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: $v Entry: 7 Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: k__BackingField Entry: 7 Data: 72|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraAnchor, Assembly-CSharp + Data: UnityEngine.Animator, UnityEngine.AnimationModule - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 72 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1262,16 +1262,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2CameraAnchor + Data: Player1CameraAnchor - Name: $v Entry: 7 Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player2CameraAnchor + Data: Player1CameraAnchor - Name: k__BackingField - Entry: 9 - Data: 72 + Entry: 7 + Data: 77|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -1289,283 +1295,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 78|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: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: HostAndWinnerCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 72 - - 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: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: LocationBoardCameraAnchor - - Name: $v - Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: LocationBoardCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 72 - - 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: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: ModemCameraAnchor - - Name: $v - Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: ModemCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 72 - - 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: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 87|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: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: VideoPlayerCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 72 - - 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: 89|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 90|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: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: WideShotCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 72 - - 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: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 93|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 79|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1574,7 +1310,340 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 80|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: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player2CameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 83|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: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: HostAndWinnerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 86|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: LocationBoardCameraAnchor + - Name: $v + Entry: 7 + Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: LocationBoardCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: ModemCameraAnchor + - Name: $v + Entry: 7 + Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 92|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: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: VideoPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 95|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: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: WideShotCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 98|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1598,13 +1667,13 @@ MonoBehaviour: Data: AllPlayersCameraAnchor - Name: $v Entry: 7 - Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 72 + Data: 77 - Name: k__BackingField Entry: 9 Data: 4 @@ -1622,13 +1691,136 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 97|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 102|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: WinningPlayerCameraAnchor + - Name: $v + Entry: 7 + Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: WinningPlayerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 77 + - 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: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 105|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: _PlayModemZoom + - Name: $v + Entry: 7 + Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayModemZoom + - Name: k__BackingField + Entry: 7 + Data: 107|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 107 + - 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: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 110|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 1bf5e66..3464e59 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -29,6 +29,8 @@ public class CameraControllerRound2 : CameraControllerBase [SerializeField] public CameraTimedSwitcher LocationBoardAndWinningPlayerTimerToggle; [SerializeField] public CameraTimedSwitcher VideoPlayerToWinningPlayerTimerToggle; [Space] + [SerializeField] public Animator _CameraAnimator; + [Space] [SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor; [SerializeField] public CameraAnchor HostAndWinnerCameraAnchor; @@ -38,6 +40,9 @@ public class CameraControllerRound2 : CameraControllerBase [Space] [SerializeField] public CameraAnchor WideShotCameraAnchor; [SerializeField] public CameraAnchor AllPlayersCameraAnchor; + [SerializeField] public CameraAnchor WinningPlayerCameraAnchor; + + [UdonSynced, FieldChangeCallback(nameof(_PlayModemZoomCallback))] private bool _PlayModemZoom = false; public override void InitialiseCameras() @@ -74,6 +79,8 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, LocationBoardAndWinningPlayerTimerToggle.gameObject); Networking.SetOwner(Player, VideoPlayerToWinningPlayerTimerToggle.gameObject); + Networking.SetOwner(Player, _CameraAnimator.gameObject); + Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject); Networking.SetOwner(Player, HostAndWinnerCameraAnchor.gameObject); @@ -82,6 +89,7 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, WideShotCameraAnchor.gameObject); Networking.SetOwner(Player, AllPlayersCameraAnchor.gameObject); + Networking.SetOwner(Player, WinningPlayerCameraAnchor.gameObject); base.OnOwnershipTransferred(Player); } @@ -138,6 +146,26 @@ public class CameraControllerRound2 : CameraControllerBase SwitchToLiveCamera(PrimaryFocusCamera); } + public void ActivateWinningPlayerCamera() + { + WinningPlayerCameraAnchor.AttachCamera(PrimaryFocusCamera); + } + public void SwitchToWinningPlayerCamera() + { + ActivateWinningPlayerCamera(); + SwitchToLiveCamera(PrimaryFocusCamera); + } + + + public void WinningPlayerCamera_FollowPlayers(string[] Players, float FollowSpeed = 1.0f) + { + WinningPlayerCameraAnchor.FollowPlayers(Players, FollowSpeed); + } + public void WinningPlayerCamera_StopFollowingPlayers() + { + WinningPlayerCameraAnchor.StopFollowingPlayers(); + } + public void ActivateHostAllPlayersCameraSwitcher() { @@ -205,6 +233,19 @@ public class CameraControllerRound2 : CameraControllerBase } + public void PlayModemZoom(bool Play) + { + if (Play) + { + SwitchToModemCamera(); + } + + _PlayModemZoomCallback = Play; + + RequestSerialization(); + } + + public override void DisableAllTriggers() { HostAndAllPlayersCameraTrigger.gameObject.SetActive(false); @@ -214,4 +255,15 @@ public class CameraControllerRound2 : CameraControllerBase { ActivateCameraSwitcher(null); } + + + private bool _PlayModemZoomCallback + { + set + { + _PlayModemZoom = value; + _CameraAnimator.SetBool("Play Modem Zoom", _PlayModemZoom); + } + get => _PlayModemZoom; + } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 6a2ae91..aa88eb2 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -93,6 +93,7 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1.InitialiseCameras(); _CameraControllerRound1.ActivateHostCameraTrigger(); _CameraControllerRound1.PlayOpening(true); + _CameraControllerRound1.PlayModemZoom(false); DisableInteraction(); @@ -109,6 +110,9 @@ public class GameManagerRound1 : GameManagerBase _Modem.Activate(false); _CameraControllerRound1.DeinitialiseCameras(); + _CameraControllerRound1.PlayOpening(false); + _CameraControllerRound1.PlayOpeningDoorway(false); + _CameraControllerRound1.PlayModemZoom(false); base.DeinitialiseGameMode(); } @@ -1466,7 +1470,7 @@ public class GameManagerRound1 : GameManagerBase _Modem.Teleport(); SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 2.5f); _CameraControllerRound1.DisableAllSwitchers(); - _CameraControllerRound1.SwitchToModemCamera(); + _CameraControllerRound1.PlayModemZoom(true); } public void _ContinueToRound2_Private() { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index da633f0..39c58e0 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 26 + Data: 27 - Name: Entry: 7 Data: @@ -1304,19 +1304,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _PanelToReveal_Cache + Data: _PlayingJailCall - Name: $v Entry: 7 Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _PanelToReveal_Cache + Data: _PlayingJailCall - Name: k__BackingField Entry: 9 - Data: 69 + Data: 32 - Name: k__BackingField Entry: 9 - Data: 69 + Data: 32 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1352,25 +1352,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD + Data: _PanelToReveal_Cache - Name: $v Entry: 7 Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_STANDARD + Data: _PanelToReveal_Cache - Name: k__BackingField - Entry: 7 - Data: 87|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 69 - Name: k__BackingField Entry: 9 - Data: 87 + Data: 69 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1385,7 +1379,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1406,19 +1400,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: $v Entry: 7 - Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: COLOR_STANDARD - Name: k__BackingField - Entry: 9 - Data: 87 + Entry: 7 + Data: 89|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 87 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1454,19 +1454,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_RED - Name: $v Entry: 7 Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_YELLOW + Data: COLOR_RED - Name: k__BackingField Entry: 9 - Data: 87 + Data: 89 - Name: k__BackingField Entry: 9 - Data: 87 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1502,19 +1502,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_GREEN + Data: COLOR_YELLOW - Name: $v Entry: 7 Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_GREEN + Data: COLOR_YELLOW - Name: k__BackingField Entry: 9 - Data: 87 + Data: 89 - Name: k__BackingField Entry: 9 - Data: 87 + Data: 89 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1545,6 +1545,54 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: COLOR_GREEN + - Name: $v + Entry: 7 + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 89 + - Name: k__BackingField + Entry: 9 + Data: 89 + - 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: 96|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: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 0a68f41..12d744e 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -39,6 +39,8 @@ public class GameManagerRound2 : GameManagerBase private CameraControllerRound2 _CameraControllerRound2 = null; + private bool _PlayingJailCall = false; + private int _PanelToReveal_Cache = -1; private readonly Color COLOR_STANDARD = new Color(0.78431f, 0.78431f, 0.78431f); @@ -62,6 +64,7 @@ public class GameManagerRound2 : GameManagerBase base.InitialiseGameMode(); _StageIndex = 0; + _PlayingJailCall = false; InitialiseLocationBoard(); @@ -74,16 +77,21 @@ public class GameManagerRound2 : GameManagerBase _CameraControllerRound2.DisableAllSwitchers(); _CameraControllerRound2.SwitchToModemCamera(); _CameraControllerRound2.ActivateHostAllPlayersCameraTrigger(); + _CameraControllerRound2.PlayModemZoom(true); + _CameraControllerRound2.WinningPlayerCamera_StopFollowingPlayers(); RequestSerialization(); } public override void DeinitialiseGameMode() { + _PlayingJailCall = false; + _JailPhone.Activate = false; _JailChain.Show = false; _CameraControllerRound2.DeinitialiseCameras(); + _CameraControllerRound2.PlayModemZoom(false); base.DeinitialiseGameMode(); } @@ -163,6 +171,7 @@ public class GameManagerRound2 : GameManagerBase private void DisplayBriefing() { + _CameraControllerRound2.PlayModemZoom(false); _CameraControllerRound2.DeactivateHostAllPlayersCameraTrigger(); _CameraControllerRound2.ActivateHostPlayersAndWideShotCameraSwitcher(); @@ -311,6 +320,7 @@ public class GameManagerRound2 : GameManagerBase _CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher(); _CameraControllerRound2.ActivateHostWinnerCameraTrigger(); + _CameraControllerRound2.WinningPlayerCamera_FollowPlayers(Winner); AdvanceRound(); @@ -368,6 +378,8 @@ public class GameManagerRound2 : GameManagerBase Interface.HeaderUI.text = "Round is over."; Interface.CommentUI.text = "Let's go to the map!"; + _CameraControllerRound2.WinningPlayerCamera_StopFollowingPlayers(); + _CaseManager.ContinueToRound3(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, @@ -515,19 +527,19 @@ public class GameManagerRound2 : GameManagerBase public void PlayJailCall() { - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent()); - SendCustomEventDelayedSeconds(nameof(CheckIfJailCallIsOver), 1.0f); + _PlayingJailCall = true; - _CameraControllerRound2.SwitchToHostAndWinnerCamera(); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent()); + SendCustomEventDelayedSeconds(nameof(JailCallIsOver), _AudioManager.CurrentSFXLength()); + + _CameraControllerRound2.DisableAllSwitchers(); + _CameraControllerRound2.SwitchToWinningPlayerCamera(); } - public void CheckIfJailCallIsOver() + public void JailCallIsOver() { - if (_AudioManager.IsSFXPlaying()) - { - SendCustomEventDelayedSeconds(nameof(CheckIfJailCallIsOver), 1.0f); - } - else + if (_PlayingJailCall) { + _PlayingJailCall = false; _CameraControllerRound2.DisableAllSwitchers(); _CameraControllerRound2.SwitchToHostAndWinnerCamera(); } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index 5f2dfaa..8574af9 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -253,7 +253,6 @@ public class GameManagerRound3 : GameManagerBase UpdateInterface(); _CameraControllerRound3.DisableAllSwitchers(); - _CameraControllerRound3.ActivateHostPlayerCameraSwitcher(); _CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true; InitialiseGameplayCameraFollowers(); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index 036a370..b946757 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, + serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index 13d78db..b35639e 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, + serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index d89a1a4..1def3de 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, + serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index ea98aa4..8101274 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, + serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index b4b3ede..901d05e 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, + serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index c624599..da92932 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, + serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index 5226f4f..ee4621f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, + serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs index 422df91..8cfc02b 100644 --- a/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs +++ b/Assets/UdonSharp/Video Players/CaseVideoSyncPlayer.cs @@ -313,7 +313,14 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour } public void LoadNewVideoURL() { - _VideoPlayer.LoadURL(_CaseVideoList[_VideoIndex]); + if (_VideoIndex >= 0 && _VideoIndex < _CaseVideoList.Length) + { + _VideoPlayer.LoadURL(_CaseVideoList[_VideoIndex]); + } + else + { + Debug.LogError("[CaseVideoSyncPlayer] Video index " + _VideoIndex + " is invalid for a list of " + _CaseVideoList.Length + " videos"); + } } private void _PlayVideo_Private() diff --git a/Assets/UdonSharp/Window/GlassShatter.asset b/Assets/UdonSharp/Window/GlassShatter.asset index 65778f4..2e55524 100644 --- a/Assets/UdonSharp/Window/GlassShatter.asset +++ b/Assets/UdonSharp/Window/GlassShatter.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 4 - Name: Entry: 7 Data: @@ -116,16 +116,76 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Shattered + Data: _Colliders - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Shattered + Data: _Colliders - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Collider[], UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: _Shattered + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Shattered + - Name: k__BackingField + Entry: 7 + Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -134,7 +194,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 8 + Data: 12 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -149,19 +209,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 10|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 14|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 11|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 15|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -185,16 +245,16 @@ MonoBehaviour: Data: _Prepared - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _Prepared - Name: k__BackingField Entry: 9 - Data: 8 + Data: 12 - Name: k__BackingField Entry: 9 - Data: 8 + Data: 12 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -209,7 +269,7 @@ MonoBehaviour: Data: false - 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: 0 diff --git a/Assets/UdonSharp/Window/GlassShatter.cs b/Assets/UdonSharp/Window/GlassShatter.cs index ab026a3..5117e1c 100644 --- a/Assets/UdonSharp/Window/GlassShatter.cs +++ b/Assets/UdonSharp/Window/GlassShatter.cs @@ -7,13 +7,31 @@ using VRC.Udon.Common.Interfaces; [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] public class GlassShatter : UdonSharpBehaviour { - [SerializeField] AudioManager _AudioManager; + [SerializeField] private AudioManager _AudioManager; + [SerializeField] private Collider[] _Colliders; [UdonSynced, FieldChangeCallback(nameof(Shattered))] private bool _Shattered = false; private bool _Prepared = false; + public void HostEnabled() + { + foreach (Collider GlassCollider in _Colliders) + { + GlassCollider.gameObject.SetActive(true); + } + } + + public void HostDisabled() + { + foreach (Collider GlassCollider in _Colliders) + { + GlassCollider.gameObject.SetActive(false); + } + } + + public void PrepareEnter() { if (!Shattered)