From 936026b647186d29bb3ea6a4c6b10751e0dc4fc7 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 19 Apr 2020 04:02:40 +0300 Subject: [PATCH] Add terrain textures and misc tweaks --- Assets/Prefabs/Environment/Campfire.prefab | 50 +- Assets/Prefabs/UI/Pause Menu.prefab | 14 +- Assets/Scenes/MainScene.unity | 597 +++++++----------- Assets/Scripts/GameOverMenu.cs | 2 +- Assets/Skyboxes/Nightsky/Nightsky.mat | 2 +- Assets/Terrains/Charcoal Layer.terrainlayer | 22 + .../Terrains/Charcoal Layer.terrainlayer.meta | 8 + Assets/Terrains/Dirt Layer.terrainlayer | 22 + Assets/Terrains/Dirt Layer.terrainlayer.meta | 8 + Assets/Terrains/Forest Terrain.asset | Bin 574344 -> 1975508 bytes Assets/Terrains/Grass Layer.terrainlayer | 22 + Assets/Terrains/Grass Layer.terrainlayer.meta | 8 + Assets/Textures.meta | 8 + Assets/Textures/Charcoal.png | Bin 0 -> 502 bytes Assets/Textures/Charcoal.png.meta | 92 +++ Assets/Textures/Dirt.png | Bin 0 -> 1157 bytes Assets/Textures/Dirt.png.meta | 92 +++ Assets/Textures/Grass.png | Bin 0 -> 503 bytes Assets/Textures/Grass.png.meta | 92 +++ ProjectSettings/DynamicsManager.asset | 2 +- ProjectSettings/TagManager.asset | 2 +- 21 files changed, 667 insertions(+), 376 deletions(-) create mode 100644 Assets/Terrains/Charcoal Layer.terrainlayer create mode 100644 Assets/Terrains/Charcoal Layer.terrainlayer.meta create mode 100644 Assets/Terrains/Dirt Layer.terrainlayer create mode 100644 Assets/Terrains/Dirt Layer.terrainlayer.meta create mode 100644 Assets/Terrains/Grass Layer.terrainlayer create mode 100644 Assets/Terrains/Grass Layer.terrainlayer.meta create mode 100644 Assets/Textures.meta create mode 100644 Assets/Textures/Charcoal.png create mode 100644 Assets/Textures/Charcoal.png.meta create mode 100644 Assets/Textures/Dirt.png create mode 100644 Assets/Textures/Dirt.png.meta create mode 100644 Assets/Textures/Grass.png create mode 100644 Assets/Textures/Grass.png.meta diff --git a/Assets/Prefabs/Environment/Campfire.prefab b/Assets/Prefabs/Environment/Campfire.prefab index b83dc2c..e25661d 100644 --- a/Assets/Prefabs/Environment/Campfire.prefab +++ b/Assets/Prefabs/Environment/Campfire.prefab @@ -35,6 +35,7 @@ Transform: - {fileID: 8703236790229133739} - {fileID: 8279143985661205166} - {fileID: 664587661892241191} + - {fileID: 4680470241112840667} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -136,6 +137,51 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 14 m_Mesh: {fileID: -4095829847968280453, guid: 4facd75878c39c7499d4291e717cda98, type: 3} +--- !u!1 &4519649591337959282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4680470241112840667} + - component: {fileID: 7977285724283365198} + m_Layer: 12 + m_Name: Player Wall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4680470241112840667 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4519649591337959282} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalScale: {x: 1, y: 3, z: 1} + m_Children: [] + m_Father: {fileID: 8265150240760341263} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &7977285724283365198 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4519649591337959282} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.8 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &4797807552203538256 GameObject: m_ObjectHideFlags: 0 @@ -161,7 +207,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4797807552203538256} m_LocalRotation: {x: -0.7010575, y: 0.092295825, z: -0.0922958, w: -0.7010574} - m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8265150240760341263} @@ -180,7 +226,7 @@ Light: m_Shape: 0 m_Color: {r: 1, g: 0.84329563, b: 0.6556604, a: 1} m_Intensity: 1.5 - m_Range: 9.458514 + m_Range: 15 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 m_CookieSize: 10 diff --git a/Assets/Prefabs/UI/Pause Menu.prefab b/Assets/Prefabs/UI/Pause Menu.prefab index b018e0b..dd32468 100644 --- a/Assets/Prefabs/UI/Pause Menu.prefab +++ b/Assets/Prefabs/UI/Pause Menu.prefab @@ -32,9 +32,9 @@ RectTransform: m_Father: {fileID: 5400695020334462789} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5400695019851472734 @@ -110,10 +110,10 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!225 &5400695020334462788 CanvasGroup: @@ -139,4 +139,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6829428ba845e44e915027851669930, type: 3} m_Name: m_EditorClassIdentifier: - Paused: 0 + GameState: {fileID: 0} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index c5e294f..e5122fc 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -323,6 +323,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 71403635} m_PrefabAsset: {fileID: 0} +--- !u!4 &116564792 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + m_PrefabInstance: {fileID: 758673230} + m_PrefabAsset: {fileID: 0} --- !u!1 &176857073 GameObject: m_ObjectHideFlags: 0 @@ -775,99 +781,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 377974306} m_PrefabAsset: {fileID: 0} ---- !u!1 &404370537 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 404370538} - - component: {fileID: 404370541} - - component: {fileID: 404370540} - - component: {fileID: 404370539} - m_Layer: 0 - m_Name: Bench Log (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &404370538 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404370537} - m_LocalRotation: {x: -0, y: -0.084781334, z: -0, w: 0.99639964} - m_LocalPosition: {x: 0.38, y: 0.15, z: -2.53} - m_LocalScale: {x: 4, y: 0.5, z: 0.5} - m_Children: [] - m_Father: {fileID: 1161135096} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: -9.727, z: 0} ---- !u!65 &404370539 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404370537} - 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 &404370540 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404370537} - 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_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 ---- !u!33 &404370541 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404370537} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &429180125 stripped GameObject: m_CorrespondingSourceObject: {fileID: 531861614786402144, guid: 0a942b74adc03b248ac74ce8af504ca5, @@ -1025,7 +938,7 @@ Transform: m_Children: - {fileID: 2090879596} m_Father: {fileID: 1161135096} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 45, y: 150.64001, z: 0} --- !u!65 &506855460 BoxCollider: @@ -1287,6 +1200,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 625582144} m_PrefabAsset: {fileID: 0} +--- !u!1001 &758673230 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1660514110} + m_Modifications: + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_Name + value: Log + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.94 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.04 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.14697704 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.98914 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 343.096 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!1001 &771789323 PrefabInstance: m_ObjectHideFlags: 0 @@ -2111,11 +2093,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1872559113} - {fileID: 506855459} - - {fileID: 1850702053} - - {fileID: 1946780413} - - {fileID: 404370538} m_Father: {fileID: 1660514110} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2680,6 +2658,75 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1372384187} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1442608327 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1660514110} + m_Modifications: + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_Name + value: Log + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.554 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.819 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.0000028312204 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180.00002 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!1001 &1484899786 PrefabInstance: m_ObjectHideFlags: 0 @@ -2886,12 +2933,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 9177655810625684608} m_PrefabAsset: {fileID: 0} +--- !u!4 &1559223405 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + m_PrefabInstance: {fileID: 1442608327} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1566722760 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1161135096} + m_TransformParent: {fileID: 1660514110} m_Modifications: - target: {fileID: 986826787110512831, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} @@ -2931,17 +2984,17 @@ PrefabInstance: - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} @@ -2951,7 +3004,7 @@ PrefabInstance: - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} @@ -2970,6 +3023,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ee6eecf5317b4841817712d24763e37, type: 3} +--- !u!4 &1639218800 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + m_PrefabInstance: {fileID: 1863830598} + m_PrefabAsset: {fileID: 0} --- !u!1 &1660514109 GameObject: m_ObjectHideFlags: 0 @@ -3001,6 +3060,10 @@ Transform: - {fileID: 1195794718} - {fileID: 833188479} - {fileID: 1161135096} + - {fileID: 1872559113} + - {fileID: 1559223405} + - {fileID: 116564792} + - {fileID: 1639218800} - {fileID: 1694329891} m_Father: {fileID: 0} m_RootOrder: 4 @@ -3060,7 +3123,7 @@ Transform: - {fileID: 234379563} - {fileID: 1704854706} m_Father: {fileID: 1660514110} - m_RootOrder: 4 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1704854705 PrefabInstance: @@ -3239,99 +3302,75 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1849724584} m_CullTransparentMesh: 0 ---- !u!1 &1850702052 -GameObject: +--- !u!1001 &1863830598 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1850702053} - - component: {fileID: 1850702056} - - component: {fileID: 1850702055} - - component: {fileID: 1850702054} - m_Layer: 0 - m_Name: Bench Log (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1850702053 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850702052} - m_LocalRotation: {x: -0, y: 0.96735656, z: -0, w: 0.25341934} - m_LocalPosition: {x: -0.97, y: 0.19, z: 1.93} - m_LocalScale: {x: 4, y: 0.5, z: 0.49999988} - m_Children: [] - m_Father: {fileID: 1161135096} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 150.64001, z: 0} ---- !u!65 &1850702054 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850702052} - 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 &1850702055 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850702052} - 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_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 ---- !u!33 &1850702056 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1850702052} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_Modification: + m_TransformParent: {fileID: 1660514110} + m_Modifications: + - target: {fileID: 110889063446132937, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_Name + value: Log + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.x + value: 2.802 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.463 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.6952662 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7187523 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 88.09701 + objectReference: {fileID: 0} + - target: {fileID: 1537215554624875642, guid: 3d3251a3aedb46143931b1ea4eaa4138, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d3251a3aedb46143931b1ea4eaa4138, type: 3} --- !u!4 &1872559113 stripped Transform: m_CorrespondingSourceObject: {fileID: 8265150240760341263, guid: 8ee6eecf5317b4841817712d24763e37, @@ -3540,99 +3579,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1946780412 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1946780413} - - component: {fileID: 1946780416} - - component: {fileID: 1946780415} - - component: {fileID: 1946780414} - m_Layer: 0 - m_Name: Bench Log (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1946780413 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946780412} - m_LocalRotation: {x: -0, y: 0.60876197, z: -0, w: 0.793353} - m_LocalPosition: {x: 2.89, y: 0.19, z: 0.58} - m_LocalScale: {x: 4, y: 0.5, z: 0.5} - m_Children: [] - m_Father: {fileID: 1161135096} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 75, z: 0} ---- !u!65 &1946780414 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946780412} - 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 &1946780415 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946780412} - 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_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 ---- !u!33 &1946780416 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1946780412} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2038862783 GameObject: m_ObjectHideFlags: 0 @@ -4205,31 +4151,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} propertyPath: m_RootOrder @@ -4250,56 +4171,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5400695020334462789, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - target: {fileID: 5400695020334462791, guid: 2cd64e49ad7ad1c4bb4a4264703d7915, type: 3} propertyPath: GameState diff --git a/Assets/Scripts/GameOverMenu.cs b/Assets/Scripts/GameOverMenu.cs index 5fef907..2054257 100644 --- a/Assets/Scripts/GameOverMenu.cs +++ b/Assets/Scripts/GameOverMenu.cs @@ -19,7 +19,7 @@ public class GameOverMenu : MonoBehaviour { private void UpdateCanvas(bool instantTransition) { bool IsGameOver = GameState.Current == State.GameOver; - Canvas.alpha = Mathf.Lerp(Canvas.alpha, IsGameOver ? 1 : 0, instantTransition ? 1 : 5f * Time.deltaTime); + Canvas.alpha = Mathf.Lerp(Canvas.alpha, IsGameOver ? 1 : 0, instantTransition ? 1 : 2f * Time.deltaTime); Canvas.interactable = IsGameOver; } } diff --git a/Assets/Skyboxes/Nightsky/Nightsky.mat b/Assets/Skyboxes/Nightsky/Nightsky.mat index 16f329d..214bbb2 100644 --- a/Assets/Skyboxes/Nightsky/Nightsky.mat +++ b/Assets/Skyboxes/Nightsky/Nightsky.mat @@ -84,7 +84,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 0.5 + - _Exposure: 0.3 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/Assets/Terrains/Charcoal Layer.terrainlayer b/Assets/Terrains/Charcoal Layer.terrainlayer new file mode 100644 index 0000000..d1ba60c --- /dev/null +++ b/Assets/Terrains/Charcoal Layer.terrainlayer @@ -0,0 +1,22 @@ +%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: Charcoal Layer + m_DiffuseTexture: {fileID: 2800000, guid: b00aa27389e39ee4094bf6d7f6bcaabf, 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/Terrains/Charcoal Layer.terrainlayer.meta b/Assets/Terrains/Charcoal Layer.terrainlayer.meta new file mode 100644 index 0000000..66e0486 --- /dev/null +++ b/Assets/Terrains/Charcoal Layer.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6204a108990d1fb478120f315fa46ebe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Terrains/Dirt Layer.terrainlayer b/Assets/Terrains/Dirt Layer.terrainlayer new file mode 100644 index 0000000..b84e6f6 --- /dev/null +++ b/Assets/Terrains/Dirt Layer.terrainlayer @@ -0,0 +1,22 @@ +%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: Dirt Layer + m_DiffuseTexture: {fileID: 2800000, guid: 3da53fb564a703d48aa6a495a9d8d059, 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/Terrains/Dirt Layer.terrainlayer.meta b/Assets/Terrains/Dirt Layer.terrainlayer.meta new file mode 100644 index 0000000..8625809 --- /dev/null +++ b/Assets/Terrains/Dirt Layer.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40d8f305a9564824c8776cf90f8b47c2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Terrains/Forest Terrain.asset b/Assets/Terrains/Forest Terrain.asset index a4f94e5730de03fd908f4640c474331acc8cff58..24d46eeefafc0cfcad8552f9b9028d77772ecc5d 100644 GIT binary patch literal 1975508 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 z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7> z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim} z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7> z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim} z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7> z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim} z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg zfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7> z3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36A zpnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim} z0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7j zD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUgfC36Apnw7jD4>7>3Mim}0tzUg zfC36Apnw7jD4>7>3Mim}0tzUgfC36U7X>~(fBHcDGv^-#6xfOdri*6)&jFqT71*i; z(rbVN@4aCwKL5GR3T)v5H=e#Rzx8*VzQa3#E$m>ce&=($(=)&=@sDQ!78KZu1v~?6 z#e3atR-jSf=DnZDe-d#2KCgroP+$ud$RGcw58SbL3*Pp|v!MbCY_$S6-je?mFg*)+ zG$^3J7Ax?%eZ9y3frq>c*kbp-=X?d$AOFwpzuvn5&j1Q+y#nP=0silSU!V7ksDJ`n zufVJJe|`UFZn^dcvYWTwZFh?mP#_g}=;p_7zTLZkt@jGhEmj~eaQj}5f8PrfP(T3% z6i`3`1r$&~0R7> z3Mim}0tzUgfC36AaE=z3pZbM&ZRXHl^5{=*YW>aZ+qy5p0@I%!?`fm?w<*c|^yh2G zdDS2PcJ1r_!?<<&i}@^HXDYk?H@D~0xj6Ts0Rs#$zyJdbFu(u<3^2d|1Aom1y4mi$ zarJqty&tb`clCLz-F~;%&z~4zfB^;=V1NMz7+`<_1{h#~0S3kyc)ovb_I&SuTpKfw z9R{|xfz3WYZFc<^o4<{EY&0L$qq$!7b^6?z%Ch1=1Mq14uB^K^%hKmFKkbaG9z3zw zUfa8P;#hn4Rn0YLss*v1EI#hJ_u?!qOMgVRmHs0HvYw${^|Ja zLjwjFV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz z7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|Xg zfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_ z1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;= zV1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~0R|XgfB^;=V1NMz7+`<_1{h#~ z0R|XgfB^;=*sOu9+`wkHV|^AGV1NMz7&tc!RNwpiKfCYFjr-31tVofw*fB^;=c%d2S|0eZ9J2uDT@xlND3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}Pxy2Iij0vh?xH+_`hie7Ua}c3jd&V{sN2 z(q;FV1`II300Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs# zzyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d| z0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdb zFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?0 z00Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u<3^2d|0}L?000Rs#zyJdbFu(u< z3^2d|0}L?000Rs#@E@+svI9@;%APu~E8}5ndU)o_UD+q+-2ePI?WR3 w-_PI5V*U7dv3GL&zCHJG@{~SC_1eH1YoFN02*gZ4%nZaV SK+FonY(UJuePSDjy9WR_i6T1y diff --git a/Assets/Terrains/Grass Layer.terrainlayer b/Assets/Terrains/Grass Layer.terrainlayer new file mode 100644 index 0000000..0d30170 --- /dev/null +++ b/Assets/Terrains/Grass Layer.terrainlayer @@ -0,0 +1,22 @@ +%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: Grass Layer + m_DiffuseTexture: {fileID: 2800000, guid: 820c2875b7733f6409b06f7ca97a73ad, 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/Terrains/Grass Layer.terrainlayer.meta b/Assets/Terrains/Grass Layer.terrainlayer.meta new file mode 100644 index 0000000..8e629ee --- /dev/null +++ b/Assets/Terrains/Grass Layer.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be6c87722c036b1478b85881634e4fc2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures.meta b/Assets/Textures.meta new file mode 100644 index 0000000..a1fce0a --- /dev/null +++ b/Assets/Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aa0b706bebf483441a30ec590993845d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Charcoal.png b/Assets/Textures/Charcoal.png new file mode 100644 index 0000000000000000000000000000000000000000..c28ca728331b55d7ac0a4be081cec08ab94afc2b GIT binary patch literal 502 zcmVEX>4Tx04R}tkv&MmKpe$i(@I4u4(%Y~kfAzR5EXHhRxE;r(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi>Z$Bv4xZ!d9zMR_#dwzYxj)CCQZyOh6N%@UZdk+{#Iu{0 z&Uv3W!YYzNd`>)J&;^Mfxh}i>#<}dUz%wI8E|VaR5R2s=mV20043&6>II5@`nv4j-T5Fw+1Dr&G0qg5ltM27a`9{v%>pC*?~t|}Ng z7Ep%@$?=2#!S8O(()5&@6p90VFSh+L1_XD3cGI@Mk8Qhs0{EYSE3NCVw}81%(wki^ zdISt@0~gm_P2K}8cYxt1T{0v`^3xPbCE)#xzNr9&Z-Id|x3|tdP9K0Ab+vp092^4U zWy)Uncz1tqZ~va@^!EdK+H$Jq2;l($000SaNLh0L04^f{04^f|c%?sf0000PNklY*l9FN|1u!v?2u3xGY8W~i03u@mZiNbe8~^|S07*qoM6N<$f-OeT*Z=?k literal 0 HcmV?d00001 diff --git a/Assets/Textures/Charcoal.png.meta b/Assets/Textures/Charcoal.png.meta new file mode 100644 index 0000000..f42425e --- /dev/null +++ b/Assets/Textures/Charcoal.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b00aa27389e39ee4094bf6d7f6bcaabf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Dirt.png b/Assets/Textures/Dirt.png new file mode 100644 index 0000000000000000000000000000000000000000..3ede07fba5966ddb92e667a4e3ef32e6d677fed5 GIT binary patch literal 1157 zcmV;01bX|4P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGj@=*(hTmC5mw<2BEQfHBx`QsiKS}1ybUJFM zYNfs$tP@AX*v6khC(UnPSNeiM9yzIblv+y0(5jUiULwDadFyMAvYyYELHCo=haVVP zpyir$y}!ym|6*Sr8je2rK=y8dJi_qXz~1h8&iq40h+Oj95wE|sMyxfj-8C&JL%B9} zg-9=MV0fTPaxNGoW4m2&(S8X5zqULaS8sFPJip*>FDX`>FDX`>FDX` z>F7T@l7+tyHGK!cM^wnXME~Ug00Dz(LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PL zN<}IT?I7Zip*mR*6>*eSEP{p7R%q412R|084ld5RI=Bjg;0K74 zqm!bGl=#1-&?3fz<9@um_qclp2(21Z&A=p}YL<~n#>ISLRSdo&fG~hj#3W|wsqA77 zp5yBtKEB??c$W9MKgXa_G#TI%iRYPaSi~E|vzwOAd7n7KDw0BcPCQ}I1&JTIF1!53 zx$LmOGb2VWlOT=|i{&1cdze)Wm3W3Ys;C;}3wf6n&Rd+-T7z}&$zK>MYAac;JIy4q zgcQ;cA)|pRYOoNaRU^ejhW6tg{t?HYCYMaEDi}EyP=^Z1@q_=t?{3Y~^pu+viUWNw zw*4^%1b2aU)3(2lZM%H}_@99*t?RG1fVof7n_Vq>1PpBh7uQ`)-UBXofZ-=yG9*Xx z(-cZ2;QfrgsQ`p;fq^x*x6VFJAAlTnwR{5{90KEI%3k+)cYkkh|DNge_XBy_a;h5g zymJ5m010qNS#tmYE+YT{E+YYWr9XB6000?DL_t(2&tnX7Gh!eGFfot_Mm3CT7&;mN Xomv3u8{JEj00000NkvXXu0mjfN8c5X literal 0 HcmV?d00001 diff --git a/Assets/Textures/Dirt.png.meta b/Assets/Textures/Dirt.png.meta new file mode 100644 index 0000000..fce7e48 --- /dev/null +++ b/Assets/Textures/Dirt.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3da53fb564a703d48aa6a495a9d8d059 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/Grass.png b/Assets/Textures/Grass.png new file mode 100644 index 0000000000000000000000000000000000000000..2d11c7e2a83ddb0b15d1dbd7612703c2832f79ff GIT binary patch literal 503 zcmVEX>4Tx04R}tkv&MmKpe$i(@I4u4(%Y~kfAzR5EXHhRxE;r(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;lcSTOi>Z$Bv4xZ!d9zMR_#dwzYxj)CCQZyOh6N%@UZdk+{#Iu{0 z&Uv3W!YYzNd`>)J&;^Mfxh}i>#<}dUz%wI8E|VaR5R2s=mV20043&6>II5@`nv4j-T5Fw+1Dr&G0qg5ltM27a`9{v%>pC*?~t|}Ng z7Ep%@$?=2#!S8O(()5&@6p90VFSh+L1_XD3cGI@Mk8Qhs0{EYSE3NCVw}81%(wki^ zdISt@0~gm_P2K}8cYxt1T{0v`^3xPbCE)#xzNr9&Z-Id|x3|tdP9K0Ab+vp092^4U zWy)Uncz1tqZ~va@^!EdK+H$Jq2;l($000SaNLh0L04^f{04^f|c%?sf0000QNklYzpYF;)3SeR&5sYdW)i884008!p0b7i0hlT(E002ovPDHLkV1iK!)oK6$ literal 0 HcmV?d00001 diff --git a/Assets/Textures/Grass.png.meta b/Assets/Textures/Grass.png.meta new file mode 100644 index 0000000..6d0f982 --- /dev/null +++ b/Assets/Textures/Grass.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 820c2875b7733f6409b06f7ca97a73ad +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 561357e..e8cb106 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -17,7 +17,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffbffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: ffefffffffefffffffefffffffffffffffefffffffefffffffffffffffffffffffefffffffefffffffe7fffffffbffffc8e8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 75642c6..2b53b7a 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -19,7 +19,7 @@ TagManager: - Campfire - Item - Player - - + - Player-only Colliders - - -