From a4489d81853dc98039ea38e81f486a5cc24c75f4 Mon Sep 17 00:00:00 2001 From: Samir Badi Date: Thu, 7 Nov 2024 23:55:25 -0500 Subject: [PATCH] Save --- Assets/Prefabs/Desk.prefab | 245 ++++++ Assets/Prefabs/Desk.prefab.meta | 7 + Assets/Scenes/Samir.unity | 1267 +++++++++++++++++++++++++++-- Assets/Scripts/Core/PlayerMain.cs | 7 +- 4 files changed, 1439 insertions(+), 87 deletions(-) create mode 100644 Assets/Prefabs/Desk.prefab create mode 100644 Assets/Prefabs/Desk.prefab.meta diff --git a/Assets/Prefabs/Desk.prefab b/Assets/Prefabs/Desk.prefab new file mode 100644 index 0000000..f05a88a --- /dev/null +++ b/Assets/Prefabs/Desk.prefab @@ -0,0 +1,245 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &652795851957083200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9145593127470297154} + - component: {fileID: 536950067797659535} + - component: {fileID: 5086893892868252538} + - component: {fileID: 6693502288575769402} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9145593127470297154 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652795851957083200} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.375, z: 0} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8229128251828257617} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &536950067797659535 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652795851957083200} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5086893892868252538 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652795851957083200} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b0db3d4b2af15934fa2ede5f8ef9fae6, 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: 1 + 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!65 &6693502288575769402 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 652795851957083200} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8337335446898272115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1917647960093475553} + - component: {fileID: 840559881972327867} + - component: {fileID: 2689350075166833444} + - component: {fileID: 6568750664624037710} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1917647960093475553 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337335446898272115} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.5, z: 0} + m_LocalScale: {x: 1.8, y: 1, z: 1.2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8229128251828257617} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &840559881972327867 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337335446898272115} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2689350075166833444 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337335446898272115} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 05e8a59fe7af18f4190f6bdd0edd7dce, 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: 1 + 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!65 &6568750664624037710 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8337335446898272115} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8742590115818964410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8229128251828257617} + m_Layer: 0 + m_Name: Desk + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8229128251828257617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8742590115818964410} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1917647960093475553} + - {fileID: 9145593127470297154} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Desk.prefab.meta b/Assets/Prefabs/Desk.prefab.meta new file mode 100644 index 0000000..8211688 --- /dev/null +++ b/Assets/Prefabs/Desk.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8af091cace6089e428a354aefadb7b34 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Samir.unity b/Assets/Scenes/Samir.unity index 3aecef3..79755eb 100644 --- a/Assets/Scenes/Samir.unity +++ b/Assets/Scenes/Samir.unity @@ -256,7 +256,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1823285418} - {fileID: 256841827} - {fileID: 2038879510} - {fileID: 1386266369} @@ -404,6 +403,46 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &184268638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 184268639} + m_Layer: 0 + m_Name: Desks + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &184268639 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 184268638} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3500289701967161188} + - {fileID: 300628669} + - {fileID: 832849852} + - {fileID: 1699108345} + - {fileID: 1911377100} + - {fileID: 1972022440} + - {fileID: 1362141396} + - {fileID: 1157236919} + - {fileID: 1216978241} + m_Father: {fileID: 1958973072} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &187840931 PrefabInstance: m_ObjectHideFlags: 0 @@ -837,6 +876,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &300628668 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &300628669 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 300628668} + m_PrefabAsset: {fileID: 0} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -849,6 +962,7 @@ GameObject: - component: {fileID: 330585545} - component: {fileID: 330585544} - component: {fileID: 330585547} + - component: {fileID: 330585548} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -873,8 +987,8 @@ Camera: m_GameObject: {fileID: 330585543} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.019607844, g: 0.12156863, b: 0.22352941, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -923,12 +1037,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330585543} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalRotation: {x: 0.000000029784712, y: -0.034376148, z: 0.0000000010244892, + w: 0.99940896} + m_LocalPosition: {x: -0.8602132, y: 1.5, z: -2.0639849} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1148775911} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &330585547 MonoBehaviour: @@ -974,6 +1089,40 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!114 &330585548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330585543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowDebugText: 0 + m_ShowCameraFrustum: 1 + m_IgnoreTimeScale: 0 + m_WorldUpOverride: {fileID: 0} + m_UpdateMethod: 2 + m_BlendUpdateMethod: 1 + m_DefaultBlend: + m_Style: 1 + m_Time: 2 + m_CustomCurve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_CustomBlends: {fileID: 0} + m_CameraCutEvent: + m_PersistentCalls: + m_Calls: [] + m_CameraActivatedEvent: + m_PersistentCalls: + m_Calls: [] --- !u!1 &334916789 GameObject: m_ObjectHideFlags: 0 @@ -1230,7 +1379,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &461561937 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1963,6 +2112,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &832849851 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 9.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &832849852 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 832849851} + m_PrefabAsset: {fileID: 0} --- !u!1 &882270497 GameObject: m_ObjectHideFlags: 0 @@ -2310,6 +2533,113 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1133589576} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1148775910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1148775911} + m_Layer: 0 + m_Name: CameraHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1148775911 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1148775910} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 330585546} + - {fileID: 1842961526} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1157236918 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1157236919 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1157236918} + m_PrefabAsset: {fileID: 0} --- !u!1 &1196902882 GameObject: m_ObjectHideFlags: 0 @@ -2341,6 +2671,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1216978240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 9.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1216978241 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1216978240} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1220896922 PrefabInstance: m_ObjectHideFlags: 0 @@ -2625,6 +3029,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1336899449} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1362141395 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1362141396 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1362141395} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1386266368 PrefabInstance: m_ObjectHideFlags: 0 @@ -2699,6 +3177,101 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1386266368} m_PrefabAsset: {fileID: 0} +--- !u!1 &1392871766 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1392871767} + - component: {fileID: 1392871770} + - component: {fileID: 1392871769} + - component: {fileID: 1392871768} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1392871767 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392871766} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1842961526} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1392871768 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392871766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 0, z: -2} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!114 &1392871769 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392871766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1392871770 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392871766} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1456785128 GameObject: m_ObjectHideFlags: 0 @@ -2893,6 +3466,80 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1699108344 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1699108345 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1699108344} + m_PrefabAsset: {fileID: 0} --- !u!1 &1721698428 GameObject: m_ObjectHideFlags: 0 @@ -2919,13 +3566,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1721698428} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: -0.03437615, z: 0, w: 0.999409} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2036081136} + - {fileID: 1839156922} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -3.94, z: 0} --- !u!114 &1721698430 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2950,80 +3599,142 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45f6ccbbf842ceb47bfe1cc19085daa0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1823285417 -PrefabInstance: +--- !u!1 &1839156921 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 54002814} - m_Modifications: - - target: {fileID: 2684113167729998087, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_Name - value: NPC - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 58a9a466f0501ce4d8388102500b1754, type: 3} ---- !u!4 &1823285418 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3614258387417921825, guid: 58a9a466f0501ce4d8388102500b1754, - type: 3} - m_PrefabInstance: {fileID: 1823285417} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1839156922} + m_Layer: 0 + m_Name: ViewPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1839156922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1839156921} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1841957481} + m_Father: {fileID: 1721698429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1841957480 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841957481} + m_Layer: 0 + m_Name: CameraTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1841957481 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841957480} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1839156922} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1842961525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1842961526} + - component: {fileID: 1842961527} + m_Layer: 0 + m_Name: Virtual Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1842961526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842961525} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000029784712, y: -0.034376148, z: 0.0000000010244892, + w: 0.99940896} + m_LocalPosition: {x: -0.8602132, y: 1.5, z: -2.0639849} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1392871767} + m_Father: {fileID: 1148775911} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1842961527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842961525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1841957481} + m_Follow: {fileID: 1841957481} + m_Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1392871767} --- !u!1 &1892060567 GameObject: m_ObjectHideFlags: 0 @@ -3060,6 +3771,163 @@ Transform: - {fileID: 110478556} m_Father: {fileID: 334916790} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1911377099 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 5.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1911377100 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1911377099} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1946770798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1946770799} + - component: {fileID: 1946770801} + - component: {fileID: 1946770800} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1946770799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946770798} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.468, z: 0.466} + m_LocalScale: {x: 0.7024752, y: 0.23334014, z: 0.35894734} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2036081136} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1946770800 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946770798} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 88d7cc0aa67b7784e87f3bf4dc7b893f, 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: 1 + 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 &1946770801 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1946770798} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1952830668 GameObject: m_ObjectHideFlags: 0 @@ -3198,8 +4066,83 @@ Transform: - {fileID: 882270498} - {fileID: 334916790} - {fileID: 54002814} + - {fileID: 184268639} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1972022439 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 9.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &1972022440 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 1972022439} + m_PrefabAsset: {fileID: 0} --- !u!1 &1986501443 GameObject: m_ObjectHideFlags: 0 @@ -3231,6 +4174,90 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2036081135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2036081136} + - component: {fileID: 2036081138} + - component: {fileID: 2036081137} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2036081136 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036081135} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1946770799} + m_Father: {fileID: 1721698429} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2036081137 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036081135} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 88d7cc0aa67b7784e87f3bf4dc7b893f, 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: 1 + 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 &2036081138 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036081135} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2038879509 PrefabInstance: m_ObjectHideFlags: 0 @@ -3379,6 +4406,80 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2076373777} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3500289701967161187 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 184268639} + m_Modifications: + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8742590115818964410, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + propertyPath: m_Name + value: Desk + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8af091cace6089e428a354aefadb7b34, type: 3} +--- !u!4 &3500289701967161188 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8229128251828257617, guid: 8af091cace6089e428a354aefadb7b34, + type: 3} + m_PrefabInstance: {fileID: 3500289701967161187} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3386,7 +4487,7 @@ SceneRoots: - {fileID: 410087041} - {fileID: 832575519} - {fileID: 298469752} - - {fileID: 330585546} + - {fileID: 1148775911} - {fileID: 130761953} - {fileID: 1196902883} - {fileID: 1721698429} diff --git a/Assets/Scripts/Core/PlayerMain.cs b/Assets/Scripts/Core/PlayerMain.cs index 81514b4..93c1d1a 100644 --- a/Assets/Scripts/Core/PlayerMain.cs +++ b/Assets/Scripts/Core/PlayerMain.cs @@ -45,10 +45,9 @@ namespace GameOff.Core private void InputHandler_OnChangeState(object sender, EventArgs e) { - bool isClass = _currentState is PlayerQuizState; - Debug.Log(isClass); - ChangeState(isClass ? _quizState : _classState); - OnStateUpdate?.Invoke(this, isClass); + bool isQuiz = _currentState is PlayerQuizState; + ChangeState(isQuiz ? _classState: _quizState); + OnStateUpdate?.Invoke(this, isQuiz); } private void ChangeState(IState next)