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

A bunch of tweaks

Browse Source
This commit is contained in:
Travis
2025-07-14 16:55:26 -07:00
parent 7d5f7ea7c6
commit 47030a76a1
19 changed files with 144 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Scripts/AccountMenu/AccountChangePassword.cs
View File

@@ -31,7 +31,7 @@ public class AccountChangePassword : MonoBehaviour
{
if (changePasswordNewPasswordInput.text != changePasswordRetypeNewPasswordInput.text)
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
return;
}
EncryptedWWWForm dataForm = new();
@@ -39,35 +39,35 @@ public class AccountChangePassword : MonoBehaviour
dataForm.AddField("newpassword", changePasswordNewPasswordInput.text);
dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.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)
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(changePasswordStatusText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -77,11 +77,11 @@ public class AccountChangePassword : MonoBehaviour
{
BazookaManager.Instance.SetAccountSession((string)jsonResponse["token"]);
AccountHandler.instance.SwitchPanel(0);
AccountHandler.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Password changed successfully", Color.green);
}
else
{
AccountHandler.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(changePasswordStatusText, (string)jsonResponse["message"], Color.red);
}
}
}

16
Assets/Scripts/AccountMenu/AccountChangeUsername.cs
View File

@@ -32,35 +32,35 @@ public class AccountChangeUsername : MonoBehaviour
dataForm.AddField("newusername", changeUsernameNewUsernameInput.text);
dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.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)
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -70,11 +70,11 @@ public class AccountChangeUsername : MonoBehaviour
{
BazookaManager.Instance.SetAccountName(changeUsernameNewUsernameInput.text);
AccountHandler.instance.SwitchPanel(0);
AccountHandler.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
Tools.UpdateStatusText(AccountHandler.instance.accountLoggedIn.loggedInText, "Username changed successfully", Color.green);
}
else
{
AccountHandler.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(changeUsernameStatusText, (string)jsonResponse["message"], Color.red);
}
}
}

7
Assets/Scripts/AccountMenu/AccountHandler.cs
View File

@@ -1,4 +1,3 @@
using TMPro;
using UnityEngine;
public class AccountHandler : MonoBehaviour
@@ -98,10 +97,4 @@ public class AccountHandler : MonoBehaviour
break;
}
}
public static void UpdateStatusText(TMP_Text statusText, string message, Color color)
{
statusText.text = message;
statusText.color = color;
}
}

34
Assets/Scripts/AccountMenu/AccountLoggedIn.cs
View File

@@ -39,7 +39,7 @@ public class AccountLoggedIn : MonoBehaviour
{
loggedInSaveButton.interactable = true;
loggedInLoadButton.interactable = true;
AccountHandler.UpdateStatusText(loggedInText, "Logged in as: " + BazookaManager.Instance.GetAccountName(), Color.white);
Tools.UpdateStatusText(loggedInText, "Logged in as: " + BazookaManager.Instance.GetAccountName(), Color.white);
}
async void SaveAccount()
@@ -60,35 +60,35 @@ public class AccountLoggedIn : MonoBehaviour
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));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.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)
{
AccountHandler.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -96,11 +96,11 @@ public class AccountLoggedIn : MonoBehaviour
var jsonResponse = JObject.Parse(response);
if ((bool)jsonResponse["success"])
{
AccountHandler.UpdateStatusText(loggedInText, "Synced account", Color.green);
Tools.UpdateStatusText(loggedInText, "Synced account", Color.green);
}
else
{
AccountHandler.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
}
}
loggedInLoadButton.interactable = true;
@@ -114,35 +114,35 @@ public class AccountLoggedIn : MonoBehaviour
EncryptedWWWForm dataForm = new();
dataForm.AddField("token", BazookaManager.Instance.GetAccountSession());
dataForm.AddField("username", BazookaManager.Instance.GetAccountName());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.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)
{
AccountHandler.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(loggedInText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(loggedInText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(loggedInText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(loggedInText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(loggedInText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -161,11 +161,11 @@ public class AccountLoggedIn : MonoBehaviour
BazookaManager.Instance.SetGameStoreTotalAttepts(BigInteger.Parse((string)jsonResponse["totalAttempts"]));
BazookaManager.Instance.SetColorSettingIcon(JArray.Parse(jsonResponse["birdColor"].ToString()));
BazookaManager.Instance.SetColorSettingOverlay(JArray.Parse(jsonResponse["overlayColor"].ToString()));
AccountHandler.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
Tools.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
}
else
{
AccountHandler.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(loggedInText, (string)jsonResponse["message"], Color.red);
}
}
loggedInLoadButton.interactable = true;

18
Assets/Scripts/AccountMenu/AccountLogin.cs
View File

@@ -31,7 +31,7 @@ public class AccountLogin : MonoBehaviour
{
if (loginUsernameInput.text == string.Empty || loginPasswordInput.text == string.Empty)
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "All input fields must be filled", Color.red);
return;
}
EncryptedWWWForm dataForm = new();
@@ -39,35 +39,35 @@ public class AccountLogin : MonoBehaviour
dataForm.AddField("password", loginPasswordInput.text);
dataForm.AddField("currentHighScore", BazookaManager.Instance.GetGameStoreHighScore().ToString());
dataForm.AddField("loginType", "0");
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.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)
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -90,11 +90,11 @@ public class AccountLogin : MonoBehaviour
BazookaManager.Instance.SetColorSettingIcon(JArray.Parse(jsonResponse["data"]["birdColor"].ToString()));
BazookaManager.Instance.SetColorSettingOverlay(JArray.Parse(jsonResponse["data"]["overlayColor"].ToString()));
AccountHandler.instance.SwitchPanel(0);
AccountHandler.UpdateStatusText(loginPanelStatusText, "", Color.red);
Tools.UpdateStatusText(loginPanelStatusText, "", Color.red);
}
else
{
AccountHandler.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(loginPanelStatusText, (string)jsonResponse["message"], Color.red);
}
}
}

16
Assets/Scripts/AccountMenu/AccountRefreshLogin.cs
View File

@@ -31,35 +31,35 @@ public class AccountRefreshLogin : MonoBehaviour
dataForm.AddField("username", refreshLoginUsernameInput.text);
dataForm.AddField("password", refreshLoginPasswordInput.text);
dataForm.AddField("loginType", "1");
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.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)
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -71,11 +71,11 @@ public class AccountRefreshLogin : MonoBehaviour
BazookaManager.Instance.SetAccountName((string)jsonResponse["data"]["username"]);
BazookaManager.Instance.SetAccountID(BigInteger.Parse((string)jsonResponse["data"]["userid"]));
AccountHandler.instance.SwitchPanel(0);
AccountHandler.UpdateStatusText(refreshLoginStatusText, "", Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, "", Color.red);
}
else
{
AccountHandler.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(refreshLoginStatusText, (string)jsonResponse["message"], Color.red);
}
}
}

20
Assets/Scripts/AccountMenu/AccountRegister.cs
View File

@@ -41,52 +41,52 @@ public class AccountRegister : MonoBehaviour
registerRetypePasswordInput.text == string.Empty
)
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "All input fields must be filled", Color.red);
return;
}
if (registerEmailInput.text != registerRetypeEmailInput.text)
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Emails don't match", Color.red);
return;
}
if (registerPasswordInput.text != registerRetypePasswordInput.text)
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Passwords don't match", Color.red);
return;
}
EncryptedWWWForm dataForm = new();
dataForm.AddField("username", registerUsernameInput.text);
dataForm.AddField("email", registerEmailInput.text);
dataForm.AddField("password", registerPasswordInput.text);
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.php", dataForm.GetWWWForm());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.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)
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Failed to make HTTP request", Color.red);
return;
}
string response = SensitiveInfo.Decrypt(request.downloadHandler.text, SensitiveInfo.SERVER_RECEIVE_TRANSFER_KEY);
if (response == "-999")
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Server error while fetching data", Color.red);
return;
}
else if (response == "-998")
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Client version too outdated to access servers", Color.red);
return;
}
else if (response == "-997")
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Encryption/decryption issues", Color.red);
return;
}
else if (response == "-996")
{
AccountHandler.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red);
Tools.UpdateStatusText(registerPanelStatusText, "Can't send requests on self-built instance", Color.red);
return;
}
else
@@ -98,7 +98,7 @@ public class AccountRegister : MonoBehaviour
}
else
{
AccountHandler.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
Tools.UpdateStatusText(registerPanelStatusText, (string)jsonResponse["message"], Color.red);
}
}
}