diff --git a/Assets/New GUISkin.guiskin b/Assets/New GUISkin.guiskin index 12a9f9c55832bc60c7b62aa92a2f6b63c232ed95..c097e4c0f1a09c17bcf1a69f6e1d8347afa8fabc 100644 --- a/Assets/New GUISkin.guiskin +++ b/Assets/New GUISkin.guiskin @@ -135,7 +135,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_Font: {fileID: 0} - m_FontSize: 0 + m_FontSize: 25 m_FontStyle: 0 m_Alignment: 4 m_WordWrap: 0 diff --git a/Assets/Scripts/Managers/TimeElapsedManager.cs b/Assets/Scripts/Managers/TimeElapsedManager.cs index d934e2de08d0fb3c9d9250bec1764ed87341ecd1..9b37c06f129f4966699c8595e2c2a99f7504181a 100644 --- a/Assets/Scripts/Managers/TimeElapsedManager.cs +++ b/Assets/Scripts/Managers/TimeElapsedManager.cs @@ -21,7 +21,7 @@ public class TimeElapsedManager : MonoBehaviour { if (timerActive) { - currentTime = currentTime + Time.deltaTime; + currentTime = currentTime + Time.unscaledDeltaTime; TimeSpan time = TimeSpan.FromSeconds(currentTime); currentTimeText.text = time.Minutes.ToString() + ":" + time.Seconds.ToString(); } diff --git a/Assets/Scripts/Player/PlayerMoney.cs b/Assets/Scripts/Player/PlayerMoney.cs index b7c1a9826375f4bff533fc317b6fb5087291b3bf..162913cb92e606064d226faee85b9c440729cb22 100644 --- a/Assets/Scripts/Player/PlayerMoney.cs +++ b/Assets/Scripts/Player/PlayerMoney.cs @@ -12,11 +12,20 @@ public class PlayerMoney : MonoBehaviour { if (CheatState.motherlodeState) { - currentMoney = 999999; + return; } else if((currentMoney + money) <= 999999) { currentMoney += money; + moneyText.text = "$" + currentMoney.ToString(); + } + } + + private void Update() { + if(CheatState.motherlodeState) + { + moneyText.text = "$999999"; + } else { + moneyText.text = "$" + currentMoney.ToString(); } - moneyText.text = "$" + currentMoney.ToString(); } public int GetMoney() diff --git a/Assets/Scripts/Shop/NewUI/ShopUIController.cs b/Assets/Scripts/Shop/NewUI/ShopUIController.cs index 096ddc01528df19ec0e3df5e91dd85a3625f9de8..6c840614c9961a9bd8f69599203642ffe4304606 100644 --- a/Assets/Scripts/Shop/NewUI/ShopUIController.cs +++ b/Assets/Scripts/Shop/NewUI/ShopUIController.cs @@ -32,15 +32,7 @@ public class ShopUIController : MonoBehaviour { return; } - - // if (PersistentSceneData.pets != index && PersistentSceneData.pets != -1) - // { - // // Switch Pets - // PetHealth currentPetHP = GameObject.Find("Pet").GetComponents<PetHealth>()[0]; - // PersistentSceneData.petHealths[PersistentSceneData.pets] = currentPetHP.currentHealth; - // PersistentSceneData.pets = index; - // Instantiate(petPrefab[PersistentSceneData.pets],player.transform.position,player.transform.rotation); - // } else + if (!PersistentSceneData.hasPets[index]){ // Add to Inventory (Buy) PersistentSceneData.hasPets[index] = true; @@ -66,6 +58,11 @@ public class ShopUIController : MonoBehaviour bool IsMoneyEnough(int targetAmount) { + if (CheatState.motherlodeState) + { + return true; + } + int result = (currentMoney - targetAmount); if (result < 0) { @@ -129,7 +126,12 @@ public class ShopUIController : MonoBehaviour } playerMoney = GameObject.FindGameObjectWithTag("Player").GetComponent<PlayerMoney>(); - currentMoney = playerMoney.GetMoney(); + if (CheatState.motherlodeState) + { + currentMoney = 999999; + } else { + currentMoney = playerMoney.GetMoney(); + } money.text = currentMoney.ToString(); UpdateWeaponUI(); @@ -180,6 +182,10 @@ public class ShopUIController : MonoBehaviour // Update is called once per frame void Update() { + if (CheatState.motherlodeState) + { + currentMoney = 999999; + } if (currentMoney > 0) { currency.style.color = Color.green;