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

Changes here

Browse Source
This commit is contained in:
Lncvrt committed 2026-03-08 11:23:34 -07:00
1 parent 2a2f8cc808
commit d5aa11c1ec
10 files changed
+63 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Prefabs/SettingsPrefab.prefab
+4 -4
View File
@@ -2554,7 +2554,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 118.84, y: -17.505} m_AnchoredPosition: {x: 118.84, y: -17.505}
m_SizeDelta: {x: 133.68, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4123066978558023322 --- !u!222 &4123066978558023322
CanvasRenderer: CanvasRenderer:
@@ -5143,7 +5143,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 144.95, y: -17.505} m_AnchoredPosition: {x: 144.95, y: -17.505}
m_SizeDelta: {x: 185.9, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5184616622156144944 --- !u!222 &5184616622156144944
CanvasRenderer: CanvasRenderer:
@@ -6176,7 +6176,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 168.16501, y: -17.505} m_AnchoredPosition: {x: 168.16501, y: -17.505}
m_SizeDelta: {x: 232.33, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3727655552475763163 --- !u!222 &3727655552475763163
CanvasRenderer: CanvasRenderer:
@@ -8172,7 +8172,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 221.39, y: -16} m_AnchoredPosition: {x: 221.39, y: -16}
m_SizeDelta: {x: 338.78, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6064585581559598998 --- !u!222 &6064585581559598998
CanvasRenderer: CanvasRenderer:
Assets/Scripts/AccountMenu/AccountChangePassword.cs
+6 -6
View File
@@ -20,7 +20,7 @@ public class AccountChangePassword : MonoBehaviour {
changePasswordRetypeNewPasswordInput.text = ""; changePasswordRetypeNewPasswordInput.text = "";
changePasswordStatusText.text = ""; changePasswordStatusText.text = "";
changePasswordSubmitButton.onClick.RemoveAllListeners(); changePasswordSubmitButton.onClick.RemoveAllListeners();
AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0)); AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
changePasswordSubmitButton.onClick.AddListener(() => ChangePassword()); changePasswordSubmitButton.onClick.AddListener(() => ChangePassword());
} }
@@ -29,7 +29,7 @@ public class AccountChangePassword : MonoBehaviour {
Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
return; return;
} }
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
changePasswordSubmitButton.interactable = false; changePasswordSubmitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("newPassword", changePasswordNewPasswordInput.text); dataForm.AddField("newPassword", changePasswordNewPasswordInput.text);
@@ -40,7 +40,7 @@ public class AccountChangePassword : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
changePasswordSubmitButton.interactable = true; changePasswordSubmitButton.interactable = true;
Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
return; return;
@@ -48,12 +48,12 @@ public class AccountChangePassword : MonoBehaviour {
var jsonResponse = JObject.Parse(request.downloadHandler.text); var jsonResponse = JObject.Parse(request.downloadHandler.text);
if ((bool)jsonResponse["success"]) { if ((bool)jsonResponse["success"]) {
BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]);
AccountHandler.instance.SwitchPanel(0); AccountHandler.Instance.SwitchPanel(0);
Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green); Tools.UpdateStatusText(AccountHandler.Instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
} else { } else {
Tools.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red);
} }
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
changePasswordSubmitButton.interactable = true; changePasswordSubmitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountChangeUsername.cs
+6 -6
View File
@@ -17,12 +17,12 @@ public class AccountChangeUsername : MonoBehaviour {
changeUsernameNewUsernameInput.text = ""; changeUsernameNewUsernameInput.text = "";
changeUsernameStatusText.text = ""; changeUsernameStatusText.text = "";
changeUsernameSubmitButton.onClick.RemoveAllListeners(); changeUsernameSubmitButton.onClick.RemoveAllListeners();
AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0)); AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
changeUsernameSubmitButton.onClick.AddListener(() => ChangeUsername()); changeUsernameSubmitButton.onClick.AddListener(() => ChangeUsername());
} }
async void ChangeUsername() { async void ChangeUsername() {
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
changeUsernameSubmitButton.interactable = false; changeUsernameSubmitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("newUsername", changeUsernameNewUsernameInput.text); dataForm.AddField("newUsername", changeUsernameNewUsernameInput.text);
@@ -33,7 +33,7 @@ public class AccountChangeUsername : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
changeUsernameSubmitButton.interactable = true; changeUsernameSubmitButton.interactable = true;
Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
return; return;
@@ -42,12 +42,12 @@ public class AccountChangeUsername : MonoBehaviour {
if ((bool)jsonResponse["success"]) { if ((bool)jsonResponse["success"]) {
BazookaManager.Instance.SetAccountName(changeUsernameNewUsernameInput.text); BazookaManager.Instance.SetAccountName(changeUsernameNewUsernameInput.text);
BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]);
AccountHandler.instance.SwitchPanel(0); AccountHandler.Instance.SwitchPanel(0);
Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green); Tools.UpdateStatusText(AccountHandler.Instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
} else { } else {
Tools.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red);
} }
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
changeUsernameSubmitButton.interactable = true; changeUsernameSubmitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountForgotDetails.cs
+5 -5
View File
@@ -21,18 +21,18 @@ public class AccountForgotDetails : MonoBehaviour {
forgotDetailsEmailInput.text = ""; forgotDetailsEmailInput.text = "";
forgotDetailsVerifyCodeInput.text = ""; forgotDetailsVerifyCodeInput.text = "";
forgotDetailsSubmitButton.onClick.RemoveAllListeners(); forgotDetailsSubmitButton.onClick.RemoveAllListeners();
AccountHandler.instance.backButton.onClick.AddListener(() => { AccountHandler.Instance.backButton.onClick.AddListener(() => {
forgotDetailsSubmitButton.interactable = false; forgotDetailsSubmitButton.interactable = false;
mode = 0; mode = 0;
forgotDetailsTitleText.text = ""; forgotDetailsTitleText.text = "";
forgotDetailsStatusText.text = ""; forgotDetailsStatusText.text = "";
AccountHandler.instance.SwitchPanel(2); AccountHandler.Instance.SwitchPanel(2);
}); });
forgotDetailsSubmitButton.onClick.AddListener(() => ForgotDetails()); forgotDetailsSubmitButton.onClick.AddListener(() => ForgotDetails());
} }
async void ForgotDetails() { async void ForgotDetails() {
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
forgotDetailsSubmitButton.interactable = false; forgotDetailsSubmitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("email", forgotDetailsEmailInput.text); dataForm.AddField("email", forgotDetailsEmailInput.text);
@@ -44,7 +44,7 @@ public class AccountForgotDetails : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
forgotDetailsSubmitButton.interactable = true; forgotDetailsSubmitButton.interactable = true;
Tools.UpdateStatusText(forgotDetailsStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(forgotDetailsStatusText, "Failed to make HTTP request", Color.red);
return; return;
@@ -52,7 +52,7 @@ public class AccountForgotDetails : MonoBehaviour {
var jsonResponse = JObject.Parse(request.downloadHandler.text); var jsonResponse = JObject.Parse(request.downloadHandler.text);
if ((bool)jsonResponse["success"]) Tools.UpdateStatusText(forgotDetailsStatusText, "An email has been sent to your inbox", Color.green); if ((bool)jsonResponse["success"]) Tools.UpdateStatusText(forgotDetailsStatusText, "An email has been sent to your inbox", Color.green);
else Tools.UpdateStatusText(forgotDetailsStatusText, (string)jsonResponse["message"], Color.red); else Tools.UpdateStatusText(forgotDetailsStatusText, (string)jsonResponse["message"], Color.red);
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
forgotDetailsSubmitButton.interactable = true; forgotDetailsSubmitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountHandler.cs
+3 -3
View File
@@ -3,9 +3,9 @@ using UnityEngine.InputSystem;
using UnityEngine.UI; using UnityEngine.UI;
public class AccountHandler : MonoBehaviour { public class AccountHandler : MonoBehaviour {
public static AccountHandler instance; public static AccountHandler Instance;
public AccountLoggedIn accountLoggedIn; public AccountLoggedIn accountLoggedIn;
[SerializeField] private Button exitButton; [SerializeField] internal Button exitButton;
[SerializeField] internal Button backButton; [SerializeField] internal Button backButton;
[SerializeField] private AccountLoggedOut accountLoggedOut; [SerializeField] private AccountLoggedOut accountLoggedOut;
[SerializeField] private AccountLogin accountLogin; [SerializeField] private AccountLogin accountLogin;
@@ -16,7 +16,7 @@ public class AccountHandler : MonoBehaviour {
[SerializeField] internal AccountForgotDetails accountForgotDetails; [SerializeField] internal AccountForgotDetails accountForgotDetails;
void Awake() { void Awake() {
instance = this; Instance = this;
exitButton.onClick.AddListener(() => Destroy(gameObject)); exitButton.onClick.AddListener(() => Destroy(gameObject));
} }
Assets/Scripts/AccountMenu/AccountLoggedIn.cs
+12 -10
View File
@@ -28,14 +28,16 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.onClick.RemoveAllListeners(); loggedInLoadButton.onClick.RemoveAllListeners();
loggedInRefreshLoginButton.onClick.RemoveAllListeners(); loggedInRefreshLoginButton.onClick.RemoveAllListeners();
loggedInLogoutButton.onClick.RemoveAllListeners(); loggedInLogoutButton.onClick.RemoveAllListeners();
loggedInChangeUsernameButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(4)); loggedInChangeUsernameButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(4));
loggedInChangePasswordButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(5)); loggedInChangePasswordButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(5));
loggedInSaveButton.onClick.AddListener(() => SaveAccount()); loggedInSaveButton.onClick.AddListener(() => SaveAccount());
loggedInLoadButton.onClick.AddListener(() => LoadAccount()); loggedInLoadButton.onClick.AddListener(() => LoadAccount());
loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(6)); loggedInRefreshLoginButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(6));
loggedInLogoutButton.onClick.AddListener(() => { loggedInLogoutButton.onClick.AddListener(() => {
AccountHandler.Instance.exitButton.interactable = false;
BazookaManager.Instance.ResetSave(); BazookaManager.Instance.ResetSave();
AccountHandler.instance.SwitchPanel(1); AccountHandler.Instance.SwitchPanel(1);
AccountHandler.Instance.exitButton.interactable = true;
}); });
} }
@@ -46,7 +48,7 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = false; loggedInLoadButton.interactable = false;
loggedInRefreshLoginButton.interactable = false; loggedInRefreshLoginButton.interactable = false;
loggedInLogoutButton.interactable = false; loggedInLogoutButton.interactable = false;
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.exitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("saveData", Convert.ToBase64String(Encoding.UTF8.GetBytes(BazookaManager.Instance.saveFile.ToString(Formatting.None)))); dataForm.AddField("saveData", Convert.ToBase64String(Encoding.UTF8.GetBytes(BazookaManager.Instance.saveFile.ToString(Formatting.None))));
using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_SAVE_ENDPOINT, dataForm); using UnityWebRequest request = UnityWebRequest.Post(Endpoints.ACCOUNT_SAVE_ENDPOINT, dataForm);
@@ -62,7 +64,7 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = true; loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true; loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true; loggedInLogoutButton.interactable = true;
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.exitButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return; return;
} }
@@ -74,7 +76,7 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = true; loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true; loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true; loggedInLogoutButton.interactable = true;
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.exitButton.interactable = true;
} }
async void LoadAccount() { async void LoadAccount() {
@@ -84,7 +86,7 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = false; loggedInLoadButton.interactable = false;
loggedInRefreshLoginButton.interactable = false; loggedInRefreshLoginButton.interactable = false;
loggedInLogoutButton.interactable = false; loggedInLogoutButton.interactable = false;
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.exitButton.interactable = false;
using UnityWebRequest request = UnityWebRequest.Get(Endpoints.ACCOUNT_SAVE_ENDPOINT); using UnityWebRequest request = UnityWebRequest.Get(Endpoints.ACCOUNT_SAVE_ENDPOINT);
request.SetRequestHeader("Authorization", BazookaManager.Instance.GetAccountSession()); request.SetRequestHeader("Authorization", BazookaManager.Instance.GetAccountSession());
request.SetRequestHeader("Requester", "BerryDashClient"); request.SetRequestHeader("Requester", "BerryDashClient");
@@ -98,7 +100,7 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = true; loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true; loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true; loggedInLogoutButton.interactable = true;
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.exitButton.interactable = true;
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return; return;
} }
@@ -124,6 +126,6 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLoadButton.interactable = true; loggedInLoadButton.interactable = true;
loggedInRefreshLoginButton.interactable = true; loggedInRefreshLoginButton.interactable = true;
loggedInLogoutButton.interactable = true; loggedInLogoutButton.interactable = true;
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.exitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountLoggedOut.cs
+2 -2
View File
@@ -8,7 +8,7 @@ public class AccountLoggedOut : MonoBehaviour {
void OnEnable() { void OnEnable() {
loggedOutLoginButton.onClick.RemoveAllListeners(); loggedOutLoginButton.onClick.RemoveAllListeners();
loggedOutRegisterButton.onClick.RemoveAllListeners(); loggedOutRegisterButton.onClick.RemoveAllListeners();
loggedOutLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(2)); loggedOutLoginButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(2));
loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3)); loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(3));
} }
} }
Assets/Scripts/AccountMenu/AccountLogin.cs
+15 -15
View File
@@ -25,26 +25,26 @@ public class AccountLogin : MonoBehaviour {
loginSubmitButton.onClick.RemoveAllListeners(); loginSubmitButton.onClick.RemoveAllListeners();
forgotUsernameButton.onClick.RemoveAllListeners(); forgotUsernameButton.onClick.RemoveAllListeners();
forgotPasswordButton.onClick.RemoveAllListeners(); forgotPasswordButton.onClick.RemoveAllListeners();
AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(1)); AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(1));
loginSubmitButton.onClick.AddListener(() => SubmitLogin()); loginSubmitButton.onClick.AddListener(() => SubmitLogin());
forgotUsernameButton.onClick.AddListener(() => { forgotUsernameButton.onClick.AddListener(() => {
AccountHandler.instance.SwitchPanel(7); AccountHandler.Instance.SwitchPanel(7);
AccountHandler.instance.accountForgotDetails.mode = 0; AccountHandler.Instance.accountForgotDetails.mode = 0;
AccountHandler.instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot username"; AccountHandler.Instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot username";
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
AccountHandler.instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true; AccountHandler.Instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
}); });
forgotPasswordButton.onClick.AddListener(() => { forgotPasswordButton.onClick.AddListener(() => {
AccountHandler.instance.SwitchPanel(7); AccountHandler.Instance.SwitchPanel(7);
AccountHandler.instance.accountForgotDetails.mode = 1; AccountHandler.Instance.accountForgotDetails.mode = 1;
AccountHandler.instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot password"; AccountHandler.Instance.accountForgotDetails.forgotDetailsTitleText.text = "Forgot password";
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
AccountHandler.instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true; AccountHandler.Instance.accountForgotDetails.forgotDetailsSubmitButton.interactable = true;
}); });
} }
async void SubmitLogin() { async void SubmitLogin() {
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
loginSubmitButton.interactable = false; loginSubmitButton.interactable = false;
if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty) { if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty) {
Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
@@ -59,7 +59,7 @@ public class AccountLogin : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
loginSubmitButton.interactable = true; loginSubmitButton.interactable = true;
Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
@@ -69,12 +69,12 @@ public class AccountLogin : MonoBehaviour {
BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"])); BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
AccountHandler.instance.SwitchPanel(0); AccountHandler.Instance.SwitchPanel(0);
Tools.UpdateStatusText(loginPanelStatusText, "", Color.red); Tools.UpdateStatusText(loginPanelStatusText, "", Color.red);
} else { } else {
Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
} }
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
loginSubmitButton.interactable = true; loginSubmitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountRefreshLogin.cs
+5 -5
View File
@@ -20,12 +20,12 @@ public class AccountRefreshLogin : MonoBehaviour {
refreshLoginUsernameInput.text = ""; refreshLoginUsernameInput.text = "";
refreshLoginPasswordInput.text = ""; refreshLoginPasswordInput.text = "";
refreshLoginSubmitButton.onClick.RemoveAllListeners(); refreshLoginSubmitButton.onClick.RemoveAllListeners();
AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(0)); AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(0));
refreshLoginSubmitButton.onClick.AddListener(() => RefreshLogin()); refreshLoginSubmitButton.onClick.AddListener(() => RefreshLogin());
} }
async void RefreshLogin() { async void RefreshLogin() {
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
refreshLoginSubmitButton.interactable = false; refreshLoginSubmitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("username", refreshLoginUsernameInput.text); dataForm.AddField("username", refreshLoginUsernameInput.text);
@@ -36,7 +36,7 @@ public class AccountRefreshLogin : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
refreshLoginSubmitButton.interactable = true; refreshLoginSubmitButton.interactable = true;
Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
return; return;
@@ -46,12 +46,12 @@ public class AccountRefreshLogin : MonoBehaviour {
BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]); BazookaManager.Instance.SetAccountSession((string)jsonResponse["data"]["session"]);
BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]); BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"])); BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["id"]));
AccountHandler.instance.SwitchPanel(0); AccountHandler.Instance.SwitchPanel(0);
Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red); Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red);
} else { } else {
Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
} }
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
refreshLoginSubmitButton.interactable = true; refreshLoginSubmitButton.interactable = true;
} }
} }
Assets/Scripts/AccountMenu/AccountRegister.cs
+5 -5
View File
@@ -28,7 +28,7 @@ public class AccountRegister : MonoBehaviour {
registerRetypePasswordInput.text = ""; registerRetypePasswordInput.text = "";
registerVerifyCodeInput.text = ""; registerVerifyCodeInput.text = "";
registerPanelStatusText.text = ""; registerPanelStatusText.text = "";
AccountHandler.instance.backButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(1)); AccountHandler.Instance.backButton.onClick.AddListener(() => AccountHandler.Instance.SwitchPanel(1));
registerSubmitButton.onClick.AddListener(() => SubmitRegister()); registerSubmitButton.onClick.AddListener(() => SubmitRegister());
} }
@@ -47,7 +47,7 @@ public class AccountRegister : MonoBehaviour {
Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
return; return;
} }
AccountHandler.instance.backButton.interactable = false; AccountHandler.Instance.backButton.interactable = false;
registerSubmitButton.interactable = false; registerSubmitButton.interactable = false;
WWWForm dataForm = new(); WWWForm dataForm = new();
dataForm.AddField("username", registerUsernameInput.text); dataForm.AddField("username", registerUsernameInput.text);
@@ -61,18 +61,18 @@ public class AccountRegister : MonoBehaviour {
request.SetRequestHeader("ClientPlatform", Application.platform.ToString()); request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest(); await request.SendWebRequest();
if (request.downloadHandler.text == null) { if (request.downloadHandler.text == null) {
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
registerSubmitButton.interactable = true; registerSubmitButton.interactable = true;
Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red); Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
return; return;
} }
var jsonResponse = JObject.Parse(request.downloadHandler.text); var jsonResponse = JObject.Parse(request.downloadHandler.text);
if ((bool)jsonResponse["success"]) { if ((bool)jsonResponse["success"]) {
AccountHandler.instance.SwitchPanel(2); AccountHandler.Instance.SwitchPanel(2);
} else { } else {
Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red); Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
} }
AccountHandler.instance.backButton.interactable = true; AccountHandler.Instance.backButton.interactable = true;
registerSubmitButton.interactable = true; registerSubmitButton.interactable = true;
} }
} }