Fixes to a bunch of crap
This commit is contained in:
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;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user