From b961e0278090ee286080422342cf3e51a0c31831 Mon Sep 17 00:00:00 2001
From: Raffael Di Pietro <maxou4170@gmail.com>
Date: Mon, 29 Mar 2021 14:20:16 +0200
Subject: [PATCH] merge
---
Assets/Scripts/GUI/Dialog.cs | 14 ++++++++++----
Assets/Scripts/Inventory/Border.cs | 9 +++++----
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index d12ef42..1e073f8 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -77,11 +77,17 @@ public class Dialog : MonoBehaviour
"Ouvrir le menu c'est avec",
"la touche E chacal"
};
+ this.ListDialogs.Add("Marchand", DialogMarchand);
+
+ string[] DialogChaussure = {
+ "Ouvrir le menu c'est avec",
+ "la touche E chacal"
+ };
+ this.ListDialogs.Add("Chaussures", DialogChaussure);
- this.ListDialogs.Add("marchand", DialogMarchand);
if (this.dialogActive)
- this.Situation("start");
+ this.setSituation("start");
}
// Update is called once per frame
@@ -99,7 +105,7 @@ public class Dialog : MonoBehaviour
{
Debug.Log("tut");
- this.Situation("marchand");
+ this.setSituation("marchand");
}
if(this.dialogActive)
@@ -126,7 +132,7 @@ public class Dialog : MonoBehaviour
}
// Ouvre une bulle de dialogue dans une situation donnée
- void Situation(string sit)
+ public void setSituation(string sit)
{
this.situation = sit;
this.dialog = 0;
diff --git a/Assets/Scripts/Inventory/Border.cs b/Assets/Scripts/Inventory/Border.cs
index 278fed3..d00772b 100644
--- a/Assets/Scripts/Inventory/Border.cs
+++ b/Assets/Scripts/Inventory/Border.cs
@@ -5,7 +5,6 @@ using UnityEngine;
public class Border : MonoBehaviour
{
public Item itemNeeded;
- public Inventory inventory;
public BoxCollider2D collider;
private void OnCollisionEnter2D(Collision2D collision)
@@ -14,15 +13,17 @@ public class Border : MonoBehaviour
{
Debug.Log("JE TOUCHE LA BORDEER");
- if (inventory.hasItem(itemNeeded))
+ if (Inventory.instance.hasItem(itemNeeded))
{
Debug.Log("Je possède l'item nécessaire");
collider.enabled = false;
}
else
- Debug.Log("Je ne possède pas l'item nécessaire");
-
+ {
+ Debug.Log("Je n'ai pas l'item nécessaire");
+ Dialog.instance.setSituation("Chaussures");
+ }
}
}
--
GitLab