From 75a6f34ece25ce1b3de2b4f5fc74c58958f6291a Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sat, 2 Oct 2021 16:08:14 +0200 Subject: [PATCH] Added Warehouse --- Assets/Materials/ConstructionMat.mat | 16 +- Assets/Prefabs/Buildings/Warehouse.meta | 8 + .../Warehouse/Warehouse_1_building.prefab | 216 +++++++ .../Warehouse_1_building.prefab.meta | 7 + .../Warehouse_level_1_blueprint.prefab | 229 +++++++ .../Warehouse_level_1_blueprint.prefab.meta | 7 + .../Warehouse_level_1_construction.prefab | 145 +++++ ...Warehouse_level_1_construction.prefab.meta | 7 + Assets/Scenes/SampleScene.unity | 598 ++++-------------- Assets/Scripts/Building/BuildingBlueprint.cs | 5 +- .../Building/BuildingBlueprint.cs.meta | 5 +- .../Buildings/House/HouseBlueprint.cs | 3 +- .../Buildings/House/HouseConstruction.cs | 2 - .../Buildings/Warehouse/WarehouseBlueprint.cs | 34 + .../Warehouse/WarehouseBlueprint.cs.meta | 11 + .../Buildings/Warehouse/WarehouseBuilding.cs | 2 + .../Warehouse/WarehouseConstruction.cs | 25 + .../Warehouse/WarehouseConstruction.cs.meta | 11 + .../Scripts/Building/Types/StorageBuilding.cs | 5 +- 19 files changed, 847 insertions(+), 489 deletions(-) create mode 100644 Assets/Prefabs/Buildings/Warehouse.meta create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab.meta create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab.meta create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab create mode 100644 Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab.meta create mode 100644 Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs create mode 100644 Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs.meta create mode 100644 Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs create mode 100644 Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs.meta diff --git a/Assets/Materials/ConstructionMat.mat b/Assets/Materials/ConstructionMat.mat index aea2fd2..a0d78b0 100644 --- a/Assets/Materials/ConstructionMat.mat +++ b/Assets/Materials/ConstructionMat.mat @@ -9,12 +9,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ConstructionMat m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -55,24 +56,25 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 0.5641353, b: 0, a: 1} + - _Color: {r: 1, g: 0.35848054, b: 0, a: 0.627451} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/Buildings/Warehouse.meta b/Assets/Prefabs/Buildings/Warehouse.meta new file mode 100644 index 0000000..a85e545 --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84cbf9c825c99454a8b6b669d464b0c2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab b/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab new file mode 100644 index 0000000..ad6820c --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab @@ -0,0 +1,216 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2671152174645631802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3374747785745903776} + - component: {fileID: 5738375459927381641} + - component: {fileID: 6943109061101234717} + m_Layer: 7 + m_Name: Floor.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3374747785745903776 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671152174645631802} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.1620822, y: 0.5584547, z: -0.24324588} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 4358974056487211830} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5738375459927381641 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671152174645631802} + m_Mesh: {fileID: 8634657762449747467, guid: 58ed7c948063db949b6cf8b56570779b, type: 3} +--- !u!23 &6943109061101234717 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2671152174645631802} + 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: 3e21ca7ffec4eef48ba7759b5ef29773, 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!1 &3978366649280498060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4358974056487211830} + - component: {fileID: -1078629889059076755} + m_Layer: 0 + m_Name: Warehouse_1_building + m_TagString: Building + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4358974056487211830 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978366649280498060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.856, y: 19.18, z: 29.15} + m_LocalScale: {x: 5.220408, y: 1.6200442, z: 3.7660024} + m_Children: + - {fileID: 4364796130633758424} + - {fileID: 3374747785745903776} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-1078629889059076755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3978366649280498060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a48bc1459390b4459fbf54ad16b50f9, type: 3} + m_Name: + m_EditorClassIdentifier: + title: New Building + description: A cool new building + buildingType: 0 + inventory: [] + inventorySpace: 0 +--- !u!1 &8031894978334521553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4364796130633758424} + - component: {fileID: 9091913441717499544} + - component: {fileID: 7180692275269582420} + m_Layer: 7 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4364796130633758424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8031894978334521553} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 4358974056487211830} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &9091913441717499544 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8031894978334521553} + m_Mesh: {fileID: 3909233067320746374, guid: 58ed7c948063db949b6cf8b56570779b, type: 3} +--- !u!23 &7180692275269582420 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8031894978334521553} + 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: 3e21ca7ffec4eef48ba7759b5ef29773, 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} diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab.meta b/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab.meta new file mode 100644 index 0000000..afe518d --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_1_building.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2b10f200e22755b4a87a0ad56dc0b033 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab new file mode 100644 index 0000000..c8a3385 --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab @@ -0,0 +1,229 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3267014614944694456 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2746374261508250114} + - component: {fileID: -2123280463771350525} + - component: {fileID: 8823925826730153315} + m_Layer: 9 + m_Name: Warehouse_level_1_blueprint + m_TagString: Blueprint + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2746374261508250114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3267014614944694456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.856, y: 19.18, z: 29.15} + m_LocalScale: {x: 5.220408, y: 1.6200442, z: 3.7660024} + m_Children: + - {fileID: 2806276847690940396} + - {fileID: 3798425796809488788} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-2123280463771350525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3267014614944694456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c08df78a8e2e51d4c80019a27fc2cc5c, type: 3} + m_Name: + m_EditorClassIdentifier: + isColliding: 0 + constructionPrefab: {fileID: 3699202177395613354, guid: e005a35428b0931408acff181f30550f, type: 3} + collisionMat: {fileID: 2100000, guid: a1e8fb1ea637c0e45bed70dd7d1feaab, type: 2} + blueprintMat: {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2} +--- !u!65 &8823925826730153315 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3267014614944694456} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.004565, y: 1.171629, z: 1.820494} + m_Center: {x: 2.8669777, y: 0.124507755, z: 0.20441929} +--- !u!1 &4571978084335096334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3798425796809488788} + - component: {fileID: 6179489595208736701} + - component: {fileID: 8807312437194122025} + m_Layer: 9 + m_Name: Floor.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3798425796809488788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4571978084335096334} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0.1620822, y: 0.5584547, z: -0.24324588} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 2746374261508250114} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6179489595208736701 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4571978084335096334} + m_Mesh: {fileID: 8634657762449747467, guid: 58ed7c948063db949b6cf8b56570779b, type: 3} +--- !u!23 &8807312437194122025 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4571978084335096334} + 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: 78d3985cb7b88204b930cd05567c0c61, 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!1 &8436437226840568293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2806276847690940396} + - component: {fileID: 7228220238419099564} + - component: {fileID: 8774642153520133984} + m_Layer: 9 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2806276847690940396 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436437226840568293} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 2746374261508250114} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7228220238419099564 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436437226840568293} + m_Mesh: {fileID: 3909233067320746374, guid: 58ed7c948063db949b6cf8b56570779b, type: 3} +--- !u!23 &8774642153520133984 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8436437226840568293} + 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: 78d3985cb7b88204b930cd05567c0c61, 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} diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab.meta b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab.meta new file mode 100644 index 0000000..bf2f243 --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_blueprint.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7360393ab87b77243835eef567656173 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab new file mode 100644 index 0000000..e18a3e9 --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3699202177395613354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4043639190317171728} + - component: {fileID: 5603597318780791675} + - component: {fileID: 2747402840162228189} + m_Layer: 9 + m_Name: Warehouse_level_1_construction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4043639190317171728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3699202177395613354} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0547132, y: 18.931429, z: 29.32705} + m_LocalScale: {x: 5.220408, y: 1.6200442, z: 3.7660024} + m_Children: + - {fileID: 4103084172607283710} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5603597318780791675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3699202177395613354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c290e17b16e818841aabd5083a3475db, type: 3} + m_Name: + m_EditorClassIdentifier: + building: {fileID: 3978366649280498060, guid: 2b10f200e22755b4a87a0ad56dc0b033, type: 3} + neededWood: 10 + havingWood: 0 +--- !u!65 &2747402840162228189 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3699202177395613354} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 2.069237, y: 0.9999998, z: 1.5839136} + m_Center: {x: 2.8074286, y: 0, z: 0.20314999} +--- !u!1 &7716018877951062007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4103084172607283710} + - component: {fileID: 8813329786598318526} + - component: {fileID: 7477446734293100914} + m_Layer: 9 + m_Name: Base + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4103084172607283710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716018877951062007} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_Children: [] + m_Father: {fileID: 4043639190317171728} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8813329786598318526 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716018877951062007} + m_Mesh: {fileID: 3909233067320746374, guid: 58ed7c948063db949b6cf8b56570779b, type: 3} +--- !u!23 &7477446734293100914 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7716018877951062007} + 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: 6d57040d91b3e934697eaab0c5744571, 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} diff --git a/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab.meta b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab.meta new file mode 100644 index 0000000..059cda1 --- /dev/null +++ b/Assets/Prefabs/Buildings/Warehouse/Warehouse_level_1_construction.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e005a35428b0931408acff181f30550f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index b05ffcb..5820c95 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -157,7 +157,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: terrain: {fileID: 1417065444} - prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3} + prefab: {fileID: 3267014614944694456, guid: 7360393ab87b77243835eef567656173, type: 3} --- !u!4 &95348674 stripped Transform: m_CorrespondingSourceObject: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} @@ -372,99 +372,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185435514} m_CullTransparentMesh: 1 ---- !u!1 &317073666 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 317073667} - m_Layer: 7 - m_Name: Env - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &317073667 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 317073666} - 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_Children: - - {fileID: 1417065445} - - {fileID: 1667291200} - - {fileID: 1238304666} - - {fileID: 1300620966} - - {fileID: 763358974} - - {fileID: 1735927146} - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &392314070 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 317073667} - m_Modifications: - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.x - value: -2.5174565 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.y - value: 19.6 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.z - value: 61.9 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_Name - value: House (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -556,7 +463,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &708126139 GameObject: @@ -654,145 +561,70 @@ RectTransform: - {fileID: 114639928} - {fileID: 1395840125} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 7 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: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &763358969 -GameObject: +--- !u!1001 &1039691705 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 763358974} - - component: {fileID: 763358973} - - component: {fileID: 763358972} - - component: {fileID: 763358971} - - component: {fileID: 763358970} - m_Layer: 0 - m_Name: Warehouse - m_TagString: StorageBuilding - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &763358970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763358969} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a48bc1459390b4459fbf54ad16b50f9, type: 3} - m_Name: - m_EditorClassIdentifier: - title: New Building - description: A cool new building - buildingType: 0 - inventory: [] - inventorySpace: 0 ---- !u!65 &763358971 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763358969} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &763358972 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763358969} - 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: 10303, guid: 0000000000000000f000000000000000, type: 0} - 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 &763358973 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763358969} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &763358974 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 763358969} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 84.6, y: 21, z: 29.60771} - m_LocalScale: {x: 10, y: 10, z: 10} - m_Children: [] - m_Father: {fileID: 317073667} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &958599864 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2550463727306718371, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - m_PrefabInstance: {fileID: 2075598895} - m_PrefabAsset: {fileID: 0} ---- !u!65 &958599868 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958599864} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.019743247, y: 0.019999994, z: 0.014233764} - m_Center: {x: 0.00012837116, y: 4.7271787e-17, z: -0.10644658} + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalPosition.x + value: 1.5593584 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalPosition.y + value: 19.738813 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalPosition.z + value: 15.017967 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2746374261508250114, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3267014614944694456, guid: 7360393ab87b77243835eef567656173, type: 3} + propertyPath: m_Name + value: Warehouse_level_1_blueprint + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7360393ab87b77243835eef567656173, type: 3} --- !u!1 &1048269303 GameObject: m_ObjectHideFlags: 0 @@ -885,11 +717,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 19f9379cc95b36d44bd902c97580c107, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &1238304666 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 392314070} - m_PrefabAsset: {fileID: 0} --- !u!1 &1248751118 GameObject: m_ObjectHideFlags: 0 @@ -935,13 +762,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1300620966 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 1799643402} - m_PrefabAsset: {fileID: 0} --- !u!1 &1395840124 GameObject: m_ObjectHideFlags: 0 @@ -1177,147 +999,13 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1417065444 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} m_PrefabInstance: {fileID: 7029954222161724659} m_PrefabAsset: {fileID: 0} ---- !u!4 &1417065445 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} - m_PrefabInstance: {fileID: 7029954222161724659} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1440733975 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 317073667} - m_Modifications: - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.x - value: -2.5174565 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.y - value: 19.6 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.z - value: 24.662142 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1118460100164241581, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.x - value: 36.7 - objectReference: {fileID: 0} - - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_Name - value: House - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4552884677486152052, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} ---- !u!4 &1667291200 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 1440733975} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1735927146 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - m_PrefabInstance: {fileID: 2075598895} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1799643402 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 317073667} - m_Modifications: - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.x - value: -2.5174565 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.y - value: 19.6 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalPosition.z - value: -121.7 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 494189295979627311, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_Name - value: House (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} --- !u!1 &1814976973 GameObject: m_ObjectHideFlags: 0 @@ -1382,7 +1070,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1861247503 GameObject: @@ -1429,7 +1117,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1861247507 MonoBehaviour: @@ -1456,113 +1144,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f1735c997ccb39408dfa8bf3790319f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &2075598895 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 317073667} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalScale.x - value: 2.2806 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalScale.y - value: 2.0199504 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalScale.z - value: 2.2806 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalPosition.x - value: 37.743706 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalPosition.y - value: 15.2939 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalPosition.z - value: 111.99756 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8442031686558042824, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_ReceiveShadows - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -1760714182489039777, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_Name - value: Warehouse_level_4 - objectReference: {fileID: 0} - - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_CastShadows - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_ReceiveShadows - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_DynamicOccludee - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_LightProbeUsage - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4370951913967234905, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4effc28206419704cbfe36aa3046d68c, type: 3} --- !u!1001 &7029954222161724659 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 317073667} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_RootOrder - value: 0 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalPosition.x @@ -1712,7 +1303,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.x @@ -1720,7 +1311,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.y - value: 25 + value: 21.77 objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z @@ -1764,3 +1355,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} +--- !u!1001 &8944073591592410994 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3699202177395613354, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_Name + value: Warehouse_level_1_construction + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0547132 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalPosition.y + value: 18.931429 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalPosition.z + value: 29.32705 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4043639190317171728, guid: e005a35428b0931408acff181f30550f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e005a35428b0931408acff181f30550f, type: 3} diff --git a/Assets/Scripts/Building/BuildingBlueprint.cs b/Assets/Scripts/Building/BuildingBlueprint.cs index 5723707..848ab15 100644 --- a/Assets/Scripts/Building/BuildingBlueprint.cs +++ b/Assets/Scripts/Building/BuildingBlueprint.cs @@ -6,7 +6,10 @@ public abstract class BuildingBlueprint : MonoBehaviour { public bool isColliding; public GameObject constructionPrefab; - + + public Material collisionMat; + public Material blueprintMat; + private GameObject terrain; private Canvas hud; diff --git a/Assets/Scripts/Building/BuildingBlueprint.cs.meta b/Assets/Scripts/Building/BuildingBlueprint.cs.meta index 423e0e1..16f4e07 100644 --- a/Assets/Scripts/Building/BuildingBlueprint.cs.meta +++ b/Assets/Scripts/Building/BuildingBlueprint.cs.meta @@ -3,7 +3,10 @@ guid: 76f9b3b57e22ab047b8f95bcb552289a MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: [] + defaultReferences: + - constructionPrefab: {instanceID: 0} + - collisionMat: {fileID: 2100000, guid: a1e8fb1ea637c0e45bed70dd7d1feaab, type: 2} + - blueprintMat: {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2} executionOrder: 0 icon: {instanceID: 0} userData: diff --git a/Assets/Scripts/Building/Buildings/House/HouseBlueprint.cs b/Assets/Scripts/Building/Buildings/House/HouseBlueprint.cs index caf1ed2..a83b095 100644 --- a/Assets/Scripts/Building/Buildings/House/HouseBlueprint.cs +++ b/Assets/Scripts/Building/Buildings/House/HouseBlueprint.cs @@ -5,8 +5,7 @@ using UnityEngine; public class HouseBlueprint : BuildingBlueprint { - public Material collisionMat; - public Material blueprintMat; + private Transform houseCube; diff --git a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs index 415604f..0db92c3 100644 --- a/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs +++ b/Assets/Scripts/Building/Buildings/House/HouseConstruction.cs @@ -4,8 +4,6 @@ using UnityEngine; public class HouseConstruction : BuildingConstruction { - private GameObject gameManager; - [Header("Needed Resources")] [SerializeField] private int neededWood = 10; diff --git a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs new file mode 100644 index 0000000..8c12586 --- /dev/null +++ b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WarehouseBlueprint : BuildingBlueprint +{ + private MeshRenderer[] childrenMeshRenderer; + + public override void Init() + { + //Haus cube ím Obj -> hier wird es benutzt zum material ändern + childrenMeshRenderer = gameObject.GetComponentsInChildren(); + } + + public override void WhileColliding() + { + //Wenn es collidet soll der HouseCube IM Object verändert werden! + //Das ist bei jedem Building anders + foreach(MeshRenderer r in childrenMeshRenderer) + { + r.material = collisionMat; + } + + } + + public override void WhileNotColliding() + { + //Das selbe wie bei "WhileColliding" + foreach (MeshRenderer r in childrenMeshRenderer) + { + r.material = blueprintMat; + } + } +} diff --git a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs.meta b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs.meta new file mode 100644 index 0000000..c8e9496 --- /dev/null +++ b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBlueprint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c08df78a8e2e51d4c80019a27fc2cc5c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs index d10f24b..8b4cdae 100644 --- a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs +++ b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseBuilding.cs @@ -7,6 +7,8 @@ public class WarehouseBuilding : StorageBuilding private void Start() { + title = "Warehouse"; + description = "A place to store your resources"; inventorySpace = 500; } diff --git a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs new file mode 100644 index 0000000..ffad605 --- /dev/null +++ b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class WarehouseConstruction : BuildingConstruction +{ + [Header("Needed Resources")] + [SerializeField] private int neededWood = 10; + + [Header("Having Resources")] + [SerializeField] private int havingWood = 0; + + public override void Init() + { + } + + public override bool CheckForResources() + { + if (havingWood == neededWood) + { + return true; + } + return false; + } +} diff --git a/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs.meta b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs.meta new file mode 100644 index 0000000..6d3ddfe --- /dev/null +++ b/Assets/Scripts/Building/Buildings/Warehouse/WarehouseConstruction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c290e17b16e818841aabd5083a3475db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/Types/StorageBuilding.cs b/Assets/Scripts/Building/Types/StorageBuilding.cs index 55f3dde..f72aa68 100644 --- a/Assets/Scripts/Building/Types/StorageBuilding.cs +++ b/Assets/Scripts/Building/Types/StorageBuilding.cs @@ -7,9 +7,12 @@ public class StorageBuilding : Building [SerializeField] private List inventory = new List(); public int inventorySpace; - public void Start() + + + public void Awake() { buildingType = BuildingType.Storage; + } public void Add(Item item) {