diff --git a/Assets/Scripts/GUI/Dialog.cs b/Assets/Scripts/GUI/Dialog.cs index 13a47b521412ab7b9449088790b1ff6212c7db4f..50e33bfa9d967ba4ec0befb5644968a5f85bf328 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 0a8043a1d3a4eb0fbb5b10288062428f7855c1da..095bbefac0d6357da983650bc264c15ef007087a 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 91021f166abeb74114be19c8d302d22a7ae10554..d53393a53acd545004ba1bb2ea2febbfe5d1c0d3 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