diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs index f2999520..048330db 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Assertions; namespace TON { @@ -25,7 +26,13 @@ namespace TON private void LoadHeartData() { - heartDatas = JSONLoader.LoadFromResources>("Heart"); + if (heartDatas != null) + { + heartDatas.Clear(); + } + + JSONLoader.SaveJsonToPersistentData("heart"); + heartDatas = JSONLoader.LoadJsonFromPersistentData>("Heart"); if (heartDatas == null) { heartDatas = new List(); @@ -37,8 +44,9 @@ namespace TON { HeartData heartData = new HeartData(characterId); heartDatas.Add(heartData); - JSONLoader.SaveToFile(heartDatas, "heart"); + Assert.IsTrue(JSONLoader.SaveUpdatedJsonToPersistentData(heartDatas, "heart")); Debug.Log($"heartData test:: {heartData.currentHearts}"); + LoadHeartData(); } public void SetCurrentUserHeart() @@ -68,7 +76,8 @@ namespace TON public void SaveHeartData() { heartDatas[characterId] = currentHeartData; - JSONLoader.SaveToFile(heartDatas, "heart"); + Assert.IsTrue(JSONLoader.SaveUpdatedJsonToPersistentData(heartDatas, "heart")); + LoadHeartData(); } // 게임이 다시 실행될때 마지막 하트 소모 시간과 현재 시간을 계산해서 하트 충전량을 반영 diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs index f02c51b9..bf809c09 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Assertions; namespace TON { @@ -18,9 +19,9 @@ namespace TON [SerializeField] private int defensiveGrowthFactor = 200; // 방어력 성장 변수 (조정 가능) - protected override void Awake() + + public void Initalize() { - base.Awake(); LoadPlayerData(); } @@ -78,7 +79,8 @@ namespace TON if (index > -1) { playersData[index] = player; - JSONLoader.SaveUpdatedJsonToPersistentData(playersData, "player"); + Assert.IsTrue(JSONLoader.SaveUpdatedJsonToPersistentData(playersData, "player")); + Initalize(); } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs index 8ffe3858..fb6222c7 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs @@ -43,11 +43,12 @@ namespace TON { Main.Singleton.Initialize(); - List playersData = PlayerDataManager.Singleton.playersData; + // List playersData = PlayerDataManager.Singleton.playersData; + PlayerDataManager.Singleton.Initalize(); PlayerPrefs.SetInt("SelectedPlayerIndex", 0); PlayerDataManager.Singleton.SetCurrentUserData(); // HeartDataManager.Singleton.(); - List skillDatas = SkillDataManager.Singleton.skillDatas; + // List skillDatas = SkillDataManager.Singleton.skillDatas; SkillDataManager.Singleton.Initalize(); // TODO : Custom Order After System Load