Berry-Dash/source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update leaderboards script for server rewrite

Browse Source
This commit is contained in:
Travis
2025-07-12 16:52:36 -07:00
parent 70a0b0ea9a
commit 8bf10963d5
2 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scenes/LeaderboardMenu.unity
View File

@@ -2916,7 +2916,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: 'Score: ' m_text: 'Berries: '
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2} m_fontAsset: {fileID: 11400000, guid: 4fd546dd0900395408d2de20f5025882, type: 2}
m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2} m_sharedMaterial: {fileID: -1476194838487357290, guid: 4fd546dd0900395408d2de20f5025882, type: 2}

87
Assets/Scripts/LeaderboardsMenu.cs
View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Numerics; using System.Numerics;
using System.Text; using System.Text;
using Newtonsoft.Json.Linq;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.Networking; using UnityEngine.Networking;
@@ -143,22 +144,17 @@ public class LeaderboardsMenu : MonoBehaviour
} }
else else
{ {
var splitResponse = response.Split(';'); var jsonResponse = JArray.Parse(response);
for (int i = 0; i < splitResponse.Length; i++) for (int i = 0; i < jsonResponse.Count; i++)
{ {
var entry = splitResponse[i]; var entry = JObject.Parse(jsonResponse[i].ToString());
var split = entry.Split(":"); var username = (string)entry["username"];
var username = Encoding.UTF8.GetString(Convert.FromBase64String(split[0])); var highScore = BigInteger.Parse((string)entry["value"]);
var highScore = split[1]; var icon = (int)entry["icon"];
var icon = split[2]; var overlay = (int)entry["overlay"];
var overlay = split[3]; var uid = BigInteger.Parse((string)entry["userid"]);
var uid = split[4]; var birdColor = (JArray)entry["birdColor"];
var birdR = split[5]; var overlayColor = (JArray)entry["overlayColor"];
var birdG = split[6];
var birdB = split[7];
var overlayR = split[8];
var overlayG = split[9];
var overlayB = split[10];
var entryInfo = Instantiate(scoreSampleObject, scoreContent.transform); var entryInfo = Instantiate(scoreSampleObject, scoreContent.transform);
var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>(); var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>();
@@ -166,7 +162,7 @@ public class LeaderboardsMenu : MonoBehaviour
var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>(); var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>();
var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>(); var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>();
if (BazookaManager.Instance.GetAccountID() == BigInteger.Parse(uid)) if (BazookaManager.Instance.GetAccountID() == uid)
{ {
usernameText.color = Color.aquamarine; usernameText.color = Color.aquamarine;
highScoreText.color = Color.aquamarine; highScoreText.color = Color.aquamarine;
@@ -175,31 +171,31 @@ public class LeaderboardsMenu : MonoBehaviour
usernameText.text = $"{username} (#{i + 1})"; usernameText.text = $"{username} (#{i + 1})";
highScoreText.text += Tools.FormatWithCommas(highScore); highScoreText.text += Tools.FormatWithCommas(highScore);
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon); playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
if (icon == "1") if (icon == 1)
{ {
playerIcon.sprite = Tools.GetIconForUser(int.Parse(uid)); playerIcon.sprite = Tools.GetIconForUser(uid);
} }
playerOverlayIcon.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlay); playerOverlayIcon.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlay);
if (overlay == "0") if (overlay == 0)
{ {
playerOverlayIcon.gameObject.SetActive(false); playerOverlayIcon.gameObject.SetActive(false);
} }
else if (overlay == "8") else if (overlay == 8)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.56f, 14.81f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.56f, 14.81f);
} }
else if (overlay == "11") else if (overlay == 11)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-14.74451f, 20.39122f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-14.74451f, 20.39122f);
} }
else if (overlay == "13") else if (overlay == 13)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.54019f, 14.70365f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.54019f, 14.70365f);
} }
try try
{ {
playerIcon.color = new Color32(byte.Parse(birdR), byte.Parse(birdG), byte.Parse(birdB), 255); playerIcon.color = new Color((int)birdColor[0] / 255f, (int)birdColor[1] / 255f, (int)birdColor[2] / 255f, 1f);
playerOverlayIcon.color = new Color32(byte.Parse(overlayR), byte.Parse(overlayG), byte.Parse(overlayB), 255); playerOverlayIcon.color = new Color((int)overlayColor[0] / 255f, (int)overlayColor[1] / 255f, (int)overlayColor[2] / 255f, 1f);
} }
catch (Exception) catch (Exception)
{ {
@@ -265,22 +261,17 @@ public class LeaderboardsMenu : MonoBehaviour
} }
else else
{ {
var splitResponse = response.Split(';'); var jsonResponse = JArray.Parse(response);
for (int i = 0; i < splitResponse.Length; i++) for (int i = 0; i < jsonResponse.Count; i++)
{ {
var entry = splitResponse[i]; var entry = JObject.Parse(jsonResponse[i].ToString());
var split = entry.Split(":"); var username = (string)entry["username"];
var username = Encoding.UTF8.GetString(Convert.FromBase64String(split[0])); var highScore = BigInteger.Parse((string)entry["value"]);
var highScore = split[1]; var icon = (int)entry["icon"];
var icon = split[2]; var overlay = (int)entry["overlay"];
var overlay = split[3]; var uid = BigInteger.Parse((string)entry["userid"]);
var uid = split[4]; var birdColor = (JArray)entry["birdColor"];
var birdR = split[5]; var overlayColor = (JArray)entry["overlayColor"];
var birdG = split[6];
var birdB = split[7];
var overlayR = split[8];
var overlayG = split[9];
var overlayB = split[10];
var entryInfo = Instantiate(berrySampleObject, berryContent.transform); var entryInfo = Instantiate(berrySampleObject, berryContent.transform);
var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>(); var usernameText = entryInfo.transform.GetChild(0).GetComponent<TMP_Text>();
@@ -288,7 +279,7 @@ public class LeaderboardsMenu : MonoBehaviour
var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>(); var playerOverlayIcon = playerIcon.transform.GetChild(0).GetComponent<Image>();
var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>(); var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>();
if (BazookaManager.Instance.GetAccountID() == BigInteger.Parse(uid)) if (BazookaManager.Instance.GetAccountID() == uid)
{ {
usernameText.color = Color.aquamarine; usernameText.color = Color.aquamarine;
highScoreText.color = Color.aquamarine; highScoreText.color = Color.aquamarine;
@@ -297,31 +288,31 @@ public class LeaderboardsMenu : MonoBehaviour
usernameText.text = $"{username} (#{i + 1})"; usernameText.text = $"{username} (#{i + 1})";
highScoreText.text += Tools.FormatWithCommas(highScore); highScoreText.text += Tools.FormatWithCommas(highScore);
playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon); playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
if (icon == "1") if (icon == 1)
{ {
playerIcon.sprite = Tools.GetIconForUser(int.Parse(uid)); playerIcon.sprite = Tools.GetIconForUser(uid);
} }
playerOverlayIcon.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlay); playerOverlayIcon.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlay);
if (overlay == "0") if (overlay == 0)
{ {
playerOverlayIcon.gameObject.SetActive(false); playerOverlayIcon.gameObject.SetActive(false);
} }
else if (overlay == "8") else if (overlay == 8)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.56f, 14.81f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.56f, 14.81f);
} }
else if (overlay == "11") else if (overlay == 11)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-14.74451f, 20.39122f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-14.74451f, 20.39122f);
} }
else if (overlay == "13") else if (overlay == 13)
{ {
playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.54019f, 14.70365f); playerOverlayIcon.transform.localPosition = new UnityEngine.Vector2(-16.54019f, 14.70365f);
} }
try try
{ {
playerIcon.color = new Color32(byte.Parse(birdR), byte.Parse(birdG), byte.Parse(birdB), 255); playerIcon.color = new Color((int)birdColor[0] / 255f, (int)birdColor[1] / 255f, (int)birdColor[2] / 255f, 1f);
playerOverlayIcon.color = new Color32(byte.Parse(overlayR), byte.Parse(overlayG), byte.Parse(overlayB), 255); playerOverlayIcon.color = new Color((int)overlayColor[0] / 255f, (int)overlayColor[1] / 255f, (int)overlayColor[2] / 255f, 1f);
} }
catch (Exception) catch (Exception)
{ {