diff --git a/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim index b975038..3c8ba29 100644 --- a/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim +++ b/Assets/Animations/Camera/Round 1 Cameras/Modem Zoom.anim @@ -29,22 +29,22 @@ AnimationClip: 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 + time: 1.3333334 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: -0} - outSlope: {x: 0, y: 0, z: -0.06256307} + outSlope: {x: 0, y: 0, z: -0.1135807} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.16145308} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.2667992} - serializedVersion: 3 - time: 1.3333334 + time: 1.8333334 value: {x: 1, y: 1, z: 0.4} - inSlope: {x: 0, y: 0, z: -1.507404} + inSlope: {x: 0, y: 0, z: -2.9403248} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.13569385} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.09893775} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -74,7 +74,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.3333334 + m_StopTime: 1.8333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -104,22 +104,22 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.16145308 - serializedVersion: 3 - time: 0.6666667 + time: 1.3333334 value: 1 inSlope: -0 - outSlope: -0.06256307 + outSlope: -0.1135807 tangentMode: 5 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.16145308 + outWeight: 0.2667992 - serializedVersion: 3 - time: 1.3333334 + time: 1.8333334 value: 0.4 - inSlope: -1.507404 + inSlope: -2.9403248 outSlope: 0 tangentMode: 65 weightedMode: 0 - inWeight: 0.13569385 + inWeight: 0.09893775 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim index 88a619a..9276c67 100644 --- a/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim +++ b/Assets/Animations/Camera/Round 2 Cameras/Modem Zoom.anim @@ -29,7 +29,7 @@ AnimationClip: 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 + time: 1.6666666 value: {x: 1, y: 1, z: 0.4} inSlope: {x: 0, y: 0, z: -0} outSlope: {x: 0, y: 0, z: 0.07339278} @@ -40,11 +40,11 @@ AnimationClip: - 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} + inSlope: {x: 0, y: 0, z: 2.6514857} + outSlope: {x: 0, y: 0, z: 2.6514857} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.112327576} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.10057256} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 @@ -104,7 +104,7 @@ AnimationClip: inWeight: 0.11660179 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6666667 + time: 1.6666666 value: 0.4 inSlope: -0 outSlope: 0.07339278 @@ -115,11 +115,11 @@ AnimationClip: - serializedVersion: 3 time: 2.1666667 value: 1 - inSlope: 0.5994971 - outSlope: 0.5994971 + inSlope: 2.6514857 + outSlope: 2.6514857 tangentMode: 0 weightedMode: 0 - inWeight: 0.112327576 + inWeight: 0.10057256 outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 diff --git a/Assets/Animations/Modem/Enter.anim b/Assets/Animations/Modem/Enter.anim index 3b28ff7..b4a2568 100644 --- a/Assets/Animations/Modem/Enter.anim +++ b/Assets/Animations/Modem/Enter.anim @@ -54,7 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2 - value: {x: 0, y: 2.725, z: 0} + value: {x: 0, y: 2.6666667, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -66,37 +66,7 @@ AnimationClip: m_RotationOrder: 4 path: Activation Object/SM_Modem m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Activation Object - classID: 1 - script: {fileID: 0} - flags: 0 + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -123,15 +93,6 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 4027051573 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -199,7 +160,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 2 - value: 2.725 + value: 2.6666667 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -334,36 +295,6 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Activation Object - classID: 1 - script: {fileID: 0} - flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: diff --git a/Assets/Animations/Modem/Exit.anim b/Assets/Animations/Modem/Exit.anim index fc5fbfe..0ff47d6 100644 --- a/Assets/Animations/Modem/Exit.anim +++ b/Assets/Animations/Modem/Exit.anim @@ -54,7 +54,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 2.725, z: 0} + value: {x: 0, y: 2.6666667, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -63,7 +63,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.5 - value: {x: 0, y: 2.725, z: 0} + value: {x: 0, y: 2.6666667, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -84,46 +84,7 @@ AnimationClip: m_RotationOrder: 4 path: Activation Object/SM_Modem m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.5 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 3.5 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Activation Object - classID: 1 - script: {fileID: 0} - flags: 0 + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -150,15 +111,6 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 4027051573 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -226,7 +178,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.725 + value: 2.6666667 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -235,7 +187,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 2.725 + value: 2.6666667 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -415,45 +367,6 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1.5 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 3.5 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Activation Object - classID: 1 - script: {fileID: 0} - flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: diff --git a/Assets/Models/SM_Modem.fbx b/Assets/Models/SM_Modem.fbx index bbf4dd8..281dce6 100644 Binary files a/Assets/Models/SM_Modem.fbx and b/Assets/Models/SM_Modem.fbx differ diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 7d6953a..4630812 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -31045,7 +31045,7 @@ PrefabInstance: - target: {fileID: 4605600515244599674, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} propertyPath: m_LocalPosition.y - value: 2.725 + value: 2.6666667 objectReference: {fileID: 0} - target: {fileID: 4718414904658311444, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} @@ -35529,7 +35529,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.40000004, y: 0.14999999, z: 0.85} m_Center: {x: -0.00000047683716, y: -0.00000047683716, z: 0.425} @@ -52058,12 +52058,6 @@ 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, @@ -52908,12 +52902,12 @@ GameObject: - component: {fileID: 1289569929} - component: {fileID: 1289569930} m_Layer: 0 - m_Name: Camera Trigger + m_Name: Modem Camera Trigger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1289569929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52937,7 +52931,7 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 1289569930} _CameraController: {fileID: 1524477936} - _SwitchFunction: SwitchToModemCamera + _SwitchFunction: SwitchToModemCameraAndDisableAllSwitchers --- !u!114 &1289569930 MonoBehaviour: m_ObjectHideFlags: 2 @@ -52983,7 +52977,7 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 1 + m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!4 &1289569932 Transform: @@ -52993,12 +52987,12 @@ Transform: 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_LocalRotation: {x: -0, y: 0.7654277, z: -0, w: -0.643522} + m_LocalPosition: {x: 10.030001, y: 0, z: -5.030001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1252584789} + m_Father: {fileID: 1882024111} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1294807477 stripped GameObject: @@ -53586,10 +53580,10 @@ GameObject: m_Component: - component: {fileID: 1311764231} - component: {fileID: 1311764234} - - component: {fileID: 1311764233} - - component: {fileID: 1311764232} + - component: {fileID: 1311764236} + - component: {fileID: 1311764235} m_Layer: 0 - m_Name: Host And All Players Switch Trigger + m_Name: Wide Shot Switch Trigger m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -53611,57 +53605,6 @@ Transform: - {fileID: 35514605} m_Father: {fileID: 1483356975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1311764232 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311764230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} - m_Name: - m_EditorClassIdentifier: - interactTextPlacement: {fileID: 0} - interactText: Use - interactTextGO: {fileID: 0} - proximity: 2 - SynchronizePosition: 0 - AllowCollisionOwnershipTransfer: 0 - Reliable: 0 - _syncMethod: 3 - serializedProgramAsset: {fileID: 11400000, guid: bcfe845926156534eb3829e94dfbfd14, - type: 2} - programSource: {fileID: 11400000, guid: d0dcbcd91babecf4eb7fc3933e55d3b7, type: 2} - serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF - publicVariablesUnityEngineObjects: [] - publicVariablesSerializationDataFormat: 0 ---- !u!114 &1311764233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311764230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7b1f46c10efe4454fada90c597c6e038, type: 3} - m_Name: - m_EditorClassIdentifier: - serializationData: - SerializedFormat: 2 - SerializedBytes: - ReferencedUnityObjects: [] - SerializedBytesString: - Prefab: {fileID: 0} - PrefabModificationsReferencedUnityObjects: [] - PrefabModifications: [] - SerializationNodes: [] - _udonSharpBackingUdonBehaviour: {fileID: 1311764232} - _CameraController: {fileID: 1355919010} - _EnterSwitchFunction: ActivateHostAllPlayersCameraSwitcher - _ExitSwitchFunction: --- !u!65 &1311764234 BoxCollider: m_ObjectHideFlags: 0 @@ -53683,6 +53626,56 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 2.5753372, y: 5.9157925, z: 6.3446593} m_Center: {x: 0.057150777, y: 2.4578972, z: -0.19181636} +--- !u!114 &1311764235 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558, + type: 2} + programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!114 &1311764236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311764230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 1311764235} + _CameraController: {fileID: 1355919010} + _SwitchFunction: SwitchToWideShotCamera --- !u!1 &1311860702 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6794671311155608280, guid: 126991d511ca61841a0ef899b6c038a6, @@ -56214,7 +56207,7 @@ MonoBehaviour: LocationBoardCamera: {fileID: 1983062415} PrimaryFocusCamera: {fileID: 2043045206} VideoPlayerCamera: {fileID: 1064115356} - HostAndAllPlayersCameraTrigger: {fileID: 1311764233} + WideShotCameraTrigger: {fileID: 1311764236} HostAndWinnerCameraTrigger: {fileID: 106321079} HostAllPlayersTimerToggle: {fileID: 35514607} HostPlayersAndWideShotTimerToggle: {fileID: 1193018063} @@ -58976,7 +58969,7 @@ GameObject: - component: {fileID: 1449300098} - component: {fileID: 1449300099} m_Layer: 0 - m_Name: Reflection Probe + m_Name: Main Area Reflection Probe m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -58991,7 +58984,7 @@ Transform: m_GameObject: {fileID: 1449300097} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.38, y: 2.49, z: 2.89} + m_LocalPosition: {x: -5.58, y: 2.49, z: 2.22} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -59012,8 +59005,8 @@ ReflectionProbe: m_TimeSlicingMode: 0 m_Resolution: 256 m_UpdateFrequency: 0 - m_BoxSize: {x: 8.571296, y: 5.168228, z: 13.878811} - m_BoxOffset: {x: 0.23485994, y: 0, z: -2.4356508} + m_BoxSize: {x: 6.8438177, y: 5.168228, z: 12.278338} + m_BoxOffset: {x: -0.6288791, y: 0, z: -0.5574136} m_NearClip: 0.3 m_FarClip: 1000 m_ShadowDistance: 100 @@ -59199,6 +59192,7 @@ Transform: - {fileID: 115578769} - {fileID: 1583513123} - {fileID: 1449300098} + - {fileID: 1903577733} - {fileID: 709364351} - {fileID: 2013644313} m_Father: {fileID: 1027471609} @@ -71926,6 +71920,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[3] value: objectReference: {fileID: 2100000, guid: 462153a63867ae44596b4d0413a039bc, type: 2} + - target: {fileID: -7511558181221131132, guid: 4418ea84766ed04468a42f24f5d9fdac, + type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - target: {fileID: 919132149155446097, guid: 4418ea84766ed04468a42f24f5d9fdac, type: 3} propertyPath: m_Name @@ -82024,6 +82023,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1289569932} - {fileID: 552861271} - {fileID: 458165860} - {fileID: 59893114} @@ -82373,6 +82373,72 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4362789101225005290} m_PrefabAsset: {fileID: 0} +--- !u!1 &1903577732 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1903577733} + - component: {fileID: 1903577734} + m_Layer: 0 + m_Name: Modem Room Reflection Probe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1903577733 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903577732} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.58, y: 2.49, z: 10.93} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1451322102} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!215 &1903577734 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1903577732} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 0 + m_RefreshMode: 0 + m_TimeSlicingMode: 0 + m_Resolution: 256 + m_UpdateFrequency: 0 + m_BoxSize: {x: 8.571296, y: 5.168228, z: 13.878811} + m_BoxOffset: {x: 0.23485994, y: 0, z: -2.4356508} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 100 + m_ClearFlags: 2 + m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 1 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 2 + m_CustomBakedTexture: {fileID: 8900000, guid: 9f698044801396841bdc0c9837364ce7, + type: 3} --- !u!1 &1903593607 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8529095696286930400, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -91673,7 +91739,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_Size: {x: 0.40000004, y: 0.14999999, z: 0.85} m_Center: {x: -0.00000047683716, y: -0.00000047683716, z: 0.425} @@ -93755,11 +93821,7 @@ PrefabInstance: objectReference: {fileID: 1034723246} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6417972481979237589, guid: 597de72e4385c0d498ba1475ac5ef4f7, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1289569932} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!1001 &2357104409142985571 diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 6e7e6f0..0a65f29 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr new file mode 100644 index 0000000..7de2d7b Binary files /dev/null and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr.meta b/Assets/Scenes/witwics/ReflectionProbe-6.exr.meta new file mode 100644 index 0000000..5ff2938 --- /dev/null +++ b/Assets/Scenes/witwics/ReflectionProbe-6.exr.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 9ddc9040d0dbd3444b030e753da333f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs index b9c2907..fcedb53 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -216,6 +216,11 @@ public class CameraControllerRound1 : CameraControllerBase ActivateModemCamera(); SwitchToLiveCamera(PrimaryFocusCamera); } + public void SwitchToModemCameraAndDisableAllSwitchers() + { + DisableAllSwitchers(); + SwitchToModemCamera(); + } public void ActivateHostAllPlayersCameraSwitcher() @@ -341,6 +346,7 @@ public class CameraControllerRound1 : CameraControllerBase public override void DisableAllTriggers() { HostCameraTrigger.gameObject.SetActive(false); + ModemCameraTrigger.gameObject.SetActive(false); } public override void DisableAllSwitchers() diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset index a04ebc5..e923b1d 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.asset @@ -569,19 +569,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: HostAndAllPlayersCameraTrigger + Data: WideShotCameraTrigger - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: HostAndAllPlayersCameraTrigger + Data: WideShotCameraTrigger - Name: k__BackingField Entry: 7 Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: CameraTimerSwitchTrigger, Assembly-CSharp + Data: CameraSwitchTrigger, Assembly-CSharp - Name: Entry: 8 Data: @@ -646,14 +646,8 @@ MonoBehaviour: Entry: 1 Data: HostAndWinnerCameraTrigger - Name: k__BackingField - Entry: 7 - Data: 40|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: CameraSwitchTrigger, Assembly-CSharp - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 35 - Name: k__BackingField Entry: 9 Data: 4 @@ -671,13 +665,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|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: 42|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -701,7 +695,7 @@ MonoBehaviour: Data: HostAllPlayersTimerToggle - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAllPlayersTimerToggle @@ -725,13 +719,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 45|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 44|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -740,7 +734,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -764,7 +758,7 @@ MonoBehaviour: Data: HostPlayersAndWideShotTimerToggle - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostPlayersAndWideShotTimerToggle @@ -788,13 +782,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -818,7 +812,7 @@ MonoBehaviour: Data: Player1AndLocationBoardTimerToggle - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1AndLocationBoardTimerToggle @@ -842,13 +836,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 52|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -872,7 +866,7 @@ MonoBehaviour: Data: Player2AndLocationBoardTimerToggle - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player2AndLocationBoardTimerToggle @@ -896,13 +890,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -926,7 +920,7 @@ MonoBehaviour: Data: LocationBoardAndShortHostTimerToggle - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndShortHostTimerToggle @@ -950,13 +944,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -980,7 +974,7 @@ MonoBehaviour: Data: LocationBoardAndLongHostTimerToggle - Name: $v Entry: 7 - Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndLongHostTimerToggle @@ -1004,13 +998,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1034,7 +1028,7 @@ MonoBehaviour: Data: LocationBoardAndCurrentPlayerTimerToggle - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndCurrentPlayerTimerToggle @@ -1058,13 +1052,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1088,7 +1082,7 @@ MonoBehaviour: Data: LocationBoardAndWinningPlayerTimerToggle - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardAndWinningPlayerTimerToggle @@ -1112,13 +1106,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1142,7 +1136,7 @@ MonoBehaviour: Data: VideoPlayerToWinningPlayerTimerToggle - Name: $v Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerToWinningPlayerTimerToggle @@ -1166,13 +1160,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1196,13 +1190,13 @@ MonoBehaviour: Data: _CameraAnimator - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CameraAnimator - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 71|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1211,7 +1205,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 72 + Data: 71 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1226,13 +1220,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 74|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1241,7 +1235,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1265,13 +1259,13 @@ MonoBehaviour: Data: Player1CameraAnchor - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player1CameraAnchor - Name: k__BackingField Entry: 7 - Data: 77|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraAnchor, Assembly-CSharp @@ -1295,13 +1289,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 79|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1310,7 +1304,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1334,13 +1328,13 @@ MonoBehaviour: Data: Player2CameraAnchor - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1358,13 +1352,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 83|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1388,13 +1382,13 @@ MonoBehaviour: Data: HostAndWinnerCameraAnchor - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostAndWinnerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1412,13 +1406,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 86|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1442,13 +1436,13 @@ MonoBehaviour: Data: LocationBoardCameraAnchor - Name: $v Entry: 7 - Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: LocationBoardCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1466,13 +1460,13 @@ MonoBehaviour: Data: true - 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: 1 - Name: Entry: 7 - Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 88|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1496,13 +1490,13 @@ MonoBehaviour: Data: ModemCameraAnchor - Name: $v Entry: 7 - Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ModemCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1520,13 +1514,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1550,13 +1544,13 @@ MonoBehaviour: Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 - Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1574,13 +1568,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1604,13 +1598,13 @@ MonoBehaviour: Data: WideShotCameraAnchor - Name: $v Entry: 7 - Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: WideShotCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1628,13 +1622,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 98|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1643,7 +1637,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1667,13 +1661,13 @@ MonoBehaviour: Data: AllPlayersCameraAnchor - Name: $v Entry: 7 - Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: AllPlayersCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1691,14 +1685,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1722,13 +1716,13 @@ MonoBehaviour: Data: WinningPlayerCameraAnchor - Name: $v Entry: 7 - Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: WinningPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 77 + Data: 76 - Name: k__BackingField Entry: 9 Data: 4 @@ -1746,14 +1740,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 105|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1777,13 +1771,13 @@ MonoBehaviour: Data: _PlayModemZoom - Name: $v Entry: 7 - Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _PlayModemZoom - Name: k__BackingField Entry: 7 - Data: 107|System.RuntimeType, mscorlib + Data: 106|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1792,7 +1786,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 107 + Data: 106 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1807,20 +1801,20 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 2 - Name: Entry: 7 - Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 108|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: - Name: Entry: 7 - Data: 110|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime + Data: 109|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index 3464e59..2c4cabb 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -16,7 +16,7 @@ public class CameraControllerRound2 : CameraControllerBase [SerializeField] public Camera PrimaryFocusCamera; [SerializeField] public Camera VideoPlayerCamera; [Space] - [SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger; + [SerializeField] public CameraSwitchTrigger WideShotCameraTrigger; [SerializeField] public CameraSwitchTrigger HostAndWinnerCameraTrigger; [Space] [SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle; @@ -67,7 +67,7 @@ public class CameraControllerRound2 : CameraControllerBase Networking.SetOwner(Player, PrimaryFocusCamera.gameObject); Networking.SetOwner(Player, VideoPlayerCamera.gameObject); - Networking.SetOwner(Player, HostAndAllPlayersCameraTrigger.gameObject); + Networking.SetOwner(Player, WideShotCameraTrigger.gameObject); Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject); @@ -215,11 +215,11 @@ public class CameraControllerRound2 : CameraControllerBase public void ActivateHostAllPlayersCameraTrigger() { - HostAndAllPlayersCameraTrigger.gameObject.SetActive(true); + WideShotCameraTrigger.gameObject.SetActive(true); } public void DeactivateHostAllPlayersCameraTrigger() { - HostAndAllPlayersCameraTrigger.gameObject.SetActive(false); + WideShotCameraTrigger.gameObject.SetActive(false); } @@ -248,7 +248,7 @@ public class CameraControllerRound2 : CameraControllerBase public override void DisableAllTriggers() { - HostAndAllPlayersCameraTrigger.gameObject.SetActive(false); + WideShotCameraTrigger.gameObject.SetActive(false); } public override void DisableAllSwitchers() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index aa88eb2..a9462b1 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -1462,6 +1462,8 @@ public class GameManagerRound1 : GameManagerBase _Modem.Activate(true); _ArrivalDisplay.Activate(true); + _CameraControllerRound1.ActivateModemCameraTrigger(); + EnableInteraction("Activate Modem"); } @@ -1471,6 +1473,7 @@ public class GameManagerRound1 : GameManagerBase SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 2.5f); _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.PlayModemZoom(true); + _CameraControllerRound1.DeactivateModemCameraTrigger(); } public void _ContinueToRound2_Private() { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 12d744e..8e78810 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -530,7 +530,7 @@ public class GameManagerRound2 : GameManagerBase _PlayingJailCall = true; _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent()); - SendCustomEventDelayedSeconds(nameof(JailCallIsOver), _AudioManager.CurrentSFXLength()); + SendCustomEventDelayedSeconds(nameof(JailCallIsOver), _AudioManager.CurrentSFXLength() + 0.5f); _CameraControllerRound2.DisableAllSwitchers(); _CameraControllerRound2.SwitchToWinningPlayerCamera(); diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Raw Files/Modem.blend b/Raw Files/Modem.blend index 01aa9c8..862a384 100644 Binary files a/Raw Files/Modem.blend and b/Raw Files/Modem.blend differ