From b639108f044cf259d6ec7c9eca0ed71a95ef2926 Mon Sep 17 00:00:00 2001 From: Thomlam Date: Mon, 28 Oct 2024 22:56:56 +0100 Subject: [PATCH 1/3] feat: Add first system for regen life with Altar --- Assets/Scripts/Map Control/RoomSystem/Altar.cs | 18 +++++------------- Assets/Scripts/UI/PlayerHealth.cs | 2 +- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Assets/Scripts/Map Control/RoomSystem/Altar.cs b/Assets/Scripts/Map Control/RoomSystem/Altar.cs index 6d981ede..1f2b0428 100644 --- a/Assets/Scripts/Map Control/RoomSystem/Altar.cs +++ b/Assets/Scripts/Map Control/RoomSystem/Altar.cs @@ -9,6 +9,8 @@ public class Altar : InteractableObject private bool isPlayerNearby = false; public GameObject interactionCanvas; + private PlayerHealth healthManager; + void Start() { @@ -26,19 +28,9 @@ void Update() public override void Interact(Player player) { - if (availableItems.Count > 0) - { - - string item = availableItems[0]; - player.AddItemToInventory(item); // Ajouter l'objet à l'inventaire du joueur - playerReceivedItems.Add(item); // Ajouter à la liste des objets reçus - availableItems.RemoveAt(0); // Retirer l'objet de la liste des objets disponibles - Debug.Log("L'autel vous a donné : " + item); - } - else - { - Debug.Log("L'autel n'a plus rien à vous offrir."); - } + healthManager = FindObjectOfType(); + healthManager.Heal(1); + Destroy(gameObject); } private void OnTriggerEnter2D(Collider2D collision) diff --git a/Assets/Scripts/UI/PlayerHealth.cs b/Assets/Scripts/UI/PlayerHealth.cs index 94f7753a..ad13988b 100644 --- a/Assets/Scripts/UI/PlayerHealth.cs +++ b/Assets/Scripts/UI/PlayerHealth.cs @@ -6,7 +6,7 @@ public class PlayerHealth : MonoBehaviour { - public int maxHealth = 5; // Points de vie maximum + public static int maxHealth = 5; // Points de vie maximum private int currentHealth; public GameObject heartPrefab; From 33558f0089a473866950f4d6f8957ca97cfd994a Mon Sep 17 00:00:00 2001 From: Thomlam Date: Mon, 28 Oct 2024 23:02:38 +0100 Subject: [PATCH 2/3] feat: upgrade the altar system for going into 7 HP --- Assets/Scripts/Map Control/RoomSystem/Altar.cs | 2 +- Assets/Scripts/UI/PlayerHealth.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/Map Control/RoomSystem/Altar.cs b/Assets/Scripts/Map Control/RoomSystem/Altar.cs index 1f2b0428..f181ccaa 100644 --- a/Assets/Scripts/Map Control/RoomSystem/Altar.cs +++ b/Assets/Scripts/Map Control/RoomSystem/Altar.cs @@ -30,7 +30,7 @@ public override void Interact(Player player) { healthManager = FindObjectOfType(); healthManager.Heal(1); - Destroy(gameObject); + Destroy(transform.parent.gameObject); } private void OnTriggerEnter2D(Collider2D collision) diff --git a/Assets/Scripts/UI/PlayerHealth.cs b/Assets/Scripts/UI/PlayerHealth.cs index ad13988b..3a745777 100644 --- a/Assets/Scripts/UI/PlayerHealth.cs +++ b/Assets/Scripts/UI/PlayerHealth.cs @@ -48,7 +48,9 @@ public void Heal(int amount) currentHealth += amount; if (currentHealth > maxHealth) { + if (maxHealth == 7){ currentHealth = maxHealth; + } else maxHealth +=1; } UpdateHealthBar(); } From 5f947152eef34092e95adc023ddcc6b81e90b51b Mon Sep 17 00:00:00 2001 From: Thomlam Date: Mon, 28 Oct 2024 23:56:24 +0100 Subject: [PATCH 3/3] chore: add system env. --- Assets/Scripts/Player/PlayerController.cs | 6 +++--- Assets/Scripts/SocketManager.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index b4c5fa0f..034d24a8 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -83,8 +83,8 @@ async void Start() try { - LoadEnvVariables(); - var socketUrl = Environment.GetEnvironmentVariable("SOCKET_URL"); + + var socketUrl = "https://api.godbless.loule.me/"; var uri = new Uri(socketUrl); clientSocket = SocketManager.Instance.ClientSocket; if (clientSocket == null) @@ -98,7 +98,7 @@ async void Start() } try { - env.TryParseEnvironmentVariable("SOCKET_URL", out string socketUrl); + var socketUrl = "https://api.godbless.loule.me/"; var uri = new Uri(socketUrl); clientSocket = SocketManager.Instance.ClientSocket; diff --git a/Assets/Scripts/SocketManager.cs b/Assets/Scripts/SocketManager.cs index 6cdaccf5..1e3f7ba2 100644 --- a/Assets/Scripts/SocketManager.cs +++ b/Assets/Scripts/SocketManager.cs @@ -56,11 +56,11 @@ private void LoadEnvVariables() private async Task SetupSocket() { - LoadEnvVariables(); + // LoadEnvVariables(); try { - var socketUrl = Environment.GetEnvironmentVariable("SOCKET_URL"); + var socketUrl = "https://api.godbless.loule.me/"; var uri = new Uri(socketUrl); ClientSocket = new SocketIOUnity(uri); @@ -75,7 +75,7 @@ private async Task SetupSocket() try { - env.TryParseEnvironmentVariable("SOCKET_URL", out string socketUrl); + var socketUrl = "https://api.godbless.loule.me/"; var uri = new Uri(socketUrl); ClientSocket = new SocketIOUnity(uri);