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

Make sending data to the server easier & send new stats to the server (and load, not fully yet tho)

Browse Source
This commit is contained in:
Travis
2025-06-15 14:14:40 -07:00
parent 533bd53073
commit 12d95097a2
11 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,13 +34,13 @@ public class AccountChangePassword : MonoBehaviour
AccountHandler.UpdateStatusText(changePasswordStatusText, "Passwords do not match", Color.red);
return;
}
WWWForm dataForm = new();
dataForm.AddField("inputPassword", SensitiveInfo.Encrypt(changePasswordCurrentPasswordInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("inputNewPassword", SensitiveInfo.Encrypt(changePasswordNewPasswordInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("session", SensitiveInfo.Encrypt(PlayerPrefs.GetString("gameSession"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("userName", SensitiveInfo.Encrypt(PlayerPrefs.GetString("userName"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("inputPassword", changePasswordCurrentPasswordInput.text);
dataForm.AddField("inputNewPassword", changePasswordNewPasswordInput.text);
dataForm.AddField("session", PlayerPrefs.GetString("gameSession"));
dataForm.AddField("userName", PlayerPrefs.GetString("userName"));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountPassword.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

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

@@ -26,13 +26,13 @@ public class AccountChangeUsername : MonoBehaviour
async void ChangeUsername()
{
WWWForm dataForm = new();
dataForm.AddField("inputUserName", SensitiveInfo.Encrypt(changeUsernameCurrentUsernameInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("inputNewUserName", SensitiveInfo.Encrypt(changeUsernameNewUsernameInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("session", SensitiveInfo.Encrypt(PlayerPrefs.GetString("gameSession"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("userName", SensitiveInfo.Encrypt(PlayerPrefs.GetString("userName"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("inputUserName", changeUsernameCurrentUsernameInput.text);
dataForm.AddField("inputNewUserName", changeUsernameNewUsernameInput.text);
dataForm.AddField("session", PlayerPrefs.GetString("gameSession"));
dataForm.AddField("userName", PlayerPrefs.GetString("userName"));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "changeAccountUsername.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

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

@@ -37,14 +37,20 @@ public class AccountLoggedIn : MonoBehaviour
{
loggedInLoadButton.interactable = false;
loggedInSaveButton.interactable = false;
WWWForm dataForm = new();
dataForm.AddField("userName", SensitiveInfo.Encrypt(PlayerPrefs.GetString("userName", ""), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("gameSession", SensitiveInfo.Encrypt(PlayerPrefs.GetString("gameSession", ""), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("highScore", SensitiveInfo.Encrypt(PlayerPrefs.GetString("HighScoreV2", "0"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("icon", SensitiveInfo.Encrypt(PlayerPrefs.GetInt("icon", 1).ToString(), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("overlay", SensitiveInfo.Encrypt(PlayerPrefs.GetInt("overlay", 0).ToString(), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("userName", PlayerPrefs.GetString("userName", ""));
dataForm.AddField("gameSession", PlayerPrefs.GetString("gameSession", ""));
dataForm.AddField("highScore", PlayerPrefs.GetString("HighScoreV2", "0"));
dataForm.AddField("icon", PlayerPrefs.GetInt("icon", 1).ToString());
dataForm.AddField("overlay", PlayerPrefs.GetInt("overlay", 0).ToString());
dataForm.AddField("totalNormalBerries", PlayerPrefs.GetString("TotalNormalBerries", "0"));
dataForm.AddField("totalPoisonBerries", PlayerPrefs.GetString("TotalPoisonBerries", "0"));
dataForm.AddField("totalSlowBerries", PlayerPrefs.GetString("TotalSlowBerries", "0"));
dataForm.AddField("totalUltraBerries", PlayerPrefs.GetString("TotalUltraBerries", "0"));
dataForm.AddField("totalSpeedyBerries", PlayerPrefs.GetString("TotalSpeedyBerries", "0"));
dataForm.AddField("totalAttempts", PlayerPrefs.GetString("TotalAttempts", "0"));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "saveAccount.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();
@@ -77,11 +83,11 @@ public class AccountLoggedIn : MonoBehaviour
{
loggedInLoadButton.interactable = false;
loggedInSaveButton.interactable = false;
WWWForm dataForm = new();
dataForm.AddField("userName", SensitiveInfo.Encrypt(PlayerPrefs.GetString("userName", ""), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("gameSession", SensitiveInfo.Encrypt(PlayerPrefs.GetString("gameSession", ""), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("userName", PlayerPrefs.GetString("userName", ""));
dataForm.AddField("gameSession", PlayerPrefs.GetString("gameSession", ""));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loadAccount.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();
@@ -106,6 +112,12 @@ public class AccountLoggedIn : MonoBehaviour
PlayerPrefs.SetString("HighScoreV2", split[1]);
PlayerPrefs.SetInt("icon", int.Parse(split[2]));
PlayerPrefs.SetInt("overlay", int.Parse(split[3]));
PlayerPrefs.SetString("TotalNormalBerries", split[4]);
PlayerPrefs.SetString("TotalPoisonBerries", split[5]);
PlayerPrefs.SetString("TotalSlowBerries", split[6]);
PlayerPrefs.SetString("TotalUltraBerries", split[7]);
PlayerPrefs.SetString("TotalSpeedyBerries", split[8]);
PlayerPrefs.SetString("TotalAttempts", split[9]);
AccountHandler.UpdateStatusText(loggedInText, "Loaded account data", Color.green);
}
else

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

@@ -27,13 +27,13 @@ public class AccountLogin : MonoBehaviour
async void SubmitLogin()
{
WWWForm dataForm = new();
dataForm.AddField("username", SensitiveInfo.Encrypt(loginUsernameInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("password", SensitiveInfo.Encrypt(loginPasswordInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("currentHighScore", SensitiveInfo.Encrypt(PlayerPrefs.GetString("HighScoreV2", "0"), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("loginType", SensitiveInfo.Encrypt("0", SensitiveInfo.SERVER_SEND_TRANSFER_KEY)); //Yes.
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("username", loginUsernameInput.text);
dataForm.AddField("password", loginPasswordInput.text);
dataForm.AddField("currentHighScore", PlayerPrefs.GetString("HighScoreV2", "0"));
dataForm.AddField("loginType", "0");
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

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

@@ -25,12 +25,12 @@ public class AccountRefreshLogin : MonoBehaviour
async void RefreshLogin()
{
WWWForm dataForm = new();
dataForm.AddField("username", SensitiveInfo.Encrypt(refreshLoginUsernameInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("password", SensitiveInfo.Encrypt(refreshLoginPasswordInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("loginType", SensitiveInfo.Encrypt("1", SensitiveInfo.SERVER_SEND_TRANSFER_KEY)); //Yes II
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "loginAccount.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
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());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

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

@@ -49,12 +49,12 @@ public class AccountRegister : MonoBehaviour
AccountHandler.UpdateStatusText(registerPanelStatusText, "Username must be 3-16 characters, letters and numbers only", Color.red);
return;
}
WWWForm dataForm = new();
dataForm.AddField("username", SensitiveInfo.Encrypt(registerUsernameInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("email", SensitiveInfo.Encrypt(registerEmailInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
dataForm.AddField("password", SensitiveInfo.Encrypt(registerPasswordInput.text, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "registerAccount.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
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());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

13
Assets/Scripts/EncryptedWWWForm.cs Normal file
View File

@@ -0,0 +1,13 @@
using UnityEngine;
public class EncryptedWWWForm
{
private readonly WWWForm form = new();
public void AddField(string key, string value)
{
form.AddField(key, SensitiveInfo.Encrypt(value, SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
}
public WWWForm GetWWWForm() => form;
}

2
Assets/Scripts/EncryptedWWWForm.cs.meta Normal file
View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 3bc52d706b8e5c9ea9eab9e3836dbfec

2
Assets/Scripts/LatestVersionText.cs
View File

@@ -44,7 +44,7 @@ public class LatestVersionText : MonoBehaviour
async void GetLatestVersion()
{
using UnityWebRequest request = UnityWebRequest.Get(SensitiveInfo.SERVER_DATABASE_PREFIX + "getLatestVersion.php");
request.SetRequestHeader("User-Agent", "BerryDashClient");
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();

9
Assets/Scripts/LeaderboardsMenu.cs
View File

@@ -44,11 +44,12 @@ public class LeaderboardsMenu : MonoBehaviour
}
}
UpdateStatus(true, "Loading...");
WWWForm dataForm = new();
dataForm.AddField("showAmount", SensitiveInfo.Encrypt(showAmount.ToString(), SensitiveInfo.SERVER_SEND_TRANSFER_KEY));
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "getTopPlayers.php", dataForm);
request.SetRequestHeader("User-Agent", "BerryDashClient");
EncryptedWWWForm dataForm = new();
dataForm.AddField("showAmount", showAmount.ToString());
using UnityWebRequest request = UnityWebRequest.Post(SensitiveInfo.SERVER_DATABASE_PREFIX + "getTopPlayers.php", dataForm.GetWWWForm());
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();
if (request.result == UnityWebRequest.Result.Success)
{

2
Assets/Scripts/LoadingMenu.cs
View File

@@ -69,7 +69,7 @@ public class LoadingMenu : MonoBehaviour
if (Application.platform != RuntimePlatform.WebGLPlayer)
{
using UnityWebRequest request = UnityWebRequest.Get(SensitiveInfo.SERVER_DATABASE_PREFIX + "canLoadClient.php");
request.SetRequestHeader("User-Agent", "BerryDashClient");
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
request.SetRequestHeader("ClientPlatform", Application.platform.ToString());
await request.SendWebRequest();