diff --git a/Tenebrissilva/Assets/_Project/Prefabs/Foliage/Mushrooms/MagicTree1.prefab b/Tenebrissilva/Assets/_Project/Prefabs/Foliage/Mushrooms/MagicTree1.prefab index 1340d6b4c3b0178d059a2cc05c82b58eaf6e87bf..d0ab52d19cc104acda97bfe2f0e9961dcc480ea3 100644 --- a/Tenebrissilva/Assets/_Project/Prefabs/Foliage/Mushrooms/MagicTree1.prefab +++ b/Tenebrissilva/Assets/_Project/Prefabs/Foliage/Mushrooms/MagicTree1.prefab @@ -202,7 +202,7 @@ MeshCollider: m_GameObject: {fileID: 1973499774741761800} m_Material: {fileID: 13400000, guid: 3a1a31dc5ffea42aab5a335cefda89b9, type: 2} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 diff --git a/Tenebrissilva/Assets/_Project/Scenes/DarkWorld.unity b/Tenebrissilva/Assets/_Project/Scenes/DarkWorld.unity index 435041d865445bd674d69a713b3da1ab0a175f26..f681cc34af783f11bf88291e390c1188af6f27dd 100644 --- a/Tenebrissilva/Assets/_Project/Scenes/DarkWorld.unity +++ b/Tenebrissilva/Assets/_Project/Scenes/DarkWorld.unity @@ -1229,7 +1229,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_LocalScale.x @@ -1847,7 +1847,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22996 + m_Name: pb_Mesh100574 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2050,7 +2050,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_LocalPosition.x @@ -3255,7 +3255,7 @@ Transform: - {fileID: 88393570} - {fileID: 562283320} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &412061868 PrefabInstance: @@ -3453,7 +3453,7 @@ Transform: - {fileID: 1715731167} - {fileID: 2060246867256326983} m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &435552035 PrefabInstance: @@ -3914,6 +3914,103 @@ Transform: m_CorrespondingSourceObject: {fileID: 1972021797220598192, guid: dbb099659b24349e99b6ffb6eec939e7, type: 3} m_PrefabInstance: {fileID: 484293659} m_PrefabAsset: {fileID: 0} +--- !u!1001 &537379706 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2654847159329368140, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 2779354496351491452, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Name + value: House5 + objectReference: {fileID: 0} + - target: {fileID: 3162850456499699167, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalScale.x + value: 1.5041 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalScale.y + value: 1.5041 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalScale.z + value: 1.5041 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalPosition.x + value: 453.14 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalPosition.y + value: 140.27 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalPosition.z + value: 279.18 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalRotation.w + value: -0.582461 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.8128587 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -251.248 + objectReference: {fileID: 0} + - target: {fileID: 3303830804720390086, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5970168098437937781, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 6738034558475163461, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 6785223149711423271, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 6836267611689747163, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + - target: {fileID: 7639425771537766562, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ef80b278e3d91de4b9c38a6bba33c6f1, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: af82fc863fefab844b43d4b153ea3b6d, type: 3} --- !u!1 &537866756 GameObject: m_ObjectHideFlags: 0 @@ -4025,7 +4122,7 @@ RectTransform: - {fileID: 55398334} - {fileID: 1976095391} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5255,7 +5352,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &714546935 PrefabInstance: @@ -6161,7 +6258,7 @@ Transform: - {fileID: 1086256037} - {fileID: 1902239976} m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &831448406 GameObject: @@ -6302,7 +6399,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 8 objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_LocalPosition.x @@ -7351,7 +7448,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8989790311449474678, guid: 49d990520eaea68418ceff74f9764f1e, type: 3} propertyPath: m_RootOrder - value: 9 + value: 11 objectReference: {fileID: 0} - target: {fileID: 8989790311449474678, guid: 49d990520eaea68418ceff74f9764f1e, type: 3} propertyPath: m_LocalPosition.x @@ -7754,7 +7851,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_LocalScale.x @@ -8083,7 +8180,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_RootOrder - value: 7 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_LocalPosition.x @@ -9440,7 +9537,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: f8cd453d153b7445fbdda1f4d85011cb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 10 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f8cd453d153b7445fbdda1f4d85011cb, type: 3} propertyPath: m_LocalPosition.x @@ -10576,7 +10673,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2125934786063899372, guid: e60e6157495dd4ffa8b092892187bb12, type: 3} propertyPath: m_LocalScale.x @@ -11581,7 +11678,7 @@ Transform: - {fileID: 1736397947} - {fileID: 956641570} m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1592895979 Mesh: @@ -12108,7 +12205,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1612144168 MeshRenderer: @@ -12275,7 +12372,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4749576938505772380, guid: 185773291a05046bd89da5df90489d3c, type: 3} propertyPath: m_RootOrder - value: 4 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4749576938505772380, guid: 185773291a05046bd89da5df90489d3c, type: 3} propertyPath: m_LocalPosition.x @@ -13516,7 +13613,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1800144314 GameObject: @@ -15621,7 +15718,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_RootOrder - value: 5 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8740757922706577766, guid: 1fa2205f08aa94164bdd1bdd8c9a8c5f, type: 3} propertyPath: m_LocalPosition.x @@ -22667,7 +22764,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2964776069452984805} - m_LocalRotation: {x: 0.06288815, y: -0.7155454, z: 0.064963154, w: 0.6926901} + m_LocalRotation: {x: 0.06288815, y: -0.7155455, z: 0.064963154, w: 0.69269013} m_LocalPosition: {x: 4.997367, y: 3, z: 0.16225529} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -22699,7 +22796,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2964776069522006231} - m_LocalRotation: {x: -0.000000033527613, y: -0, z: -0.0000000037252903, w: 1} + 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: @@ -22790,7 +22887,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2964776069723448130} m_LocalRotation: {x: -0, y: 0.71848834, z: -0, w: 0.695539} - m_LocalPosition: {x: 303.43, y: 137.91, z: 690.46} + m_LocalPosition: {x: 347.41, y: 143.46, z: 872.3} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 513796621435119292} @@ -22992,7 +23089,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2964776070011568614} - m_LocalRotation: {x: -0.000000014901161, y: -0, z: 0.0000000037252903, w: 1} + 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: @@ -23024,7 +23121,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2964776070497966461} - m_LocalRotation: {x: -0.000000022351742, y: -0, z: -0, w: 1} + 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: diff --git a/Tenebrissilva/Assets/_Project/Terrain/DarkWorld_Terrain_1.asset b/Tenebrissilva/Assets/_Project/Terrain/DarkWorld_Terrain_1.asset index c30d481d8b737db675a83302f4931b2f5994ec91..d3fbb807da51a94c6cab34d066f2321b5749ccdd 100644 Binary files a/Tenebrissilva/Assets/_Project/Terrain/DarkWorld_Terrain_1.asset and b/Tenebrissilva/Assets/_Project/Terrain/DarkWorld_Terrain_1.asset differ diff --git a/Tenebrissilva/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/Tenebrissilva/ProjectSettings/Packages/com.unity.probuilder/Settings.json index a6290a4bb68ea2cc5a7be76be5339796c1e36900..ecb6b495a0ff44183eb469e67f157480395bee35 100644 --- a/Tenebrissilva/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/Tenebrissilva/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -101,7 +101,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.selectMode", - "value": "{\"m_Value\":0}" + "value": "{\"m_Value\":1}" }, { "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",