diff --git a/Assets/Materials/BlueprintCollisionMat.mat b/Assets/Materials/BlueprintCollisionMat.mat new file mode 100644 index 0000000..c97b464 --- /dev/null +++ b/Assets/Materials/BlueprintCollisionMat.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlueprintCollisionMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 0.051568203, b: 0, a: 0.6313726} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/New Terrain 2.asset.meta b/Assets/Materials/BlueprintCollisionMat.mat.meta similarity index 64% rename from Assets/New Terrain 2.asset.meta rename to Assets/Materials/BlueprintCollisionMat.mat.meta index aa5ce16..49cd7ae 100644 --- a/Assets/New Terrain 2.asset.meta +++ b/Assets/Materials/BlueprintCollisionMat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 048e7f3e6506e414d81445501c63d21c +guid: a1e8fb1ea637c0e45bed70dd7d1feaab NativeFormatImporter: externalObjects: {} - mainObjectFileID: 15600000 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/BlueprintMat.mat b/Assets/Materials/BlueprintMat.mat new file mode 100644 index 0000000..c8d0ca4 --- /dev/null +++ b/Assets/Materials/BlueprintMat.mat @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlueprintMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 0, g: 0.27892852, b: 1, a: 0.5882353} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset.meta b/Assets/Materials/BlueprintMat.mat.meta similarity index 64% rename from Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset.meta rename to Assets/Materials/BlueprintMat.mat.meta index 51bce95..769c7d4 100644 --- a/Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset.meta +++ b/Assets/Materials/BlueprintMat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 8255c919e9488d845bac3bf5ccf86830 +guid: 78d3985cb7b88204b930cd05567c0c61 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 15600000 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/ConstructionMat.mat b/Assets/Materials/ConstructionMat.mat new file mode 100644 index 0000000..aea2fd2 --- /dev/null +++ b/Assets/Materials/ConstructionMat.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ConstructionMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.5641353, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/New Terrain.asset.meta b/Assets/Materials/ConstructionMat.mat.meta similarity index 64% rename from Assets/New Terrain.asset.meta rename to Assets/Materials/ConstructionMat.mat.meta index 811bfff..2d3c86c 100644 --- a/Assets/New Terrain.asset.meta +++ b/Assets/Materials/ConstructionMat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 9d9c1d950713064438f5117fbeff7b57 +guid: 6d57040d91b3e934697eaab0c5744571 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 15600000 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/HouseMat.mat b/Assets/Materials/HouseMat.mat new file mode 100644 index 0000000..58d572b --- /dev/null +++ b/Assets/Materials/HouseMat.mat @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HouseMat + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6577872, g: 0, b: 0.764151, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/New Terrain 1.asset.meta b/Assets/Materials/HouseMat.mat.meta similarity index 64% rename from Assets/New Terrain 1.asset.meta rename to Assets/Materials/HouseMat.mat.meta index 79ed327..bbf6e87 100644 --- a/Assets/New Terrain 1.asset.meta +++ b/Assets/Materials/HouseMat.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: c8f5a538d4e48dd48adb98836e520bd3 +guid: af72c0e8f4a578043ae0abf3310fee0b NativeFormatImporter: externalObjects: {} - mainObjectFileID: 15600000 + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Materials/NewLayer.terrainlayer b/Assets/Materials/NewLayer.terrainlayer deleted file mode 100644 index fa57ae6..0000000 --- a/Assets/Materials/NewLayer.terrainlayer +++ /dev/null @@ -1,22 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1953259897 &8574412962073106934 -TerrainLayer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NewLayer - m_DiffuseTexture: {fileID: 2800000, guid: 5e1acf362611957488060eee4178b3f3, type: 3} - m_NormalMapTexture: {fileID: 0} - m_MaskMapTexture: {fileID: 0} - m_TileSize: {x: 2, y: 2} - m_TileOffset: {x: 0, y: 0} - m_Specular: {r: 0, g: 0, b: 0, a: 0} - m_Metallic: 0 - m_Smoothness: 0 - m_NormalScale: 1 - m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} - m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} - m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} diff --git a/Assets/Materials/NewLayer.terrainlayer.meta b/Assets/Materials/NewLayer.terrainlayer.meta deleted file mode 100644 index e2f31a1..0000000 --- a/Assets/Materials/NewLayer.terrainlayer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7f6460ad660235c429a8d341e179eec3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8574412962073106934 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/New Terrain 1.asset b/Assets/New Terrain 1.asset deleted file mode 100644 index 18ad0c2..0000000 Binary files a/Assets/New Terrain 1.asset and /dev/null differ diff --git a/Assets/New Terrain 2.asset b/Assets/New Terrain 2.asset deleted file mode 100644 index 3bbf465..0000000 Binary files a/Assets/New Terrain 2.asset and /dev/null differ diff --git a/Assets/New Terrain.asset b/Assets/New Terrain.asset deleted file mode 100644 index 2826c3d..0000000 Binary files a/Assets/New Terrain.asset and /dev/null differ diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab new file mode 100644 index 0000000..b1a1f33 --- /dev/null +++ b/Assets/Prefabs/Buildings/House.prefab @@ -0,0 +1,270 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1795195828905777770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118460100164241581} + - component: {fileID: 5984078921890859602} + - component: {fileID: 3215530432599005050} + - component: {fileID: 4737916247134474313} + m_Layer: 7 + m_Name: HouseCube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1118460100164241581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795195828905777770} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 64.59468, y: 44, z: 20.101233} + m_Children: [] + m_Father: {fileID: 494189295979627311} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5984078921890859602 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795195828905777770} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3215530432599005050 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795195828905777770} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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!65 &4737916247134474313 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1795195828905777770} + 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!1 &3752104966216439849 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1576403652048898793} + - component: {fileID: 5947967616133429600} + - component: {fileID: 7948750963708881473} + - component: {fileID: 1586295770122338240} + - component: {fileID: 8755003508867702973} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1576403652048898793 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3752104966216439849} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.34, y: 10, z: 6.38} + m_LocalScale: {x: 0.61721, y: 1.3248, z: 2.108} + m_Children: [] + m_Father: {fileID: 494189295979627311} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5947967616133429600 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3752104966216439849} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7948750963708881473 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3752104966216439849} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 1fae3d354d8f44b438d51fbc992ccae4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1586295770122338240 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3752104966216439849} + 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!114 &8755003508867702973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3752104966216439849} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b83755523bca294c8ebaacb9bfd6f02, type: 3} + m_Name: + m_EditorClassIdentifier: + interactionType: 0 +--- !u!1 &5179206290616997027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 494189295979627311} + - component: {fileID: 8068927831030430839} + - component: {fileID: 7337432708349338768} + m_Layer: 0 + m_Name: House + m_TagString: Building + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &494189295979627311 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179206290616997027} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5113401, y: 0.64607, z: 0.70913} + m_Children: + - {fileID: 1118460100164241581} + - {fileID: 1576403652048898793} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &8068927831030430839 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179206290616997027} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &7337432708349338768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5179206290616997027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 255558bfba6648641822c24b4555e7db, type: 3} + m_Name: + m_EditorClassIdentifier: + title: House + description: A place for people to live in. diff --git a/Assets/Prefabs/House.prefab.meta b/Assets/Prefabs/Buildings/House.prefab.meta similarity index 100% rename from Assets/Prefabs/House.prefab.meta rename to Assets/Prefabs/Buildings/House.prefab.meta diff --git a/Assets/Prefabs/House.prefab b/Assets/Prefabs/Buildings/HouseBlueprint.prefab similarity index 67% rename from Assets/Prefabs/House.prefab rename to Assets/Prefabs/Buildings/HouseBlueprint.prefab index b30dfe2..1259edd 100644 --- a/Assets/Prefabs/House.prefab +++ b/Assets/Prefabs/Buildings/HouseBlueprint.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &859987615724007234 +--- !u!1 &194332003443584216 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,126 +8,63 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3029879266300785804} + - component: {fileID: 4866682319586851668} + - component: {fileID: 3311111595986389378} + - component: {fileID: 4142088092775269754} m_Layer: 0 - m_Name: House - m_TagString: Untagged + m_Name: HouseBlueprint + m_TagString: Building m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3029879266300785804 +--- !u!4 &4866682319586851668 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 859987615724007234} + m_GameObject: {fileID: 194332003443584216} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -32.8, y: 25.5, z: -19.907093} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5113401, y: 0.64607, z: 0.70913} m_Children: - - {fileID: 5791216138142392183} - - {fileID: 619410602844490362} + - {fileID: 5393002048649408726} + - {fileID: 5814949246021907090} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1702862245869139066 -GameObject: +--- !u!114 &3311111595986389378 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 619410602844490362} - - component: {fileID: 4742757801571746483} - - component: {fileID: 7963601677874317816} - - component: {fileID: 4229670816734552781} - m_Layer: 0 - m_Name: Sign - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &619410602844490362 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702862245869139066} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 32.34, y: -4.43, z: 6.38} - m_LocalScale: {x: 0.61721, y: 1.3248, z: 2.108} - m_Children: [] - m_Father: {fileID: 3029879266300785804} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4742757801571746483 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702862245869139066} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7963601677874317816 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702862245869139066} + m_GameObject: {fileID: 194332003443584216} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - 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!65 &4229670816734552781 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d49e2868fa536c4fac8ec278501f38b, type: 3} + m_Name: + m_EditorClassIdentifier: + isColliding: 0 + followMouse: 1 + constructionPrefab: {fileID: 4975262029746308050, guid: f33a8569297837340a0e2ff7f85847a8, type: 3} + collisionMat: {fileID: 2100000, guid: a1e8fb1ea637c0e45bed70dd7d1feaab, type: 2} + blueprintMat: {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2} +--- !u!65 &4142088092775269754 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1702862245869139066} + m_GameObject: {fileID: 194332003443584216} 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!1 &3846751508054121740 + m_Size: {x: 65.011826, y: 40.389984, z: 21.721184} + m_Center: {x: 0.12955377, y: 1.3417872, z: -0.1813599} +--- !u!1 &6754144191350989329 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -135,10 +72,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5791216138142392183} - - component: {fileID: 6735171198865895387} - - component: {fileID: 9038250759702376144} - - component: {fileID: 9117137228089857341} + - component: {fileID: 5393002048649408726} + - component: {fileID: 1610568275509015081} + - component: {fileID: 7623891201045491457} m_Layer: 7 m_Name: HouseCube m_TagString: Untagged @@ -146,35 +82,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5791216138142392183 +--- !u!4 &5393002048649408726 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3846751508054121740} + m_GameObject: {fileID: 6754144191350989329} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 64.59468, y: 22.081419, z: 20.101233} + m_LocalScale: {x: 64.59468, y: 44, z: 20.101233} m_Children: [] - m_Father: {fileID: 3029879266300785804} + m_Father: {fileID: 4866682319586851668} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &6735171198865895387 +--- !u!33 &1610568275509015081 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3846751508054121740} + m_GameObject: {fileID: 6754144191350989329} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &9038250759702376144 +--- !u!23 &7623891201045491457 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3846751508054121740} + m_GameObject: {fileID: 6754144191350989329} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -187,7 +123,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -209,16 +145,84 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &9117137228089857341 -BoxCollider: +--- !u!1 &8160659780747141202 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3846751508054121740} - m_Material: {fileID: 0} - m_IsTrigger: 0 + serializedVersion: 6 + m_Component: + - component: {fileID: 5814949246021907090} + - component: {fileID: 1718464429846659355} + - component: {fileID: 3106913784298869306} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5814949246021907090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8160659780747141202} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.34, y: 10, z: 6.38} + m_LocalScale: {x: 0.61721, y: 1.3248, z: 2.108} + m_Children: [] + m_Father: {fileID: 4866682319586851668} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1718464429846659355 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8160659780747141202} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3106913784298869306 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8160659780747141202} m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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/HouseBlueprint.prefab.meta b/Assets/Prefabs/Buildings/HouseBlueprint.prefab.meta new file mode 100644 index 0000000..eb857a1 --- /dev/null +++ b/Assets/Prefabs/Buildings/HouseBlueprint.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1c0b2ac83b1c14641b7e9eee6c5776b3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/HouseConstruction.prefab b/Assets/Prefabs/Buildings/HouseConstruction.prefab new file mode 100644 index 0000000..fedf1e8 --- /dev/null +++ b/Assets/Prefabs/Buildings/HouseConstruction.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1874134898345004315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 967714629185282012} + - component: {fileID: 5899762558759361827} + - component: {fileID: 3347380956744957963} + - component: {fileID: 4840216639598610232} + m_Layer: 7 + m_Name: HouseCube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &967714629185282012 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874134898345004315} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 64.59468, y: 44, z: 20.101233} + m_Children: [] + m_Father: {fileID: 301781106009560158} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5899762558759361827 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874134898345004315} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3347380956744957963 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874134898345004315} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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} +--- !u!65 &4840216639598610232 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874134898345004315} + 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!1 &3961396688198438744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1660438608889617816} + - component: {fileID: 5791910400456764945} + - component: {fileID: 7828435077521227056} + - component: {fileID: 1506512640857204913} + m_Layer: 0 + m_Name: Sign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1660438608889617816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961396688198438744} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 32.34, y: 10, z: 6.38} + m_LocalScale: {x: 0.61721, y: 1.3248, z: 2.108} + m_Children: [] + m_Father: {fileID: 301781106009560158} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5791910400456764945 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961396688198438744} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7828435077521227056 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961396688198438744} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 244582ee9b7c8bb43a081a1f5acc7cef, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1506512640857204913 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3961396688198438744} + 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!1 &4975262029746308050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 301781106009560158} + - component: {fileID: 8041566757370854614} + - component: {fileID: 1315160238030080861} + m_Layer: 0 + m_Name: HouseConstruction + m_TagString: Building + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &301781106009560158 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975262029746308050} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5113401, y: 0.64607, z: 0.70913} + m_Children: + - {fileID: 967714629185282012} + - {fileID: 1660438608889617816} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &8041566757370854614 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975262029746308050} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 +--- !u!114 &1315160238030080861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4975262029746308050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b49d2e0b5f1b960469b9dc34355fcc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + building: {fileID: 5179206290616997027, guid: 613866d46c759a848b2a462973745a74, type: 3} + neededWood: 10 + havingWood: 0 diff --git a/Assets/Prefabs/Buildings/HouseConstruction.prefab.meta b/Assets/Prefabs/Buildings/HouseConstruction.prefab.meta new file mode 100644 index 0000000..358d296 --- /dev/null +++ b/Assets/Prefabs/Buildings/HouseConstruction.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f33a8569297837340a0e2ff7f85847a8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Event.prefab b/Assets/Prefabs/Event.prefab index a9d84e7..442bd9c 100644 --- a/Assets/Prefabs/Event.prefab +++ b/Assets/Prefabs/Event.prefab @@ -345,4 +345,4 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: You Picked Up An Item + m_Text: diff --git a/Assets/Prefabs/FirstPerson Player.prefab b/Assets/Prefabs/FirstPerson Player.prefab index b707ebd..8f1d26b 100644 --- a/Assets/Prefabs/FirstPerson Player.prefab +++ b/Assets/Prefabs/FirstPerson Player.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1918321787624083565 +--- !u!1 &8390537187855206697 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1918321787624083564} + - component: {fileID: 8390537187855206696} m_Layer: 0 m_Name: GroundCheck m_TagString: Untagged @@ -16,21 +16,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1918321787624083564 +--- !u!4 &8390537187855206696 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321787624083565} + m_GameObject: {fileID: 8390537187855206697} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -1.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1918321789073437693} + m_Father: {fileID: 8390537188327133022} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1918321789073437691 +--- !u!1 &8390537187866079435 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -38,169 +38,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1918321789073437693} - - component: {fileID: 1918321789073437690} - - component: {fileID: 1918321789073437692} - m_Layer: 0 - m_Name: FirstPerson Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1918321789073437693 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789073437691} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 16.93, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1918321789141492587} - - {fileID: 1918321789146359861} - - {fileID: 1918321787624083564} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!143 &1918321789073437690 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789073437691} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 3.8 - m_Radius: 0.6 - m_SlopeLimit: 45 - m_StepOffset: 0.7 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &1918321789073437692 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789073437691} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcb8e32fc55ebe9478dee06683e84d92, type: 3} - m_Name: - m_EditorClassIdentifier: - controller: {fileID: 1918321789073437690} - speed: 12 - airSpeed: 0.7 - sneakSpeed: 0.4 - sprintSpeed: 1.8 - sprintAirSpeed: 1.9 - gravity: -19.62 - jumpHeight: 4 - groundCheck: {fileID: 1918321787624083564} - groundDistance: 0.4 - groundMask: - serializedVersion: 2 - m_Bits: 128 ---- !u!1 &1918321789141492584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1918321789141492587} - - component: {fileID: 1918321789141492589} - - component: {fileID: 1918321789141492586} - m_Layer: 0 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1918321789141492587 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789141492584} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.8, z: 1.2} - m_Children: [] - m_Father: {fileID: 1918321789073437693} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1918321789141492589 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789141492584} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1918321789141492586 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789141492584} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - 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: 244582ee9b7c8bb43a081a1f5acc7cef, 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 &1918321789146359856 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1918321789146359861} - - component: {fileID: 1918321789146359858} - - component: {fileID: 1918321789146359859} - - component: {fileID: 1918321789146359860} + - component: {fileID: 8390537187866079434} + - component: {fileID: 8390537187866079439} + - component: {fileID: 8390537187866079436} + - component: {fileID: 8390537187866079437} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -208,27 +49,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1918321789146359861 +--- !u!4 &8390537187866079434 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789146359856} + m_GameObject: {fileID: 8390537187866079435} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1918321789073437693} + m_Father: {fileID: 8390537188327133022} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &1918321789146359858 +--- !u!20 &8390537187866079439 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789146359856} + m_GameObject: {fileID: 8390537187866079435} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 @@ -265,30 +106,200 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!81 &1918321789146359859 +--- !u!81 &8390537187866079436 AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789146359856} + m_GameObject: {fileID: 8390537187866079435} m_Enabled: 1 ---- !u!114 &1918321789146359860 +--- !u!114 &8390537187866079437 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918321789146359856} + m_GameObject: {fileID: 8390537187866079435} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27ccf256a5b5a4841834e2cc7ef253e0, type: 3} m_Name: m_EditorClassIdentifier: mouseSensitivityX: 800 -<<<<<<< Updated upstream - mouseSensitivityY: 700 -======= mouseSensitivityY: 800 ->>>>>>> Stashed changes - playerBody: {fileID: 1918321789073437693} + playerBody: {fileID: 8390537188327133022} +--- !u!1 &8390537188327133021 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8390537188327133022} + - component: {fileID: 8390537188327133023} + - component: {fileID: 8390537188327133020} + - component: {fileID: 8390537188327132961} + m_Layer: 0 + m_Name: FirstPerson Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8390537188327133022 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537188327133021} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 20, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8390537189371922023} + - {fileID: 8390537187866079434} + - {fileID: 8390537187855206696} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &8390537188327133023 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537188327133021} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Height: 3.8 + m_Radius: 0.6 + m_SlopeLimit: 45 + m_StepOffset: 0.7 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8390537188327133020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537188327133021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcb8e32fc55ebe9478dee06683e84d92, type: 3} + m_Name: + m_EditorClassIdentifier: + controller: {fileID: 8390537188327133023} + speed: 12 + airSpeed: 0.7 + sneakSpeed: 0.4 + sprintSpeed: 1.8 + sprintAirSpeed: 1.9 + gravity: -19.62 + jumpHeight: 4 + groundCheck: {fileID: 8390537187855206696} + groundDistance: 0.4 + groundMask: + serializedVersion: 2 + m_Bits: 128 +--- !u!114 &8390537188327132961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537188327133021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49d5033db90749f43a12d57f82fcf8be, type: 3} + m_Name: + m_EditorClassIdentifier: + interactionDistance: 20 + interactionText: {fileID: 0} +--- !u!1 &8390537189371922020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8390537189371922023} + - component: {fileID: 8390537189371922025} + - component: {fileID: 8390537189371922022} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8390537189371922023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537189371922020} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.2, y: 1.8, z: 1.2} + m_Children: [] + m_Father: {fileID: 8390537188327133022} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8390537189371922025 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537189371922020} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8390537189371922022 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390537189371922020} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + 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: 244582ee9b7c8bb43a081a1f5acc7cef, 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/Terrain.prefab b/Assets/Prefabs/Terrain.prefab new file mode 100644 index 0000000..f471fd2 --- /dev/null +++ b/Assets/Prefabs/Terrain.prefab @@ -0,0 +1,95 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7029954221290272535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7029954221290272534} + - component: {fileID: 7029954221290272532} + - component: {fileID: 7029954221290272533} + - component: {fileID: 7029954221290272539} + m_Layer: 7 + m_Name: Terrain + m_TagString: Terrain + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &7029954221290272534 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7029954221290272535} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -500, y: 0, z: -500} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!218 &7029954221290272532 +Terrain: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7029954221290272535} + m_Enabled: 1 + serializedVersion: 6 + m_TerrainData: {fileID: 15600000, guid: 78608360dbca50d488ddfbb5bb7c54a9, type: 2} + m_TreeDistance: 5000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_ShadowCastingMode: 2 + m_DrawHeightmap: 1 + m_DrawInstanced: 0 + m_DrawTreesAndFoliage: 1 + m_ReflectionProbeUsage: 1 + m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} + m_BakeLightProbesForTrees: 1 + m_PreserveTreePrototypeLayers: 0 + m_DeringLightProbesForTrees: 1 + m_ScaleInLightmap: 0.0256 + m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + m_GroupingID: 0 + m_RenderingLayerMask: 1 + m_AllowAutoConnect: 1 +--- !u!154 &7029954221290272533 +TerrainCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7029954221290272535} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 15600000, guid: 78608360dbca50d488ddfbb5bb7c54a9, type: 2} + m_EnableTreeColliders: 1 +--- !u!54 &7029954221290272539 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7029954221290272535} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 diff --git a/Assets/Prefabs/Terrain.prefab.meta b/Assets/Prefabs/Terrain.prefab.meta new file mode 100644 index 0000000..db04d9c --- /dev/null +++ b/Assets/Prefabs/Terrain.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 83265ec..b557e39 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -123,86 +123,12 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &95348668 +--- !u!1 &95348668 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789073437691, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} + m_CorrespondingSourceObject: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + m_PrefabInstance: {fileID: 8390537188401440993} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 95348671} - - component: {fileID: 95348670} - - component: {fileID: 95348669} - - component: {fileID: 95348672} - m_Layer: 0 - m_Name: FirstPerson Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &95348669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789073437692, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95348668} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fcb8e32fc55ebe9478dee06683e84d92, type: 3} - m_Name: - m_EditorClassIdentifier: - controller: {fileID: 95348670} - speed: 12 - airSpeed: 0.7 - sneakSpeed: 0.4 - sprintSpeed: 1.8 - sprintAirSpeed: 1.9 - gravity: -19.62 - jumpHeight: 4 - groundCheck: {fileID: 563077577} - groundDistance: 0.4 - groundMask: - serializedVersion: 2 - m_Bits: 128 ---- !u!143 &95348670 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789073437690, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95348668} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 3.8 - m_Radius: 0.6 - m_SlopeLimit: 45 - m_StepOffset: 0.7 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &95348671 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 95348668} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 20, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1248374406} - - {fileID: 539564075} - - {fileID: 563077577} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &95348672 +--- !u!114 &95348673 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -211,11 +137,11 @@ MonoBehaviour: m_GameObject: {fileID: 95348668} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 49d5033db90749f43a12d57f82fcf8be, type: 3} + m_Script: {fileID: 11500000, guid: 2fe01a752f991734aa307cc7b7665015, type: 3} m_Name: m_EditorClassIdentifier: - interactionDistance: 20 - interactionText: {fileID: 114639929} + terrain: {fileID: 1417065444} + prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3} --- !u!1 &114639927 GameObject: m_ObjectHideFlags: 0 @@ -453,181 +379,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1417065445} - - {fileID: 472721408} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &472721407 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 859987615724007234, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 6646823741502194991} - m_PrefabAsset: {fileID: 0} ---- !u!4 &472721408 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 6646823741502194991} - m_PrefabAsset: {fileID: 0} ---- !u!114 &472721409 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 472721407} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 255558bfba6648641822c24b4555e7db, type: 3} - m_Name: - m_EditorClassIdentifier: - title: House - description: A place for people to live in. ---- !u!1 &539564074 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789146359856, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 539564075} - - component: {fileID: 539564078} - - component: {fileID: 539564077} - - component: {fileID: 539564076} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &539564075 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789146359861, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539564074} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 95348671} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &539564076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789146359860, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539564074} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 27ccf256a5b5a4841834e2cc7ef253e0, type: 3} - m_Name: - m_EditorClassIdentifier: - mouseSensitivityX: 800 - mouseSensitivityY: 800 - playerBody: {fileID: 95348671} ---- !u!81 &539564077 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789146359859, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539564074} - m_Enabled: 1 ---- !u!20 &539564078 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789146359858, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 539564074} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!1 &563077576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321787624083565, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 563077577} - m_Layer: 0 - m_Name: GroundCheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &563077577 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321787624083564, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 563077576} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.75, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 95348671} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &644283049 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1702862245869139066, guid: 613866d46c759a848b2a462973745a74, type: 3} - m_PrefabInstance: {fileID: 6646823741502194991} - m_PrefabAsset: {fileID: 0} ---- !u!114 &644283051 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 644283049} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 18cda7c2fe759504a9a7b59a3a413b35, type: 3} - m_Name: - m_EditorClassIdentifier: - interactionType: 0 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -917,87 +671,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: GamerManager: {fileID: 1861247503} ---- !u!1 &1248374405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789141492584, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1248374406} - - component: {fileID: 1248374408} - - component: {fileID: 1248374407} - m_Layer: 0 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1248374406 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789141492587, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1248374405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.8, z: 1.2} - m_Children: [] - m_Father: {fileID: 95348671} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &1248374407 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789141492586, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1248374405} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - 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: 244582ee9b7c8bb43a081a1f5acc7cef, 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 &1248374408 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1918321789141492589, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - m_PrefabInstance: {fileID: 1918321789023077697} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1248374405} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1248751118 GameObject: m_ObjectHideFlags: 0 @@ -1043,84 +716,18 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1417065444 +--- !u!1 &1417065444 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} + m_PrefabInstance: {fileID: 7029954222161724659} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1417065445} - - component: {fileID: 1417065447} - - component: {fileID: 1417065446} - m_Layer: 7 - m_Name: Terrain - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1417065445 +--- !u!4 &1417065445 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} + m_PrefabInstance: {fileID: 7029954222161724659} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1417065444} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -500, y: 0, z: -500} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 317073667} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!154 &1417065446 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1417065444} - m_Material: {fileID: 0} - m_Enabled: 1 - m_TerrainData: {fileID: 15600000, guid: 78608360dbca50d488ddfbb5bb7c54a9, type: 2} - m_EnableTreeColliders: 1 ---- !u!218 &1417065447 -Terrain: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1417065444} - m_Enabled: 1 - serializedVersion: 6 - m_TerrainData: {fileID: 15600000, guid: 78608360dbca50d488ddfbb5bb7c54a9, type: 2} - m_TreeDistance: 5000 - m_TreeBillboardDistance: 50 - m_TreeCrossFadeLength: 5 - m_TreeMaximumFullLODCount: 50 - m_DetailObjectDistance: 80 - m_DetailObjectDensity: 1 - m_HeightmapPixelError: 5 - m_SplatMapDistance: 1000 - m_HeightmapMaximumLOD: 0 - m_ShadowCastingMode: 2 - m_DrawHeightmap: 1 - m_DrawInstanced: 0 - m_DrawTreesAndFoliage: 1 - m_ReflectionProbeUsage: 1 - m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} - m_BakeLightProbesForTrees: 1 - m_PreserveTreePrototypeLayers: 0 - m_DeringLightProbesForTrees: 1 - m_ScaleInLightmap: 0.0256 - m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} - m_GroupingID: 0 - m_RenderingLayerMask: 1 - m_AllowAutoConnect: 1 --- !u!1 &1690461075 GameObject: m_ObjectHideFlags: 0 @@ -1347,125 +954,121 @@ MonoBehaviour: eventObject: {fileID: 8681335675325213624, guid: 240f676d062888042ac64a67d71aaa9d, type: 3} parentEventObject: {fileID: 1690461076} events: [] ---- !u!1001 &1918321789023077697 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1918321789073437691, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_Name - value: FirstPerson Player - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalPosition.y - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1918321789073437693, guid: 6a86db7765f277243b912c20f451dc47, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} ---- !u!1001 &6646823741502194991 +--- !u!1001 &7029954222161724659 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 317073667} m_Modifications: - - target: {fileID: 859987615724007234, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_Name - value: House - objectReference: {fileID: 0} - - target: {fileID: 859987615724007234, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_TagString - value: Building - objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalPosition.x - value: -32.8 + value: -500 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalPosition.y - value: 25.5 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalPosition.z - value: -19.907093 + value: -500 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3029879266300785804, guid: 613866d46c759a848b2a462973745a74, type: 3} + - target: {fileID: 7029954221290272534, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7963601677874317816, guid: 613866d46c759a848b2a462973745a74, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3e21ca7ffec4eef48ba7759b5ef29773, type: 2} + - target: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} + propertyPath: m_Name + value: Terrain + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 613866d46c759a848b2a462973745a74, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} +--- !u!1001 &8390537188401440993 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8390537188327132961, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: interactionText + value: + objectReference: {fileID: 114639929} + - target: {fileID: 8390537188327133021, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_Name + value: FirstPerson Player + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalPosition.y + value: 21.11 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3} diff --git a/Assets/Scripts/Building/BuildingBlueprint.cs b/Assets/Scripts/Building/BuildingBlueprint.cs new file mode 100644 index 0000000..258c726 --- /dev/null +++ b/Assets/Scripts/Building/BuildingBlueprint.cs @@ -0,0 +1,75 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class BuildingBlueprint : MonoBehaviour +{ + public bool isColliding; + public bool followMouse = true; + public GameObject constructionPrefab; + + private GameObject terrain; + + + Ray ray; + + public abstract void Init(); + public abstract void WhileColliding(); + public abstract void WhileNotColliding(); + + private void Start() + { + terrain = GameObject.FindGameObjectWithTag("Terrain"); + Init(); + } + + + //Collision + public void OnCollisionEnter(Collision collision) + { + isColliding = true; + + Debug.Log("Colliding True"); + } + public void OnCollisionStay(Collision collision) + { + isColliding = true; + Debug.Log("Colliding True"); + } + public void OnCollisionExit(Collision collision) + { + isColliding = false; + Debug.Log("Colliding False"); + } + + //Placing + public void Update() + { + if (followMouse) + { + //Following Mouse + ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hitData; + if (terrain.GetComponent().Raycast(ray, out hitData, Mathf.Infinity)) + { + transform.position = hitData.point; + } + } + + if (Input.GetMouseButtonDown(0) && !isColliding) + { + Instantiate(constructionPrefab, transform.position, transform.rotation); + Destroy(this.gameObject); + } + + if (isColliding) + { + WhileColliding(); + } + else + { + WhileNotColliding(); + } + } + +} diff --git a/Assets/Scripts/Building/BuildingSign.cs.meta b/Assets/Scripts/Building/BuildingBlueprint.cs.meta similarity index 83% rename from Assets/Scripts/Building/BuildingSign.cs.meta rename to Assets/Scripts/Building/BuildingBlueprint.cs.meta index 1dd1151..423e0e1 100644 --- a/Assets/Scripts/Building/BuildingSign.cs.meta +++ b/Assets/Scripts/Building/BuildingBlueprint.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18cda7c2fe759504a9a7b59a3a413b35 +guid: 76f9b3b57e22ab047b8f95bcb552289a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Building/BuildingConstruction.cs b/Assets/Scripts/Building/BuildingConstruction.cs new file mode 100644 index 0000000..04eb4fb --- /dev/null +++ b/Assets/Scripts/Building/BuildingConstruction.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class BuildingConstruction : MonoBehaviour +{ + + public GameObject building; + + public abstract bool CheckForResources(); + public abstract void Init(); + + private void Start() + { + Init(); + } + + private void Update() + { + if (CheckForResources()) + { + Instantiate(building, gameObject.transform.position, Quaternion.identity); + Destroy(this.gameObject); + } + } +} diff --git a/Assets/Scripts/Building/BuildingConstruction.cs.meta b/Assets/Scripts/Building/BuildingConstruction.cs.meta new file mode 100644 index 0000000..437200c --- /dev/null +++ b/Assets/Scripts/Building/BuildingConstruction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 891ae650cdb2a6a438a2fd1bbb520db2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/BuildingPlacement.cs b/Assets/Scripts/Building/BuildingPlacement.cs new file mode 100644 index 0000000..4c7eef9 --- /dev/null +++ b/Assets/Scripts/Building/BuildingPlacement.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class BuildingPlacement : MonoBehaviour +{ + [SerializeField] private GameObject terrain; + [SerializeField] private GameObject prefab; + + Ray ray; + + void Update() + { + // Build Button Handler + if (Input.GetButtonDown("Build")) + { // Wenn man den Button 'B' + ray = Camera.main.ScreenPointToRay(Input.mousePosition); + RaycastHit hitData; + if (terrain.GetComponent().Raycast(ray, out hitData, Mathf.Infinity)) + { + Instantiate(prefab, hitData.point, Quaternion.identity); + + } + } + } +} diff --git a/Assets/Scripts/Building/BuildingPlacement.cs.meta b/Assets/Scripts/Building/BuildingPlacement.cs.meta new file mode 100644 index 0000000..3b345f3 --- /dev/null +++ b/Assets/Scripts/Building/BuildingPlacement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2fe01a752f991734aa307cc7b7665015 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/House.meta b/Assets/Scripts/Building/House.meta new file mode 100644 index 0000000..ffcf758 --- /dev/null +++ b/Assets/Scripts/Building/House.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0c8f7012e4cce54bb00c3edeac83c65 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/House/HouseBlueprint.cs b/Assets/Scripts/Building/House/HouseBlueprint.cs new file mode 100644 index 0000000..caf2653 --- /dev/null +++ b/Assets/Scripts/Building/House/HouseBlueprint.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HouseBlueprint : BuildingBlueprint +{ + public Material collisionMat; + + public Material blueprintMat; + private Transform houseCube; + + public override void Init() + { + houseCube = gameObject.transform.Find("HouseCube"); + } + + public override void WhileColliding() + { + houseCube.GetComponent().material = collisionMat; + } + + public override void WhileNotColliding() + { + houseCube.GetComponent().material = blueprintMat; + } +} diff --git a/Assets/Scripts/Building/House/HouseBlueprint.cs.meta b/Assets/Scripts/Building/House/HouseBlueprint.cs.meta new file mode 100644 index 0000000..ebd2a88 --- /dev/null +++ b/Assets/Scripts/Building/House/HouseBlueprint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6d49e2868fa536c4fac8ec278501f38b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/HouseBuildingScript.cs b/Assets/Scripts/Building/House/HouseBuildingScript.cs similarity index 100% rename from Assets/Scripts/Building/HouseBuildingScript.cs rename to Assets/Scripts/Building/House/HouseBuildingScript.cs diff --git a/Assets/Scripts/Building/HouseBuildingScript.cs.meta b/Assets/Scripts/Building/House/HouseBuildingScript.cs.meta similarity index 100% rename from Assets/Scripts/Building/HouseBuildingScript.cs.meta rename to Assets/Scripts/Building/House/HouseBuildingScript.cs.meta diff --git a/Assets/Scripts/Building/House/HouseConstruction.cs b/Assets/Scripts/Building/House/HouseConstruction.cs new file mode 100644 index 0000000..b26daf9 --- /dev/null +++ b/Assets/Scripts/Building/House/HouseConstruction.cs @@ -0,0 +1,31 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HouseConstruction : BuildingConstruction +{ + private GameObject gameManager; + + [Header("Needed Resources")] + [SerializeField] private int neededWood = 10; + + [Header("Having Resources")] + [SerializeField] private int havingWood = 0; + + public override void Init() + { + gameManager = GameObject.Find("GameManager"); + gameManager.GetComponent().CreateEvent("Construction: House"); + } + + public override bool CheckForResources() + { + if (havingWood == neededWood) + { + gameManager.GetComponent().CreateEvent("Construction: House: finished"); + return true; + } + return false; + } + +} diff --git a/Assets/Scripts/Building/House/HouseConstruction.cs.meta b/Assets/Scripts/Building/House/HouseConstruction.cs.meta new file mode 100644 index 0000000..7de75a8 --- /dev/null +++ b/Assets/Scripts/Building/House/HouseConstruction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b49d2e0b5f1b960469b9dc34355fcc5f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Building/BuildingSign.cs b/Assets/Scripts/Building/InfoSign.cs similarity index 81% rename from Assets/Scripts/Building/BuildingSign.cs rename to Assets/Scripts/Building/InfoSign.cs index fefffec..23075ef 100644 --- a/Assets/Scripts/Building/BuildingSign.cs +++ b/Assets/Scripts/Building/InfoSign.cs @@ -1,6 +1,8 @@ +using System.Collections; +using System.Collections.Generic; using UnityEngine; -public class BuildingSign : Interactable +public class InfoSign : Interactable { private Building parentBuilding; @@ -18,7 +20,8 @@ public class BuildingSign : Interactable public override void Interact() { Debug.Log(parentBuilding.GetTitle()); - + Debug.Log("interact"); } } + diff --git a/Assets/Scripts/Building/InfoSign.cs.meta b/Assets/Scripts/Building/InfoSign.cs.meta new file mode 100644 index 0000000..d6dce47 --- /dev/null +++ b/Assets/Scripts/Building/InfoSign.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0b83755523bca294c8ebaacb9bfd6f02 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset b/Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset deleted file mode 100644 index fc047c5..0000000 Binary files a/Assets/TerrainData_569ec6c2-3686-46cf-8199-c1704b877350.asset and /dev/null differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 6009b85..32b0cbe 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -262,13 +262,13 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Submit + m_Name: Build descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: enter + positiveButton: b altNegativeButton: - altPositiveButton: space + altPositiveButton: gravity: 1000 dead: 0.001 sensitivity: 1000 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 17145d9..269c1c9 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - Undefined - Event - Building + - Terrain layers: - Default - TransparentFX