From 6361f3b23b5f611142e53893f3741ade3edd4a99 Mon Sep 17 00:00:00 2001
From: Nat10k <110515021+Nat10k@users.noreply.github.com>
Date: Fri, 10 May 2024 10:34:47 +0700
Subject: [PATCH] fix : invalid saved health load

---
 Assets/Scripts/Cutscene1Manager.cs    | 4 ++++
 Assets/Scripts/Player/PlayerHealth.cs | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Assets/Scripts/Cutscene1Manager.cs b/Assets/Scripts/Cutscene1Manager.cs
index 4593cc3..db21baa 100644
--- a/Assets/Scripts/Cutscene1Manager.cs
+++ b/Assets/Scripts/Cutscene1Manager.cs
@@ -8,6 +8,7 @@ public class Cutscene1Manager : MonoBehaviour
     // Start is called before the first frame update
     void OnEnable()
     {
+#if MOBILE_INPUT
         if (PlayerPrefs.GetInt("isAR", 0) != 0)
         {
             SceneManager.LoadScene("AR", LoadSceneMode.Single);
@@ -15,5 +16,8 @@ public class Cutscene1Manager : MonoBehaviour
         {
             SceneManager.LoadScene("Main", LoadSceneMode.Single);
         }
+#else
+        SceneManager.LoadScene("Main", LoadSceneMode.Single);
+#endif
     }
 }
diff --git a/Assets/Scripts/Player/PlayerHealth.cs b/Assets/Scripts/Player/PlayerHealth.cs
index ce62ec6..2838f95 100644
--- a/Assets/Scripts/Player/PlayerHealth.cs
+++ b/Assets/Scripts/Player/PlayerHealth.cs
@@ -126,12 +126,15 @@ namespace Nightmare
 
         public void LoadData(GameData data)
         {
-            this.currentHealth = data.playerHealth;
-            healthSlider.value = this.currentHealth;
+            if (data.playerHealth > 0)
+            {
+                this.currentHealth = data.playerHealth;
+                healthSlider.value = this.currentHealth;
+            }
         }
 
         public void SaveData(ref GameData data)
-        {
+        { 
             data.playerHealth = this.currentHealth;
         }
 
-- 
GitLab