mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 캐릭터 최초 생성 시에 발생하는 exception 처리

Browse Source
This commit is contained in:
aube.lee
2025-02-17 10:03:23 +09:00
parent d6975c623f
commit e64919215b
10 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gameton-06/Assets/Gameton/Resources/GameData/heart.json
View File

@@ -1,8 +0,0 @@
[
{
"characterId": 0,
"currentHearts": 3,
"heartRechargeTime": 0,
"lastHeartTime": ""
}
]

7
Gameton-06/Assets/Gameton/Resources/GameData/heart.json.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: e8666d47c97d4d347aa8687892718f69
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14
Gameton-06/Assets/Gameton/Resources/GameData/player.json
View File

@@ -1,14 +0,0 @@
[
{
"id": 0,
"type": "w",
"name": "lulu",
"level": 3,
"experience": 0,
"hp": 1000,
"mp": 1000,
"attackPower": 50,
"defensivePower": 30,
"critical": 30
}
]

7
Gameton-06/Assets/Gameton/Resources/GameData/player.json.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a4dee2e685350b1458b15992a0fdfc34
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

36
Gameton-06/Assets/Gameton/Scripts/Character/Heart/HeartDataManager.cs
View File

@@ -52,7 +52,7 @@ namespace TON
public void SetCurrentUserHeart()
{
characterId = PlayerPrefs.GetInt("SelectedPlayerIndex", -1);
if (characterId > -1)
if (characterId > -1 && heartDatas.Count > 0)
{
currentHeartData = heartDatas[characterId];
if (currentHeartData != null)
@@ -85,9 +85,16 @@ namespace TON
{
if (currentHeartData.currentHearts >= maxHearts) return;
DateTime lastTime = DateTime.Parse(currentHeartData.lastHeartTime);
TimeSpan timePassed = DateTime.Now - lastTime;
DateTime lastTime;
bool hasValidTime = DateTime.TryParse(currentHeartData.lastHeartTime, out lastTime);
if (!hasValidTime)
{
lastTime = DateTime.Now; // 기본값 설정
currentHeartData.lastHeartTime = lastTime.ToString();
}
TimeSpan timePassed = DateTime.Now - lastTime;
int heartsToRecover = (int)(timePassed.TotalSeconds / heartRechargeTime);
if (heartsToRecover > 0)
@@ -109,16 +116,23 @@ namespace TON
if (currentHeartData.currentHearts > 0)
{
currentHeartData.currentHearts--;
// lastHeartTime이 비어있거나 잘못된 경우를 대비하여 기본값 설정
DateTime lastTime;
bool hasValidTime = DateTime.TryParse(currentHeartData.lastHeartTime, out lastTime);
if (!hasValidTime)
{
lastTime = DateTime.Now; // 기본값을 현재 시간으로 설정
currentHeartData.lastHeartTime = lastTime.ToString();
}
// 재충전 중일 경우 lastHeartTime을 유지
DateTime lastTime = DateTime.Parse(currentHeartData.lastHeartTime);
TimeSpan timePassed = DateTime.Now - lastTime;
// 재충전 시간이 지났거나, 처음 소모하여 재충전이 시작될 때만 lastHeartTime 갱신
if (timePassed.TotalSeconds >= heartRechargeTime || currentHeartData.currentHearts == maxHearts - 1)
{
currentHeartData.lastHeartTime = DateTime.Now.ToString();
}
SaveHeartData();
FindObjectOfType<HeartSystem>().UpdateHeartUI(); // UI 업데이트
}
@@ -129,7 +143,15 @@ namespace TON
{
if (currentHeartData.currentHearts >= maxHearts) return 0;
DateTime lastTime = DateTime.Parse(currentHeartData.lastHeartTime);
DateTime lastTime;
bool hasValidTime = DateTime.TryParse(currentHeartData.lastHeartTime, out lastTime);
if (!hasValidTime)
{
lastTime = DateTime.Now; // 기본값 설정
currentHeartData.lastHeartTime = lastTime.ToString();
}
TimeSpan timePassed = DateTime.Now - lastTime;
int timeLeft = heartRechargeTime - (int)timePassed.TotalSeconds;

12
Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs
View File

@@ -23,8 +23,7 @@ namespace TON
public void Initalize()
{
LoadPlayerData();
// 현재 플레이어 1개만 사용하므로 0번째 인덱스의 플레이어 데이터를 사용
PlayerPrefs.SetInt("SelectedPlayerIndex", 0);
// PlayerPrefs.SetInt("SelectedPlayerIndex", 0);
}
private void LoadPlayerData()
@@ -88,12 +87,13 @@ namespace TON
public void SetCurrentUserData()
{
int characterId = PlayerPrefs.GetInt("SelectedPlayerIndex", -1);
if (characterId > -1)
if (playersData.Count > 0)
{
player = playersData[characterId];
// 현재 플레이어 1개만 사용하므로 0번째 인덱스의 플레이어 데이터를 사용
PlayerPrefs.SetInt("SelectedPlayerIndex", 0);
player = playersData[0];
// FIXME: 테스트를 위해 캐릭터 레벨 강제 적용함
player.level = 15;
// player.level = 15;
}
else
{

3
Gameton-06/Assets/Gameton/Scripts/Common/JSONLoader.cs
View File

@@ -121,7 +121,8 @@ namespace TON
}
else
{
Debug.LogError($"❌ Resources에서 JSON 파일을 찾을 s수 없음: {path}");
Debug.LogError($"❌ Resources에서 JSON 파일을 찾을 수 없음: {path}");
File.WriteAllText(persistentPath, "[]");
}
}

4
Gameton-06/Assets/Gameton/Scripts/Common/Main.cs
View File

@@ -28,10 +28,6 @@ namespace TON
// TODO : GameDataModel.Singleton.Initalize();
PlayerDataManager.Singleton.Initalize();
PlayerDataManager.Singleton.SetCurrentUserData();
StageManager.Singleton.Initialize();
SkillDataManager.Singleton.Initalize();
isIniaialized = true;
}

3
Gameton-06/Assets/Gameton/Scripts/GameData/HeartData.cs
View File

@@ -18,7 +18,8 @@ namespace TON
public HeartData(int characterId)
{
this.characterId = characterId;
// currentHearts = maxHearts;
currentHearts = 3;
lastHeartTime = null;
}
}

6
Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs
View File

@@ -21,6 +21,12 @@ namespace TON
yield return null;
}
PlayerDataManager.Singleton.SetCurrentUserData();
StageManager.Singleton.Initialize();
SkillDataManager.Singleton.Initalize();
UIManager.Show<LobbyUI>(UIList.LobbyUI);
UIManager.Show<OptionUI>(UIList.OptionUI);
}