diff --git a/Assets/Scenes/IconMarketplaceMenu.unity b/Assets/Scenes/IconMarketplaceMenu.unity index 115fef0..e7e08c5 100644 --- a/Assets/Scenes/IconMarketplaceMenu.unity +++ b/Assets/Scenes/IconMarketplaceMenu.unity @@ -5238,7 +5238,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1866125038 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs index fce22ec..8a9aae3 100644 --- a/Assets/Scripts/BazookaManager.cs +++ b/Assets/Scripts/BazookaManager.cs @@ -142,7 +142,7 @@ public class BazookaManager : MonoBehaviour public void SetCustomBirdIconData(MarketplaceIconStorageType value) { if (saveFile["bird"] == null) saveFile["bird"] = new JObject(); - saveFile["bird"]["customIcon"] = value.ConvertTo(); + saveFile["bird"]["customIcon"] = JObject.FromObject(value); } public void UnsetCustomBirdIconData() diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs index 0aa2968..044b1a3 100644 --- a/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs +++ b/Assets/Scripts/IconMarketplace/IconMarketplaceDownloadIcon.cs @@ -1,3 +1,5 @@ +using System.Collections; +using System.Linq; using Newtonsoft.Json.Linq; using TMPro; using UnityEngine; @@ -12,6 +14,8 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour public Button backButton; public GameObject content; public GameObject sample; + private string statusMessage; + private Coroutine statusRoutine; void Awake() { @@ -21,6 +25,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour internal void Load() { GetIcons(); + balanceText.text = "You have " + Tools.FormatWithCommas(BazookaManager.Instance.GetCustomBirdIconData().Balance) + " coins to spend"; } async void GetIcons() @@ -32,7 +37,7 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour Destroy(item.gameObject); } } - Tools.UpdateStatusText(statusText, "Loading...", Color.white); + ShowStatus("Loading..."); using UnityWebRequest request = UnityWebRequest.Get(SensitiveInfo.SERVER_DATABASE_PREFIX + "getMarketplaceIcons.php"); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); @@ -40,33 +45,33 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour await request.SendWebRequest(); if (request.result != UnityWebRequest.Result.Success) { - Tools.UpdateStatusText(statusText, "Failed to make HTTP request", Color.red); + ShowStatus("Failed to make HTTP request"); return; } string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY); if (response == "-999") { - Tools.UpdateStatusText(statusText, "Server error while fetching data", Color.red); + ShowStatus("Server error while fetching data"); return; } else if (response == "-998") { - Tools.UpdateStatusText(statusText, "Client version too outdated to access servers", Color.red); + ShowStatus("Client version too outdated to access servers"); return; } else if (response == "-997") { - Tools.UpdateStatusText(statusText, "Encryption/decryption issues", Color.red); + ShowStatus("Encryption/decryption issues"); return; } else if (response == "-996") { - Tools.UpdateStatusText(statusText, "Can't send requests on self-built instance", Color.red); + ShowStatus("Can't send requests on self-built instance"); return; } else { - Tools.UpdateStatusText(statusText, "", Color.red); + ShowStatus(null); var jsonResponse = JArray.Parse(response); foreach (var item in jsonResponse) { @@ -77,17 +82,89 @@ public class IconMarketplaceDownloadIcon : MonoBehaviour Tools.RenderFromBase64(entry.Data, newIcon.transform.GetChild(0).GetChild(0).GetComponent()); newIcon.transform.GetChild(1).GetComponent().text = "Bird Name: " + entry.Name; newIcon.transform.GetChild(2).GetComponent().text = "Price " + entry.Price + " coin"; - newIcon.transform.GetChild(3).GetComponent().text = "Designer Name: " + entry.CreatorUsername; - newIcon.transform.GetChild(4).GetChild(0).GetComponent().text = "Purchase"; - newIcon.transform.GetChild(4).GetComponent