Merge branch 'master' into 'master'

AJout de la première scène See merge request chirz/cityescape!24

Merge branch 'master' into 'master'
AJout de la première scène See merge request chirz/cityescape!24
da0bebab · BLOCH VALENTIN · 80bf5df4 · 29e83a12 · da0bebab · da0bebab
Commit da0bebab authored 4 years ago by BLOCH VALENTIN
--- a/Assets/Import/basic-environment/Overworld.png.meta
+++ b/Assets/Import/basic-environment/Overworld.png.meta
--- a/Assets/Palets/basic-environment/overworld.prefab
+++ b/Assets/Palets/basic-environment/overworld.prefab
--- a/Assets/Prefabs/Verdure/buisson.prefab
+++ b/Assets/Prefabs/Verdure/buisson.prefab
@@ -73,7 +73,7 @@ SpriteRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 1
+  m_SortingOrder: 50
  m_Sprite: {fileID: 21300000, guid: 9a3da46151bad6b47a98a789649aebeb, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -179,4 +179,4 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c2eed50797895184ab44621a154ad526, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  nbPoints: 5
+  nbPoints: 25
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!162 &1
+EditorUserSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 4
+  m_ConfigSettings:
+    RecentlyUsedScenePath-0:
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      flags: 0
+    vcSharedLogLevel:
+      value: 0d5e400f0650
+      flags: 0
+  m_VCAutomaticAdd: 1
+  m_VCDebugCom: 0
+  m_VCDebugCmd: 0
+  m_VCDebugOut: 0
+  m_SemanticMergeMode: 2
+  m_VCShowFailedCheckout: 1
+  m_VCOverwriteFailedCheckoutAssets: 1
+  m_VCProjectOverlayIcons: 1
+  m_VCHierarchyOverlayIcons: 1
+  m_VCOtherOverlayIcons: 1
+  m_VCAllowAsyncUpdate: 1