From ff76dc028e8f9a170408b13fd9539dca5cb3c2f1 Mon Sep 17 00:00:00 2001
From: GIMENEZ TANGUY <tanguy.gimenez@etu.unistra.fr>
Date: Mon, 29 Mar 2021 10:01:51 +0200
Subject: [PATCH] truc
---
Assets/Scripts/GUI/Dialog.cs | 11 ++++++++++-
Assets/Scripts/Player/PlayerNature.cs | 7 +++++--
UserSettings/EditorUserSettings.asset | 3 +++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs
index 13a47b5..50e33bf 100644
--- a/Assets/Scripts/GUI/Dialog.cs
+++ b/Assets/Scripts/GUI/Dialog.cs
@@ -30,11 +30,20 @@ public class Dialog : MonoBehaviour
"Je fais un test pour le niveau 1",
"Ca marche bien nan ?",
"Melvyn t moch",
- "Valentin aussi"
+ "Valentin aussi",
+ "Raff est pas bo"
};
this.ListDialogs.Add("sceneTanguy", DialogsLvl1);
+ string[] Dialogsraff = {
+ "Salut",
+ "cava ?",
+ "Je te mange tes morts"
+ };
+
+ this.ListDialogs.Add("Niveau2", Dialogsraff);
+
if (this.dialogActive)
this.dialogText.text = this.ListDialogs[SceneManager.GetActiveScene().name][0];
}
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index 0a8043a..095bbef 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -44,7 +44,7 @@ public class PlayerNature : MonoBehaviour
void Update()
{
- //on
+ //toutes les x secondes => on perd un certain nombre de secondes
if (Time.time > nextActionTime)
{
nextActionTime += period;
@@ -57,10 +57,13 @@ public class PlayerNature : MonoBehaviour
}
// Perd un certain nombre de points de nature
-
public void LooseNature(int damage)
{
this.currentNature -= damage;
+
+ if(this.currentNature < 0)
+ this.currentNature = 0;
+
this.natureBar.SetValue(this.currentNature);
}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 91021f1..d53393a 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -17,6 +17,9 @@ EditorUserSettings:
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c71190012193f7e66333e243d04
flags: 0
+ RecentlyUsedScenePath-4:
+ value: 22424703114646680e0b0227036c72151802563f22213229
+ flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
--
GitLab