Merge branch 'master' of git.unistra.fr:chirz/cityescape

Assets/Scenes/sceneRaffael.unity

@@ -5596,7 +5596,7 @@ BoxCollider2D:
   m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
-  m_Offset: {x: -11.424435, y: -7.6097336}
+  m_Offset: {x: -11.424435, y: -9.144066}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0, y: 0}
@@ -5607,7 +5607,7 @@ BoxCollider2D:
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 49.0467, y: 4.449005}
+  m_Size: {x: 49.0467, y: 7.5176697}
   m_EdgeRadius: 0
 --- !u!4 &1467294797 stripped
 Transform:

Assets/Scripts/Player/PlayerNature.cs

@@ -8,8 +8,6 @@ using System;
 using System.Timers;
 
 public class PlayerNature : MonoBehaviour
-
-    
 {
 
     // l'instance de PlayerNature (pour un singleton)
@@ -41,6 +39,8 @@ public class PlayerNature : MonoBehaviour
 
 
     }
+
+
     void Update()
     {
 

Assets/Shopping.cs

@@ -55,7 +55,6 @@ public class Shopping : MonoBehaviour
 
         if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown("joystick button 1")) && playerInRange && sellItem && itemForSale.Count > 0)
         {
-            PlayerNature.instance.LooseNature(25);
             switch (sellItem.id)
             {
                 case 1:

ProjectSettings/EditorBuildSettings.asset

@@ -5,10 +5,10 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Niveau1.unity
     guid: 2cda990e2423bbf4892e6590ba056729
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Menu.unity
     guid: 458707c07ba6b4b4297fc1de6ac38622
   - enabled: 1
@@ -17,10 +17,10 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/sceneRaffael.unity
     guid: bdf7662389bf8487c9a7909d08af8c3e
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Valentin.unity
     guid: 8c9ceab1c999ea749aa0fe2b0c87b0bf
-  - enabled: 0
+  - enabled: 1
     path: Assets/Scenes/Niveau2.unity
     guid: 4ae30febc4f91474fa9164b85521aaf5
   - enabled: 1