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

Re-add loading stuff that was removed temp

Browse Source
This commit is contained in:
Travis
2025-08-20 19:36:13 -07:00
parent b912116539
commit 230fdc5132
5 changed files with 67 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Scripts/BazookaManager.cs
View File

@@ -147,10 +147,10 @@ public class BazookaManager : MonoBehaviour
saveFile["settings"]["fullScreen"] = value;
}
public bool? GetSettingFullScreen()
public bool GetSettingFullScreen()
{
if (saveFile["settings"] == null) return null;
if (saveFile["settings"]["fullScreen"] == null) return null;
if (saveFile["settings"] == null) return true;
if (saveFile["settings"]["fullScreen"] == null) return true;
return bool.Parse(saveFile["settings"]["fullScreen"].ToString());
}
@@ -173,10 +173,10 @@ public class BazookaManager : MonoBehaviour
saveFile["settings"]["vsync"] = value;
}
public bool? GetSettingVsync()
public bool GetSettingVsync()
{
if (saveFile["settings"] == null) return null;
if (saveFile["settings"]["vsync"] == null) return null;
if (saveFile["settings"] == null) return true;
if (saveFile["settings"]["vsync"] == null) return true;
return bool.Parse(saveFile["settings"]["vsync"].ToString());
}

4
Assets/Scripts/HideIfSettingFalse.cs
View File

@@ -12,9 +12,9 @@ public class HideIfSettingFalse : MonoBehaviour {
bool GetSettingValue(SettingTypes s) {
var b = BazookaManager.Instance;
return s switch {
SettingTypes.FullScreen => b.GetSettingFullScreen() ?? false,
SettingTypes.FullScreen => b.GetSettingFullScreen(),
SettingTypes.ShowFPS => b.GetSettingShowFPS(),
SettingTypes.Vsync => b.GetSettingVsync() ?? false,
SettingTypes.Vsync => b.GetSettingVsync(),
SettingTypes.HideSocials => b.GetSettingHideSocials() ?? false,
_ => false
};

19
Assets/Scripts/LoadingMenu.cs
View File

@@ -10,8 +10,18 @@ public class LoadingMenu : MonoBehaviour
public Button updateButton;
public Button continueButton;
void Awake()
void Start()
{
QualitySettings.vSyncCount = BazookaManager.Instance.GetSettingVsync() ? 1 : -1;
if (!Application.isMobilePlatform)
{
Screen.fullScreen = BazookaManager.Instance.GetSettingFullScreen();
}
else
{
Application.targetFrameRate = 360;
QualitySettings.vSyncCount = 0;
}
PlayerPrefs.SetString("latestVersion", Application.version);
updateButton.onClick.AddListener(() =>
{
@@ -21,16 +31,11 @@ public class LoadingMenu : MonoBehaviour
{
await SceneManager.LoadSceneAsync("MainMenu");
});
}
void Start()
{
CheckUpdate();
}
async void CheckUpdate()
{
string response;
using UnityWebRequest request = UnityWebRequest.Get(SensitiveInfo.SERVER_DATABASE_PREFIX + "canLoadClient.php");
request.SetRequestHeader("Requester", "BerryDashClient");
request.SetRequestHeader("ClientVersion", Application.version);
@@ -41,7 +46,7 @@ public class LoadingMenu : MonoBehaviour
text.text = "Failed to check version";
return;
}
response = request.downloadHandler.text;
string response = request.downloadHandler.text;
if (response == "1")
{
await SceneManager.LoadSceneAsync("MainMenu");

4
Assets/Scripts/SettingsMenu.cs
View File

@@ -34,9 +34,9 @@ public class SettingsMenu : MonoBehaviour
sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume();
if (!Application.isMobilePlatform)
{
setting1toggle.isOn = BazookaManager.Instance.GetSettingFullScreen() ?? true == true;
setting1toggle.isOn = BazookaManager.Instance.GetSettingFullScreen() == true;
setting2toggle.isOn = BazookaManager.Instance.GetSettingShowFPS() == true;
setting3toggle.isOn = BazookaManager.Instance.GetSettingVsync() ?? true == true;
setting3toggle.isOn = BazookaManager.Instance.GetSettingVsync() == true;
setting4toggle.isOn = BazookaManager.Instance.GetSettingHideSocials() == true;
}
else