From bb8cfb834555d3a793ea37670e2193fde6b432f7 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 19 Apr 2020 04:08:38 +0300 Subject: [PATCH] Add tent --- Assets/Prefabs/Environment/Campfire.prefab | 46 --- Assets/Scenes/MainScene.unity | 313 ++++++--------------- Assets/Terrains/Forest Terrain.asset | Bin 1975508 -> 1975508 bytes ProjectSettings/TagManager.asset | 2 +- 4 files changed, 90 insertions(+), 271 deletions(-) diff --git a/Assets/Prefabs/Environment/Campfire.prefab b/Assets/Prefabs/Environment/Campfire.prefab index e25661d..a1b18ef 100644 --- a/Assets/Prefabs/Environment/Campfire.prefab +++ b/Assets/Prefabs/Environment/Campfire.prefab @@ -35,7 +35,6 @@ Transform: - {fileID: 8703236790229133739} - {fileID: 8279143985661205166} - {fileID: 664587661892241191} - - {fileID: 4680470241112840667} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -137,51 +136,6 @@ 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 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index e5122fc..00a2924 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -906,100 +906,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 466426407} m_PrefabAsset: {fileID: 0} ---- !u!1 &506855458 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 506855459} - - component: {fileID: 506855462} - - component: {fileID: 506855461} - - component: {fileID: 506855460} - m_Layer: 0 - m_Name: Tent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &506855459 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506855458} - m_LocalRotation: {x: 0.09697973, y: 0.8937207, z: -0.37019122, w: 0.23412979} - m_LocalPosition: {x: -7.06, y: 0.3, z: -4.08} - m_LocalScale: {x: 5.5016, y: 3, z: 3} - m_Children: - - {fileID: 2090879596} - m_Father: {fileID: 1161135096} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 45, y: 150.64001, z: 0} ---- !u!65 &506855460 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506855458} - 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 &506855461 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506855458} - 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 &506855462 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 506855458} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &612701634 PrefabInstance: m_ObjectHideFlags: 0 @@ -2066,37 +1972,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156509020} m_CullTransparentMesh: 0 ---- !u!1 &1161135095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1161135096} - m_Layer: 0 - m_Name: Placeholder Objects - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1161135096 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1161135095} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 506855459} - m_Father: {fileID: 1660514110} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1165177030 PrefabInstance: m_ObjectHideFlags: 0 @@ -2403,6 +2278,90 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1267955959} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1293177754 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5298320185909332155, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_Name + value: Tent + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.85 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalPosition.z + value: -2.73 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5004727 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.8657523 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 60.063004 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalScale.x + value: 1.6194947 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalScale.y + value: 1.6194947 + objectReference: {fileID: 0} + - target: {fileID: 9033857765742716543, guid: a266bcf30ea85ae4f8457cbcd97ad222, + type: 3} + propertyPath: m_LocalScale.z + value: 1.6194947 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a266bcf30ea85ae4f8457cbcd97ad222, type: 3} --- !u!1001 &1329349865 PrefabInstance: m_ObjectHideFlags: 0 @@ -3059,14 +3018,13 @@ Transform: - {fileID: 2038862784} - {fileID: 1195794718} - {fileID: 833188479} - - {fileID: 1161135096} - {fileID: 1872559113} - {fileID: 1559223405} - {fileID: 116564792} - {fileID: 1639218800} - {fileID: 1694329891} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1694329890 GameObject: @@ -3123,7 +3081,7 @@ Transform: - {fileID: 234379563} - {fileID: 1704854706} m_Father: {fileID: 1660514110} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1704854705 PrefabInstance: @@ -3572,7 +3530,7 @@ RectTransform: - {fileID: 1156509021} - {fileID: 429180126} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3741,99 +3699,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2039684479} m_PrefabAsset: {fileID: 0} ---- !u!1 &2090879595 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2090879596} - - component: {fileID: 2090879599} - - component: {fileID: 2090879598} - - component: {fileID: 2090879597} - m_Layer: 0 - m_Name: Tent Inner - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &2090879596 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090879595} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.07071069, z: 0.07071069} - m_LocalScale: {x: 1.0905918, y: 0.7333334, z: 0.73333335} - m_Children: [] - m_Father: {fileID: 506855459} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 45, y: 150.64001, z: 0} ---- !u!65 &2090879597 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090879595} - 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 &2090879598 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090879595} - 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 &2090879599 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2090879595} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &2096199221 PrefabInstance: m_ObjectHideFlags: 0 @@ -3998,7 +3863,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &531861614376686525 PrefabInstance: @@ -4233,7 +4098,7 @@ PrefabInstance: - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 6125707630481988396, guid: 558201eae20fa5540a826edb23937665, type: 3} diff --git a/Assets/Terrains/Forest Terrain.asset b/Assets/Terrains/Forest Terrain.asset index 24d46eeefafc0cfcad8552f9b9028d77772ecc5d..51628c2e42debaf9fce0e30870ea645d9b8b0f60 100644 GIT binary patch delta 220 zcmca|vf|3giiQ@(7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Ednu{wT``}Bg_0zA_T4hsl?_%ERRc%XvzhSMM{2*g4_EDXdVKr9NxVn8eo#1h*ZPD?)d z%eCL0fq~&a14DiN_Pmo)znIw|0_}NcrGQv^d)`@@e+^9YF7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#Ednu{r%yP~!7@GJ zumH#Ql+6Mh9NPq*~EC$5l zKrFGn;k4wFzhE=i?DsP;*zez-cT(yXGgySlet&!3St%fv-kx_>=3fKTdHwBqezHvq z*pC}CGdve&23e*sz2LBb0Hp-y_7Cr69n{%A@-Q&`WSJg+SU?f4k(}E%h|4YDWc