From c6010d3747f61b11bc23d87f0281d7f979c42d32 Mon Sep 17 00:00:00 2001 From: bewe <93899302+bernarduswillson@users.noreply.github.com> Date: Sat, 11 May 2024 14:44:05 +0700 Subject: [PATCH] fix: global pref --- Assets/Scenes/MainMenu.unity | 69 ++++++++++++++++++++++++ Assets/Script/Menu/LoadMenu.cs | 4 +- Assets/Script/Player/GlobalPreference.cs | 21 +------- Assets/Script/Shop/Shop.cs | 5 +- Assets/Script/Stage/StageManager.cs | 31 +++++++++++ 5 files changed, 109 insertions(+), 21 deletions(-) diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7f714489..79094134 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -8557,6 +8557,74 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389716654} m_CullTransparentMesh: 1 +--- !u!1001 &1407203997 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalPosition.x + value: 307.4222 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalPosition.y + value: 250.74649 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalPosition.z + value: -176.33171 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 43553817601766637, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2742978964631120395, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, + type: 3} + propertyPath: m_Name + value: GlobalPreference + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7c7e5b61da9f5ea4ca1609807df6bd8d, type: 3} --- !u!1 &1410538339 GameObject: m_ObjectHideFlags: 0 @@ -13036,3 +13104,4 @@ SceneRoots: - {fileID: 672790602} - {fileID: 1196416683} - {fileID: 727113780} + - {fileID: 1407203997} diff --git a/Assets/Script/Menu/LoadMenu.cs b/Assets/Script/Menu/LoadMenu.cs index a753fdfa..138acb86 100644 --- a/Assets/Script/Menu/LoadMenu.cs +++ b/Assets/Script/Menu/LoadMenu.cs @@ -79,7 +79,7 @@ public class LoadMenu : MonoBehaviour { StartCoroutine(StartGameWithDelay(2)); } - + AudioManager.instance.StopMusic(); } public void LoadGame2() { @@ -94,6 +94,7 @@ public class LoadMenu : MonoBehaviour { StartCoroutine(StartGameWithDelay(2)); } + AudioManager.instance.StopMusic(); } public void LoadGame3() { @@ -108,6 +109,7 @@ public class LoadMenu : MonoBehaviour { StartCoroutine(StartGameWithDelay(2)); } + AudioManager.instance.StopMusic(); } private IEnumerator StartGameWithDelay(int scene) diff --git a/Assets/Script/Player/GlobalPreference.cs b/Assets/Script/Player/GlobalPreference.cs index 2ddc7593..0b0ca4ec 100644 --- a/Assets/Script/Player/GlobalPreference.cs +++ b/Assets/Script/Player/GlobalPreference.cs @@ -60,25 +60,6 @@ public class GlobalPreference : MonoBehaviour playTimePref = PlayerPrefs.GetFloat("PlayTime"); goldPref = PlayerPrefs.GetFloat("Gold"); enemiesKilledPref = PlayerPrefs.GetFloat("EnemiesKilled"); - - if (SaveLoadManager.Instance.GetSaveData() != null) - { - SaveData data = SaveLoadManager.Instance.GetSaveData(); - - SetPlayerHealth(data.health); - SetPlayerGold(data.golds); - SetPlayerHealerPetHealth(data.healerPetHealth); - SetPlayerAttackPetHealth(data.attackPetHealth); - - SetDamageDealt((int)data.damage); - SetDistanceTraveled(data.distance); - SetBulletShot((int)data.bulletShot); - SetBulletHit((int)data.bulletHit); - SetPlayTime(data.playTime); - SetEnemiesKilled(data.enemiesKilled); - - setStageNumber((int)data.stageNumber); - } } // Start is called before the first frame update @@ -92,6 +73,8 @@ public class GlobalPreference : MonoBehaviour { Instance = this; } + + DontDestroyOnLoad(gameObject); } private void Update() diff --git a/Assets/Script/Shop/Shop.cs b/Assets/Script/Shop/Shop.cs index c4c6956c..b9f5ec67 100644 --- a/Assets/Script/Shop/Shop.cs +++ b/Assets/Script/Shop/Shop.cs @@ -62,7 +62,10 @@ public class Shop : MonoBehaviour { isTimer = false; closeTimer = 0; - ToggleShopUI(); + if (isShopOpen) + { + ToggleShopUI(); + } } } } diff --git a/Assets/Script/Stage/StageManager.cs b/Assets/Script/Stage/StageManager.cs index 1eede8aa..e6d98c82 100644 --- a/Assets/Script/Stage/StageManager.cs +++ b/Assets/Script/Stage/StageManager.cs @@ -32,6 +32,37 @@ public class StageManager : MonoBehaviour }*/ GameObject.Find("Gate").GetComponent<Animator>().SetTrigger("OpenGate"); } + + GlobalPreference.Instance.SetPlayerHealth(data.health); + GlobalPreference.Instance.SetPlayerGold(data.golds); + GlobalPreference.Instance.SetPlayerHealerPetHealth(data.healerPetHealth); + GlobalPreference.Instance.SetPlayerAttackPetHealth(data.attackPetHealth); + + GlobalPreference.Instance.SetDamageDealt((int)data.damage); + GlobalPreference.Instance.SetDistanceTraveled(data.distance); + GlobalPreference.Instance.SetBulletShot((int)data.bulletShot); + GlobalPreference.Instance.SetBulletHit((int)data.bulletHit); + GlobalPreference.Instance.SetPlayTime(data.playTime); + GlobalPreference.Instance.SetEnemiesKilled(data.enemiesKilled); + + GlobalPreference.Instance.setStageNumber((int)data.stageNumber); + } + + if (currentStage == 1) + { + GlobalPreference.Instance.SetPlayerHealth(100); + GlobalPreference.Instance.SetPlayerGold(0); + GlobalPreference.Instance.SetPlayerHealerPetHealth(0); + GlobalPreference.Instance.SetPlayerAttackPetHealth(0); + + GlobalPreference.Instance.SetDamageDealt(0); + GlobalPreference.Instance.SetDistanceTraveled(0); + GlobalPreference.Instance.SetBulletShot(0); + GlobalPreference.Instance.SetBulletHit(0); + GlobalPreference.Instance.SetPlayTime(0); + GlobalPreference.Instance.SetEnemiesKilled(0); + + GlobalPreference.Instance.setStageNumber(0); } StartNextStage(); -- GitLab