diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 21ff52a..bc8e331 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1} + m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -14478,9 +14478,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b4b4a071451fb1c47af7fedbbf6a4179, type: 3} m_Name: m_EditorClassIdentifier: - difficulte: 5 + easy: 4 + hard: 8 minDrop: 1 - itemDrop: 5 + maxDrop: 10 + fewTree: 0 + manyTree: 4 WinUI: {fileID: 1264435080} LooseUI: {fileID: 1470635746} --- !u!1 &1774186325 stripped diff --git a/Assets/Script/InventoryManager.cs b/Assets/Script/InventoryManager.cs index 7776866..d29bec1 100644 --- a/Assets/Script/InventoryManager.cs +++ b/Assets/Script/InventoryManager.cs @@ -145,13 +145,21 @@ public class InventoryManager : MonoBehaviour public void PlaceRandomTrees(int number) { + TreeItem[] trees = items.Where(x => x.type != TreeType.Nothing).ToArray(); for (int i = 0; i < number; i++) { + TreeItem tree = trees[Random.Range(0, trees.Length)]; int index = Random.Range(0, plots.Length); - if(plots[index].treePlaced == TreeType.Nothing) - index = Random.Range(0, plots.Length); - PlaceTree(items[Random.Range(0, items.Length)], index); + while(!CanPlantAt(index, tree)) + { + print(index); + index++; + if (index > plots.Length) + continue; + } + + PlaceTree(tree, index); } } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 74d7b53..9e432d1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,8 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index f327fe1..863581f 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,7 +3,7 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: