From d6cdd12fbfa7ec7b1718ad84d7bb633dc03ab7b4 Mon Sep 17 00:00:00 2001 From: alexiscatnip Date: Wed, 9 Jun 2021 03:09:20 +0800 Subject: [PATCH] Added a welcome screen. tested and wired the following screens up together: welcome,eula,login --- Assets/ExitAppBehaviorCallable.cs | 23 + Assets/ExitAppBehaviorCallable.cs.meta | 11 + Assets/Raindrop/Core/LoginUtils.cs | 18 +- Assets/Raindrop/Netcom/LoginOptions.cs | 8 +- Assets/Raindrop/RaindropInstance.cs | 11 +- .../UI/CanvasHelpers/CanvasManager.cs | 37 + .../Raindrop/UI/CanvasHelpers/CanvasType.cs | 4 +- Assets/Raindrop/UI/LoadingCanvasPresenter.cs | 26 + .../UI/LoadingCanvasPresenter.cs.meta | 11 + Assets/Raindrop/UI/ModalManager.cs | 102 +- .../{mainUIManager.cs => UIManager.cs} | 8 +- ...ainUIManager.cs.meta => UIManager.cs.meta} | 0 Assets/Raindrop/UI/modalPresenter.cs | 8 +- Assets/Raindrop/UI/unity/ChatPresenter.cs | 2 +- Assets/Raindrop/UI/unity/GamePresenter.cs | 4 +- Assets/Raindrop/UI/unity/LoginPresenter.cs | 129 +- Assets/Raindrop/UI/unity/MapPresenter.cs | 4 +- Assets/Raindrop/UI/unity/MinimapModule.cs | 2 +- Assets/Scenes/newUI.unity | 1407 +++++++++++------ Assets/Tests/NetworkTests.cs | 5 + Assets/Tests/RaindropTests.cs | 2 +- 21 files changed, 1284 insertions(+), 538 deletions(-) create mode 100644 Assets/ExitAppBehaviorCallable.cs create mode 100644 Assets/ExitAppBehaviorCallable.cs.meta create mode 100644 Assets/Raindrop/UI/LoadingCanvasPresenter.cs create mode 100644 Assets/Raindrop/UI/LoadingCanvasPresenter.cs.meta rename Assets/Raindrop/UI/internal/{mainUIManager.cs => UIManager.cs} (97%) rename Assets/Raindrop/UI/internal/{mainUIManager.cs.meta => UIManager.cs.meta} (100%) diff --git a/Assets/ExitAppBehaviorCallable.cs b/Assets/ExitAppBehaviorCallable.cs new file mode 100644 index 0000000..1901bc6 --- /dev/null +++ b/Assets/ExitAppBehaviorCallable.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ExitAppBehaviorCallable : MonoBehaviour +{ + + public void closeApp() + { + Application.Quit(); + } + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/ExitAppBehaviorCallable.cs.meta b/Assets/ExitAppBehaviorCallable.cs.meta new file mode 100644 index 0000000..933225a --- /dev/null +++ b/Assets/ExitAppBehaviorCallable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ec448f9fd0f246449491c7fee276e7b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raindrop/Core/LoginUtils.cs b/Assets/Raindrop/Core/LoginUtils.cs index 4405a57..9ca810b 100644 --- a/Assets/Raindrop/Core/LoginUtils.cs +++ b/Assets/Raindrop/Core/LoginUtils.cs @@ -7,13 +7,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using UnityEngine; namespace Raindrop { class LoginUtils { - // this function saves content of loginoptions to globalsettings file. - public static void SaveConfig(LoginOptions loginoptions, Raindrop.Settings globalSettings) + // this function appends (and saves) content of loginoptions to globalsettings file. + //it is called when the user clicks the login button. + public static void SaveConfig(LoginOptions loginoptions, Raindrop.Settings globalSettings, bool isSaveCredentials) { Raindrop.Settings s = globalSettings; SavedLogin sl = new SavedLogin(); @@ -21,6 +23,7 @@ namespace Raindrop string username = loginoptions.FirstName + " " + loginoptions.LastName; string Password = loginoptions.Password; + //checks if the username selected is a dropdown option. this means you use the username from the settings instead of the text box. //if (cbxUsername.SelectedIndex > 0 && cbxUsername.SelectedItem is SavedLogin) //{ // username = ((SavedLogin)cbxUsername.SelectedItem).Username; @@ -44,9 +47,9 @@ namespace Raindrop s["saved_logins"] = new OSDMap(); } - if (loginoptions.IsSaveCredentials) + if (isSaveCredentials) { - + Debug.Log("Saving user cred"); sl.Username = s["username"] = username; if (LoginOptions.IsPasswordMD5(Password)) @@ -59,6 +62,9 @@ namespace Raindrop sl.Password = Utils.MD5(Password); s["password"] = Utils.MD5(Password); } + + //apparently the startlocation is also part of saveCredentials? + //if (cbxLocation.SelectedIndex == -1) //{ // sl.CustomStartLocation = cbxLocation.Text; @@ -80,7 +86,7 @@ namespace Raindrop //s["login_grid"] = OSD.FromInteger(gridmgr.); //note: this was removed as this was literally a magic number (int) that corresponds to the position of the dropbox selection. s["login_uri"] = OSD.FromString(loginoptions.GridLoginUri); - s["remember_login"] = OSD.FromBoolean (loginoptions.IsSaveCredentials); + s["remember_login"] = isSaveCredentials; //OSD.FromBoolean (loginoptions.IsSaveCredentials); } public class SavedLogin @@ -168,5 +174,7 @@ namespace Raindrop } + + } } diff --git a/Assets/Raindrop/Netcom/LoginOptions.cs b/Assets/Raindrop/Netcom/LoginOptions.cs index 3325ef7..4c68642 100644 --- a/Assets/Raindrop/Netcom/LoginOptions.cs +++ b/Assets/Raindrop/Netcom/LoginOptions.cs @@ -131,9 +131,9 @@ namespace Raindrop.Netcom set { lastExecEvent = value; } } - public bool IsSaveCredentials { - get => isSaveCredentials; - set => isSaveCredentials = value; - } + //public bool IsSaveCredentials { + // get => isSaveCredentials; + // set => isSaveCredentials = value; + //} } } diff --git a/Assets/Raindrop/RaindropInstance.cs b/Assets/Raindrop/RaindropInstance.cs index 5ce64eb..cf3fbbb 100644 --- a/Assets/Raindrop/RaindropInstance.cs +++ b/Assets/Raindrop/RaindropInstance.cs @@ -66,7 +66,7 @@ namespace Raindrop private string streaming_assets_dir; //private frmMain mainForm; //frmMain is a class that inherits RadegastForm. It seems to be the code-behind of the overall UI, that includes the view and buttons. - private mainUIManager mainCanvas; + private UIManager ui_manager; //private RaindropUnitySceneRenderer mainWorldRenderer; // Singleton, there can be only one instance @@ -325,7 +325,7 @@ namespace Raindrop names = new NameManager(this); COF = new CurrentOutfitFolder(this); - mainCanvas = new mainUIManager(this); + ui_manager = new UIManager(this); //mainCanvas.InitializeControls(); //mainCanvas.Load += new EventHandler(mainForm_Load); @@ -349,6 +349,7 @@ namespace Raindrop client.Settings.USE_ASSET_CACHE = true; client.Settings.ASSET_CACHE_DIR = Path.Combine(userDir, "cache"); + Debug.Log("Userdir:" + userDir); client.Assets.Cache.AutoPruneEnabled = false; client.Assets.Cache.ComputeAssetCacheFilename = ComputeCacheName; @@ -663,6 +664,8 @@ namespace Raindrop userDir = System.Environment.CurrentDirectory; }; + Debug.Log("Userdir:" + userDir); + globalLogFile = Path.Combine(userDir, PROGRAMNAME + ".log"); globalSettings = new Settings(Path.Combine(userDir, "settings.xml")); //frmSettings.InitSettigs(globalSettings, monoRuntime); @@ -683,9 +686,9 @@ namespace Raindrop get { return state; } } - public mainUIManager MainCanvas + public UIManager UI { - get { return mainCanvas; } + get { return ui_manager; } } public OpenMetaverse.Vector3 cameraLoc { get; internal set; } diff --git a/Assets/Raindrop/UI/CanvasHelpers/CanvasManager.cs b/Assets/Raindrop/UI/CanvasHelpers/CanvasManager.cs index f31d3e8..f15a791 100644 --- a/Assets/Raindrop/UI/CanvasHelpers/CanvasManager.cs +++ b/Assets/Raindrop/UI/CanvasHelpers/CanvasManager.cs @@ -40,6 +40,43 @@ public class CanvasManager : Singleton return activeCanvasStack.Peek().gameObject; } + public CanvasType getCanvasTypeFromString(string _type) + { + foreach(CanvasIdentifier _ in canvasControllerList) + { + var thecanvastype = _.canvasType; + if (_type == thecanvastype.ToString()) + { + return thecanvastype; + } + + } + + return CanvasType.UNKNOWN; + + } + public void pushCanvas(string _type) + { + pushCanvas(_type, false); + } + + //isPopCurrentActiveCanvas true will pop the current top canvas and then push the new desired one. + public void pushCanvas(string _type, bool isPopCurrentActiveCanvas) + { + CanvasType theCanvasType = getCanvasTypeFromString(_type); + if (theCanvasType ==CanvasType.UNKNOWN) + { + Debug.LogError("unable to get the canvas of identifer: "+ _type); + } + + if (isPopCurrentActiveCanvas) + { + popCanvas(); + } + pushCanvas(theCanvasType); + } + + public void pushCanvas(CanvasType _type) { if (activeCanvasStack.Count() != 0) diff --git a/Assets/Raindrop/UI/CanvasHelpers/CanvasType.cs b/Assets/Raindrop/UI/CanvasHelpers/CanvasType.cs index 55e05e0..74639c7 100644 --- a/Assets/Raindrop/UI/CanvasHelpers/CanvasType.cs +++ b/Assets/Raindrop/UI/CanvasHelpers/CanvasType.cs @@ -5,7 +5,7 @@ Game, Chat, Map, - EULA, + EULA_modal, Settings, - + UNKNOWN } \ No newline at end of file diff --git a/Assets/Raindrop/UI/LoadingCanvasPresenter.cs b/Assets/Raindrop/UI/LoadingCanvasPresenter.cs new file mode 100644 index 0000000..1b9c493 --- /dev/null +++ b/Assets/Raindrop/UI/LoadingCanvasPresenter.cs @@ -0,0 +1,26 @@ +using Raindrop.Netcom; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +namespace Raindrop.Presenters +{ + public class LoadingCanvasPresenter : MonoBehaviour + { + private RaindropInstance instance { get { return RaindropInstance.GlobalInstance; } } + private RaindropNetcom netcom { get { return instance.Netcom; } } + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + } +} diff --git a/Assets/Raindrop/UI/LoadingCanvasPresenter.cs.meta b/Assets/Raindrop/UI/LoadingCanvasPresenter.cs.meta new file mode 100644 index 0000000..c559b01 --- /dev/null +++ b/Assets/Raindrop/UI/LoadingCanvasPresenter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 74f0a76d6b05c674c809ba6529de56c0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raindrop/UI/ModalManager.cs b/Assets/Raindrop/UI/ModalManager.cs index f56ea53..ad57c6c 100644 --- a/Assets/Raindrop/UI/ModalManager.cs +++ b/Assets/Raindrop/UI/ModalManager.cs @@ -11,29 +11,77 @@ public class ModalManager : Singleton { Thread mainThread; //pool of modals. - modalPresenter modalsAvailable; + public modalPresenter genericModal; + public modalPresenter eulaModal; + public modalPresenter loggingInStatusModal; protected override void Awake() { base.Awake(); //find yo modals in scene. - if (FindObjectsOfType().Length != 0) + //foreach(modalPresenter _ in FindObjectsOfType()) + //{ + + // genericModal.Add(_); + // _.closeModal(); + //} + + //if (FindObjectsOfType().Length != 0) + //{ + // genericModal = FindObjectsOfType()[0]; + // genericModal.closeModal(); + //} + + if (genericModal == null) { - modalsAvailable = FindObjectsOfType()[0]; - modalsAvailable.closeModal(); + Debug.LogError("cannot find the gneric modal"); } mainThread = System.Threading.Thread.CurrentThread; } - public void showModal(string title, string content) + public void openEula() + { + setVisibleEulaModal(true); + } + + public void closeEula() + { + setVisibleEulaModal(false); + } + + public void setVisibleEulaModal(bool visibility) { if (isOnMainThread()) { - if (modalsAvailable != null) + if (eulaModal != null) { - modalsAvailable.setModal(title, content); - modalsAvailable.gameObject.SetActive(true); + eulaModal.gameObject.SetActive(visibility); + } + else + { + Debug.Log("unable to get the modalPresenter object!"); + } + } + else + { + + UnityMainThreadDispatcher.Instance().Enqueue(() => { + Debug.Log(" dispatching of showing modal"); + setVisibleEulaModal(visibility); + }); + } + + + } + public void setVisibleGenericModal(string title, string content, bool visibility) + { + if (isOnMainThread()) + { + if (genericModal != null) + { + genericModal.setModal(title, content); + genericModal.gameObject.SetActive(visibility); } else { @@ -44,7 +92,37 @@ public class ModalManager : Singleton UnityMainThreadDispatcher.Instance().Enqueue(() => { Debug.Log(" dispatching of showing modal"); - showModal(title, content); + setVisibleGenericModal(title, content, visibility); + }); + } + + + } + + + //by default obviously this must be visible; we are updating the login status. + public void setVisibleLoggingInModal(string content) + { + string title = "Logging in status..."; + + if (isOnMainThread()) + { + if (loggingInStatusModal != null) + { + loggingInStatusModal.setModal(title, content); + loggingInStatusModal.gameObject.SetActive(true); + } + else + { + Debug.Log("unable to get the modalPresenter object!"); + } + } + else + { + + UnityMainThreadDispatcher.Instance().Enqueue(() => { + Debug.Log(" dispatching of showing modal"); + setVisibleLoggingInModal(content); }); } @@ -59,10 +137,10 @@ public class ModalManager : Singleton public void showSimpleModalBoxWithActionBtn(string title, string content, string Action) { - if (modalsAvailable != null) + if (genericModal != null) { - modalsAvailable.setModal(title, content, Action); - modalsAvailable.gameObject.SetActive(true); + genericModal.setModal(title, content, Action); + genericModal.gameObject.SetActive(true); } else { diff --git a/Assets/Raindrop/UI/internal/mainUIManager.cs b/Assets/Raindrop/UI/internal/UIManager.cs similarity index 97% rename from Assets/Raindrop/UI/internal/mainUIManager.cs rename to Assets/Raindrop/UI/internal/UIManager.cs index e24e40a..f53e1f3 100644 --- a/Assets/Raindrop/UI/internal/mainUIManager.cs +++ b/Assets/Raindrop/UI/internal/UIManager.cs @@ -12,7 +12,7 @@ using UnityEngine; namespace Raindrop { - public class mainUIManager + public class UIManager { //mainUImanager has dependencies: // CanvasManager - stores and manages the pops, push of views onto the ui stack. @@ -26,7 +26,7 @@ namespace Raindrop public CanvasManager canvasManager { get { return CanvasManager.GetInstance(); } } public ModalManager modalManager { get { return ModalManager.GetInstance(); } } - public mainUIManager(RaindropInstance raindropInstance) + public UIManager(RaindropInstance raindropInstance) { this.instance = raindropInstance; @@ -78,7 +78,7 @@ namespace Raindrop { if (e.Status == LoginStatus.Failed) { - modalManager.showModal("Login failed.", e.Message); + modalManager.setVisibleGenericModal("Login failed.", e.Message, true); //if (InAutoReconnect) //{ // if (instance.GlobalSettings["auto_reconnect"].AsBoolean() && e.FailReason != "tos") @@ -89,7 +89,7 @@ namespace Raindrop } else if (e.Status == LoginStatus.Success) { - modalManager.showModal("Login success!", e.Message); + modalManager.setVisibleGenericModal("Login success!", e.Message, true); //InAutoReconnect = false; //reconnectToolStripMenuItem.Enabled = false; //loginToolStripMenuItem.Enabled = false; diff --git a/Assets/Raindrop/UI/internal/mainUIManager.cs.meta b/Assets/Raindrop/UI/internal/UIManager.cs.meta similarity index 100% rename from Assets/Raindrop/UI/internal/mainUIManager.cs.meta rename to Assets/Raindrop/UI/internal/UIManager.cs.meta diff --git a/Assets/Raindrop/UI/modalPresenter.cs b/Assets/Raindrop/UI/modalPresenter.cs index fb47ddc..42a37b3 100644 --- a/Assets/Raindrop/UI/modalPresenter.cs +++ b/Assets/Raindrop/UI/modalPresenter.cs @@ -9,7 +9,7 @@ using UnityEngine.UI; public class modalPresenter : MonoBehaviour { - public Text titletext; + public TMP_Text titletext; public TMP_Text contenttext; public TMP_Text actionText; public GameObject modal; @@ -29,9 +29,9 @@ public class modalPresenter : MonoBehaviour { BackgroundButton.onClick.AsObservable().Subscribe(_ => closeModal()); //when clicked, runs this method. } - if (titletext.GetComponent() == null) + if (titletext.GetComponent() == null) { - Debug.LogError("titletext.GetComponent() failed"); + Debug.LogError("titletext.GetComponent() failed"); } if (contenttext.GetComponent() == null) { @@ -43,7 +43,7 @@ public class modalPresenter : MonoBehaviour //sets the textual contents of the ui public void setModal(string title, string content, string ActionText) { - titletext.GetComponent().text = title; + titletext.GetComponent().text = title; contenttext.GetComponent().text = content; if (actionText != null) { diff --git a/Assets/Raindrop/UI/unity/ChatPresenter.cs b/Assets/Raindrop/UI/unity/ChatPresenter.cs index 196bfe1..ec773cf 100644 --- a/Assets/Raindrop/UI/unity/ChatPresenter.cs +++ b/Assets/Raindrop/UI/unity/ChatPresenter.cs @@ -107,7 +107,7 @@ namespace Raindrop.Presenters private void OnCloseBtnClick() { - instance.MainCanvas.canvasManager.popCanvas(); + instance.UI.canvasManager.popCanvas(); } diff --git a/Assets/Raindrop/UI/unity/GamePresenter.cs b/Assets/Raindrop/UI/unity/GamePresenter.cs index 33213d5..e3c2055 100644 --- a/Assets/Raindrop/UI/unity/GamePresenter.cs +++ b/Assets/Raindrop/UI/unity/GamePresenter.cs @@ -92,13 +92,13 @@ namespace Raindrop.Presenters public void OnChatBtnClick() { - instance.MainCanvas.canvasManager.pushCanvas(CanvasType.Chat); + instance.UI.canvasManager.pushCanvas(CanvasType.Chat); } public void OnMapBtnClick() { - instance.MainCanvas.canvasManager.pushCanvas(CanvasType.Map); + instance.UI.canvasManager.pushCanvas(CanvasType.Map); } diff --git a/Assets/Raindrop/UI/unity/LoginPresenter.cs b/Assets/Raindrop/UI/unity/LoginPresenter.cs index 7f2584d..2fcb2c7 100644 --- a/Assets/Raindrop/UI/unity/LoginPresenter.cs +++ b/Assets/Raindrop/UI/unity/LoginPresenter.cs @@ -40,19 +40,19 @@ namespace Raindrop.Presenters public Toggle TOSCheckbox; public Toggle RememberCheckbox; - public Modal loginStatusModal; + //public Modal loginStatusModal; //extragrid seclections - public GameObject GridDropdownGO; //required. - public GenericDropdown genericDropdown; + //public GameObject GridDropdownGO; //required. + //public GenericDropdown genericDropdown; //public TMP_InputField customURL; //public Toggle customURLCheckbox; #endregion #region internal representations - private string username; - private string password; + //private string Username; + //private string Password; private readonly string INIT_USERNAME = "username"; private readonly string INIT_PASSWORD = "password"; private Settings s; @@ -68,6 +68,9 @@ namespace Raindrop.Presenters } public ReactiveProperty Login_msg { get; private set; } + private ReactiveProperty btnLoginEnabled; + + public string uninitialised = "(unknown)"; //private List gridDropdownOptions = new List //type is grid //{ @@ -76,15 +79,14 @@ namespace Raindrop.Presenters private int gridSelectedItem; private object lblLoginStatus; - private string login_msg; + //private string login_msg; - private bool btnLoginEnabled; private bool cbTOStrue = true; private bool cbCustomURL = false; private bool cbRememberBool; - private DropdownMenuWithEntry usernameDropdownMenuWithEntry; - private GameObject UserDropdownMenu; + //private DropdownMenuWithEntry usernameDropdownMenuWithEntry; + //private GameObject UserDropdownMenu; #endregion @@ -94,31 +96,45 @@ namespace Raindrop.Presenters // Use this for initialization void Start() { + //1 load deafult UI fields. + initialiseFields(); + + //2 load various loginInformation from the settings. + InitializeConfig(); + + //GridDropdownGO = this.gameObject.GetComponent().gameObject; - genericDropdown = GridDropdownGO.GetComponent(); + //genericDropdown = GridDropdownGO.GetComponent(); //GridDropdownView.DropdownSelectionChanged += GenericDropdown_DropdownSelectionChanged; + //3 hookup reactive UIs. LoginButton.onClick.AsObservable().Subscribe(_ => OnLoginBtnClick()); //when clicked, runs this method. + + btnLoginEnabled = new ReactiveProperty(true); + btnLoginEnabled.AsObservable().Subscribe(_ => LoginButton.gameObject.SetActive(_)); //update the login button availabilty according to this boolean. + usernameField.onValueChanged.AsObservable().Subscribe(_ => Username = _); //change username property. - passwordField.onValueChanged.AsObservable().Subscribe(_ => Password = _); //change username property. + passwordField.onValueChanged.AsObservable().Subscribe(_ => Password = _); RememberCheckbox.OnValueChangedAsObservable().Subscribe(_ => cbRememberBool = _); //when toggle checkbox, set boolean to the same value as the toggle-state TOSCheckbox.OnValueChangedAsObservable().Subscribe(_ => cbTOStrue = _); //when toggle checkbox, set boolean to the same value as the toggle-state + Login_msg.AsObservable().Where(_ => ! _.Equals(uninitialised)).Subscribe(_ => UpdateModalText(_)); //no bug? + //gridDropdown.OnValueChangedAsObservable().Subscribe(_ => gridSelectedItem = _); //customURLCheckbox.onValueChanged.AsObservable().Subscribe(_ => cbCustomURL = _); //change username property. //DropdownMenuWithEntry = UserDropdownMenu.GetComponent(); + //4subscribe to events. AddNetcomEvents(); } - private void GenericDropdown_DropdownSelectionChanged() + private void UpdateModalText(string _) { - - throw new NotImplementedException(); + instance.UI.modalManager.setVisibleLoggingInModal(_); } private void AddNetcomEvents() @@ -144,25 +160,25 @@ namespace Raindrop.Presenters { case LoginStatus.ConnectingToLogin: Login_msg.GetType().GetProperty("Value").SetValue(Login_msg, "Connecting to login server..."); - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "cancel"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal"); //lblLoginStatus.ForeColor = Color.Black; break; case LoginStatus.ConnectingToSim: Login_msg.Value = ("Connecting to region..."); - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "cancel"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal"); //lblLoginStatus.ForeColor = Color.Black; break; case LoginStatus.Redirecting: Login_msg.Value = "Redirecting..."; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "cancel"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal"); //lblLoginStatus.ForeColor = Color.Black; break; case LoginStatus.ReadingResponse: Login_msg.Value = "Reading response..."; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "cancel"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...", Login_msg.Value, "close modal"); //lblLoginStatus.ForeColor = Color.Black; break; @@ -172,10 +188,13 @@ namespace Raindrop.Presenters //proLogin.Visible = false; //btnLogin.Text = "Logout"; - btnLoginEnabled = false; + btnLoginEnabled.Value = false; instance.Client.Groups.RequestCurrentGroups(); - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...","Logged in !", "yay!"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in process...","Logged in !", "yay!"); + instance.UI.canvasManager.pushCanvas("Game", true); //refactor needed: better way to schedule push and pop as we are facing some issues here. + instance.UI.canvasManager.popCanvas(); + LoginButton.interactable = true; break; case LoginStatus.Failed: @@ -183,16 +202,18 @@ namespace Raindrop.Presenters if (e.FailReason == "tos") { Login_msg.Value = "Must agree to Terms of Service before logging in"; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed",Login_msg.Value, "ok"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed",Login_msg.Value, "ok"); //pnlTos.Visible = true; //txtTOS.Text = e.Message.Replace("\n", "\r\n"); - btnLoginEnabled = true; + btnLoginEnabled.Value = true; + LoginButton.interactable = true; } else { Login_msg.Value = e.Message; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed", Login_msg.Value, "ok"); - btnLoginEnabled = false; + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Logging in failed", Login_msg.Value, "ok"); + btnLoginEnabled.Value = true; + LoginButton.interactable = true; } //proLogin.Visible = false; @@ -204,7 +225,7 @@ namespace Raindrop.Presenters public void netcom_ClientLoggedOut(object sender, EventArgs e) { Login_msg.Value = "logged out."; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); //pnlLoginPrompt.Visible = true; //pnlLoggingIn.Visible = false; @@ -214,10 +235,10 @@ namespace Raindrop.Presenters public void netcom_ClientLoggingOut(object sender, OverrideEventArgs e) { - btnLoginEnabled = false; + btnLoginEnabled.Value = false; Login_msg.Value = "Logging out..."; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); //lblLoginStatus.ForeColor = Color.FromKnownColor(KnownColor.ControlText); //proLogin.Visible = true; @@ -226,14 +247,14 @@ namespace Raindrop.Presenters public void netcom_ClientLoggingIn(object sender, OverrideEventArgs e) { Login_msg.Value = "Logging in..."; - instance.MainCanvas.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); + instance.UI.modalManager.showSimpleModalBoxWithActionBtn("Login status", Login_msg.Value, "ok"); //lblLoginStatus.ForeColor = Color.FromKnownColor(KnownColor.ControlText); //proLogin.Visible = true; //pnlLoggingIn.Visible = true; //pnlLoginPrompt.Visible = false; - btnLoginEnabled = false; + btnLoginEnabled.Value = false; } @@ -241,14 +262,13 @@ namespace Raindrop.Presenters private void initialiseFields() { //reset user and pw fields - username = INIT_USERNAME; - password = INIT_PASSWORD; + Username = INIT_USERNAME; + Password = INIT_PASSWORD; //modal - Login_msg = new ReactiveProperty("???"); + Login_msg = new ReactiveProperty(uninitialised); //grids selector - InitializeConfig(); //location selector } @@ -257,7 +277,7 @@ namespace Raindrop.Presenters private void InitializeConfig() { // Initilize grid dropdown - int gridIx = -1; + //int gridIx = -1; //GridDropdownGO.clear(); //GridDropdownGO.set(instance.GridManger.Grids); @@ -283,6 +303,7 @@ namespace Raindrop.Presenters string savedUsername = s["username"]; usernameField.text = (savedUsername); + //try to get saved username try { if (s["saved_logins"] is OSDMap) @@ -308,7 +329,7 @@ namespace Raindrop.Presenters // Fill in saved password or use one specified on the command line passwordField.text = s["password"].AsString(); - Debug.Log("pass cache: " + passwordField.text); + Debug.Log("password cache: " + passwordField.text); // Setup login location either from the last used or // override from the command line @@ -379,7 +400,7 @@ namespace Raindrop.Presenters { LoginButton.interactable = false; //sanity - if (username == INIT_USERNAME || password == INIT_PASSWORD) + if (Username == INIT_USERNAME || Password == INIT_PASSWORD) { Debug.LogError("Either username and password is not defined!"); @@ -409,6 +430,8 @@ namespace Raindrop.Presenters private void BeginLogin() { + + string username = Username; //if (Username.SelectedIndex > 0 && cbxUsername.SelectedItem is SavedLogin) @@ -436,21 +459,24 @@ namespace Raindrop.Presenters netcom.LoginOptions.Version = "Version"; // Version netcom.AgreeToTos = cbTOStrue; - //switch (cbxLocation.SelectedIndex) - //{ - // case -1: //Custom - // netcom.LoginOptions.StartLocation = StartLocationType.Custom; - // netcom.LoginOptions.StartLocationCustom = cbxLocation.Text; - // break; + //placeholder + switch (1) + { + case -1: //Custom + netcom.LoginOptions.StartLocation = StartLocationType.Custom; + netcom.LoginOptions.StartLocationCustom = "placeholder text"; + break; - // case 0: //Home - // netcom.LoginOptions.StartLocation = StartLocationType.Home; - // break; + case 0: //Home + netcom.LoginOptions.StartLocation = StartLocationType.Home; + break; - // case 1: //Last - // netcom.LoginOptions.StartLocation = StartLocationType.Last; - // break; - //} + case 1: //Last + netcom.LoginOptions.StartLocation = StartLocationType.Last; + break; + } + + //netcom.LoginOptions.IsSaveCredentials = cbRememberBool; //if (cbxGrid.SelectedIndex == cbxGrid.Items.Count - 1) // custom login uri //{ @@ -468,6 +494,9 @@ namespace Raindrop.Presenters //netcom.LoginOptions.Grid = instance.GridManger.Grids[gridSelectedItem]; //} + //placeholder to select SL as grid. + netcom.LoginOptions.Grid = instance.GridManger.Grids[0]; //0 means sl i think + if (netcom.LoginOptions.Grid.Platform != "SecondLife") { instance.Client.Settings.MULTIPLE_SIMS = true; @@ -483,7 +512,7 @@ namespace Raindrop.Presenters var temp = netcom.LoginOptions; netcom.Login(); - LoginUtils.SaveConfig(netcom.LoginOptions, instance.GlobalSettings); + LoginUtils.SaveConfig(netcom.LoginOptions, instance.GlobalSettings, cbRememberBool); } diff --git a/Assets/Raindrop/UI/unity/MapPresenter.cs b/Assets/Raindrop/UI/unity/MapPresenter.cs index 0f07f8b..1c0c911 100644 --- a/Assets/Raindrop/UI/unity/MapPresenter.cs +++ b/Assets/Raindrop/UI/unity/MapPresenter.cs @@ -73,13 +73,13 @@ public class MapPresenter : MonoBehaviour public void OnChatBtnClick() { - instance.MainCanvas.canvasManager.pushCanvas(CanvasType.Chat); + instance.UI.canvasManager.pushCanvas(CanvasType.Chat); } public void OnMapBtnClick() { - instance.MainCanvas.canvasManager.pushCanvas(CanvasType.Map); + instance.UI.canvasManager.pushCanvas(CanvasType.Map); } diff --git a/Assets/Raindrop/UI/unity/MinimapModule.cs b/Assets/Raindrop/UI/unity/MinimapModule.cs index 2fec9c3..b7cf38b 100644 --- a/Assets/Raindrop/UI/unity/MinimapModule.cs +++ b/Assets/Raindrop/UI/unity/MinimapModule.cs @@ -51,7 +51,7 @@ namespace Raindrop.Presenters private void OnMinimapClick() { //what happend when minimap is clicked? - instance.MainCanvas.canvasManager.pushCanvas(CanvasType.Map); + instance.UI.canvasManager.pushCanvas(CanvasType.Map); Debug.Log("clicked minimap"); } diff --git a/Assets/Scenes/newUI.unity b/Assets/Scenes/newUI.unity index 8999475..aa36db0 100644 --- a/Assets/Scenes/newUI.unity +++ b/Assets/Scenes/newUI.unity @@ -374,82 +374,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 26135230} m_CullTransparentMesh: 1 ---- !u!1 &26288764 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 26288765} - - component: {fileID: 26288767} - - component: {fileID: 26288766} - m_Layer: 5 - m_Name: Overlaydebug - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &26288765 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 26288764} - 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_Children: - - {fileID: 267083071} - m_Father: {fileID: 904771131} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1831, y: -525} - m_SizeDelta: {x: -923.4992, y: -601.3484} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &26288766 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 26288764} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &26288767 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 26288764} - m_CullTransparentMesh: 1 --- !u!1 &38931173 GameObject: m_ObjectHideFlags: 0 @@ -759,12 +683,12 @@ RectTransform: - {fileID: 2111952115} - {fileID: 902984667} m_Father: {fileID: 892152801} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 839.2689, y: -96.44946} + m_SizeDelta: {x: 1638.5378, y: 152.89893} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &49835070 MonoBehaviour: @@ -860,6 +784,36 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &73694551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 73694552} + m_Layer: 0 + m_Name: ===UI=== + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &73694552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 73694551} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &83400467 GameObject: m_ObjectHideFlags: 0 @@ -980,6 +934,49 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 83400467} m_CullTransparentMesh: 0 +--- !u!1 &83768051 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 83768053} + - component: {fileID: 83768052} + m_Layer: 0 + m_Name: mainthreaddispatcher + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &83768052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 83768051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 166e46cf3e858f546afb5238ba99e9bd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &83768053 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 83768051} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 914.7407, y: 741.3838, z: 19.903809} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &87325354 GameObject: m_ObjectHideFlags: 0 @@ -1640,7 +1637,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -1804,7 +1801,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &140787664 RectTransform: m_ObjectHideFlags: 0 @@ -2269,10 +2266,10 @@ RectTransform: m_Father: {fileID: 1902245567} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 150, y: -150} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &232226603 MonoBehaviour: @@ -2407,7 +2404,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 234840926} m_CullTransparentMesh: 1 ---- !u!1 &267083070 +--- !u!1 &244426248 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2415,101 +2412,28 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 267083071} - - component: {fileID: 267083075} - - component: {fileID: 267083074} - - component: {fileID: 267083073} - m_Layer: 5 - m_Name: Panel + - component: {fileID: 244426249} + m_Layer: 0 + m_Name: ===Managers and entrypoints=== m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &267083071 -RectTransform: +--- !u!4 &244426249 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 267083070} + m_GameObject: {fileID: 244426248} 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_Children: - - {fileID: 1597224912} - m_Father: {fileID: 26288765} + m_Children: [] + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -457.23755, y: 191.93365} - m_SizeDelta: {x: 914.4751, y: 383.8673} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &267083073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 267083070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &267083074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 267083070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &267083075 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 267083070} - m_CullTransparentMesh: 1 --- !u!1 &274049924 GameObject: m_ObjectHideFlags: 0 @@ -2718,7 +2642,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 22451668, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} propertyPath: m_AnchorMax.x @@ -2847,10 +2771,10 @@ RectTransform: m_Father: {fileID: 403228334} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 819.2689, y: -276.9932} + m_SizeDelta: {x: 1598.5378, y: 513.9864} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &337535311 MonoBehaviour: @@ -3193,9 +3117,9 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!114 &349949370 MonoBehaviour: @@ -3240,8 +3164,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1245426832} m_HandleRect: {fileID: 1245426831} m_Direction: 2 - m_Value: 1 - m_Size: 0.23749305 + m_Value: 0.42614174 + m_Size: 0.22026287 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3308,7 +3232,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &367179951 RectTransform: m_ObjectHideFlags: 0 @@ -3320,6 +3244,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 892152801} - {fileID: 1430441571} - {fileID: 1542315698} m_Father: {fileID: 1661772798} @@ -3403,6 +3328,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3aa7a5a5fc2f14a4da5a09383ddb6712, type: 3} m_Name: m_EditorClassIdentifier: + genericModal: {fileID: 1542315699} + eulaModal: {fileID: 892152805} + loggingInStatusModal: {fileID: 1542315699} --- !u!1 &377217584 GameObject: m_ObjectHideFlags: 0 @@ -3595,12 +3523,12 @@ RectTransform: - {fileID: 337535310} - {fileID: 1344033180} m_Father: {fileID: 892152801} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 839.2689, y: -509.89212} + m_SizeDelta: {x: 1638.5378, y: 673.9864} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &403228335 MonoBehaviour: @@ -4258,7 +4186,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d76a6d052750ed5489de979675b9f21a, type: 3} m_Name: m_EditorClassIdentifier: - titletext: {fileID: 377217586} + titletext: {fileID: 0} contenttext: {fileID: 782939724} actionText: {fileID: 0} modal: {fileID: 489807615} @@ -4770,7 +4698,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bde4e90fdce089044b44101b61ebfaac, type: 3} m_Name: m_EditorClassIdentifier: - canvasType: 3 + canvasType: 4 --- !u!114 &528185995 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4788,8 +4716,7 @@ MonoBehaviour: passwordField: {fileID: 0} TOSCheckbox: {fileID: 0} RememberCheckbox: {fileID: 0} - GridDropdownGO: {fileID: 0} - genericDropdown: {fileID: 0} + uninitialised: (unknown) --- !u!114 &528185996 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5167,7 +5094,7 @@ RectTransform: m_Children: - {fileID: 1171704729} m_Father: {fileID: 1995801065} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6126,7 +6053,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bde4e90fdce089044b44101b61ebfaac, type: 3} m_Name: m_EditorClassIdentifier: - canvasType: 2 + canvasType: 3 --- !u!114 &656302653 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6144,8 +6071,7 @@ MonoBehaviour: passwordField: {fileID: 0} TOSCheckbox: {fileID: 0} RememberCheckbox: {fileID: 0} - GridDropdownGO: {fileID: 0} - genericDropdown: {fileID: 0} + uninitialised: (unknown) --- !u!114 &656302654 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6671,31 +6597,86 @@ MonoBehaviour: m_GameObject: {fileID: 696494505} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 85 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 300 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: close + m_text: '[ACTIONTEXT]' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278453253 + m_fontColor: {r: 0.01886791, g: 0.017354917, b: 0.017354917, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &696494508 CanvasRenderer: m_ObjectHideFlags: 0 @@ -7087,6 +7068,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 713735731} m_CullTransparentMesh: 1 +--- !u!1 &714528519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 714528520} + m_Layer: 0 + m_Name: ===etc=== + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &714528520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714528519} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &721455755 GameObject: m_ObjectHideFlags: 0 @@ -7764,6 +7775,126 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 768666720} m_CullTransparentMesh: 1 +--- !u!1 &775592846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 775592847} + - component: {fileID: 775592850} + - component: {fileID: 775592849} + - component: {fileID: 775592848} + m_Layer: 5 + m_Name: ModalBackground (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &775592847 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 775592846} + 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_Children: [] + m_Father: {fileID: 1430441571} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 818.1792, y: -20} + m_SizeDelta: {x: 1596.3584, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &775592848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 775592846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 775592849} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &775592849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 775592846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0.8509804} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &775592850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 775592846} + m_CullTransparentMesh: 1 --- !u!1 &782939721 GameObject: m_ObjectHideFlags: 0 @@ -8228,7 +8359,7 @@ GameObject: - component: {fileID: 808827425} - component: {fileID: 808827426} m_Layer: 5 - m_Name: Tap Button (LeanButton) (1) + m_Name: LetsGo! m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8359,18 +8490,30 @@ MonoBehaviour: onClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1889810039} - m_TargetAssemblyTypeName: - m_MethodName: + - m_Target: {fileID: 904771132} + m_TargetAssemblyTypeName: CanvasManager, RaindropUnity + m_MethodName: popCanvas m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 904771132} + m_TargetAssemblyTypeName: CanvasManager, RaindropUnity + m_MethodName: pushCanvas + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: Login + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &842874641 GameObject: m_ObjectHideFlags: 0 @@ -8482,9 +8625,9 @@ RectTransform: m_Father: {fileID: 140787664} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -151.66609} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &853334010 @@ -8699,6 +8842,126 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 853768759} m_CullTransparentMesh: 1 +--- !u!1 &865909120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 865909121} + - component: {fileID: 865909124} + - component: {fileID: 865909123} + - component: {fileID: 865909122} + m_Layer: 5 + m_Name: ModalBackground (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &865909121 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865909120} + 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_Children: [] + m_Father: {fileID: 892152801} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 839.2689, y: -846.88} + m_SizeDelta: {x: 1596.3584, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &865909122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865909120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 865909123} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &865909123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865909120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 0.8509804} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &865909124 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 865909120} + m_CullTransparentMesh: 1 --- !u!1 &871849019 GameObject: m_ObjectHideFlags: 0 @@ -8985,11 +9248,11 @@ RectTransform: - {fileID: 632800670} - {fileID: 512934468} m_Father: {fileID: 1995801065} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: -581.45593} m_SizeDelta: {x: 1078.001, y: 418.6744} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &892152800 @@ -9004,13 +9267,15 @@ GameObject: - component: {fileID: 892152804} - component: {fileID: 892152803} - component: {fileID: 892152802} + - component: {fileID: 892152806} + - component: {fileID: 892152805} m_Layer: 5 m_Name: EulaModal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &892152801 RectTransform: m_ObjectHideFlags: 0 @@ -9018,19 +9283,20 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 892152800} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_Children: + - {fileID: 865909121} - {fileID: 49835069} - {fileID: 403228334} - m_Father: {fileID: 904771131} - m_RootOrder: 6 + m_Father: {fileID: 367179951} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 0} - m_SizeDelta: {x: -241.787, y: -174.0413} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -241.4622, y: -213.1147} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &892152802 MonoBehaviour: @@ -9096,6 +9362,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 892152800} m_CullTransparentMesh: 1 +--- !u!114 &892152805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892152800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d76a6d052750ed5489de979675b9f21a, type: 3} + m_Name: + m_EditorClassIdentifier: + titletext: {fileID: 2111952116} + contenttext: {fileID: 1253076629} + actionText: {fileID: 0} + modal: {fileID: 892152800} + CloseButton: {fileID: 902984670} + BackgroundButton: {fileID: 865909122} +--- !u!114 &892152806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 892152800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e395c2ef7bf934f40879e238aabf3fd6, type: 3} + m_Name: + m_EditorClassIdentifier: + EulaToggleGO: {fileID: 1541732509} --- !u!1 &892165909 GameObject: m_ObjectHideFlags: 0 @@ -9259,7 +9556,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &902984666 GameObject: @@ -9272,6 +9569,7 @@ GameObject: - component: {fileID: 902984667} - component: {fileID: 902984669} - component: {fileID: 902984668} + - component: {fileID: 902984670} m_Layer: 5 m_Name: Close m_TagString: Untagged @@ -9336,6 +9634,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 902984666} m_CullTransparentMesh: 1 +--- !u!114 &902984670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 902984666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 902984668} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &904771127 GameObject: m_ObjectHideFlags: 0 @@ -9433,8 +9775,6 @@ RectTransform: - {fileID: 1090573972} - {fileID: 528185992} - {fileID: 656302650} - - {fileID: 26288765} - - {fileID: 892152801} m_Father: {fileID: 1661772798} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9832,9 +10172,9 @@ RectTransform: m_Father: {fileID: 140787664} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 228.2427, y: -50.833046} m_SizeDelta: {x: 152.1618, y: 33.8887} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &936677287 @@ -9972,8 +10312,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 940, y: -775.7982} - m_SizeDelta: {x: 1840, y: 180.46385} + m_AnchoredPosition: {x: 798.1792, y: -571.9049} + m_SizeDelta: {x: 1556.3584, y: 164.15239} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &939971690 MonoBehaviour: @@ -10415,8 +10755,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca2b2f6974c6e104ba51b93674432915, type: 3} m_Name: m_EditorClassIdentifier: - variableJoystick: {fileID: 0} - theJoystickInScene: {fileID: 0} + variableJoystick: {fileID: 951900357} + theJoystickInScene: {fileID: 951900354} --- !u!1 &952164417 GameObject: m_ObjectHideFlags: 0 @@ -10671,7 +11011,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &970949438 GameObject: @@ -10908,7 +11248,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: nevermind, restart viewer. + m_text: restart viewer (this will restart the entire app). m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -10935,8 +11275,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 34.7 + m_fontSizeBase: 34.7 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -11021,7 +11361,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 460, y: -90.231926} + m_AnchoredPosition: {x: 389.0896, y: -82.076195} m_SizeDelta: {x: 500, y: 125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1049033201 @@ -11063,7 +11403,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_SelectedTrigger: Selected m_DisabledTrigger: Disabled - m_Interactable: 1 + m_Interactable: 0 m_TargetGraphic: {fileID: 1049033202} m_OnClick: m_PersistentCalls: @@ -11434,7 +11774,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bde4e90fdce089044b44101b61ebfaac, type: 3} m_Name: m_EditorClassIdentifier: - canvasType: 1 + canvasType: 2 --- !u!114 &1090573974 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11452,8 +11792,7 @@ MonoBehaviour: passwordField: {fileID: 0} TOSCheckbox: {fileID: 0} RememberCheckbox: {fileID: 0} - GridDropdownGO: {fileID: 0} - genericDropdown: {fileID: 0} + uninitialised: (unknown) --- !u!222 &1090573976 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13212,8 +13551,8 @@ RectTransform: m_Father: {fileID: 151857395} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.33227858} + m_AnchorMax: {x: 1, y: 0.55254143} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -13324,10 +13663,10 @@ RectTransform: m_Father: {fileID: 2114563880} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1582.3718, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1582.3718, y: -1128.1665} + m_SizeDelta: {x: 1582.3718, y: 1128.1665} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1253076628 MonoBehaviour: @@ -14669,10 +15008,10 @@ RectTransform: m_Father: {fileID: 403228334} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 819.2689, y: -593.9864} + m_SizeDelta: {x: 1598.5378, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1344033181 MonoBehaviour: @@ -14814,7 +15153,7 @@ MonoBehaviour: m_GameObject: {fileID: 1356808777} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -14825,20 +15164,75 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 6 - m_MaxSize: 60 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: title + m_text: Titleaaaaaaaaaaaaaaaaaaaaaaa + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!222 &1356808780 CanvasRenderer: m_ObjectHideFlags: 0 @@ -15044,9 +15438,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: -17} m_Pivot: {x: 0, y: 1} --- !u!114 &1413528313 MonoBehaviour: @@ -15495,17 +15889,18 @@ RectTransform: m_GameObject: {fileID: 1430441570} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 775592847} - {fileID: 1641462275} - {fileID: 2015226332} m_Father: {fileID: 367179951} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1920, y: 1080} + m_AnchoredPosition: {x: 0, y: 0.0026245117} + m_SizeDelta: {x: -283.6416, y: -213.12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1430441572 MonoBehaviour: @@ -15522,9 +15917,9 @@ MonoBehaviour: titletext: {fileID: 0} contenttext: {fileID: 0} actionText: {fileID: 0} - modal: {fileID: 0} - CloseButton: {fileID: 0} - BackgroundButton: {fileID: 0} + modal: {fileID: 1430441570} + CloseButton: {fileID: 1855022504} + BackgroundButton: {fileID: 775592848} --- !u!114 &1430441573 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16928,8 +17323,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 940, y: -352.78314} - m_SizeDelta: {x: 1840, y: 665.5663} + m_AnchoredPosition: {x: 798.1792, y: -254.91435} + m_SizeDelta: {x: 1556.3584, y: 469.8287} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1540897338 MonoBehaviour: @@ -17121,7 +17516,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1542315698 RectTransform: m_ObjectHideFlags: 0 @@ -17136,7 +17531,7 @@ RectTransform: - {fileID: 2046282080} - {fileID: 87325355} m_Father: {fileID: 367179951} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17157,10 +17552,40 @@ MonoBehaviour: m_EditorClassIdentifier: titletext: {fileID: 1356808779} contenttext: {fileID: 2023618656} - actionText: {fileID: 0} + actionText: {fileID: 696494507} modal: {fileID: 1542315697} CloseButton: {fileID: 1418630377} BackgroundButton: {fileID: 2046282083} +--- !u!1 &1577540112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1577540113} + m_Layer: 0 + m_Name: 'Note: each canvas has its own manager to show/hide panels/modals' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1577540113 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1577540112} + 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_Children: [] + m_Father: {fileID: 1661772798} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1582993049 GameObject: m_ObjectHideFlags: 0 @@ -17268,7 +17693,7 @@ RectTransform: m_Father: {fileID: 2006338897} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.7125574} + m_AnchorMin: {x: 0, y: 0.7993077} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} @@ -17386,140 +17811,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1595666817} m_CullTransparentMesh: 0 ---- !u!1 &1597224911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1597224912} - - component: {fileID: 1597224914} - - component: {fileID: 1597224913} - m_Layer: 5 - m_Name: LocationText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1597224912 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1597224911} - 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_Children: [] - m_Father: {fileID: 267083071} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 240.7321, y: -42.3337} - m_SizeDelta: {x: 481.4642, y: 84.6674} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1597224913 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1597224911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1597224914 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1597224911} - m_CullTransparentMesh: 1 --- !u!1 &1597489625 GameObject: m_ObjectHideFlags: 0 @@ -17798,12 +18089,12 @@ RectTransform: - {fileID: 1688871482} - {fileID: 1855022501} m_Father: {fileID: 1430441571} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -96.984924} - m_SizeDelta: {x: 1880, y: 153.96985} + m_AnchoredPosition: {x: 818.1792, y: -96.44945} + m_SizeDelta: {x: 1596.3584, y: 152.8989} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1641462276 MonoBehaviour: @@ -18177,6 +18468,7 @@ Transform: - {fileID: 1850116754} - {fileID: 367179951} - {fileID: 2036252509} + - {fileID: 1577540113} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -18536,7 +18828,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00012207031, y: 0.00030633959} + m_AnchoredPosition: {x: -0.00012207031, y: 0.000042951364} m_SizeDelta: {x: 0, y: 240} m_Pivot: {x: 0, y: 1} --- !u!114 &1696326125 @@ -18579,6 +18871,140 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 +--- !u!1 &1696932006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1696932007} + - component: {fileID: 1696932009} + - component: {fileID: 1696932008} + m_Layer: 5 + m_Name: titleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1696932007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696932006} + 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_Children: [] + m_Father: {fileID: 1995801065} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 553, y: -330.66} + m_SizeDelta: {x: 241.5879, y: 82.9118} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1696932008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696932006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Login + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278321666 + m_fontColor: {r: 0.009433985, g: 0.009433985, b: 0.009433985, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 85.4 + m_fontSizeBase: 85.4 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1696932009 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696932006} + m_CullTransparentMesh: 1 --- !u!1 &1704212243 GameObject: m_ObjectHideFlags: 0 @@ -18608,7 +19034,7 @@ Transform: m_Children: - {fileID: 344191853} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1705436869 GameObject: @@ -18645,9 +19071,9 @@ RectTransform: m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: -17, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &1705436871 MonoBehaviour: @@ -19211,6 +19637,36 @@ MonoBehaviour: Duration: 0 Target: {fileID: 8300000, guid: 622df6012652bdb498c7ec99b1b8a532, type: 3} Volume: 1 +--- !u!1 &1735618709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1735618710} + m_Layer: 0 + m_Name: ===Scene=== + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1735618710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1735618709} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1738246286 GameObject: m_ObjectHideFlags: 0 @@ -20545,6 +21001,7 @@ GameObject: - component: {fileID: 1855022501} - component: {fileID: 1855022503} - component: {fileID: 1855022502} + - component: {fileID: 1855022504} m_Layer: 5 m_Name: Close m_TagString: Untagged @@ -20609,6 +21066,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1855022500} m_CullTransparentMesh: 1 +--- !u!114 &1855022504 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1855022500} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1855022502} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1859245779 GameObject: m_ObjectHideFlags: 0 @@ -21045,7 +21546,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1889810042 MonoBehaviour: @@ -21332,7 +21833,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1902245567 RectTransform: m_ObjectHideFlags: 0 @@ -21514,8 +22015,7 @@ MonoBehaviour: passwordField: {fileID: 632800671} TOSCheckbox: {fileID: 1867112361} RememberCheckbox: {fileID: 1336933098} - GridDropdownGO: {fileID: 0} - genericDropdown: {fileID: 0} + uninitialised: (unknown) --- !u!114 &1910810522 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21528,7 +22028,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bde4e90fdce089044b44101b61ebfaac, type: 3} m_Name: m_EditorClassIdentifier: - canvasType: 0 + canvasType: 1 --- !u!1 &1913465134 GameObject: m_ObjectHideFlags: 0 @@ -22025,11 +22525,11 @@ RectTransform: - {fileID: 1867112360} - {fileID: 1336933097} m_Father: {fileID: 1995801065} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 960, y: -820.7931} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1984979049 @@ -22100,6 +22600,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1696932007} - {fileID: 889152473} - {fileID: 1984979048} - {fileID: 601590703} @@ -22118,7 +22619,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1995801064} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -22824,12 +23325,12 @@ RectTransform: - {fileID: 1540897337} - {fileID: 939971689} m_Father: {fileID: 1430441571} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -616.9849} - m_SizeDelta: {x: 1880, y: 886.03015} + m_AnchoredPosition: {x: 818.1792, y: -509.88943} + m_SizeDelta: {x: 1596.3584, y: 673.9811} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2015226333 MonoBehaviour: @@ -23050,7 +23551,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: content + m_text: 'contentaaaaaaaaaaaaaaa + + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -23210,7 +23713,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1586289128} m_Direction: 2 m_Value: 1 - m_Size: 0.28744262 + m_Size: 0.20069233 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -23289,7 +23792,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1380, y: -90.231926} + m_AnchoredPosition: {x: 1167.2688, y: -82.076195} m_SizeDelta: {x: 500, y: 125} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2026891405 @@ -24488,7 +24991,19 @@ MonoBehaviour: m_Calls: [] onClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 367179955} + m_TargetAssemblyTypeName: ModalManager, RaindropUnity + m_MethodName: openEula + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2094826590 GameObject: m_ObjectHideFlags: 0 @@ -24584,7 +25099,7 @@ Transform: m_Children: - {fileID: 558395080} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2106375842 GameObject: @@ -24912,7 +25427,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00005054474} + m_AnchoredPosition: {x: -0.000015258789, y: 1009.61554} m_SizeDelta: {x: 0.00012207, y: 2256.333} m_Pivot: {x: 0, y: 1} --- !u!114 &2114563881 @@ -25038,7 +25553,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2056656629} m_Direction: 2 m_Value: 0 - m_Size: 0.9999959 + m_Size: 0.99999774 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Tests/NetworkTests.cs b/Assets/Tests/NetworkTests.cs index 4361083..34afe07 100644 --- a/Assets/Tests/NetworkTests.cs +++ b/Assets/Tests/NetworkTests.cs @@ -30,6 +30,7 @@ using System.Net; using OpenMetaverse; using OpenMetaverse.Packets; using NUnit.Framework; +using UnityEngine; namespace OpenMetaverse.Tests { @@ -67,8 +68,12 @@ namespace OpenMetaverse.Tests Console.Write($"Logging in {fullusername}..."); // Connect to the grid string startLoc = NetworkManager.StartLocation("Hooper", 179, 18, 32); + //changed: + Debug.Log("startLoc : " + startLoc); Assert.IsTrue(Client.Network.Login(username[0], username[1], password, "Unit Test Framework", startLoc, "contact@openmetaverse.co"), "Client failed to login, reason: " + Client.Network.LoginMessage); + //changed: + Debug.Log("login message: " + Client.Network.LoginMessage); Console.WriteLine("Done"); Assert.IsTrue(Client.Network.Connected, "Client is not connected to the grid"); diff --git a/Assets/Tests/RaindropTests.cs b/Assets/Tests/RaindropTests.cs index a4ff70d..e8f11a7 100644 --- a/Assets/Tests/RaindropTests.cs +++ b/Assets/Tests/RaindropTests.cs @@ -39,7 +39,7 @@ namespace Raindrop.Tests //get viewmodel to login. //getCurrentForeground gives us the loginVM, which we then call onloginbtnclick from. - GameObject temp = (GameObject)instance.MainCanvas.getCurrentForegroundPresenter(); + GameObject temp = (GameObject)instance.UI.getCurrentForegroundPresenter(); if (temp == null) {