Fixes to a bunch of crap

This commit is contained in:
Lncvrt committed 2026-03-08 11:47:43 -07:00
1 parent d5aa11c1ec
commit 167076aaa5
5 files changed
+42 -22

No files matched your search

@@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq;
using TMPro;
using UnityEngine;
using UnityEngine.Networking;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class AccountLoggedIn : MonoBehaviour {
@@ -36,6 +37,11 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLogoutButton.onClick.AddListener(() => {
AccountHandler.Instance.exitButton.interactable = false;
BazookaManager.Instance.ResetSave();
DontDestroyOnLoad(AccountHandler.Instance.gameObject);
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
SceneManager.sceneLoaded += OnSceneLoaded;
AccountHandler.Instance.SwitchPanel(1);
AccountHandler.Instance.exitButton.interactable = true;
});
@@ -107,6 +113,11 @@ public class AccountLoggedIn : MonoBehaviour {
var jsonResponse = JObject.Parse(request.downloadHandler.text);
if ((bool)jsonResponse["success"]) {
BazookaManager.Instance.saveFile = JObject.FromObject(jsonResponse["data"]);
DontDestroyOnLoad(AccountHandler.Instance.gameObject);
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
SceneManager.sceneLoaded += OnSceneLoaded;
if (!Application.isMobilePlatform) {
var width = Display.main.systemWidth;
var height = Display.main.systemHeight;
@@ -128,4 +139,13 @@ public class AccountLoggedIn : MonoBehaviour {
loggedInLogoutButton.interactable = true;
AccountHandler.Instance.exitButton.interactable = true;
}
void OnSceneLoaded(Scene scene, LoadSceneMode mode) {
SceneManager.MoveGameObjectToScene(AccountHandler.Instance.gameObject, scene);
SceneManager.sceneLoaded -= OnSceneLoaded;
var canvas = AccountHandler.Instance.GetComponentInChildren<Canvas>();
canvas.enabled = false;
canvas.enabled = true;
}
}
+1
View File
@@ -1,6 +1,7 @@
using UnityEngine;
using UnityEngine.SceneManagement;
[RequireComponent(typeof(AudioSource))]
public class MenuMusic : MonoBehaviour {
public static MenuMusic Instance;
+17 -1
View File
@@ -2,6 +2,7 @@ using Newtonsoft.Json.Linq;
using TMPro;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class SettingsMenu : MonoBehaviour {
@@ -73,7 +74,13 @@ public class SettingsMenu : MonoBehaviour {
setting2toggle.onValueChanged.AddListener(value => {
BazookaManager.Instance.SetSettingShowFPS(value);
});
setting4toggle.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingHideSocials(value));
setting4toggle.onValueChanged.AddListener(value => {
BazookaManager.Instance.SetSettingHideSocials(value);
DontDestroyOnLoad(gameObject);
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
SceneManager.sceneLoaded += OnSceneLoaded;
});
setting5toggle.onValueChanged.AddListener(value => BazookaManager.Instance.SetSettingRandomMusic(value));
musicSlider.onValueChanged.AddListener(value => {
BazookaManager.Instance.SetSettingMusicVolume(value);
@@ -127,4 +134,13 @@ public class SettingsMenu : MonoBehaviour {
void Update() {
if (Keyboard.current.escapeKey.wasPressedThisFrame && exitButton.interactable) exitButton.onClick.Invoke();
}
void OnSceneLoaded(Scene scene, LoadSceneMode mode) {
SceneManager.MoveGameObjectToScene(gameObject, scene);
SceneManager.sceneLoaded -= OnSceneLoaded;
var canvas = GetComponentInChildren<Canvas>();
canvas.enabled = false;
canvas.enabled = true;
}
}