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

Use Enum for mode instead

Browse Source
This commit is contained in:
Travis
2026-02-02 16:26:59 -07:00
parent 7e1135f59e
commit 8e5fb1dbdc
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Scripts/LeaderboardsMenu.cs
View File

@@ -25,16 +25,16 @@ public class LeaderboardsMenu : MonoBehaviour
[SerializeField] private GameObject sampleObject; [SerializeField] private GameObject sampleObject;
[SerializeField] private TMP_Dropdown berryShowTypeDropdown; [SerializeField] private TMP_Dropdown berryShowTypeDropdown;
private int mode = -1; private LeaderboardMode mode = LeaderboardMode.None;
private bool changedByCode = false; private bool changedByCode = false;
void Awake() void Awake()
{ {
selectionScoreButton.onClick.AddListener(() => { mode = 0; SwitchMenu(1); }); selectionScoreButton.onClick.AddListener(() => { mode = LeaderboardMode.Score; SwitchMenu(1); });
selectionBerryButton.onClick.AddListener(() => { mode = 1; SwitchMenu(1); }); selectionBerryButton.onClick.AddListener(() => { mode = LeaderboardMode.Berry; SwitchMenu(1); });
selectionCoinButton.onClick.AddListener(() => { mode = 2; SwitchMenu(1); }); selectionCoinButton.onClick.AddListener(() => { mode = LeaderboardMode.Coin; SwitchMenu(1); });
selectionLegacyButton.onClick.AddListener(() => { mode = 3; SwitchMenu(1); }); selectionLegacyButton.onClick.AddListener(() => { mode = LeaderboardMode.Legacy; SwitchMenu(1); });
selectionTotalBerriesButton.onClick.AddListener(() => { mode = 4; SwitchMenu(1); }); selectionTotalBerriesButton.onClick.AddListener(() => { mode = LeaderboardMode.TotalBerries; SwitchMenu(1); });
berryShowTypeDropdown.onValueChanged.AddListener(_ => GetTopPlayers()); berryShowTypeDropdown.onValueChanged.AddListener(_ => GetTopPlayers());
backButton.onClick.AddListener(async () => backButton.onClick.AddListener(async () =>
@@ -61,16 +61,16 @@ public class LeaderboardsMenu : MonoBehaviour
if (menu == 0) if (menu == 0)
{ {
mode = -1; mode = LeaderboardMode.None;
refreshButton.gameObject.SetActive(false); refreshButton.gameObject.SetActive(false);
selectionPanel.SetActive(true); selectionPanel.SetActive(true);
scoresPanel.SetActive(false); scoresPanel.SetActive(false);
} }
else if (menu == 1) else if (menu == 1)
{ {
refreshButton.transform.localPosition = mode == 1 ? new Vector2(402.5f, 282.33f) : new Vector2(-402.5f, -282.33f); refreshButton.transform.localPosition = mode == LeaderboardMode.Berry ? new Vector2(402.5f, 282.33f) : new Vector2(-402.5f, -282.33f);
refreshButton.gameObject.SetActive(true); refreshButton.gameObject.SetActive(true);
berryShowTypeDropdown.gameObject.SetActive(mode == 1); berryShowTypeDropdown.gameObject.SetActive(mode == LeaderboardMode.Berry);
changedByCode = true; changedByCode = true;
berryShowTypeDropdown.value = 0; berryShowTypeDropdown.value = 0;
changedByCode = false; changedByCode = false;
@@ -93,13 +93,13 @@ public class LeaderboardsMenu : MonoBehaviour
} }
} }
UpdateStatus(true, "Loading..."); UpdateStatus(true, "Loading...");
using UnityWebRequest request = UnityWebRequest.Get(mode == 0 using UnityWebRequest request = UnityWebRequest.Get(mode == LeaderboardMode.Score
? Endpoints.LEADERBOARDS_SCORE_ENDPOINT ? Endpoints.LEADERBOARDS_SCORE_ENDPOINT
: mode == 1 : mode == LeaderboardMode.Berry
? Endpoints.LEADERBOARDS_BERRY_ENDPOINT + "?berry=" + berryShowTypeDropdown.value ? Endpoints.LEADERBOARDS_BERRY_ENDPOINT + "?berry=" + berryShowTypeDropdown.value
: mode == 2 : mode == LeaderboardMode.Coin
? Endpoints.LEADERBOARDS_COIN_ENDPOINT ? Endpoints.LEADERBOARDS_COIN_ENDPOINT
: mode == 3 : mode == LeaderboardMode.Legacy
? Endpoints.LEADERBOARDS_LEGACY_ENDPOINT ? Endpoints.LEADERBOARDS_LEGACY_ENDPOINT
: Endpoints.LEADERBOARDS_TOTAL_ENDPOINT); : Endpoints.LEADERBOARDS_TOTAL_ENDPOINT);
request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("Requester", "BerryDashClient");
@@ -125,7 +125,7 @@ public class LeaderboardsMenu : MonoBehaviour
var scoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>(); var scoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>();
usernameText.text = $"{entry.Username} (#{entry.UserID + 1})"; usernameText.text = $"{entry.Username} (#{entry.UserID + 1})";
scoreText.text = (mode == 1 || mode == 4 ? "Berries: " : mode == 2 ? "Coins: " : "Score: ") + Tools.FormatWithCommas(entry.Value); scoreText.text = (mode == LeaderboardMode.Berry || mode == LeaderboardMode.TotalBerries ? "Berries: " : mode == LeaderboardMode.Coin ? "Coins: " : "Score: ") + Tools.FormatWithCommas(entry.Value);
if (BazookaManager.Instance.GetAccountID() == entry.UserID) if (BazookaManager.Instance.GetAccountID() == entry.UserID)
{ {

9
Assets/Scripts/Types/LeaderboardMode.cs Normal file
View File

@@ -0,0 +1,9 @@
public enum LeaderboardMode
{
None,
Score,
Berry,
Coin,
Legacy,
TotalBerries
}

2
Assets/Scripts/Types/LeaderboardMode.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 1f90bcbfacbcb444a8eea859852d8a01