From bcaa786e7cc1fade9d2710cda817ac4421690979 Mon Sep 17 00:00:00 2001 From: Valdimir Date: Wed, 8 Mar 2023 13:40:01 +0200 Subject: [PATCH] time to bed --- Assets/Scenes/CheapHouse.unity | 1273 ++++++++++++++++++++- Assets/Scenes/City.unity | 56 +- Assets/Scripts/DontDestroy.cs | 11 +- Assets/Scripts/InteractableObjects/Bed.cs | 11 +- Assets/Scripts/MouseInputManager.cs | 2 +- Assets/Scripts/SelectedVisual.cs | 6 +- Assets/Scripts/TimeManager.cs | 41 +- 7 files changed, 1362 insertions(+), 38 deletions(-) diff --git a/Assets/Scenes/CheapHouse.unity b/Assets/Scenes/CheapHouse.unity index ade204a2..4e68764d 100644 --- a/Assets/Scenes/CheapHouse.unity +++ b/Assets/Scenes/CheapHouse.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1} + m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,6 +123,89 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &76943518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 76943519} + - component: {fileID: 76943521} + - component: {fileID: 76943520} + m_Layer: 0 + m_Name: comforter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &76943519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76943518} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 0.11, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1241828232} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &76943520 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76943518} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &76943521 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76943518} + m_Mesh: {fileID: -2256659843706960637, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} --- !u!1 &287262744 GameObject: m_ObjectHideFlags: 0 @@ -256,6 +339,89 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: 0, y: 0, z: 0} m_TimeToStationary: 0.5 +--- !u!1 &378273822 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 378273823} + - component: {fileID: 378273825} + - component: {fileID: 378273824} + m_Layer: 0 + m_Name: pCylinder68 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &378273823 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378273822} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.002054878, z: 0.0075688935} + m_LocalScale: {x: 6.8871117, y: 6.8871117, z: 6.8871117} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 420283331} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &378273824 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378273822} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &378273825 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 378273822} + m_Mesh: {fileID: -2279334706522210217, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} --- !u!1 &385441352 GameObject: m_ObjectHideFlags: 3 @@ -369,6 +535,124 @@ MonoBehaviour: m_BiasX: 0 m_BiasY: 0 m_CenterOnActivate: 1 +--- !u!1 &420283330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 420283331} + m_Layer: 0 + m_Name: Bedframe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &420283331 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 420283330} + 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: 1870099139} + - {fileID: 1540463559} + - {fileID: 1519462758} + - {fileID: 378273823} + m_Father: {fileID: 1241828232} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &675623049 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 675623050} + - component: {fileID: 675623052} + - component: {fileID: 675623051} + m_Layer: 0 + m_Name: pillow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &675623050 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 675623049} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.00037474858, y: 0.0029785095, z: 0.006341945} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1241828232} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &675623051 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 675623049} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &675623052 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 675623049} + m_Mesh: {fileID: 4731840015933613875, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -734,6 +1018,40 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.001, y: 0.0025, z: 0.001} m_Center: {x: 0, y: 0, z: -0.0005} +--- !u!1 &1241828231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1241828232} + m_Layer: 0 + m_Name: Bed_Visual (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1241828232 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1241828231} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.14376114, y: 0.14376113, z: 0.14376114} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 420283331} + - {fileID: 76943519} + - {fileID: 675623050} + m_Father: {fileID: 1401154114} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1259198848 GameObject: m_ObjectHideFlags: 0 @@ -849,6 +1167,208 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272856204} m_Mesh: {fileID: 8123095675721969769, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} +--- !u!1001 &1401154112 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7399893390412519594} + m_Modifications: + - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.00086 + objectReference: {fileID: 0} + - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00072 + objectReference: {fileID: 0} + - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2369538501029799684, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: _selectedObject + value: + objectReference: {fileID: 1401154117} + - target: {fileID: 2369538501029799684, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: visualGameObjectArray.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2369538501029799684, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: visualGameObjectArray.Array.data[0] + value: + objectReference: {fileID: 1241828231} + - target: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalScale.x + value: 1.02 + objectReference: {fileID: 0} + - target: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalScale.y + value: 1.02 + objectReference: {fileID: 0} + - target: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalScale.z + value: 1.01 + objectReference: {fileID: 0} + - target: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_Name + value: Bed + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.003829515 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.000001706002 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.002548367 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: 1 + addedObject: {fileID: 723155130181676973} + - targetCorrespondingSourceObject: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1241828232} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1401154117} + - targetCorrespondingSourceObject: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1401154119} + m_SourcePrefab: {fileID: 100100000, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, type: 3} +--- !u!4 &1401154113 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7908616180235619651, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + m_PrefabInstance: {fileID: 1401154112} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1401154114 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5263837543333092293, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + m_PrefabInstance: {fileID: 1401154112} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1401154115 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1595984948554774838, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + m_PrefabInstance: {fileID: 1401154112} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1401154116 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5577632863133830020, guid: bb469c3bf9d2c0f45be39b5b5a6ecfad, + type: 3} + m_PrefabInstance: {fileID: 1401154112} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1401154117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401154116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec924e9d7d23a4e46b256dedc9caa75c, type: 3} + m_Name: + m_EditorClassIdentifier: + _interactionPoint: {fileID: 1401154115} +--- !u!65 &1401154119 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401154116} + 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: 0.001, y: 0.001, z: 0.0024} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1443280724 PrefabInstance: m_ObjectHideFlags: 0 @@ -1062,6 +1582,172 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1519462757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1519462758} + - component: {fileID: 1519462760} + - component: {fileID: 1519462759} + m_Layer: 0 + m_Name: pCylinder17 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1519462758 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519462757} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.002054878, z: -0.0076893885} + m_LocalScale: {x: 6.8871117, y: 6.8871117, z: 6.8871117} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 420283331} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1519462759 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519462757} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &1519462760 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519462757} + m_Mesh: {fileID: -5667961617959078298, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} +--- !u!1 &1540463558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1540463559} + - component: {fileID: 1540463561} + - component: {fileID: 1540463560} + m_Layer: 0 + m_Name: pCube53 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1540463559 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540463558} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0018535444, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 420283331} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1540463560 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540463558} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &1540463561 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540463558} + m_Mesh: {fileID: 5001103794907324600, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} --- !u!850595691 &1709286000 LightingSettings: m_ObjectHideFlags: 0 @@ -1126,6 +1812,479 @@ LightingSettings: m_PVRTiledBaking: 0 m_NumRaysToShootPerTexel: -1 m_RespectSceneVisibilityWhenBakingGI: 0 +--- !u!1001 &1801648428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 420815665062891442, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420815665062891442, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420815665062891442, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 420815665062891442, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 808129671576928264, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182.005 + objectReference: {fileID: 0} + - target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1159489747999635777, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1159489747999635777, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1159489747999635777, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1159489747999635777, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2097376342396863895, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: _minuteToRealTime + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 2133092304313334115, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2133092304313334115, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2133092304313334115, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2133092304313334115, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2652297900654876911, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2652297900654876911, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2652297900654876911, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 250 + objectReference: {fileID: 0} + - target: {fileID: 4307980429506515175, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4537241548631189332, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4537241548631189332, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4537241548631189332, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4537241548631189332, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4809642769087784323, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4809642769087784323, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4809642769087784323, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5195994616405739126, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5195994616405739126, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5195994616405739126, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5971285090833758387, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5971285090833758387, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5971285090833758387, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5971285090833758387, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182.005 + objectReference: {fileID: 0} + - target: {fileID: 6551138445549304010, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6712048436670305279, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6712048436670305279, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6712048436670305279, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6712048436670305279, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6967241971874729682, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_Name + value: TestPack + objectReference: {fileID: 0} + - target: {fileID: 7046225486284069809, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7046225486284069809, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7489002102543253423, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7489002102543253423, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7489002102543253423, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7489002102543253423, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7636248814809471226, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7636248814809471226, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513480319803, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513480319803, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 30.585 + objectReference: {fileID: 0} + - target: {fileID: 7883991513735294445, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182.005 + objectReference: {fileID: 0} + - target: {fileID: 7883991513978601488, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_SizeDelta.x + value: 364.01 + objectReference: {fileID: 0} + - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 182.005 + objectReference: {fileID: 0} + - target: {fileID: 7949779033593405736, guid: 8939548f67eb43c4fa321f112c45f83b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3} --- !u!1 &1856998489 GameObject: m_ObjectHideFlags: 0 @@ -1244,6 +2403,106 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1 &1870099138 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1870099139} + - component: {fileID: 1870099142} + - component: {fileID: 1870099141} + - component: {fileID: 1870099140} + m_Layer: 0 + m_Name: pCube52 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1870099139 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870099138} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.00090506574, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 420283331} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!208 &1870099140 +NavMeshObstacle: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870099138} + m_Enabled: 1 + serializedVersion: 3 + m_Shape: 1 + m_Extents: {x: 0.004, y: 0.004, z: 0.007} + m_MoveThreshold: 0.1 + m_Carve: 1 + m_CarveOnlyStationary: 0 + m_Center: {x: 0, y: 0, z: 0} + m_TimeToStationary: 0.5 +--- !u!23 &1870099141 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870099138} + 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: 710613883f6dfb64889bf6134b4b15e3, 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 &1870099142 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870099138} + m_Mesh: {fileID: 882776928807334550, guid: 465f2c2230bc7f746afc7d50351462f3, type: 3} --- !u!1 &1917683048 GameObject: m_ObjectHideFlags: 0 @@ -2725,15 +3984,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4514176033895078985} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.003829515, y: -0.0000017060023, z: 0.002548367} - m_LocalScale: {x: 0.14519875, y: 0.14519875, z: 0.14519875} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.14519876, y: 0.14519875, z: 0.14519876} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1001862741931952531} - {fileID: 6303688018712581684} - {fileID: 1621468092813307191} - m_Father: {fileID: 7399893390412519594} + m_Father: {fileID: 1401154113} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &747917971373718899 @@ -8009,7 +9268,7 @@ GameObject: m_Component: - component: {fileID: 723155130181676973} m_Layer: 0 - m_Name: Bed + m_Name: Bed_Visual m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -12596,7 +13855,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3777066041942112539} - - {fileID: 723155130181676973} + - {fileID: 1401154113} - {fileID: 4581755655232164261} - {fileID: 202230120432408033} - {fileID: 393139330812688555} diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index c76f4246..d6c6d8e9 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1} + m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -936,7 +936,7 @@ Transform: - {fileID: 2110938952} - {fileID: 1930563420} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &294733042 GameObject: @@ -1886,7 +1886,7 @@ PrefabInstance: - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} @@ -2449,8 +2449,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50} + m_AnchoredPosition: {x: 182.005, y: 0} + m_SizeDelta: {x: 364.01, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &771379432 MonoBehaviour: @@ -2528,7 +2528,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 182.005, y: 0} m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &815467878 @@ -2958,7 +2958,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 957.94086, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &927596948 @@ -3247,7 +3247,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 674.0475, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &952219226 @@ -3503,7 +3503,6 @@ Transform: m_Children: - {fileID: 307039700} - {fileID: 1689632238} - - {fileID: 1550470211} m_Father: {fileID: 1488006971} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9256,7 +9255,7 @@ Transform: m_Children: - {fileID: 1838394470} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1368465711 GameObject: @@ -9541,7 +9540,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1503626360 @@ -9883,6 +9882,7 @@ GameObject: - component: {fileID: 1550470211} - component: {fileID: 1550470210} - component: {fileID: 1550470209} + - component: {fileID: 1550470212} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -9937,9 +9937,21 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 971260931} - m_RootOrder: 2 + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1550470212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1550470208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59acbdefe19456b4093c8081fc195458, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1568871088 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2402651526520908900, guid: c0021857f236ae341a3c917b9da4dfaf, @@ -9988,7 +10000,7 @@ Transform: m_Children: - {fileID: 358062558} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1600157251 GameObject: @@ -10188,7 +10200,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1689632236 GameObject: @@ -10542,7 +10554,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1750970806 GameObject: @@ -10820,7 +10832,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 275.15417, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1811096135 @@ -11042,7 +11054,7 @@ PrefabInstance: - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 182.005 objectReference: {fileID: 0} - target: {fileID: 3806516704876462308, guid: ea47665625ccfd4408f6411caf45f910, type: 3} @@ -11365,7 +11377,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 182.005, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1964284071 @@ -16126,7 +16138,7 @@ Transform: - {fileID: 1526894738} - {fileID: 294733043} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &543839634859946773 GameObject: @@ -29137,7 +29149,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4652948641423679027} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} - m_LocalPosition: {x: -9.080154, y: -0, z: -62.99} + m_LocalPosition: {x: -9.080154, y: 0, z: -62.15678} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] @@ -78514,7 +78526,7 @@ PrefabInstance: - target: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d, type: 3} diff --git a/Assets/Scripts/DontDestroy.cs b/Assets/Scripts/DontDestroy.cs index 26c86e70..b557b9b4 100644 --- a/Assets/Scripts/DontDestroy.cs +++ b/Assets/Scripts/DontDestroy.cs @@ -2,8 +2,17 @@ using UnityEngine; public class DontDestroy : MonoBehaviour { + public static DontDestroy Instance { get; private set; } + private void Awake() { - DontDestroyOnLoad(gameObject); + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + else + Destroy(gameObject); + } } diff --git a/Assets/Scripts/InteractableObjects/Bed.cs b/Assets/Scripts/InteractableObjects/Bed.cs index c05746c1..1d17a5c9 100644 --- a/Assets/Scripts/InteractableObjects/Bed.cs +++ b/Assets/Scripts/InteractableObjects/Bed.cs @@ -1,11 +1,20 @@ - +using System; using UnityEngine; public class Bed : BaseInteractableObject { + private Player _player; + public override void Interact(Player player) { + _player=player; Debug.Log("Sitting"); player.SetPlayerAnimation(AnimationStates.Sitting); + TimeManager.Instance.FastForward(TimeSpan.FromHours(8), OnFastForwardEnd); + } + + private void OnFastForwardEnd() + { + _player.SetPlayerAnimation(AnimationStates.Standing); } } diff --git a/Assets/Scripts/MouseInputManager.cs b/Assets/Scripts/MouseInputManager.cs index c5093b65..94236ad7 100644 --- a/Assets/Scripts/MouseInputManager.cs +++ b/Assets/Scripts/MouseInputManager.cs @@ -12,7 +12,7 @@ public class MouseInputManager : MonoBehaviour private WaypointVisual _waypointVisual; - public event EventHandler OnSelectedObjectChanged; + public static event EventHandler OnSelectedObjectChanged; public static MouseInputManager Instance { get; private set; } diff --git a/Assets/Scripts/SelectedVisual.cs b/Assets/Scripts/SelectedVisual.cs index 45590588..3386f71a 100644 --- a/Assets/Scripts/SelectedVisual.cs +++ b/Assets/Scripts/SelectedVisual.cs @@ -10,12 +10,14 @@ public class SelectedVisual : MonoBehaviour private void Start() { - MouseInputManager.Instance.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged; + MouseInputManager.OnSelectedObjectChanged += Mouse_OnSelectedObjectChanged; + print($"{_selectedObject.name} is subscribed to OnSelectedObjectChanged"); } private void OnDestroy() { - MouseInputManager.Instance.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged; + MouseInputManager.OnSelectedObjectChanged -= Mouse_OnSelectedObjectChanged; + print($"{_selectedObject.name} is Unsubscribed to OnSelectedObjectChanged"); } private void Mouse_OnSelectedObjectChanged(object sender, OnSelectedObjectChangedEventArgs e) diff --git a/Assets/Scripts/TimeManager.cs b/Assets/Scripts/TimeManager.cs index bbc81c36..710d8e24 100644 --- a/Assets/Scripts/TimeManager.cs +++ b/Assets/Scripts/TimeManager.cs @@ -1,8 +1,13 @@ using System; +using System.Collections; using UnityEngine; public class TimeManager : MonoBehaviour { + public static TimeManager Instance { get; private set; } + + private const float MINUTE_TIME = 0.5f; + public static Action OnMinuteChanged; [SerializeField] @@ -22,16 +27,31 @@ public class TimeManager : MonoBehaviour private float _timer; private float _sunInitialIntensity; - [SerializeField] - private float _minuteToRealTime = 0.05f; + private float _minuteToRealTime; private static TimeSpan _currentTime; public static TimeSpan CurrentTime => _currentTime; + private TimeSpan _timeToStop; + private Action _callBackOnFastForward; + + + private void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + } + else + Destroy(gameObject); + + } + // Start is called before the first frame update void Start() { - // _sunInitialIntensity = _sunLight.intensity; + // _sunInitialIntensity = _sunLight.intensity; _timer = _minuteToRealTime; _currentTime = TimeSpan.Zero + TimeSpan.FromHours(_startHour); _sunriseTime = TimeSpan.FromHours(_sunriseHour); @@ -53,10 +73,23 @@ public class TimeManager : MonoBehaviour _currentTime = _currentTime.Add(TimeSpan.FromMinutes(1)); OnMinuteChanged?.Invoke(); + if (_currentTime.TotalMinutes >= _timeToStop.TotalMinutes) + { + _minuteToRealTime = MINUTE_TIME; + _timeToStop = TimeSpan.MaxValue; + _callBackOnFastForward.Invoke(); + } _timer = _minuteToRealTime; } } + public void FastForward(TimeSpan timeToStop,Action callBack) + { + _timeToStop = _currentTime.Add(timeToStop); + _minuteToRealTime = 0.03f; + _callBackOnFastForward= callBack; + } + private void RotateSun() { float intensityMultiplier = 1; @@ -73,7 +106,7 @@ public class TimeManager : MonoBehaviour { intensityMultiplier = 0; } - // _sunLight.intensity = _sunInitialIntensity * intensityMultiplier; + // _sunLight.intensity = _sunInitialIntensity * intensityMultiplier; } private TimeSpan CalculateTimeDifference(TimeSpan from, TimeSpan to)