diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ee51d35..80969f4 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -1174,6 +1174,10 @@ Library\ScriptAssemblies\Unity.Rider.Editor.dll False + + Library\ScriptAssemblies\Unity.2D.Sprite.Editor.dll + False + Library\ScriptAssemblies\Unity.Formats.Fbx.Runtime.dll False diff --git a/Assets/Animations/Camera/Round 1 Cameras.meta b/Assets/Animations/Camera/Round 1 Cameras.meta new file mode 100644 index 0000000..cb65a86 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90784e01bf185864493a0974beb14e06 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller new file mode 100644 index 0000000..2e7a973 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller @@ -0,0 +1,223 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8191742683389374813 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Opening + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7351194553351748194} + 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: 505fb604a9c0c964882aedb6149f9875, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7391541177819858899 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Opening Doorway + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -4692977000017523001} + 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: bd25200a2edde174986dabbbd23e869f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7351194553351748194 +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 Opening Doorway + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7391541177819858899} + 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!1101 &-4692977000017523001 +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 Opening + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: Play Opening Doorway + 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!1107 &-1992508409679594653 +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: -8191742683389374813} + m_Position: {x: 420, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5448109171515969289} + m_Position: {x: 30, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7391541177819858899} + m_Position: {x: 420, y: 120, 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: 5448109171515969289} +--- !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 Opening + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Play Opening Doorway + 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: -1992508409679594653} + 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!1101 &2481516024324196914 +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 Opening + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8191742683389374813} + 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!1102 &5448109171515969289 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Nothing + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2481516024324196914} + 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: diff --git a/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller.meta b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller.meta new file mode 100644 index 0000000..b18d4f7 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Crane Shots.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f14a31a9658e7b24f8c1de0cafafd4ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim new file mode 100644 index 0000000..45c7798 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim @@ -0,0 +1,388 @@ +%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: Opening Doorway + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 22.118, y: 124.97, z: 0} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + - serializedVersion: 3 + time: 1 + value: {x: -1.2, y: 125.088, z: 0} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Alternate Camera Anchors/Opening Camera Anchor + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 8.582, y: 3.428, z: -4.583} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 7.226, y: 1.283, z: -3.621} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Alternate Camera Anchors/Opening Camera Anchor + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 1 + script: {fileID: 0} + flags: 16 + 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: 4199792127 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4199792127 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + 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 + 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: 22.118 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 124.97 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 125.088 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 8.582 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 7.226 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.428 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.283 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.583 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -3.621 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + 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: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 1 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim.meta b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim.meta new file mode 100644 index 0000000..0fb8627 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening Doorway.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd25200a2edde174986dabbbd23e869f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening.anim b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim new file mode 100644 index 0000000..0cbea2c --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim @@ -0,0 +1,664 @@ +%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: Opening + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 5.051, y: 34.263, z: 0} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + - serializedVersion: 3 + time: 2.5 + value: {x: 3.363, y: -36.126, z: -0.479} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Alternate Camera Anchors/Opening Camera Anchor + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 4.871, y: 1.451, z: -4.28} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + - serializedVersion: 3 + time: 2.5 + value: {x: 8.514, y: 1.364, z: -3.684} + inSlope: {x: 0, y: 0, z: 0} + 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.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Alternate Camera Anchors/Opening Camera Anchor + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - 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: 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: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 1 + script: {fileID: 0} + flags: 16 + 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: 4199792127 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4199792127 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 2108656497 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 1303350129 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 1571785585 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1598280187 + attribute: 1840221041 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 3.5 + 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.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.r + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.g + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.b + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.6666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.1666667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 3.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Color.a + path: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 23 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4.871 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 8.514 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.451 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 1.364 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.28 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: -3.684 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.051 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: 3.363 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 34.263 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: -36.126 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.5 + value: -0.479 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Alternate Camera Anchors/Opening Camera Anchor + 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: 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: Alternate Camera Anchors/Opening Camera Anchor/SM_LogoCard + classID: 1 + script: {fileID: 0} + flags: 16 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Alternate Camera Anchors/Opening Camera Anchor + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening.anim.meta b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim.meta new file mode 100644 index 0000000..856df51 --- /dev/null +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 505fb604a9c0c964882aedb6149f9875 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat index 0c5c084..9d11511 100644 --- a/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat +++ b/Assets/Materials/ClueVideoScreen/M_ClueVideoScreen_Maps.mat @@ -48,7 +48,7 @@ Material: - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 0.5, y: 0.33333334} - m_Offset: {x: 0.5, y: 0.33333334} + m_Offset: {x: 0, y: 0.6666667} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Materials/M_AcmeCrimenetDecal.mat b/Assets/Materials/M_Decal.mat similarity index 98% rename from Assets/Materials/M_AcmeCrimenetDecal.mat rename to Assets/Materials/M_Decal.mat index 8eb13ff..39c24b7 100644 --- a/Assets/Materials/M_AcmeCrimenetDecal.mat +++ b/Assets/Materials/M_Decal.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: M_AcmeCrimenetDecal + m_Name: M_Decal m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/M_AcmeCrimenetDecal.mat.meta b/Assets/Materials/M_Decal.mat.meta similarity index 100% rename from Assets/Materials/M_AcmeCrimenetDecal.mat.meta rename to Assets/Materials/M_Decal.mat.meta diff --git a/Assets/Materials/M_LocationBoard_Crook.mat b/Assets/Materials/M_LocationBoard_Crook.mat index 1558d18..9c0de23 100644 --- a/Assets/Materials/M_LocationBoard_Crook.mat +++ b/Assets/Materials/M_LocationBoard_Crook.mat @@ -46,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 60b125c1d7b06dd439bacc9a3af6b3e0, type: 3} + m_Texture: {fileID: 2800000, guid: 81347045e06c7034b8ec7bbca4575052, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/M_LogoDecal.mat b/Assets/Materials/M_LogoDecal.mat new file mode 100644 index 0000000..c74e5dc --- /dev/null +++ b/Assets/Materials/M_LogoDecal.mat @@ -0,0 +1,92 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_LogoDecal + m_Shader: {fileID: 4800000, guid: 5f8fef09682fab74fb7a29d783391edb, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: + - _ALPHABLEND_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: eb72bd4caeb7fd34a924b1c28d88b4f2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - PixelSnap: 0 + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnableExternalAlpha: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 2 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _Flip: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_LogoDecal.mat.meta b/Assets/Materials/M_LogoDecal.mat.meta new file mode 100644 index 0000000..c2a5d02 --- /dev/null +++ b/Assets/Materials/M_LogoDecal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d14b9968c12ff6c479ca914c5e7d6563 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Paint/M_DarkRedPaint.mat b/Assets/Materials/Paint/M_DarkRedPaint.mat index 37a9392..fdd8546 100644 --- a/Assets/Materials/Paint/M_DarkRedPaint.mat +++ b/Assets/Materials/Paint/M_DarkRedPaint.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_DarkRedPaint m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} - m_Parent: {fileID: 2100000, guid: 216f9bb0d588b78419214329a6f35462, type: 2} + m_Parent: {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA diff --git a/Assets/Materials/Paint/M_OrangePaint.mat b/Assets/Materials/Paint/M_OrangePaint.mat new file mode 100644 index 0000000..29d4387 --- /dev/null +++ b/Assets/Materials/Paint/M_OrangePaint.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_OrangePaint + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 216f9bb0d588b78419214329a6f35462, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 1, g: 0.60784316, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paint/M_OrangePaint.mat.meta b/Assets/Materials/Paint/M_OrangePaint.mat.meta new file mode 100644 index 0000000..24d96c9 --- /dev/null +++ b/Assets/Materials/Paint/M_OrangePaint.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2328ced7acf68884b96deba2b991c8ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Paint/M_RedPaint.mat b/Assets/Materials/Paint/M_RedPaint.mat index 63eed9a..5140374 100644 --- a/Assets/Materials/Paint/M_RedPaint.mat +++ b/Assets/Materials/Paint/M_RedPaint.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: M_RedPaint m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} - m_Parent: {fileID: 2100000, guid: 216f9bb0d588b78419214329a6f35462, type: 2} + m_Parent: {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ENABLE_GEOMETRIC_SPECULAR_AA diff --git a/Assets/Materials/Paint/M_TealPaint.mat b/Assets/Materials/Paint/M_TealPaint.mat new file mode 100644 index 0000000..84ed662 --- /dev/null +++ b/Assets/Materials/Paint/M_TealPaint.mat @@ -0,0 +1,32 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_TealPaint + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: 216f9bb0d588b78419214329a6f35462, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLE_GEOMETRIC_SPECULAR_AA + m_InvalidKeywords: + - _NORMALMAP + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0, g: 0.45098037, b: 0.4509804, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Paint/M_TealPaint.mat.meta b/Assets/Materials/Paint/M_TealPaint.mat.meta new file mode 100644 index 0000000..51023c4 --- /dev/null +++ b/Assets/Materials/Paint/M_TealPaint.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4cbd5a7b91a8e2a469e33380a6d99a68 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Plastic/M_GreenPlastic 1.mat b/Assets/Materials/Plastic/M_GreenPlastic 1.mat new file mode 100644 index 0000000..002804d --- /dev/null +++ b/Assets/Materials/Plastic/M_GreenPlastic 1.mat @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_GreenPlastic 1 + m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3} + m_Parent: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _Color: {r: 0, g: 0.4509804, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Plastic/M_GreenPlastic 1.mat.meta b/Assets/Materials/Plastic/M_GreenPlastic 1.mat.meta new file mode 100644 index 0000000..8cc7194 --- /dev/null +++ b/Assets/Materials/Plastic/M_GreenPlastic 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fe25aa579b9514441a94bd556cf54df9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_LocationBoardCabinet.fbx b/Assets/Models/SM_LocationBoardCabinet.fbx new file mode 100644 index 0000000..e73e3c4 Binary files /dev/null and b/Assets/Models/SM_LocationBoardCabinet.fbx differ diff --git a/Assets/Models/SM_LocationBoardPlaceholderShell.fbx.meta b/Assets/Models/SM_LocationBoardCabinet.fbx.meta similarity index 99% rename from Assets/Models/SM_LocationBoardPlaceholderShell.fbx.meta rename to Assets/Models/SM_LocationBoardCabinet.fbx.meta index 3f9de0b..1b468a0 100644 --- a/Assets/Models/SM_LocationBoardPlaceholderShell.fbx.meta +++ b/Assets/Models/SM_LocationBoardCabinet.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 1 + generateSecondaryUV: 0 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_LocationBoardPlaceholderShell.fbx b/Assets/Models/SM_LocationBoardPlaceholderShell.fbx deleted file mode 100644 index b07b3e9..0000000 Binary files a/Assets/Models/SM_LocationBoardPlaceholderShell.fbx and /dev/null differ diff --git a/Assets/Models/SM_LogoCard.fbx b/Assets/Models/SM_LogoCard.fbx new file mode 100644 index 0000000..a4011de Binary files /dev/null and b/Assets/Models/SM_LogoCard.fbx differ diff --git a/Assets/Models/SM_LogoCard.fbx.meta b/Assets/Models/SM_LogoCard.fbx.meta new file mode 100644 index 0000000..2667c1a --- /dev/null +++ b/Assets/Models/SM_LogoCard.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 84a24ace91ac68749b996293c0996e86 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_Round1Door.fbx b/Assets/Models/SM_Round1Door.fbx index 57c7228..5730865 100644 Binary files a/Assets/Models/SM_Round1Door.fbx and b/Assets/Models/SM_Round1Door.fbx differ diff --git a/Assets/Prefabs/Betacam Handheld.prefab b/Assets/Prefabs/Betacam Handheld.prefab index 4e9844f..c7bac67 100644 --- a/Assets/Prefabs/Betacam Handheld.prefab +++ b/Assets/Prefabs/Betacam Handheld.prefab @@ -633,7 +633,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 2617311 + m_Bits: 11005919 m_RenderingPath: 1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Prefabs/Capture Carmen Newspaper.prefab b/Assets/Prefabs/Capture Carmen Newspaper.prefab index 3793c6d..7e43233 100644 --- a/Assets/Prefabs/Capture Carmen Newspaper.prefab +++ b/Assets/Prefabs/Capture Carmen Newspaper.prefab @@ -44,7 +44,7 @@ GameObject: - component: {fileID: 6435134046752830382} - component: {fileID: 4677303680146864714} - component: {fileID: 4693766213138297865} - m_Layer: 0 + m_Layer: 23 m_Name: Date m_TagString: Untagged m_Icon: {fileID: 0} @@ -179,7 +179,7 @@ GameObject: - component: {fileID: 1378426411902222101} - component: {fileID: 2997306230988203132} - component: {fileID: 7465527118717481133} - m_Layer: 0 + m_Layer: 23 m_Name: Headline m_TagString: Untagged m_Icon: {fileID: 0} @@ -422,7 +422,7 @@ GameObject: - component: {fileID: 8974211262632548065} - component: {fileID: 3627944098001172186} - component: {fileID: 5807763379893679145} - m_Layer: 0 + m_Layer: 23 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -584,6 +584,11 @@ PrefabInstance: propertyPath: m_Name value: SM_CaptureCarmenPhoto objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: f7465af385e59794783e3e7295216d47, + type: 3} + propertyPath: m_Layer + value: 23 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -694,6 +699,11 @@ PrefabInstance: propertyPath: m_Name value: SM_CaptureCarmenNewspaper objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: d71e5b9eaf8bc6043bdefe174c9de73d, + type: 3} + propertyPath: m_Layer + value: 23 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: diff --git a/Assets/Prefabs/Location Board.prefab b/Assets/Prefabs/Location Board.prefab index 8c9a856..9e93fdf 100644 --- a/Assets/Prefabs/Location Board.prefab +++ b/Assets/Prefabs/Location Board.prefab @@ -1033,7 +1033,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - target: {fileID: 5888369772753007458, guid: 505c0fb5a04a07649b0afc0e005950cb, type: 3} propertyPath: m_Materials.Array.data[0] diff --git a/Assets/Prefabs/Phone.prefab b/Assets/Prefabs/Phone.prefab index 5e36a11..6035d9a 100644 --- a/Assets/Prefabs/Phone.prefab +++ b/Assets/Prefabs/Phone.prefab @@ -329,7 +329,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + objectReference: {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - target: {fileID: -5278166820608330550, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} propertyPath: m_Layer @@ -339,7 +339,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2} + objectReference: {fileID: 2100000, guid: fe25aa579b9514441a94bd556cf54df9, type: 2} - target: {fileID: 919132149155446097, guid: 21599afa6ab27574182496d3ebe3232c, type: 3} propertyPath: m_Name @@ -553,6 +553,7 @@ MonoBehaviour: currentlyHeldBy: {fileID: 0} pickupable: 0 proximity: 0.5 + version: 0 --- !u!114 &7664069034163716319 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 88b9392..3cac916 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -138,6 +138,105 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1292659 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 527314383} + m_Modifications: + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FOV + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: FarClippingPlane + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_Name + value: Opening Camera Anchor + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.x + value: 4.895 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.281 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.043 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9075478 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.04660729 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.41680533 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.021405121 + 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: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 862012214} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} +--- !u!4 &1292660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1292659} + m_PrefabAsset: {fileID: 0} --- !u!1 &1587272 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9038776168754484715, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -1197,7 +1296,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1300477146} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} --- !u!4 &50383830 stripped @@ -1605,7 +1708,7 @@ PrefabInstance: - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -1743,7 +1846,7 @@ PrefabInstance: - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: sleepFlag - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} @@ -8745,6 +8848,24 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 544245846} m_PrefabAsset: {fileID: 0} +--- !u!1 &138392621 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1292659} + m_PrefabAsset: {fileID: 0} +--- !u!114 &138392623 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + m_PrefabInstance: {fileID: 1292659} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 138392621} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &139576159 stripped GameObject: m_CorrespondingSourceObject: {fileID: 744764791484571813, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -17278,7 +17399,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 264241151 m_RenderingPath: -1 m_TargetTexture: {fileID: 8600000, guid: fb730cd2dcc49654dbee12581f50a3c4, type: 2} m_TargetDisplay: 0 @@ -32226,6 +32347,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1292660} - {fileID: 5806135540292049292} - {fileID: 1743190485} - {fileID: 888210231} @@ -40426,7 +40548,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1967712740} + m_TransformParent: {fileID: 808969078} m_Modifications: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -40436,7 +40558,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -40452,37 +40574,37 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -0.8612666 + value: 2.383 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.49 + value: 1.693 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 1.1024823 + value: 1.519 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.92164433 + value: 0.64283997 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.64283997 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.3880358 + value: -0.29454494 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.29454494 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -42655,7 +42777,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1967712740} + m_TransformParent: {fileID: 2134288142} m_Modifications: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -42665,7 +42787,7 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -42681,52 +42803,52 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: -1.648778 + value: 2.383 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.49 + value: 1.693 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 1.1003234 + value: 1.519 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.92164433 + value: 0.64284 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0.64283997 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: -0.3880358 + value: -0.29454505 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: -0.294545 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 40.766 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -90 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: -90 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -43667,7 +43789,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} propertyPath: m_LocalPosition.x - value: 0.4 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -43736,6 +43858,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1149080868} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 739684420} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -45018,6 +45144,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 860275013} m_CullTransparentMesh: 1 +--- !u!1001 &862012213 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1292660} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.1277 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.70710707 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071065 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000032782546 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000007618217 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d14b9968c12ff6c479ca914c5e7d6563, type: 2} + - target: {fileID: 919132149155446097, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_Name + value: SM_LogoCard + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_Layer + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84a24ace91ac68749b996293c0996e86, type: 3} +--- !u!4 &862012214 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 84a24ace91ac68749b996293c0996e86, + type: 3} + m_PrefabInstance: {fileID: 862012213} + m_PrefabAsset: {fileID: 0} --- !u!1 &862192718 GameObject: m_ObjectHideFlags: 0 @@ -55118,7 +55333,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 264241151 + m_Bits: 260046847 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -56496,6 +56711,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1115429855} + - component: {fileID: 1115429856} m_Layer: 0 m_Name: Camera Anchors m_TagString: Untagged @@ -56524,6 +56740,27 @@ Transform: - {fileID: 527314383} m_Father: {fileID: 2110808113} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &1115429856 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1115429854} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f14a31a9658e7b24f8c1de0cafafd4ca, 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 &1117052603 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3302355766369515034, guid: 126991d511ca61841a0ef899b6c038a6, @@ -61568,6 +61805,89 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1299739207} m_PrefabAsset: {fileID: 0} +--- !u!1 &1300477145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1300477146} + - component: {fileID: 1300477148} + - component: {fileID: 1300477147} + m_Layer: 23 + m_Name: Newspaper Display + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 1 + m_IsActive: 1 +--- !u!4 &1300477146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300477145} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000003090862, y: 0.70710677, z: -0.70710677, w: -0.00000003090862} + m_LocalPosition: {x: 0, y: -0, z: 0.321} + m_LocalScale: {x: 0.027999999, y: 1.1199999, z: 0.021000003} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 50383830} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 180} +--- !u!23 &1300477147 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300477145} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 2 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 372c2f1b24e36bd438fea3de42b33e3b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 2 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1300477148 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1300477145} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1300947708 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3956068066517853170, guid: fac4aa7abd3ecbe44a9eaf7f05275244, @@ -62491,13 +62811,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1324583144} serializedVersion: 2 - m_LocalRotation: {x: -0.6840737, y: -0.45374167, z: 0.17900522, w: -0.5423272} + m_LocalRotation: {x: 0.83928233, y: -0.07592024, z: 0.12148833, w: 0.5244826} m_LocalPosition: {x: -1.7616603, y: 6, z: 0.61220455} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 115.254, y: -35.418, z: -90} + m_LocalEulerAnglesHint: {x: 115.996, y: -16.473022, z: 0} --- !u!108 &1324583146 Light: m_ObjectHideFlags: 0 @@ -67852,6 +68172,16 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1583513123} m_Modifications: + - target: {fileID: -8957791877142239147, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8726716253764456551, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} - target: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_LocalScale.x @@ -67912,11 +68242,276 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8391222552659086748, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -8280833267811060685, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -8143710011712545758, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8143710011712545758, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -7664728788398519507, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7664728788398519507, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -7640558969779515294, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_ScaleInLightmap + value: 3 + objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} + objectReference: {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} + - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} + - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - target: {fileID: -7511558181221131132, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[4] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -7381222009442936319, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -7146521406498821007, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -6861345101942307174, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -6763858364670572316, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -6717198702334339505, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -6687919828193911814, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -6179777994870533416, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -6093592463355912122, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -6093592463355912122, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -4683669308469848369, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4683669308469848369, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -4364756586993321885, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -4299539605182151529, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -3967195515791377647, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -3000616050479675598, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -2193736774033309338, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2159027197138042734, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -2045257923548263128, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1806680513116206669, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1806680513116206669, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -1600127564651496969, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1599826595754709761, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -1588954058007450354, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_ScaleInLightmap + value: 2 + objectReference: {fileID: 0} + - target: {fileID: -1588954058007450354, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -1588954058007450354, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} + - target: {fileID: -1588954058007450354, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: -1588954058007450354, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - target: {fileID: -1461304994638716399, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1461304994638716399, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -1120989108687609925, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1120989108687609925, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -989645189788759339, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -804731622281664130, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -804731622281664130, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -678588488315902003, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -678588488315902003, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: -516098083770646512, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -466329591000292508, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: -208595431880416365, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 239174248640774531, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 281855664364225751, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 2508e31fad449364f8b5919392c5d343, type: 3} propertyPath: m_Name @@ -67932,9 +68527,158 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 2147483647 objectReference: {fileID: 0} + - target: {fileID: 1002656965284881829, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 1058530316058467490, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 1190568904093423417, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 1939260432845100009, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 3724969418588059570, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4321514657177891973, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4321514657177891973, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: 4693873841622242415, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 4914761527628329067, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 5263467903169306984, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 5493666917057524247, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5552696614077225003, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 5554413755200638676, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_ScaleInLightmap + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5554413755200638676, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2328ced7acf68884b96deba2b991c8ca, type: 2} + - target: {fileID: 6557452121650071882, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6708191005924919820, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6745302439343835087, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745302439343835087, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} + - target: {fileID: 6813473605962544731, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 6841850624923944166, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 7581033342942720810, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 7780719577296457015, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8009987137999418058, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8053586841070629072, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 8281106601151412969, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8416272007918961125, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + - target: {fileID: 8563375906559035218, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 4cbd5a7b91a8e2a469e33380a6d99a68, type: 2} + - target: {fileID: 8567717000986892130, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8567717000986892130, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6044205050412544513} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2508e31fad449364f8b5919392c5d343, type: 3} insertIndex: -1 @@ -73000,8 +73744,8 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 1 - m_IsActive: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!4 &1523711553 Transform: m_ObjectHideFlags: 0 @@ -73026,11 +73770,11 @@ MeshRenderer: m_GameObject: {fileID: 1523711552} m_Enabled: 1 m_CastShadows: 0 - m_ReceiveShadows: 1 + m_ReceiveShadows: 0 m_DynamicOccludee: 0 m_StaticShadowCaster: 0 m_MotionVectors: 2 - m_LightProbeUsage: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 2 m_RayTraceProcedural: 0 @@ -73299,12 +74043,14 @@ MonoBehaviour: IncorrectToHostAndAllPlayersTimerToggle: {fileID: 1574468604} ThinkAboutItTimerToggle: {fileID: 1129163084} BuzzedInPlayerTimerToggle: {fileID: 1238250497} + _CameraAnimator: {fileID: 1115429856} Player1CameraAnchor: {fileID: 1564239176} Player2CameraAnchor: {fileID: 1858619632} Player3CameraAnchor: {fileID: 306921569} HostCameraAnchor: {fileID: 1519421599} DefaultWideShotCameraAnchor: {fileID: 5806135540292049291} VideoPlayerCameraAnchor: {fileID: 1914584493} + OpeningCameraAnchor: {fileID: 138392623} AllPlayersViewCameraAnchor: {fileID: 1808255084} VideoMusicClueCameraAnchor: {fileID: 1144354959} ACMECrimenetComputerCameraAnchor: {fileID: 1743190486} @@ -73386,7 +74132,7 @@ GameObject: - component: {fileID: 1528283347} - component: {fileID: 1528283346} - component: {fileID: 1528283345} - m_Layer: 0 + m_Layer: 23 m_Name: Newspaper Display m_TagString: Untagged m_Icon: {fileID: 0} @@ -73453,7 +74199,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0.7071068, w: 0} m_LocalPosition: {x: -0, y: -0, z: 0.406} - m_LocalScale: {x: 0.024999999, y: 1, z: 0.018750003} + m_LocalScale: {x: 0.024999999, y: 1, z: 0.018750004} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 169430328} @@ -78419,7 +79165,6 @@ Transform: - {fileID: 295257087} - {fileID: 1230983058} - {fileID: 1468229609714695595} - - {fileID: 6044205050412544513} - {fileID: 1470660571} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -81855,11 +82600,21 @@ PrefabInstance: value: objectReference: {fileID: 4366543248608413464, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} + - target: {fileID: 5134516453511148866, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - target: {fileID: 5456942163228829885, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 8bc2ade7ea2681744b3a5bf052974502, type: 2} + - target: {fileID: 7560483520289877561, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - target: {fileID: 8810932174823803713, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} propertyPath: m_Materials.Array.data[1] @@ -92033,13 +92788,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1965776733} serializedVersion: 2 - m_LocalRotation: {x: 0.049978007, y: 0.5782432, z: -0.70533925, w: -0.406981} + m_LocalRotation: {x: -0.053005088, y: 0.5129961, z: -0.70511776, w: -0.48665637} m_LocalPosition: {x: 2.9321992, y: 6, z: -3.2687712} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 944796117} - m_LocalEulerAnglesHint: {x: 129.192, y: -238.914, z: -90} + m_LocalEulerAnglesHint: {x: 129.192, y: -222.20999, z: -90} --- !u!108 &1965776735 Light: m_ObjectHideFlags: 0 @@ -92054,8 +92809,8 @@ Light: m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 2 m_Range: 12 - m_SpotAngle: 35 - m_InnerSpotAngle: 2 + m_SpotAngle: 45 + m_InnerSpotAngle: 1 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -92266,8 +93021,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 783795839} - - {fileID: 739684420} - {fileID: 1117826904} - {fileID: 1922829038} - {fileID: 1670138122} @@ -98481,7 +99234,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} propertyPath: m_LocalPosition.x - value: -0.4 + value: -0.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -98550,6 +99303,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1707600714} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e1d6ac734219d0644a15c88ffde4b9f0, + type: 3} + insertIndex: -1 + addedObject: {fileID: 783795839} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e1d6ac734219d0644a15c88ffde4b9f0, type: 3} @@ -106248,7 +107005,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1583513123} + m_TransformParent: {fileID: 1470660571} m_Modifications: - target: {fileID: 49684626459713128, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} @@ -106258,7 +107015,7 @@ PrefabInstance: - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} @@ -106278,17 +107035,17 @@ PrefabInstance: - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 863375335500907730, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f, type: 3} @@ -106774,12 +107531,47 @@ PrefabInstance: propertyPath: m_Name value: Interactable Door objectReference: {fileID: 0} + - target: {fileID: 1936036401552524449, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_ProbeAnchor + value: + objectReference: {fileID: 1684289505} + - target: {fileID: 1936036401552524449, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} - target: {fileID: 4366543248608413464, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} propertyPath: serializationData.Prefab value: objectReference: {fileID: 4366543248608413464, guid: 27098a93425e81745a1dc84c7b56ee61, type: 3} + - target: {fileID: 5134516453511148866, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - target: {fileID: 7560483520289877561, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - target: {fileID: 7668564496982926869, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_ProbeAnchor + value: + objectReference: {fileID: 1628790464} + - target: {fileID: 7668564496982926869, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 53b84df3db050264db8132d12d59ac74, type: 2} + - target: {fileID: 8881924600099202437, guid: 27098a93425e81745a1dc84c7b56ee61, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: e53b90b5a4f1c3048b28024a40b455e7, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -112350,6 +113142,10 @@ MonoBehaviour: ID: 1298 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 138392621} + ID: 1299 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 3bd52bd..6a72368 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 57a1b8f..0273a15 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 562c921..3a7f436 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 96fa5ed..f6911fa 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index bc9bf8c..aee6645 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 628b98a..54518a2 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index 4ac367c..761aa61 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 1ffc43f..696f3a8 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Textures/T_CarmenSandiegoLogo.tga b/Assets/Textures/T_CarmenSandiegoLogo.tga new file mode 100644 index 0000000..e4fda77 Binary files /dev/null and b/Assets/Textures/T_CarmenSandiegoLogo.tga differ diff --git a/Assets/Textures/T_CarmenSandiegoLogo.tga.meta b/Assets/Textures/T_CarmenSandiegoLogo.tga.meta new file mode 100644 index 0000000..93f4d55 --- /dev/null +++ b/Assets/Textures/T_CarmenSandiegoLogo.tga.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: eb72bd4caeb7fd34a924b1c28d88b4f2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 0 + 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: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 0 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 0 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + 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: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 30 + crunchedCompression: 1 + 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: 512 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset index 718b471..96bef05 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.asset +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 27 + Data: 31 - Name: Entry: 7 Data: @@ -971,25 +971,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: $v Entry: 7 Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: Player1CameraAnchor + Data: _CameraAnimator - Name: k__BackingField Entry: 7 Data: 59|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: 59 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1040,16 +1040,85 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: Player2CameraAnchor + Data: Player1CameraAnchor - Name: $v Entry: 7 Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: Player1CameraAnchor + - Name: k__BackingField + Entry: 7 + Data: 64|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: CameraAnchor, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 4 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 66|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 67|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: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player2CameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1067,13 +1136,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|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: 65|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1097,13 +1166,13 @@ MonoBehaviour: Data: Player3CameraAnchor - Name: $v Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Player3CameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1121,13 +1190,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 67|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: 68|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1151,13 +1220,13 @@ MonoBehaviour: Data: HostCameraAnchor - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: HostCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1175,13 +1244,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 70|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: 71|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 76|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1205,13 +1274,13 @@ MonoBehaviour: Data: DefaultWideShotCameraAnchor - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: DefaultWideShotCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1229,13 +1298,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1259,13 +1328,13 @@ MonoBehaviour: Data: VideoPlayerCameraAnchor - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: VideoPlayerCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1283,13 +1352,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|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: 77|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1310,16 +1379,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: AllPlayersViewCameraAnchor + Data: OpeningCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1337,118 +1406,19 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 79|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 + Data: 2 - Name: Entry: 7 - Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 85|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 - 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: VideoMusicClueCameraAnchor - - Name: $v - Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: VideoMusicClueCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 59 - - 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: ACMECrimenetComputerCameraAnchor - - Name: $v - Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: ACMECrimenetComputerCameraAnchor - - Name: k__BackingField - Entry: 9 - Data: 59 - - 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 @@ -1472,16 +1442,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FilingCabinetCameraAnchor + Data: AllPlayersViewCameraAnchor - Name: $v Entry: 7 Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FilingCabinetCameraAnchor + Data: AllPlayersViewCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1526,16 +1496,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ModemCameraAnchor + Data: VideoMusicClueCameraAnchor - Name: $v Entry: 7 Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ModemCameraAnchor + Data: VideoMusicClueCameraAnchor - Name: k__BackingField Entry: 9 - Data: 59 + Data: 64 - Name: k__BackingField Entry: 9 Data: 4 @@ -1575,6 +1545,297 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: ACMECrimenetComputerCameraAnchor + - Name: $v + Entry: 7 + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ACMECrimenetComputerCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 64 + - 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: FilingCabinetCameraAnchor + - Name: $v + Entry: 7 + Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: FilingCabinetCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 64 + - 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: ModemCameraAnchor + - Name: $v + Entry: 7 + Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: ModemCameraAnchor + - Name: k__BackingField + Entry: 9 + Data: 64 + - 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: _PlayOpening + - Name: $v + Entry: 7 + Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayOpening + - Name: k__BackingField + Entry: 7 + Data: 103|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 103 + - 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: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 105|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 106|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: 107|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _PlayOpeningDoorway + - Name: k__BackingField + Entry: 9 + Data: 103 + - Name: k__BackingField + Entry: 9 + Data: 103 + - 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: + - 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 c92e9df..20ee20b 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound1.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound1.cs @@ -28,19 +28,25 @@ public class CameraControllerRound1 : CameraControllerBase [SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle; [SerializeField] public CameraTimedSwitcher BuzzedInPlayerTimerToggle; [Space] + [SerializeField] public Animator _CameraAnimator; + [Space] [SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor; [SerializeField] public CameraAnchor Player3CameraAnchor; [SerializeField] public CameraAnchor HostCameraAnchor; [SerializeField] public CameraAnchor DefaultWideShotCameraAnchor; [SerializeField] public CameraAnchor VideoPlayerCameraAnchor; - + [Space] + [SerializeField] public CameraAnchor OpeningCameraAnchor; [SerializeField] public CameraAnchor AllPlayersViewCameraAnchor; [SerializeField] public CameraAnchor VideoMusicClueCameraAnchor; [SerializeField] public CameraAnchor ACMECrimenetComputerCameraAnchor; [SerializeField] public CameraAnchor FilingCabinetCameraAnchor; [SerializeField] public CameraAnchor ModemCameraAnchor; + [UdonSynced, FieldChangeCallback(nameof(PlayOpeningCallback))] private bool _PlayOpening = false; + [UdonSynced, FieldChangeCallback(nameof(PlayOpeningDoorwayCallback))] private bool _PlayOpeningDoorway = false; + public override void InitialiseCameras() { @@ -50,6 +56,17 @@ public class CameraControllerRound1 : CameraControllerBase HostCameraAnchor.AttachCamera(HostCamera); DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); + + PlayOpening(false); + PlayOpeningDoorway(false); + } + + public override void DeinitialiseCameras() + { + PlayOpening(false); + PlayOpeningDoorway(false); + + base.DeinitialiseCameras(); } public override void OnOwnershipTransferred(VRCPlayerApi Player) @@ -72,6 +89,9 @@ public class CameraControllerRound1 : CameraControllerBase Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject); Networking.SetOwner(Player, BuzzedInPlayerTimerToggle.gameObject); + Networking.SetOwner(Player, _CameraAnimator.gameObject); + + Networking.SetOwner(Player, OpeningCameraAnchor.gameObject); Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject); Networking.SetOwner(Player, Player3CameraAnchor.gameObject); @@ -109,12 +129,21 @@ public class CameraControllerRound1 : CameraControllerBase SwitchToLiveCamera(HostCamera); } + public void SwitchToPrimaryFocusCamera() + { + SwitchToLiveCamera(PrimaryFocusCamera); + } + public void SwitchToVideoPlayerCamera() { SwitchToLiveCamera(VideoPlayerCamera); } + public void ActivateOpeningCamera() + { + OpeningCameraAnchor.AttachCamera(PrimaryFocusCamera); + } public void ActivateWideShotCamera() { DefaultWideShotCameraAnchor.AttachCamera(PrimaryFocusCamera); @@ -285,6 +314,20 @@ public class CameraControllerRound1 : CameraControllerBase } + public void PlayOpening(bool Play) + { + PlayOpeningCallback = Play; + RequestSerialization(); + } + + public void PlayOpeningDoorway(bool Play) + { + PlayOpeningDoorwayCallback = Play; + RequestSerialization(); + } + + + public override void DisableAllTriggers() { HostCameraTrigger.gameObject.SetActive(false); @@ -301,4 +344,35 @@ public class CameraControllerRound1 : CameraControllerBase ThinkAboutItTimerToggle.Activate = false; BuzzedInPlayerTimerToggle.Activate = false; } + + + private bool PlayOpeningCallback + { + set + { + _PlayOpening = value; + _CameraAnimator.SetBool("Play Opening", _PlayOpening); + if (_PlayOpening) + { + ActivateOpeningCamera(); + SwitchToPrimaryFocusCamera(); + } + } + get => _PlayOpening; + } + + private bool PlayOpeningDoorwayCallback + { + set + { + _PlayOpeningDoorway = value; + _CameraAnimator.SetBool("Play Opening Doorway", _PlayOpeningDoorway); + if (_PlayOpeningDoorway) + { + ActivateOpeningCamera(); + SwitchToPrimaryFocusCamera(); + } + } + get => _PlayOpeningDoorway; + } } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs index 74a8610..1e9c640 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound3.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound3.cs @@ -54,6 +54,9 @@ public class CameraControllerRound3 : CameraControllerBase PlayerCameraAnchorSequence[0].AttachCamera(PlayerCamera); ActivatePlayfieldSwitchTriggerGroup = false; + + PlayIFeelGood(false); + PlayDoItRockapella(false); } public override void DeinitialiseCameras() diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index e1c721a..379a643 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -91,6 +91,7 @@ public class GameManagerRound1 : GameManagerBase _CameraControllerRound1.InitialiseCameras(); _CameraControllerRound1.ActivateHostCameraTrigger(); + _CameraControllerRound1.PlayOpening(true); DisableInteraction(); @@ -129,6 +130,8 @@ public class GameManagerRound1 : GameManagerBase { EnableInteraction("Start Game"); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.OpeningLoop); + + _CameraControllerRound1.PlayOpeningDoorway(true); } @@ -168,6 +171,8 @@ public class GameManagerRound1 : GameManagerBase private void PlayIntroVideo() { + _CameraControllerRound1.PlayOpening(false); + _CameraControllerRound1.PlayOpeningDoorway(false); _CameraControllerRound1.DeactivateHostCameraTrigger(); _CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.SwitchToHostCamera(); 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/Packages/manifest.json b/Packages/manifest.json index 367dbc6..c2a70e1 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.formats.fbx": "4.2.1", "com.unity.ide.rider": "3.0.26", "com.unity.ide.visualstudio": "2.0.22", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 95034d7..3cd6ca7 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -13,6 +13,12 @@ "source": "embedded", "dependencies": {} }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.ai.navigation": { "version": "1.1.5", "depth": 1, diff --git a/Raw Files/LocationBoardCasing.blend b/Raw Files/LocationBoardCasing.blend new file mode 100644 index 0000000..cf0ce64 Binary files /dev/null and b/Raw Files/LocationBoardCasing.blend differ diff --git a/Raw Files/Round1Door.blend b/Raw Files/Round1Door.blend index 8a1e57e..be11bf2 100644 Binary files a/Raw Files/Round1Door.blend and b/Raw Files/Round1Door.blend differ