Skip to content
Snippets Groups Projects
Commit d77d7462 authored by JevantJedidia's avatar JevantJedidia
Browse files

fix shop after reset

parent ae10ee17
No related merge requests found
...@@ -23,6 +23,7 @@ public class StateController : MonoBehaviour ...@@ -23,6 +23,7 @@ public class StateController : MonoBehaviour
public static int petCurrentHealth = 0; public static int petCurrentHealth = 0;
public static bool showSaveUI = true; public static bool showSaveUI = true;
public static int playerHealth = 100; public static int playerHealth = 100;
public static string saveSlotName;
public static void reset() public static void reset()
{ {
...@@ -43,5 +44,20 @@ public class StateController : MonoBehaviour ...@@ -43,5 +44,20 @@ public class StateController : MonoBehaviour
petTag = 3; petTag = 3;
petCurrentHealth = 0; petCurrentHealth = 0;
slot = "0"; slot = "0";
resetShop();
}
public static void resetShop()
{
ShopController.isShotgunBought = boughtSword;
ShopController.isSwordBought = boughtSword;
ShopController.isBowBought = boughtBow;
ShopController.isHealerBought = (petTag == 0);
ShopController.isAttackerBought = (petTag == 1);
ShopController.isBuffBought = (petTag == 2);
ShopController.isShotgunUpgraded = (shotGunMultiplier != 1);
ShopController.isSwordUpgraded = (swordMultiplier != 1);
ShopController.isBowUpgraded = (bowMultiplier != 1);
ShopController.isDefaultUpgraded = (gunMultiplier != 1);
} }
} }
\ No newline at end of file
...@@ -53,7 +53,7 @@ public class GameOver : MonoBehaviour ...@@ -53,7 +53,7 @@ public class GameOver : MonoBehaviour
if (StateController.slot == "0") if (StateController.slot == "0")
{ {
SceneManager.LoadScene(1); SceneManager.LoadScene(1);
//tambah reset StateController.reset();
} }
else else
{ {
...@@ -65,6 +65,7 @@ public class GameOver : MonoBehaviour ...@@ -65,6 +65,7 @@ public class GameOver : MonoBehaviour
stream.Close(); stream.Close();
save.Load(StateController.slot); save.Load(StateController.slot);
StateController.showSaveUI = false; StateController.showSaveUI = false;
StateController.resetShop();
toShop(); toShop();
} }
} }
......
...@@ -43,11 +43,11 @@ public class LoadUI : MonoBehaviour ...@@ -43,11 +43,11 @@ public class LoadUI : MonoBehaviour
if (lastmodified != null) if (lastmodified != null)
{ {
load1.text = save1.userName + " " + lastmodified.ToString(); load1.text = save1.saveSlotName + " " + lastmodified.ToString();
} }
else else
{ {
load1.text = save1.userName + " " + created.ToString(); load1.text = save1.saveSlotName + " " + created.ToString();
} }
} }
else else
...@@ -68,11 +68,11 @@ public class LoadUI : MonoBehaviour ...@@ -68,11 +68,11 @@ public class LoadUI : MonoBehaviour
if (lastmodified != null) if (lastmodified != null)
{ {
load2.text = save2.userName + " " + lastmodified.ToString(); load2.text = save2.saveSlotName + " " + lastmodified.ToString();
} }
else else
{ {
load2.text = save2.userName + " " + created.ToString(); load2.text = save2.saveSlotName + " " + created.ToString();
} }
} }
else else
...@@ -93,11 +93,11 @@ public class LoadUI : MonoBehaviour ...@@ -93,11 +93,11 @@ public class LoadUI : MonoBehaviour
if (lastmodified != null) if (lastmodified != null)
{ {
load3.text = save3.userName + " " + lastmodified.ToString(); load3.text = save3.saveSlotName + " " + lastmodified.ToString();
} }
else else
{ {
load3.text = save3.userName + " " + created.ToString(); load3.text = save3.saveSlotName + " " + created.ToString();
} }
} }
else else
......
...@@ -34,6 +34,7 @@ public class SaveLoad : MonoBehaviour ...@@ -34,6 +34,7 @@ public class SaveLoad : MonoBehaviour
stream.Close(); stream.Close();
save.Load(slot); save.Load(slot);
StateController.showSaveUI = false; StateController.showSaveUI = false;
StateController.resetShop();
toShop(); toShop();
} }
else else
......
...@@ -25,6 +25,8 @@ public class State ...@@ -25,6 +25,8 @@ public class State
public int playerHealth; public int playerHealth;
public string saveSlotName;
public State(int curQuestId) public State(int curQuestId)
{ {
userName = StateController.userName; userName = StateController.userName;
...@@ -42,6 +44,7 @@ public class State ...@@ -42,6 +44,7 @@ public class State
petTag = StateController.petTag; petTag = StateController.petTag;
petCurrentHealth = StateController.petCurrentHealth; petCurrentHealth = StateController.petCurrentHealth;
playerHealth = StateController.playerHealth; playerHealth = StateController.playerHealth;
saveSlotName = StateController.saveSlotName;
this.curQuestId = curQuestId; this.curQuestId = curQuestId;
} }
...@@ -64,6 +67,7 @@ public class State ...@@ -64,6 +67,7 @@ public class State
StateController.petTag = petTag; StateController.petTag = petTag;
StateController.petCurrentHealth = petCurrentHealth; StateController.petCurrentHealth = petCurrentHealth;
StateController.playerHealth = playerHealth; StateController.playerHealth = playerHealth;
StateController.saveSlotName = saveSlotName;
QuestManager questManager = GameObject.Find("QuestManager").GetComponent<QuestManager>(); QuestManager questManager = GameObject.Find("QuestManager").GetComponent<QuestManager>();
questManager.currentQuest = questManager.questList[StateController.curQuestId]; questManager.currentQuest = questManager.questList[StateController.curQuestId];
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment