diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index a8620bfcca5ff203bfcc0a1af2940c9164bcd6a0..9f7160b1bdfc95bc5d45630c1dce98b06a4a5502 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -11157,6 +11157,18 @@ PrefabInstance: propertyPath: m_Text value: Save objectReference: {fileID: 0} + - target: {fileID: 11495182, guid: 1ea864171e6acaf46af1353b799103d7, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11495182, guid: 1ea864171e6acaf46af1353b799103d7, type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11495182, guid: 1ea864171e6acaf46af1353b799103d7, type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} - target: {fileID: 22475538, guid: 1ea864171e6acaf46af1353b799103d7, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/Scripts/Player/PlayerGold.cs b/Assets/Scripts/Player/PlayerGold.cs index 4928dcf55420474fc089d21c8da480deda3d74ef..a2234fde65601de361fe377f588e9afbc978d15a 100644 --- a/Assets/Scripts/Player/PlayerGold.cs +++ b/Assets/Scripts/Player/PlayerGold.cs @@ -12,6 +12,11 @@ public class PlayerGold : MonoBehaviour return goldAmount; } + public void setGoldAmount(int goldAmount) + { + this.goldAmount = goldAmount; + } + public void increaseGoldAmount(int gold) { this.goldAmount += gold; diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs index 3471bceae9b052f0118d8516c3d6a7b16be278c4..fce94f98868e8b6179d71efec9731e5374af7e4b 100644 --- a/Assets/Scripts/Quest/QuestManager.cs +++ b/Assets/Scripts/Quest/QuestManager.cs @@ -150,4 +150,10 @@ public class QuestManager : MonoBehaviour return activeQuestIdx; } + public void setQuestIdx(int questNum) + { + this.activeQuestIdx = questNum; + nextQuest(); + } + } diff --git a/Assets/Scripts/Save/SaveHandler.cs b/Assets/Scripts/Save/SaveHandler.cs index 23a2696b0dd8a8ba03ff40f175a4a96dbe6cdca0..db9682eb8a34600da7bf07e67057b525a12442ee 100644 --- a/Assets/Scripts/Save/SaveHandler.cs +++ b/Assets/Scripts/Save/SaveHandler.cs @@ -85,8 +85,14 @@ public class SaveHandler : MonoBehaviour public void OnLoadGame() { - SaveData data = (SaveData)SaveManager.Load("save1"); - Debug.Log(data.questIdx); + GameObject player = GameObject.FindGameObjectWithTag("Player"); + QuestManager questManager = GetComponent<QuestManager>(); + SaveData data = (SaveData)SaveManager.Load("1_left"); // change + player.transform.position = data.playerPosition; + player.transform.rotation = data.playerRotation; + player.GetComponent<PlayerHealth>().currentHealth = data.playerHealth; + player.GetComponent<PlayerGold>().setGoldAmount(data.goldAmount); + questManager.setQuestIdx(data.questIdx); } public Dictionary<int, Tuple<string, DateTime>> preprocessFileName(string[] files_str)