diff --git a/My project/Assets/Scenes/MainMenu.unity b/My project/Assets/Scenes/MainMenu.unity
index fd5749132a9eda60ce38cf698cc4ebe780e2ff07..8ef6924a184f0eb3195149555bfb1b1ab05f5e6b 100644
--- a/My project/Assets/Scenes/MainMenu.unity
+++ b/My project/Assets/Scenes/MainMenu.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18319191, g: 0.2267952, b: 0.29456133, a: 1}
+ m_IndirectSpecularColor: {r: 0.18319218, g: 0.2267955, b: 0.29456192, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -2365,6 +2365,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
warning: {fileID: 561318190}
+ inputField: {fileID: 0}
--- !u!4 &475671572
Transform:
m_ObjectHideFlags: 0
diff --git a/My project/Assets/Scenes/With Shop.unity b/My project/Assets/Scenes/With Shop.unity
index b56966422c6fc15bf0a38640e2e530ccf8eb8fec..48815266651581c5c1b640ccfe58bdc894cfaf07 100644
--- a/My project/Assets/Scenes/With Shop.unity
+++ b/My project/Assets/Scenes/With Shop.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18319191, g: 0.2267952, b: 0.29456133, a: 1}
+ m_IndirectSpecularColor: {r: 0.18319218, g: 0.2267955, b: 0.29456192, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3790,6 +3790,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
warning: {fileID: 0}
+ inputField: {fileID: 736451693}
--- !u!4 &661043724
Transform:
m_ObjectHideFlags: 0
@@ -11551,7 +11552,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1090002873
RectTransform:
m_ObjectHideFlags: 0
@@ -12711,10 +12712,10 @@ MonoBehaviour:
questObjectiveRequirement: 0
reward: 0
questUI: {fileID: 0}
- titleText: {fileID: 0}
- descText: {fileID: 0}
- progressText: {fileID: 0}
- rewardText: {fileID: 0}
+ titleText: {fileID: 1073709877}
+ descText: {fileID: 170038062}
+ progressText: {fileID: 911221047}
+ rewardText: {fileID: 1007236159}
--- !u!4 &1140854478
Transform:
m_ObjectHideFlags: 0
diff --git a/My project/Assets/Scripts/Managers/GameOverManager.cs b/My project/Assets/Scripts/Managers/GameOverManager.cs
deleted file mode 100644
index e4a081e0abaf7a158297c0c971409a6079681453..0000000000000000000000000000000000000000
--- a/My project/Assets/Scripts/Managers/GameOverManager.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-public class GameOverManager : MonoBehaviour
-{
- public PlayerHealth playerHealth;
- public float restartDelay = 5f;
-
-
- Animator anim;
- float restartTimer;
-
-
- void Awake()
- {
- anim = GetComponent<Animator>();
- }
-
-
- void Update()
- {
- if (playerHealth.currentHealth <= 0)
- {
- anim.SetTrigger("GameOver");
-
- restartTimer += Time.deltaTime;
-
- if (restartTimer >= restartDelay)
- {
- SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/My project/Assets/Scripts/Managers/GameOverManager.cs.meta b/My project/Assets/Scripts/Managers/GameOverManager.cs.meta
deleted file mode 100644
index 7d9ff5ee8079408acc807dcf00846b4834b028f8..0000000000000000000000000000000000000000
--- a/My project/Assets/Scripts/Managers/GameOverManager.cs.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d9c9e0011c2ed97428a4efc03b455359
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
diff --git a/My project/Assets/Scripts/Quest/QuestUI.cs b/My project/Assets/Scripts/Quest/QuestUI.cs
index e5a45fb1c1b529e4f04f5d6538e23654ab71e23c..82ca48f4bbde7c2cce547edc2108e3d43a71a95d 100644
--- a/My project/Assets/Scripts/Quest/QuestUI.cs
+++ b/My project/Assets/Scripts/Quest/QuestUI.cs
@@ -16,10 +16,10 @@ public class QuestUI : MonoBehaviour
void Start()
{
questManager = GameObject.Find("QuestManager").GetComponent<QuestManager>();
- titleText = GameObject.Find("Title").GetComponent<Text>();
- descText = GameObject.Find("Desc").GetComponent<Text>();
- progressText = GameObject.Find("Prog").GetComponent<Text>();
- rewardText = GameObject.Find("Reward").GetComponent<Text>();
+ // titleText = GameObject.Find("Title").GetComponent<Text>();
+ // descText = GameObject.Find("Desc").GetComponent<Text>();
+ // progressText = GameObject.Find("Prog").GetComponent<Text>();
+ // rewardText = GameObject.Find("Reward").GetComponent<Text>();
}
void Update()
diff --git a/My project/Assets/Scripts/SaveLoad/LoadUI.cs b/My project/Assets/Scripts/SaveLoad/LoadUI.cs
index dde5370b3e642ccf68136df281167c0100d6b300..300e490b014cd33acd7202dc493aadf95a13374c 100644
--- a/My project/Assets/Scripts/SaveLoad/LoadUI.cs
+++ b/My project/Assets/Scripts/SaveLoad/LoadUI.cs
@@ -8,14 +8,17 @@ using System.Runtime.Serialization.Formatters.Binary;
public class LoadUI : MonoBehaviour
{
- TMP_Text load1, load2, load3;
+ TMP_Text name1, name2, name3, date1, date2, date3;
// Start is called before the first frame update
void Start()
{
- load1 = GameObject.Find("Data1").GetComponent<TMP_Text>();
- load2 = GameObject.Find("Data2").GetComponent<TMP_Text>();
- load3 = GameObject.Find("Data3").GetComponent<TMP_Text>();
- SetDate();
+ name1 = GameObject.Find("Data1").GetComponent<TMP_Text>();
+ name2 = GameObject.Find("Data2").GetComponent<TMP_Text>();
+ name3 = GameObject.Find("Data3").GetComponent<TMP_Text>();
+ date1 = GameObject.Find("Date1").GetComponent<TMP_Text>();
+ date2 = GameObject.Find("Date2").GetComponent<TMP_Text>();
+ date3 = GameObject.Find("Date3").GetComponent<TMP_Text>();
+ SetData();
}
// Update is called once per frame
@@ -24,7 +27,7 @@ public class LoadUI : MonoBehaviour
}
- void SetDate()
+ void SetData()
{
string path1 = Application.persistentDataPath + "/slot1";
string path2 = Application.persistentDataPath + "/slot2";
@@ -41,18 +44,19 @@ public class LoadUI : MonoBehaviour
State save1 = formatter.Deserialize(stream) as State;
stream.Close();
+ name1.text = save1.saveSlotName;
if (lastmodified != null)
{
- load1.text = save1.saveSlotName + " " + lastmodified.ToString();
+ date1.text = lastmodified.ToString();
}
else
{
- load1.text = save1.saveSlotName + " " + created.ToString();
+ date1.text = created.ToString();
}
}
else
{
- load1.text = "Empty";
+ name1.text = "Empty";
}
if (File.Exists(path2))
@@ -66,18 +70,19 @@ public class LoadUI : MonoBehaviour
State save2 = formatter.Deserialize(stream) as State;
stream.Close();
+ name2.text = save2.saveSlotName;
if (lastmodified != null)
{
- load2.text = save2.saveSlotName + " " + lastmodified.ToString();
+ date2.text = lastmodified.ToString();
}
else
{
- load2.text = save2.saveSlotName + " " + created.ToString();
+ date2.text = created.ToString();
}
}
else
{
- load2.text = "Empty";
+ name2.text = "Empty";
}
if (File.Exists(path3))
@@ -91,18 +96,19 @@ public class LoadUI : MonoBehaviour
State save3= formatter.Deserialize(stream) as State;
stream.Close();
+ name3.text = save3.saveSlotName;
if (lastmodified != null)
{
- load3.text = save3.saveSlotName + " " + lastmodified.ToString();
+ date3.text = lastmodified.ToString();
}
else
{
- load3.text = save3.saveSlotName + " " + created.ToString();
+ date3.text = created.ToString();
}
}
else
{
- load3.text = "Empty";
+ name3.text = "Empty";
}
}
}
diff --git a/My project/Assets/Scripts/SaveLoad/SaveLoad.cs b/My project/Assets/Scripts/SaveLoad/SaveLoad.cs
index b6446d961f9a24f4d5a913a3adc2c45d72f5debb..b1a217a9a2fc77c1aaa325a35100abfbfe47ac35 100644
--- a/My project/Assets/Scripts/SaveLoad/SaveLoad.cs
+++ b/My project/Assets/Scripts/SaveLoad/SaveLoad.cs
@@ -5,15 +5,23 @@ using UnityEngine.UI;
using System.Runtime.Serialization.Formatters.Binary;
using System.IO;
using UnityEngine.SceneManagement;
+using TMPro;
public class SaveLoad : MonoBehaviour
{
public GameObject warning;
+ public TMP_Text inputField;
public void SaveData(string slot)
{
+ string slotName = "Save Slot " + slot;
+ if (inputField.text != " ")
+ {
+ slotName = inputField.text;
+ }
QuestManager qman = GameObject.Find("QuestManager").GetComponent<QuestManager>();
State save = new State(qman.currentQuest.id);
+ save.saveSlotName = slotName;
BinaryFormatter formatter = new BinaryFormatter();
string path = Application.persistentDataPath + "/slot" + slot;
FileStream stream = new FileStream(path, FileMode.Create);