1.6.2

Assets/Scripts/BazookaManager.cs

@@ -62,6 +62,10 @@ public class BazookaManager : MonoBehaviour
                 Debug.LogWarning("Failed to load save file");
             }
         }
+        if (saveFile["version"] == null || saveFile["version"].ToString() != "0")
+        {
+            saveFile["version"] = "0";
+        }
         if (!PlayerPrefs.HasKey("LegacyConversion"))
         {
             PlayerPrefs.SetInt("LegacyConversion", 1);

Assets/Scripts/GamePlayer.cs

@@ -49,21 +49,20 @@ public class GamePlayer : MonoBehaviour
     public Button leftButton;
 
     void Start()
-    {
-        var customIconData = BazookaManager.Instance.GetCustomBirdIconData();
-        SpriteRenderer component = bird.GetComponent<SpriteRenderer>();
-        if (customIconData.Selected == null)
     {
         var backgroundColor = BazookaManager.Instance.GetColorSettingBackground();
-            var birdColor = BazookaManager.Instance.GetColorSettingIcon();
-            var overlayColor = BazookaManager.Instance.GetColorSettingOverlay();
-            try
-            {
         Camera.main.backgroundColor = new Color(
             int.Parse(backgroundColor[0].ToString()) / 255f,
             int.Parse(backgroundColor[1].ToString()) / 255f,
             int.Parse(backgroundColor[2].ToString()) / 255f
         );
+
+        var customIconData = BazookaManager.Instance.GetCustomBirdIconData();
+        SpriteRenderer component = bird.GetComponent<SpriteRenderer>();
+        if (customIconData.Selected == null)
+        {
+            var birdColor = BazookaManager.Instance.GetColorSettingIcon();
+            var overlayColor = BazookaManager.Instance.GetColorSettingOverlay();
             bird.GetComponent<SpriteRenderer>().color = new Color(
                 int.Parse(birdColor[0].ToString()) / 255f,
                 int.Parse(birdColor[1].ToString()) / 255f,
@@ -74,11 +73,6 @@ public class GamePlayer : MonoBehaviour
                 int.Parse(overlayColor[1].ToString()) / 255f,
                 int.Parse(overlayColor[2].ToString()) / 255f
             );
-            }
-            catch
-            {
-                Debug.LogError("Invalid BackgroundColor format");
-            }
 
             int num = BazookaManager.Instance.GetBirdIcon();
             int num2 = BazookaManager.Instance.GetBirdOverlay();
@@ -318,7 +312,7 @@ public class GamePlayer : MonoBehaviour
             GameObject newBerry = new("Berry");
             newBerry.transform.SetParent(berryParent.transform);
             SpriteRenderer spriteRenderer = newBerry.AddComponent<SpriteRenderer>();
-            if (spawnProbability <= 0.6f)
+            if (spawnProbability <= 0.525f)
             {
                 spriteRenderer.sprite = Resources.Load<Sprite>("Berries/Berry");
                 newBerry.tag = "NormalBerry";

Assets/Scripts/LeaderboardsMenu.cs

@@ -17,6 +17,7 @@ public class LeaderboardsMenu : MonoBehaviour
     public GameObject selectionPanel;
     public Button selectionScoreButton;
     public Button selectionBerryButton;
+    public Button selectionCoinButton;
 
     public GameObject scorePanel;
     public GameObject scoreContent;
@@ -26,12 +27,18 @@ public class LeaderboardsMenu : MonoBehaviour
     public GameObject berryContent;
     public TMP_Dropdown berryShowTypeDropdown;
     public GameObject berrySampleObject;
+
+    public GameObject coinPanel;
+    public GameObject coinContent;
+    public GameObject coinSampleObject;
+
     public Dictionary<string, string> customIcons;
 
     void Awake()
     {
         selectionScoreButton.onClick.AddListener(() => SwitchMenu(1));
         selectionBerryButton.onClick.AddListener(() => SwitchMenu(2));
+        selectionCoinButton.onClick.AddListener(() => SwitchMenu(3));
 
         berryShowTypeDropdown.onValueChanged.AddListener(value => GetTopPlayersBerry(value));
 
@@ -39,12 +46,13 @@ public class LeaderboardsMenu : MonoBehaviour
         backButton.onClick.AddListener(async () =>
         {
             if (selectionPanel.activeSelf) await SceneManager.LoadSceneAsync("MainMenu");
-            else if (scorePanel.activeSelf || berryPanel.activeSelf) SwitchMenu(0);
+            else if (scorePanel.activeSelf || berryPanel.activeSelf || coinPanel.activeSelf) SwitchMenu(0);
         });
         refreshButton.onClick.AddListener(() =>
         {
             if (scorePanel.activeSelf) GetTopPlayersScore();
             else if (berryPanel.activeSelf) GetTopPlayersBerry(berryShowTypeDropdown.value);
+            else if (coinPanel.activeSelf) GetTopPlayersCoin();
         });
     }
 
@@ -71,6 +79,16 @@ public class LeaderboardsMenu : MonoBehaviour
                 }
             }
         }
+        else if (coinPanel.activeSelf)
+        {
+            foreach (Transform item in coinContent.transform)
+            {
+                if (item.gameObject.activeSelf)
+                {
+                    Destroy(item.gameObject);
+                }
+            }
+        }
 
         switch (menu)
         {
@@ -79,6 +97,7 @@ public class LeaderboardsMenu : MonoBehaviour
                 selectionPanel.SetActive(true);
                 scorePanel.SetActive(false);
                 berryPanel.SetActive(false);
+                coinPanel.SetActive(false);
                 break;
             case 1:
                 refreshButton.transform.localPosition = new UnityEngine.Vector2(-402.5f, -282.33f);
@@ -87,6 +106,7 @@ public class LeaderboardsMenu : MonoBehaviour
                 selectionPanel.SetActive(false);
                 scorePanel.SetActive(true);
                 berryPanel.SetActive(false);
+                coinPanel.SetActive(false);
                 break;
             case 2:
                 refreshButton.transform.localPosition = new UnityEngine.Vector2(402.5f, 282.33f);
@@ -96,6 +116,16 @@ public class LeaderboardsMenu : MonoBehaviour
                 selectionPanel.SetActive(false);
                 scorePanel.SetActive(false);
                 berryPanel.SetActive(true);
+                coinPanel.SetActive(false);
+                break;
+            case 3:
+                refreshButton.transform.localPosition = new UnityEngine.Vector2(-402.5f, -282.33f);
+                refreshButton.gameObject.SetActive(true);
+                GetTopPlayersCoin();
+                selectionPanel.SetActive(false);
+                scorePanel.SetActive(false);
+                berryPanel.SetActive(false);
+                coinPanel.SetActive(true);
                 break;
         }
     }
@@ -273,10 +303,12 @@ public class LeaderboardsMenu : MonoBehaviour
             }
             else
             {
-                var jsonResponse = JArray.Parse(response);
-                for (int i = 0; i < jsonResponse.Count; i++)
+                var jsonResponse = JObject.Parse(response);
+                var entries = (JArray)jsonResponse["entries"];
+                customIcons = jsonResponse["customIcons"].ToObject<Dictionary<string, string>>();
+                for (int i = 0; i < entries.Count; i++)
                 {
-                    var entry = JObject.Parse(jsonResponse[i].ToString());
+                    var entry = JObject.Parse(entries[i].ToString());
                     var username = (string)entry["username"];
                     var highScore = BigInteger.Parse((string)entry["value"]);
                     var icon = (int)entry["icon"];
@@ -284,6 +316,7 @@ public class LeaderboardsMenu : MonoBehaviour
                     var uid = BigInteger.Parse((string)entry["userid"]);
                     var birdColor = (JArray)entry["birdColor"];
                     var overlayColor = (JArray)entry["overlayColor"];
+                    var customIcon = (string)entry["customIcon"];
 
                     var entryInfo = Instantiate(berrySampleObject, berryContent.transform);
                     var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>();
@@ -299,6 +332,8 @@ public class LeaderboardsMenu : MonoBehaviour
 
                     usernameText.text = $"{username} (#{i + 1})";
                     highScoreText.text += Tools.FormatWithCommas(highScore);
+                    if (customIcon == null)
+                    {
                         playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
                         if (icon == 1)
                         {
@@ -331,6 +366,12 @@ public class LeaderboardsMenu : MonoBehaviour
                             playerIcon.color = Color.white;
                             playerOverlayIcon.color = Color.white;
                         }
+                    }
+                    else
+                    {
+                        Tools.RenderFromBase64(customIcons[customIcon], playerIcon);
+                        playerOverlayIcon.gameObject.SetActive(false);
+                    }
                     entryInfo.SetActive(true);
                 }
             }
@@ -344,6 +385,132 @@ public class LeaderboardsMenu : MonoBehaviour
         refreshButton.interactable = true;
     }
 
+    async void GetTopPlayersCoin()
+    {
+        backButton.interactable = false;
+        refreshButton.interactable = false;
+        foreach (Transform item in coinContent.transform)
+        {
+            if (item.gameObject.activeSelf)
+            {
+                Destroy(item.gameObject);
+            }
+        }
+        UpdateStatus(true, "Loading...");
+        EncryptedWWWForm dataForm = new();
+        dataForm.AddField("type", "2");
+        using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "getTopPlayers.php", dataForm.form);
+        request.SetRequestHeader("Requester", "BerryDashClient");
+        request.SetRequestHeader("ClientVersion", Application.version);
+        request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
+        await request.SendWebRequest();
+        if (request.result == UnityWebRequest.Result.Success)
+        {
+            UpdateStatus(false);
+            string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
+            if (response == "-999")
+            {
+                UpdateStatus(true, "Server error while fetching data");
+            }
+            else if (response == "-998")
+            {
+                UpdateStatus(true, "Client version too outdated to access servers");
+            }
+            else if (response == "-997")
+            {
+                UpdateStatus(true, "Encryption/decryption issues");
+            }
+            else if (response == "-996")
+            {
+                UpdateStatus(true, "Can't send requests on self-built instance");
+            }
+            else if (response == "-1")
+            {
+                UpdateStatus(true, "No entries for this leaderboard found!");
+            }
+            else
+            {
+                var jsonResponse = JObject.Parse(response);
+                var entries = (JArray)jsonResponse["entries"];
+                customIcons = jsonResponse["customIcons"].ToObject<Dictionary<string, string>>();
+                for (int i = 0; i < entries.Count; i++)
+                {
+                    var entry = JObject.Parse(entries[i].ToString());
+                    var username = (string)entry["username"];
+                    var highScore = BigInteger.Parse((string)entry["value"]);
+                    var icon = (int)entry["icon"];
+                    var overlay = (int)entry["overlay"];
+                    var uid = BigInteger.Parse((string)entry["userid"]);
+                    var birdColor = (JArray)entry["birdColor"];
+                    var overlayColor = (JArray)entry["overlayColor"];
+                    var customIcon = (string)entry["customIcon"];
+
+                    var entryInfo = Instantiate(coinSampleObject, coinContent.transform);
+                    var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>();
+                    var playerIcon = usernameText.transform.GetChild(0).GetComponent<Image>();
+                    var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>();
+                    var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>();
+
+                    if (BazookaManager.Instance.GetAccountID() == uid)
+                    {
+                        usernameText.color = Color.aquamarine;
+                        highScoreText.color = Color.aquamarine;
+                    }
+
+                    usernameText.text = $"{username} (#{i + 1})";
+                    highScoreText.text += Tools.FormatWithCommas(highScore);
+                    if (customIcon == null)
+                    {
+                        playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
+                        if (icon == 1)
+                        {
+                            playerIcon.sprite = Tools.GetIconForUser(uid);
+                        }
+                        playerOverlayIcon.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlay);
+                        if (overlay == 0)
+                        {
+                            playerOverlayIcon.gameObject.SetActive(false);
+                        }
+                        else if (overlay == 8)
+                        {
+                            playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.56f, 14.81f);
+                        }
+                        else if (overlay == 11)
+                        {
+                            playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-14.74451f, 20.39122f);
+                        }
+                        else if (overlay == 13)
+                        {
+                            playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.54019f, 14.70365f);
+                        }
+                        try
+                        {
+                            playerIcon.color = new Color((int)birdColor[0] / 255f, (int)birdColor[1] / 255f, (int)birdColor[2] / 255f);
+                            playerOverlayIcon.color = new Color((int)overlayColor[0] / 255f, (int)overlayColor[1] / 255f, (int)overlayColor[2] / 255f);
+                        }
+                        catch (Exception)
+                        {
+                            playerIcon.color = Color.white;
+                            playerOverlayIcon.color = Color.white;
+                        }
+                    }
+                    else
+                    {
+                        Tools.RenderFromBase64(customIcons[customIcon], playerIcon);
+                        playerOverlayIcon.gameObject.SetActive(false);
+                    }
+                    entryInfo.SetActive(true);
+                }
+            }
+        }
+        else
+        {
+            UpdateStatus(true, "Failed to fetch leaderboard stats");
+        }
+        backButton.interactable = true;
+        refreshButton.interactable = true;
+    }
+
     private void UpdateStatus(bool enabled, string message = "")
     {
         statusText.gameObject.SetActive(enabled);

ProjectSettings/ProjectSettings.asset

@@ -141,7 +141,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 1.6.1
+  bundleVersion: 1.6.2
   preloadedAssets:
   - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
   metroInputSource: 0