diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 2a09007..a66cd5d 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -489,6 +489,56 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &186161493 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 186161494} + - 212: {fileID: 186161495} + m_Layer: 0 + m_Name: table_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &186161494 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 186161493} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: .889999986, z: 1} + m_Children: [] + m_Father: {fileID: 758387570} +--- !u!212 &186161495 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 186161493} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: fe4a1068e59359d4496b85146ec773d4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1001 &296847678 Prefab: m_ObjectHideFlags: 0 @@ -557,6 +607,56 @@ Prefab: m_RootGameObject: {fileID: 57666822} m_IsPrefabParent: 0 m_IsExploded: 1 +--- !u!1 &317209490 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 317209491} + - 212: {fileID: 317209492} + m_Layer: 0 + m_Name: table_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &317209491 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 317209490} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: .889999986, z: 1} + m_Children: [] + m_Father: {fileID: 1325536482} +--- !u!212 &317209492 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 317209490} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: fe4a1068e59359d4496b85146ec773d4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &330466711 GameObject: m_ObjectHideFlags: 0 @@ -731,11 +831,65 @@ Prefab: propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} + - target: {fileID: 2300006, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} + propertyPath: m_UseLightProbes + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_RootGameObject: {fileID: 1731015426} m_IsPrefabParent: 0 m_IsExploded: 1 +--- !u!1 &400339584 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 400339585} + - 212: {fileID: 400339586} + m_Layer: 0 + m_Name: table_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &400339585 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 400339584} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: .889999986, z: 1} + m_Children: [] + m_Father: {fileID: 1853019150} +--- !u!212 &400339586 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 400339584} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: fe4a1068e59359d4496b85146ec773d4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &410197318 GameObject: m_ObjectHideFlags: 0 @@ -1220,6 +1374,56 @@ NavMeshAgent: m_BaseOffset: .50000006 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 +--- !u!1 &659898285 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 659898286} + - 212: {fileID: 659898287} + m_Layer: 0 + m_Name: chair_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &659898286 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 659898285} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: .827395439, y: 0, z: 0} + m_LocalScale: {x: .939999998, y: .810000002, z: 1} + m_Children: [] + m_Father: {fileID: 1195109752} +--- !u!212 &659898287 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 659898285} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: a6c2e52f09b4a5b4cb2aa039dcba57fc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &704683991 GameObject: m_ObjectHideFlags: 0 @@ -1312,6 +1516,56 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1043241742} +--- !u!1 &739477386 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 739477387} + - 212: {fileID: 739477388} + m_Layer: 0 + m_Name: chair_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &739477387 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 739477386} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: .827395439, y: 0, z: 0} + m_LocalScale: {x: .939999998, y: .810000002, z: 1} + m_Children: [] + m_Father: {fileID: 1013787429} +--- !u!212 &739477388 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 739477386} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: a6c2e52f09b4a5b4cb2aa039dcba57fc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &745975988 GameObject: m_ObjectHideFlags: 0 @@ -1383,6 +1637,47 @@ Transform: m_Children: - {fileID: 57666823} m_Father: {fileID: 146718572} +--- !u!1 &758387569 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 758387570} + - 136: {fileID: 758387571} + m_Layer: 0 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &758387570 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 758387569} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0048752, y: 1.52725577, z: 10.840189} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 186161494} + m_Father: {fileID: 1731015427} +--- !u!136 &758387571 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 758387569} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &768198790 GameObject: m_ObjectHideFlags: 0 @@ -1973,6 +2268,47 @@ NavMeshAgent: m_BaseOffset: .50000006 m_WalkableMask: 4294967295 m_ObstacleAvoidanceType: 4 +--- !u!1 &1013787428 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1013787429} + - 136: {fileID: 1013787430} + m_Layer: 0 + m_Name: Chair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1013787429 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1013787428} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.9821014, y: 1.32844615, z: -3.87159967} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 739477387} + m_Father: {fileID: 1731015427} +--- !u!136 &1013787430 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1013787428} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1043241741 GameObject: m_ObjectHideFlags: 0 @@ -2001,6 +2337,97 @@ Transform: - {fileID: 1779026304} - {fileID: 710538758} m_Father: {fileID: 0} +--- !u!1 &1126166864 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1126166865} + - 136: {fileID: 1126166866} + m_Layer: 0 + m_Name: Chair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1126166865 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1126166864} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.9821014, y: 1.32844603, z: 3.78218436} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2107301825} + m_Father: {fileID: 1731015427} +--- !u!136 &1126166866 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1126166864} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1133868729 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1133868730} + - 212: {fileID: 1133868731} + m_Layer: 0 + m_Name: Window + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1133868730 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1133868729} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12.0936813, y: 5.99920273, z: 14.5538406} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1731015427} +--- !u!212 &1133868731 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1133868729} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 2100000, guid: 8e915197e7239465fbdcbadff64d2853, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: 378f31aba1740b845811779db7058afe, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1164596948 GameObject: m_ObjectHideFlags: 0 @@ -2042,6 +2469,47 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} +--- !u!1 &1195109751 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1195109752} + - 136: {fileID: 1195109753} + m_Layer: 0 + m_Name: Chair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1195109752 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1195109751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.9821014, y: 1.32844603, z: 10.9821796} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 659898286} + m_Father: {fileID: 1731015427} +--- !u!136 &1195109753 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1195109751} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1280434885 GameObject: m_ObjectHideFlags: 0 @@ -2162,6 +2630,88 @@ Prefab: m_RootGameObject: {fileID: 975281914} m_IsPrefabParent: 0 m_IsExploded: 1 +--- !u!1 &1325536481 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1325536482} + - 136: {fileID: 1325536483} + m_Layer: 0 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1325536482 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1325536481} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0048752, y: 1.51831698, z: -3.56907845} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 317209491} + m_Father: {fileID: 1731015427} +--- !u!136 &1325536483 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1325536481} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1447591368 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1447591369} + - 136: {fileID: 1447591370} + m_Layer: 0 + m_Name: Stool + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1447591369 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1447591368} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.38813114, y: 2.24548936, z: 9.28064919} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1880321584} + m_Father: {fileID: 1731015427} +--- !u!136 &1447591370 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1447591368} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1517894751 GameObject: m_ObjectHideFlags: 0 @@ -2410,6 +2960,15 @@ Transform: - {fileID: 1826749935} - {fileID: 1517894752} - {fileID: 330466715} + - {fileID: 1126166865} + - {fileID: 1195109752} + - {fileID: 1013787429} + - {fileID: 1853019150} + - {fileID: 758387570} + - {fileID: 1325536482} + - {fileID: 1447591369} + - {fileID: 2081427923} + - {fileID: 1133868730} m_Father: {fileID: 0} --- !u!1 &1772501581 GameObject: @@ -2660,6 +3219,97 @@ Transform: m_LocalScale: {x: 30, y: 8, z: .5} m_Children: [] m_Father: {fileID: 1731015427} +--- !u!1 &1853019149 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1853019150} + - 136: {fileID: 1853019151} + m_Layer: 0 + m_Name: Table + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1853019150 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1853019149} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0048752, y: 1.44533515, z: 3.57684898} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 400339585} + m_Father: {fileID: 1731015427} +--- !u!136 &1853019151 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1853019149} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .270000011 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1880321583 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1880321584} + - 212: {fileID: 1880321585} + m_Layer: 0 + m_Name: stool_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1880321584 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1880321583} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: .939999998, y: .810000002, z: 1} + m_Children: [] + m_Father: {fileID: 1447591369} +--- !u!212 &1880321585 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1880321583} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: a8790e3080b6f134c9146700b51820a4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1001 &1939763970 Prefab: m_ObjectHideFlags: 0 @@ -2844,3 +3494,144 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 146718571} +--- !u!1 &2009917412 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2009917413} + - 212: {fileID: 2009917414} + m_Layer: 0 + m_Name: stool_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2009917413 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2009917412} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: .850000024, z: 1} + m_Children: [] + m_Father: {fileID: 2081427923} +--- !u!212 &2009917414 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2009917412} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: a8790e3080b6f134c9146700b51820a4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &2081427921 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2081427923} + - 136: {fileID: 2081427922} + m_Layer: 0 + m_Name: Stool + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!136 &2081427922 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2081427921} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .230000004 + m_Height: 3.45000005 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!4 &2081427923 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2081427921} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.50803471, y: 2.07611465, z: 12.3070889} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2009917413} + m_Father: {fileID: 1731015427} +--- !u!1 &2107301824 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2107301825} + - 212: {fileID: 2107301826} + m_Layer: 0 + m_Name: chair_sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107301825 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2107301824} + m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalPosition: {x: .827395439, y: 0, z: 0} + m_LocalScale: {x: .939999998, y: .810000002, z: 1} + m_Children: [] + m_Father: {fileID: 1126166865} +--- !u!212 &2107301826 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2107301824} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_SortingLayerID: 0 + m_Sprite: {fileID: 21300000, guid: a6c2e52f09b4a5b4cb2aa039dcba57fc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat index d32a17a..089d98c 100644 --- a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat +++ b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat @@ -20,9 +20,31 @@ Material: m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3} m_Scale: {x: 1, y: .5} m_Offset: {x: 0, y: 0} - m_Floats: {} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DecalTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _Shininess + second: .078125 m_Colors: data: first: name: _Color second: {r: 1, g: 1, b: 1, a: 1} + data: + first: + name: _SpecColor + second: {r: .5, g: .5, b: .5, a: 1} diff --git a/Assets/Sprites/chair1.png.meta b/Assets/Sprites/chair1.png.meta index 12d53d5..8676bcc 100644 --- a/Assets/Sprites/chair1.png.meta +++ b/Assets/Sprites/chair1.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,24 +20,24 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/Sprites/stool.png.meta b/Assets/Sprites/stool.png.meta index d956473..31e3a08 100644 --- a/Assets/Sprites/stool.png.meta +++ b/Assets/Sprites/stool.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -23,21 +23,21 @@ TextureImporter: textureFormat: -1 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/Sprites/table.png.meta b/Assets/Sprites/table.png.meta index eb61508..abd3c79 100644 --- a/Assets/Sprites/table.png.meta +++ b/Assets/Sprites/table.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,24 +20,24 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] diff --git a/Assets/Sprites/window.png.meta b/Assets/Sprites/window.png.meta index db67613..81afd9e 100644 --- a/Assets/Sprites/window.png.meta +++ b/Assets/Sprites/window.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,24 +20,24 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + spritePixelsToUnits: 8 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: []