diff --git a/Assets/Scenes/LoadingMenu.unity b/Assets/Scenes/LoadingMenu.unity index eda65e7..639a0d3 100644 --- a/Assets/Scenes/LoadingMenu.unity +++ b/Assets/Scenes/LoadingMenu.unity @@ -1151,11 +1151,56 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1201615240} m_CullTransparentMesh: 1 +--- !u!1 &1547097372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547097374} + - component: {fileID: 1547097373} + m_Layer: 0 + m_Name: BazookaManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1547097373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547097372} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a0df255fc60e6e3c88ebb94d2d88db4d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1547097374 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1547097372} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 705564545} - {fileID: 842325110} + - {fileID: 1547097374} - {fileID: 734849810} - {fileID: 759356942} diff --git a/Assets/Scripts/BazookaManager.cs b/Assets/Scripts/BazookaManager.cs index 14870c4..ab8b3a9 100644 --- a/Assets/Scripts/BazookaManager.cs +++ b/Assets/Scripts/BazookaManager.cs @@ -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()); } diff --git a/Assets/Scripts/HideIfSettingFalse.cs b/Assets/Scripts/HideIfSettingFalse.cs index 0d3f2bd..874deb3 100644 --- a/Assets/Scripts/HideIfSettingFalse.cs +++ b/Assets/Scripts/HideIfSettingFalse.cs @@ -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 }; diff --git a/Assets/Scripts/LoadingMenu.cs b/Assets/Scripts/LoadingMenu.cs index 9ffe071..b25262d 100644 --- a/Assets/Scripts/LoadingMenu.cs +++ b/Assets/Scripts/LoadingMenu.cs @@ -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"); diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs index 8fc49fc..e30f411 100644 --- a/Assets/Scripts/SettingsMenu.cs +++ b/Assets/Scripts/SettingsMenu.cs @@ -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