diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs index 90217c78fe8ec5e9e710205da07f3f827f7152d8..aa127050d5973456f2b7dfd027d6dfa43afa2e06 100644 --- a/Assets/Scripts/Inventory/Border.cs +++ b/Assets/Scripts/Inventory/Border.cs @@ -5,7 +5,7 @@ using UnityEngine; public class Border : MonoBehaviour { public Item itemNeeded; - public BoxCollider2D collider; + public BoxCollider2D forestCollider; private void OnCollisionEnter2D(Collision2D collision) { @@ -16,7 +16,7 @@ public class Border : MonoBehaviour if (Inventory.instance.hasItem(itemNeeded)) { Debug.Log("Je possède l'item nécessaire"); - collider.enabled = false; + forestCollider.enabled = false; } else diff --git a/Assets/Scripts/Inventory/Item.cs b/Assets/Scripts/Inventory/Item.cs index e927be827a9f58be1ea686c2ea65529b4ec32e21..cbaebf4a52552d0cf7892b519da5a0557d87a5aa 100644 --- a/Assets/Scripts/Inventory/Item.cs +++ b/Assets/Scripts/Inventory/Item.cs @@ -6,7 +6,7 @@ using UnityEngine; public class Item : ScriptableObject { public int id; - public string name; + public string nom; public string description; public Sprite image; diff --git a/Assets/Scripts/Scene/loadScene.cs b/Assets/Scripts/Scene/loadScene.cs index 4dce656f2efddd66b7cc863ac3bf41ee8bc1d4b9..d447b0004d47e523ec54920c5c31e1c20519d299 100644 --- a/Assets/Scripts/Scene/loadScene.cs +++ b/Assets/Scripts/Scene/loadScene.cs @@ -14,14 +14,14 @@ public class loadScene : MonoBehaviour public string scene; public Animator animmator; - public string name; + public string nom; public void ChargerScene() { animmator.SetBool("Change", true); year.text = "" + nextYear; - city.text = name; + city.text = nom; StartCoroutine(nextLevelTimer()); } diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs index ad98488ad8c8faeb317a5893c206afb6672754d2..1fc1c33ee40ce0c615094e3aa38c97474df86a3c 100644 --- a/Assets/Shopping.cs +++ b/Assets/Shopping.cs @@ -36,7 +36,6 @@ public class Shopping : MonoBehaviour break; } Inventory.instance.addItem(sellItem); - Destroy(itemForSale[0]); Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire"); } }