Merge branch 'master' of https://github.com/AnonymusRaccoon/New-Unity-Project

Assets/Scenes/SampleScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872713, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -8919,8 +8919,8 @@ MonoBehaviour:
   m_outlineColor:
     serializedVersion: 2
     rgba: 4278190080
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 24
+  m_fontSizeBase: 24
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -8965,7 +8965,7 @@ MonoBehaviour:
     spaceCount: 9
     wordCount: 10
     linkCount: 0
-    lineCount: 3
+    lineCount: 2
     pageCount: 1
     materialCount: 1
   m_havePropertiesChanged: 0
@@ -13289,7 +13289,7 @@ MonoBehaviour:
   - {fileID: 798873072}
   items:
   - type: 1
-    description: A regular and completly normal apple tree
+    description: 'Apple tree: A completly normal tree'
     icon: {fileID: 21300000, guid: 5014488f5c2b6164d8e76a2a4b68969f, type: 3}
     iconGris: {fileID: 21300000, guid: 8b8e327a290a7da4ebdeb014e2863c6e, type: 3}
     tiles:
@@ -13386,7 +13386,7 @@ MonoBehaviour:
     canBePlacedOn: 0
     count: 0
   - type: 5
-    description: 
+    description: This tree swap it's position with it's surrounding tree
     icon: {fileID: 21300000, guid: 632fdd0b5928dfc40b00b5cb328dab12, type: 3}
     iconGris: {fileID: 21300000, guid: 1640efb3bcc88e14fafb6f62de15e1ac, type: 3}
     tiles:
@@ -13434,7 +13434,7 @@ MonoBehaviour:
     canBePlacedOn: -1
     count: 0
   - type: 7
-    description: 
+    description: This dry treedesperately need water
     icon: {fileID: 21300000, guid: 435e6a6ec8a286642b6e3d806a4df4a2, type: 3}
     iconGris: {fileID: 21300000, guid: ef29ac5abb1733d4c8a523736c325205, type: 3}
     tiles:
@@ -13458,7 +13458,7 @@ MonoBehaviour:
     canBePlacedOn: 16
     count: 0
   - type: 8
-    description: 
+    description: This tree canboth be placed on dry tile and regular tile
     icon: {fileID: 21300000, guid: 3db57d319be56e549bcab5adcebba956, type: 3}
     iconGris: {fileID: 21300000, guid: fce0d70ab60dddb4bba88e2e7854936e, type: 3}
     tiles:
@@ -13654,7 +13654,7 @@ MonoBehaviour:
   minDrop: 1
   itemDrop: 5
   MinArbre: 1
-  MaxArbre: 4
+  MaxArbre: 5
 --- !u!1 &1774186325 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1472403156812664, guid: 89e9215b05511f648b3306ce05aae35f,