From 54b82937e5e34a386263e61bcff4476d8dddc4fa Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Wed, 20 Aug 2025 13:59:05 -0700 Subject: [PATCH] Send marketplace & coin berry data to server (along with save) --- Assets/Scripts/AccountMenu/AccountLoggedIn.cs | 4 ++++ Assets/Scripts/AccountMenu/AccountLogin.cs | 3 +++ 2 files changed, 7 insertions(+) diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs index 7e16862..3e34589 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs @@ -57,9 +57,11 @@ public class AccountLoggedIn : MonoBehaviour dataForm.AddField("totalSlowBerries", BazookaManager.Instance.GetGameStoreTotalSlowBerries().ToString()); dataForm.AddField("totalUltraBerries", BazookaManager.Instance.GetGameStoreTotalUltraBerries().ToString()); dataForm.AddField("totalSpeedyBerries", BazookaManager.Instance.GetGameStoreTotalSpeedyBerries().ToString()); + dataForm.AddField("totalCoinBerries", BazookaManager.Instance.GetGameStoreTotalCoinBerries().ToString()); dataForm.AddField("totalAttempts", BazookaManager.Instance.GetGameStoreTotalAttepts().ToString()); dataForm.AddField("birdColor", BazookaManager.Instance.GetColorSettingIcon().ToString(Formatting.None)); dataForm.AddField("overlayColor", BazookaManager.Instance.GetColorSettingOverlay().ToString(Formatting.None)); + dataForm.AddField("marketplaceData", BazookaManager.Instance.GetCustomBirdIconData().ToString()); using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm.form); request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("ClientVersion", Application.version); @@ -174,9 +176,11 @@ public class AccountLoggedIn : MonoBehaviour BazookaManager.Instance.SetGameStoreTotalSlowBerries(BigInteger.Parse((string)jsonResponse["totalSlowBerries"])); BazookaManager.Instance.SetGameStoreTotalUltraBerries(BigInteger.Parse((string)jsonResponse["totalUltraBerries"])); BazookaManager.Instance.SetGameStoreTotalSpeedyBerries(BigInteger.Parse((string)jsonResponse["totalSpeedyBerries"])); + BazookaManager.Instance.SetGameStoreTotalCoinBerries(BigInteger.Parse((string)jsonResponse["totalCOinBerries"])); BazookaManager.Instance.SetGameStoreTotalAttepts(BigInteger.Parse((string)jsonResponse["totalAttempts"])); BazookaManager.Instance.SetColorSettingIcon(JArray.Parse(jsonResponse["birdColor"].ToString())); BazookaManager.Instance.SetColorSettingOverlay(JArray.Parse(jsonResponse["overlayColor"].ToString())); + BazookaManager.Instance.SetCustomBirdIconData(JsonConvert.DeserializeObject(jsonResponse["marketplaceData"].ToString())); Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green); } else diff --git a/Assets/Scripts/AccountMenu/AccountLogin.cs b/Assets/Scripts/AccountMenu/AccountLogin.cs index acd498e..d391235 100644 --- a/Assets/Scripts/AccountMenu/AccountLogin.cs +++ b/Assets/Scripts/AccountMenu/AccountLogin.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using TMPro; using UnityEngine; @@ -91,9 +92,11 @@ public class AccountLogin : MonoBehaviour BazookaManager.Instance.SetGameStoreTotalSlowBerries(BigInteger.Parse((string)jsonResponse["data"]["totalSlowBerries"])); BazookaManager.Instance.SetGameStoreTotalUltraBerries(BigInteger.Parse((string)jsonResponse["data"]["totalUltraBerries"])); BazookaManager.Instance.SetGameStoreTotalSpeedyBerries(BigInteger.Parse((string)jsonResponse["data"]["totalSpeedyBerries"])); + BazookaManager.Instance.SetGameStoreTotalCoinBerries(BigInteger.Parse((string)jsonResponse["data"]["totalCoinBerries"])); BazookaManager.Instance.SetGameStoreTotalAttepts(BigInteger.Parse((string)jsonResponse["data"]["totalAttempts"])); BazookaManager.Instance.SetColorSettingIcon(JArray.Parse(jsonResponse["data"]["birdColor"].ToString())); BazookaManager.Instance.SetColorSettingOverlay(JArray.Parse(jsonResponse["data"]["overlayColor"].ToString())); + BazookaManager.Instance.SetCustomBirdIconData(JsonConvert.DeserializeObject(jsonResponse["data"]["marketplaceData"].ToString())); AccountHandler.instance.SwitchPanel(0); Tools.UpdateStatusText(loginPanelStatusText, "", Color.red); }