From 550812840ac1699b839b770af17c0b52ab341de1 Mon Sep 17 00:00:00 2001 From: stephenlucerne <48700284+stephenlucerne@users.noreply.github.com> Date: Tue, 16 May 2023 12:46:15 +1000 Subject: [PATCH] 2023.5.2 hotfix --- README.md | 5 +- .../Classes/ModIOUnityImplementation.cs | 3 - .../AuthenticateViaEmail.cs | 26 +- .../Utility/SelfInstancingMonoSingleton.cs | 7 +- UI/Color Scheme/ColorApplierImage.cs | 4 +- UI/Color Scheme/ColorSetter.cs | 4 +- UI/Examples.meta | 2 +- UI/Examples/Example.unity | 102 ++- ...leGlyphSetter.cs => ExampleGlyphSetter.cs} | 15 +- ...ter.cs.meta => ExampleGlyphSetter.cs.meta} | 0 UI/Examples/ExampleInputCapture.cs | 8 +- UI/Examples/ModIOBrowser.prefab | 755 ++++++------------ .../5DigitInputPopup/5DigitInput.prefab | 88 +- UI/Prefabs/ExampleInputCapture.prefab | 59 -- UI/Prefabs/ExampleInputCapture.prefab.meta | 7 - UI/Scripts/Browser.cs | 13 +- UI/Scripts/BrowserSpawnIn.cs | 6 +- UI/Scripts/InputReceiver.cs | 20 +- UI/Scripts/Mods.cs | 2 +- UI/Scripts/Panels/Collection.cs | 4 +- UI/Scripts/Panels/Details.cs | 6 +- UI/Scripts/Panels/DownloadQueue.cs | 2 +- UI/Scripts/Panels/Home.cs | 7 +- UI/Scripts/Panels/ModioContextMenu.cs | 19 +- UI/Scripts/Panels/Notifications.cs | 2 +- UI/Scripts/Panels/SearchPanel.cs | 4 +- UI/Scripts/Panels/SearchResults.cs | 2 +- UI/Scripts/SharedUi.cs | 10 + .../{Sound.cs.meta => SharedUi.cs.meta} | 2 +- UI/Scripts/Sound.cs | 76 -- UI/Scripts/SoundPlayer.cs | 9 +- UI/Translations/Translatable.cs | 8 +- UI/Translations/TranslationManager.cs | 6 +- UI/Utility/Glyphable.cs | 14 +- UI/Utility/Glyphs.cs | 4 +- UI/Utility/InputFieldCoadjutant.cs | 8 +- UI/Utility/ModListRow.cs | 7 +- 37 files changed, 544 insertions(+), 772 deletions(-) rename UI/Examples/{ExmapleGlyphSetter.cs => ExampleGlyphSetter.cs} (75%) rename UI/Examples/{ExmapleGlyphSetter.cs.meta => ExampleGlyphSetter.cs.meta} (100%) delete mode 100644 UI/Prefabs/ExampleInputCapture.prefab delete mode 100644 UI/Prefabs/ExampleInputCapture.prefab.meta create mode 100644 UI/Scripts/SharedUi.cs rename UI/Scripts/{Sound.cs.meta => SharedUi.cs.meta} (83%) delete mode 100644 UI/Scripts/Sound.cs diff --git a/README.md b/README.md index a578aa8..ba10eba 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # mod.io Unity Plugin v2023.5.12 [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://github.com/modio/modio-unity/blob/master/LICENSE) [![Discord](https://img.shields.io/discord/389039439487434752.svg?label=Discord&logo=discord&color=7289DA&labelColor=2C2F33)](https://discord.mod.io) -[![Master docs](https://img.shields.io/badge/docs-master-green.svg)](https://github.com/modio/modio-unity-v2/wiki) +[![Master docs](https://img.shields.io/badge/docs-master-green.svg)](https://go.mod.io/unity-docs) [![Unity 3D](https://img.shields.io/badge/Unity-2019.4+-lightgrey.svg)](https://unity3d.com) Welcome to the mod.io Unity Engine plugin repository. It allows game developers to host and automatically install user-created mods in their games which use **Unity 2019.4** or newer. It provides a UI for mod discovery, installation and collection management, and a C# interface which connects to the [mod.io REST API](https://docs.mod.io). @@ -16,10 +16,10 @@ Welcome to the mod.io Unity Engine plugin repository. It allows game developers | ------------- | ------- | |Windows | ✔ | |Windows (GDK) | ✔ [Contact us](#game-studios-and-publishers) | -|Nintendo Switch| ✔ [Contact us](#game-studios-and-publishers) | |XBox (GDK) | ✔ [Contact us](#game-studios-and-publishers) | |PlayStation 4 | ✔ [Contact us](#game-studios-and-publishers) | |PlayStation 5 | ✔ [Contact us](#game-studios-and-publishers) | +|Nintendo Switch| ✔ [Contact us](#game-studios-and-publishers) | |Linux | ✔ | |macOS | ✔ | @@ -272,4 +272,3 @@ Our Unity plugin is public and open source. Game developers are welcome to utili ## Other Repositories Our aim with [mod.io](https://mod.io), is to provide an [open modding API](https://docs.mod.io). You are welcome to [view, fork and contribute to our other codebases](https://github.com/modio) in use. - \ No newline at end of file diff --git a/Runtime/ModIO.Implementation/Classes/ModIOUnityImplementation.cs b/Runtime/ModIO.Implementation/Classes/ModIOUnityImplementation.cs index 082df5c..3ae3796 100644 --- a/Runtime/ModIO.Implementation/Classes/ModIOUnityImplementation.cs +++ b/Runtime/ModIO.Implementation/Classes/ModIOUnityImplementation.cs @@ -10,7 +10,6 @@ using UnityEngine; using System.Linq; using ModIO.Implementation.API.Requests; -using UnityEngine.Profiling; namespace ModIO.Implementation { @@ -20,8 +19,6 @@ namespace ModIO.Implementation /// internal static class ModIOUnityImplementation { - // REVIEW @Jackson Not sure if this should go into mod management or just here. It doesnt - // really belong anywhere in particular. /// /// A cached reference to the current upload operation handle. /// diff --git a/Runtime/ModIO.Implementation/Implementation.API/Implementation.API.Requests/AuthenticateViaEmail.cs b/Runtime/ModIO.Implementation/Implementation.API/Implementation.API.Requests/AuthenticateViaEmail.cs index cb49302..d6a2c75 100644 --- a/Runtime/ModIO.Implementation/Implementation.API/Implementation.API.Requests/AuthenticateViaEmail.cs +++ b/Runtime/ModIO.Implementation/Implementation.API/Implementation.API.Requests/AuthenticateViaEmail.cs @@ -1,19 +1,19 @@ namespace ModIO.Implementation.API.Requests { - internal static class AuthenticateViaEmail - { - public static WebRequestConfig Request(string emailaddress) - { - var request = new WebRequestConfig() - { - Url = $"{Settings.server.serverURL}{@"/oauth/emailrequest"}?", - RequestMethodType = "POST", - }; + internal static class AuthenticateViaEmail + { + public static WebRequestConfig Request(string emailaddress) + { + var request = new WebRequestConfig() + { + Url = $"{Settings.server.serverURL}{@"/oauth/emailrequest"}?", + RequestMethodType = "POST", + }; - request.AddField("email", emailaddress); + request.AddField("email", emailaddress); - return request; - } - } + return request; + } + } } diff --git a/Runtime/Utility/SelfInstancingMonoSingleton.cs b/Runtime/Utility/SelfInstancingMonoSingleton.cs index 4ae47d9..379cb63 100644 --- a/Runtime/Utility/SelfInstancingMonoSingleton.cs +++ b/Runtime/Utility/SelfInstancingMonoSingleton.cs @@ -13,6 +13,10 @@ public class SelfInstancingMonoSingleton : MonoBehaviour, ISimpleMonoSingleto public static T Instance { get { + if(!Application.isPlaying) + { + throw new UnityException($"Attempted to get singleton when application was not playing (This can happen when exiting Playmode. It's safe to ignore)"); + } if(_instance == null) { _instance = (T)FindObjectOfType(typeof(T)); @@ -58,7 +62,8 @@ protected virtual void OnDestroy() } protected virtual void OnApplicationQuit() - { + { + Destroy(_instance.gameObject); Destroy(gameObject); _instance = null; } diff --git a/UI/Color Scheme/ColorApplierImage.cs b/UI/Color Scheme/ColorApplierImage.cs index 4366a22..eff6703 100644 --- a/UI/Color Scheme/ColorApplierImage.cs +++ b/UI/Color Scheme/ColorApplierImage.cs @@ -22,12 +22,12 @@ private void Start() private bool Apply() { - if(colorScheme == null && !Browser.SingletonIsInstantiated()) + if(colorScheme == null || SharedUi.colorScheme == null) { return false; } - var scheme = colorScheme == null ? Browser.Instance.colorScheme : colorScheme; + var scheme = colorScheme == null ? SharedUi.colorScheme : colorScheme; if(scheme != null) { graphic.color = scheme.GetSchemeColor(color); diff --git a/UI/Color Scheme/ColorSetter.cs b/UI/Color Scheme/ColorSetter.cs index b707904..caaa31d 100644 --- a/UI/Color Scheme/ColorSetter.cs +++ b/UI/Color Scheme/ColorSetter.cs @@ -12,9 +12,9 @@ internal class ColorSetter : MonoBehaviour void OnEnable() { - if(Browser.SingletonIsInstantiated()) + if(SharedUi.colorScheme != null) { - Refresh(Browser.Instance.colorScheme); + Refresh(SharedUi.colorScheme); } } diff --git a/UI/Examples.meta b/UI/Examples.meta index 6c06001..cc6b708 100644 --- a/UI/Examples.meta +++ b/UI/Examples.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9ddd8022c81229b4e832c88a28ecf894 +guid: 80dc4e16b2b73c042bb1253eca107182 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UI/Examples/Example.unity b/UI/Examples/Example.unity index c7feb58..1aabbf2 100644 --- a/UI/Examples/Example.unity +++ b/UI/Examples/Example.unity @@ -121,6 +121,49 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &35804558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 35804560} + - component: {fileID: 35804559} + m_Layer: 0 + m_Name: ExampleGlyphSetter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &35804559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35804558} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9f68958c42874b36b342c2129c39e64, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &35804560 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35804558} + 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 &768429225 GameObject: m_ObjectHideFlags: 0 @@ -401,12 +444,69 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1519110690} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 795.73627, y: 549.2372, z: 3.6627884} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4826167439654112296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826167439654112297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f95d137321812dd41a3ac7750adf5684, type: 3} + m_Name: + m_EditorClassIdentifier: + Cancel: 331 + Alternate: 332 + Options: 333 + TabLeft: 334 + TabRight: 335 + Search: 339 + Menu: 337 + controllerAndKeyboardInput: + - Horizontal + - Vertical + mouseInput: + - Mouse X + - Mouse Y + verticalControllerInput: Vertical +--- !u!1 &4826167439654112297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4826167439654112299} + - component: {fileID: 4826167439654112296} + m_Layer: 0 + m_Name: ExampleInputCapture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4826167439654112299 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826167439654112297} + 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: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &7183562815888032899 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UI/Examples/ExmapleGlyphSetter.cs b/UI/Examples/ExampleGlyphSetter.cs similarity index 75% rename from UI/Examples/ExmapleGlyphSetter.cs rename to UI/Examples/ExampleGlyphSetter.cs index 12a20d5..e4fa56f 100644 --- a/UI/Examples/ExmapleGlyphSetter.cs +++ b/UI/Examples/ExampleGlyphSetter.cs @@ -1,17 +1,16 @@ using System.Collections; -using ModIOBrowser; using ModIOBrowser.Implementation; using UnityEngine; namespace Plugins.mod.io.UI.Examples { - public class ExmapleGlyphSetter : MonoBehaviour + public class ExampleGlyphSetter : MonoBehaviour { - private bool connected = false; + bool connected; void Awake() { - this.StartCoroutine(this.CheckForControllers()); + StartCoroutine(CheckForControllers()); } IEnumerator CheckForControllers() @@ -20,9 +19,9 @@ IEnumerator CheckForControllers() { var controllers = Input.GetJoystickNames(); - if (!this.connected && controllers.Length > 0) + if (!connected && controllers.Length > 0) { - this.connected = true; + connected = true; if(controllers[0].Contains("Microsoft")) { Glyphs.Instance.ChangeGlyphs(GlyphPlatforms.XBOX); @@ -39,9 +38,9 @@ IEnumerator CheckForControllers() Debug.Log("Connected"); } - else if (this.connected && controllers.Length == 0) + else if (connected && controllers.Length == 0) { - this.connected = false; + connected = false; Glyphs.Instance.ChangeGlyphs(GlyphPlatforms.PC); Debug.Log("Disconnected"); } diff --git a/UI/Examples/ExmapleGlyphSetter.cs.meta b/UI/Examples/ExampleGlyphSetter.cs.meta similarity index 100% rename from UI/Examples/ExmapleGlyphSetter.cs.meta rename to UI/Examples/ExampleGlyphSetter.cs.meta diff --git a/UI/Examples/ExampleInputCapture.cs b/UI/Examples/ExampleInputCapture.cs index 0831a97..b6f5c93 100644 --- a/UI/Examples/ExampleInputCapture.cs +++ b/UI/Examples/ExampleInputCapture.cs @@ -1,9 +1,7 @@ using System.Collections.Generic; using System.Linq; using ModIOBrowser; -using ModIOBrowser.Implementation; using UnityEngine; -using UnityEngine.EventSystems; /// /// An Example script on how to setup the key/button bindings for the ModIO Browser. Inputs such as @@ -47,6 +45,8 @@ public class ExampleInputCapture : MonoBehaviour void Update() { + if(!Browser.IsOpen) return; + // This is a basic example of one way to capture inputs and inform the UI browser what // action that that input should perform. // @@ -62,7 +62,7 @@ void Update() HandleControllerInput(); } - private void HandleInputReceiver() + void HandleInputReceiver() { if(Input.GetKeyDown(Cancel)) { @@ -94,7 +94,7 @@ private void HandleInputReceiver() } } - private void HandleControllerInput() + void HandleControllerInput() { // Handle controller scrolling // For now, this is only used in the mod details view, and may clash with "regular" navigation diff --git a/UI/Examples/ModIOBrowser.prefab b/UI/Examples/ModIOBrowser.prefab index 522c54f..714d2db 100644 --- a/UI/Examples/ModIOBrowser.prefab +++ b/UI/Examples/ModIOBrowser.prefab @@ -32,7 +32,6 @@ Transform: m_Children: - {fileID: 8989088974461564262} - {fileID: 1893516736165879165} - - {fileID: 1627815186} - {fileID: 8409814756638695870} - {fileID: 3177595258908356968} - {fileID: 2156061094568982260} @@ -308,146 +307,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8989088974461564262} m_Modifications: - - target: {fileID: 278573619633673813, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.b - value: 0.84705883 - objectReference: {fileID: 0} - - target: {fileID: 278573619633673813, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.g - value: 0.75686276 - objectReference: {fileID: 0} - - target: {fileID: 278573619633673813, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.r - value: 0.02745098 - objectReference: {fileID: 0} - - target: {fileID: 793622887796036333, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.b - value: 0.84705883 - objectReference: {fileID: 0} - - target: {fileID: 793622887796036333, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.g - value: 0.75686276 - objectReference: {fileID: 0} - - target: {fileID: 793622887796036333, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.r - value: 0.02745098 - objectReference: {fileID: 0} - - target: {fileID: 1281414733949405647, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.b - value: 0.84705883 - objectReference: {fileID: 0} - - target: {fileID: 1281414733949405647, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.g - value: 0.75686276 - objectReference: {fileID: 0} - - target: {fileID: 1281414733949405647, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.r - value: 0.02745098 - objectReference: {fileID: 0} - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, type: 3} propertyPath: scheme value: objectReference: {fileID: 8989088974132902757} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 5224539521068155025} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: CancelButton - objectReference: {fileID: 0} - - target: {fileID: 2914680749562353562, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_SizeDelta.x - value: 720 - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_SizeDelta.y - value: 104 - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 440 - objectReference: {fileID: 0} - - target: {fileID: 3099736032738202514, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -92 - objectReference: {fileID: 0} - - target: {fileID: 3099736033898908252, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736033898908252, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736033898908252, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 3099736033898908252, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - target: {fileID: 3099736033961590443, guid: 54d3625bf28508944853cce5c940c30c, type: 3} propertyPath: m_Name value: 5DigitInput objectReference: {fileID: 0} - - target: {fileID: 3099736033961590443, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3099736033961590444, guid: 54d3625bf28508944853cce5c940c30c, type: 3} propertyPath: m_Pivot.x @@ -553,130 +422,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3099736034188945143, guid: 54d3625bf28508944853cce5c940c30c, + - target: {fileID: 5619593777788896736, guid: 54d3625bf28508944853cce5c940c30c, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736034188945143, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3099736034188945143, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 360 - objectReference: {fileID: 0} - - target: {fileID: 3099736034188945143, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -72 - objectReference: {fileID: 0} - - target: {fileID: 5268754813597789465, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.b - value: 0.84705883 - objectReference: {fileID: 0} - - target: {fileID: 5268754813597789465, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.g - value: 0.75686276 - objectReference: {fileID: 0} - - target: {fileID: 5268754813597789465, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.r - value: 0.02745098 - objectReference: {fileID: 0} - - target: {fileID: 5619593777038678719, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5619593777038678719, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5619593777038678719, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_SizeDelta.y - value: 22.83 - objectReference: {fileID: 0} - - target: {fileID: 5619593777038678719, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 440 - objectReference: {fileID: 0} - - target: {fileID: 5619593777038678719, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -195.415 - objectReference: {fileID: 0} - - target: {fileID: 5619593777148905370, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_SizeDelta.y - value: 334.83 - objectReference: {fileID: 0} - - target: {fileID: 5619593778049157054, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5619593778049157054, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5619593778049157054, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 440 - objectReference: {fileID: 0} - - target: {fileID: 5619593778049157054, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -246.83 - objectReference: {fileID: 0} - - target: {fileID: 5648169853191178097, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.b - value: 0.84705883 - objectReference: {fileID: 0} - - target: {fileID: 5648169853191178097, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.g - value: 0.75686276 - objectReference: {fileID: 0} - - target: {fileID: 5648169853191178097, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_Color.r - value: 0.02745098 - objectReference: {fileID: 0} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1042237076222423165} - target: {fileID: 5659812009272655937, guid: 54d3625bf28508944853cce5c940c30c, type: 3} propertyPath: scheme value: objectReference: {fileID: 8989088974132902757} - - target: {fileID: 5659812009272655937, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: ContinueButton - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 54d3625bf28508944853cce5c940c30c, type: 3} ---- !u!114 &5224539521068155025 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5662042383669831732, guid: 54d3625bf28508944853cce5c940c30c, - type: 3} - m_PrefabInstance: {fileID: 437648027396171941} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3248977626930042382} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3261082e64b114043b4bc3643e221a44, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3248977626930042382 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3099736033961590443, guid: 54d3625bf28508944853cce5c940c30c, @@ -710,7 +467,7 @@ PrefabInstance: - target: {fileID: 8247413803136923786, guid: 19b91031327fd4840aecddf27ac33eec, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8247413803136923786, guid: 19b91031327fd4840aecddf27ac33eec, type: 3} @@ -780,7 +537,7 @@ PrefabInstance: - target: {fileID: 1736825614451629809, guid: d2543bf02915aa745bef70de010359c2, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 1736825614451629809, guid: d2543bf02915aa745bef70de010359c2, type: 3} @@ -927,7 +684,7 @@ PrefabInstance: - target: {fileID: 1022597431898343917, guid: 65c74c8b969a6574f919233163cda9d9, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 1022597431898343917, guid: 65c74c8b969a6574f919233163cda9d9, type: 3} @@ -991,12 +748,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65c74c8b969a6574f919233163cda9d9, type: 3} ---- !u!4 &2156061094568982260 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1022597431898343917, guid: 65c74c8b969a6574f919233163cda9d9, - type: 3} - m_PrefabInstance: {fileID: 1430773410708193049} - m_PrefabAsset: {fileID: 0} --- !u!114 &7376382230776530698 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8468188248645416979, guid: 65c74c8b969a6574f919233163cda9d9, @@ -1009,6 +760,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: abcfba95a5a23e141b14a3ae260ab189, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &2156061094568982260 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1022597431898343917, guid: 65c74c8b969a6574f919233163cda9d9, + type: 3} + m_PrefabInstance: {fileID: 1430773410708193049} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1877921627258965659 PrefabInstance: m_ObjectHideFlags: 0 @@ -1188,33 +945,45 @@ PrefabInstance: objectReference: {fileID: 8989088974132902757} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} ---- !u!1 &1893516734505421756 stripped +--- !u!1 &3328724869292898985 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 20451694282229031, guid: a358e4ee54a35874e85a5115d9b91b58, + m_CorrespondingSourceObject: {fileID: 3764365408090289202, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} ---- !u!1 &3328724869292898985 stripped +--- !u!1 &7055042685535865180 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3764365408090289202, guid: a358e4ee54a35874e85a5115d9b91b58, + m_CorrespondingSourceObject: {fileID: 8928170981636048839, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} ---- !u!1 &1893516734520461365 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 20451694296090286, guid: a358e4ee54a35874e85a5115d9b91b58, +--- !u!114 &4612648473570860654 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6488803726650446069, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b55ab1eaffd41c24da914363d6dc169b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1893516736350351233 stripped GameObject: m_CorrespondingSourceObject: {fileID: 20451694917722394, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974029530188 stripped +--- !u!1 &4840592677501763395 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7399448335370840791, guid: a358e4ee54a35874e85a5115d9b91b58, + m_CorrespondingSourceObject: {fileID: 6422848446705840600, guid: a358e4ee54a35874e85a5115d9b91b58, + type: 3} + m_PrefabInstance: {fileID: 1877921627258965659} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1893516734520461365 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 20451694296090286, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} @@ -1224,27 +993,15 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} ---- !u!1 &4840592677501763395 stripped +--- !u!1 &8989088974029530188 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6422848446705840600, guid: a358e4ee54a35874e85a5115d9b91b58, - type: 3} - m_PrefabInstance: {fileID: 1877921627258965659} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4612648473570860654 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6488803726650446069, guid: a358e4ee54a35874e85a5115d9b91b58, + m_CorrespondingSourceObject: {fileID: 7399448335370840791, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b55ab1eaffd41c24da914363d6dc169b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &7055042685535865180 stripped +--- !u!1 &1893516734505421756 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8928170981636048839, guid: a358e4ee54a35874e85a5115d9b91b58, + m_CorrespondingSourceObject: {fileID: 20451694282229031, guid: a358e4ee54a35874e85a5115d9b91b58, type: 3} m_PrefabInstance: {fileID: 1877921627258965659} m_PrefabAsset: {fileID: 0} @@ -1258,7 +1015,7 @@ PrefabInstance: - target: {fileID: 839962838998309421, guid: ce4f233ac71f0ec4cb6bcdf3b0a37791, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 839962838998309421, guid: ce4f233ac71f0ec4cb6bcdf3b0a37791, type: 3} @@ -1472,6 +1229,18 @@ PrefabInstance: objectReference: {fileID: 8989088974132902757} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d745b8f4ef0816244ba1585f4f34293b, type: 3} +--- !u!1 &5095037789043063184 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7509449899451644187, guid: d745b8f4ef0816244ba1585f4f34293b, + type: 3} + m_PrefabInstance: {fileID: 3351761392141205643} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3463848345469516931 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2202777596087434248, guid: d745b8f4ef0816244ba1585f4f34293b, + type: 3} + m_PrefabInstance: {fileID: 3351761392141205643} + m_PrefabAsset: {fileID: 0} --- !u!114 &445053123 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3351761392250452040, guid: d745b8f4ef0816244ba1585f4f34293b, @@ -1484,27 +1253,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1893516735634251279 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3802382007037501060, guid: d745b8f4ef0816244ba1585f4f34293b, - type: 3} - m_PrefabInstance: {fileID: 3351761392141205643} - m_PrefabAsset: {fileID: 0} --- !u!224 &1893516735634251278 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3802382007037501061, guid: d745b8f4ef0816244ba1585f4f34293b, type: 3} m_PrefabInstance: {fileID: 3351761392141205643} m_PrefabAsset: {fileID: 0} ---- !u!1 &5095037789043063184 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7509449899451644187, guid: d745b8f4ef0816244ba1585f4f34293b, - type: 3} - m_PrefabInstance: {fileID: 3351761392141205643} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3463848345469516931 stripped +--- !u!1 &1893516735634251279 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 2202777596087434248, guid: d745b8f4ef0816244ba1585f4f34293b, + m_CorrespondingSourceObject: {fileID: 3802382007037501060, guid: d745b8f4ef0816244ba1585f4f34293b, type: 3} m_PrefabInstance: {fileID: 3351761392141205643} m_PrefabAsset: {fileID: 0} @@ -2147,30 +1904,6 @@ PrefabInstance: objectReference: {fileID: 7376382230776530698} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e7c972a3b0c92ba4f8be9938d0c63a43, type: 3} ---- !u!224 &8989088974670517171 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 5760055837242226404, guid: e7c972a3b0c92ba4f8be9938d0c63a43, - type: 3} - m_PrefabInstance: {fileID: 3697592250992239959} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1234396549239151596 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2481775387260960443, guid: e7c972a3b0c92ba4f8be9938d0c63a43, - type: 3} - m_PrefabInstance: {fileID: 3697592250992239959} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8989088974670517170} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9a181712313aa74597d2fd0cad977f4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1893516736281489272 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2960945230090701359, guid: e7c972a3b0c92ba4f8be9938d0c63a43, - type: 3} - m_PrefabInstance: {fileID: 3697592250992239959} - m_PrefabAsset: {fileID: 0} --- !u!1 &8659479706839099516 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5439462582072642859, guid: e7c972a3b0c92ba4f8be9938d0c63a43, @@ -2219,12 +1952,36 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 811030f917147504589eb74c563a0d3a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1234396549239151596 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2481775387260960443, guid: e7c972a3b0c92ba4f8be9938d0c63a43, + type: 3} + m_PrefabInstance: {fileID: 3697592250992239959} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8989088974670517170} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9a181712313aa74597d2fd0cad977f4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &8989088974670517171 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5760055837242226404, guid: e7c972a3b0c92ba4f8be9938d0c63a43, + type: 3} + m_PrefabInstance: {fileID: 3697592250992239959} + m_PrefabAsset: {fileID: 0} --- !u!1 &8989088974670517170 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5760055837242226405, guid: e7c972a3b0c92ba4f8be9938d0c63a43, type: 3} m_PrefabInstance: {fileID: 3697592250992239959} m_PrefabAsset: {fileID: 0} +--- !u!1 &1893516736281489272 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2960945230090701359, guid: e7c972a3b0c92ba4f8be9938d0c63a43, + type: 3} + m_PrefabInstance: {fileID: 3697592250992239959} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3983697154900495466 PrefabInstance: m_ObjectHideFlags: 0 @@ -2344,18 +2101,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b6b79b4f8e6f7204caf690ec4a93fdfc, type: 3} ---- !u!1 &8989088974330128610 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5473922759698932872, guid: b6b79b4f8e6f7204caf690ec4a93fdfc, - type: 3} - m_PrefabInstance: {fileID: 3983697154900495466} - m_PrefabAsset: {fileID: 0} --- !u!224 &8989088974330128611 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5473922759698932873, guid: b6b79b4f8e6f7204caf690ec4a93fdfc, type: 3} m_PrefabInstance: {fileID: 3983697154900495466} m_PrefabAsset: {fileID: 0} +--- !u!1 &8989088974330128610 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5473922759698932872, guid: b6b79b4f8e6f7204caf690ec4a93fdfc, + type: 3} + m_PrefabInstance: {fileID: 3983697154900495466} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4046368501472503916 PrefabInstance: m_ObjectHideFlags: 0 @@ -2528,6 +2285,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8989088974461564262} m_Modifications: + - target: {fileID: 1009267594947136712, guid: d54a705255921934c9d7e49fdc181f47, + type: 3} + propertyPath: image + value: + objectReference: {fileID: 197104109494813717} - target: {fileID: 3273039434364840428, guid: d54a705255921934c9d7e49fdc181f47, type: 3} propertyPath: scheme @@ -2663,20 +2425,10 @@ PrefabInstance: propertyPath: scheme value: objectReference: {fileID: 8989088974132902757} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1009267594947136712, guid: d54a705255921934c9d7e49fdc181f47, type: 3} + - {fileID: 7151542408781975298, guid: d54a705255921934c9d7e49fdc181f47, type: 3} m_SourcePrefab: {fileID: 100100000, guid: d54a705255921934c9d7e49fdc181f47, type: 3} ---- !u!1 &763285129751173082 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6576450648925541261, guid: d54a705255921934c9d7e49fdc181f47, - type: 3} - m_PrefabInstance: {fileID: 5896202355328681047} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974266968825 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3273039434490064558, guid: d54a705255921934c9d7e49fdc181f47, - type: 3} - m_PrefabInstance: {fileID: 5896202355328681047} - m_PrefabAsset: {fileID: 0} --- !u!224 &8989088974764450388 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3273039434983351811, guid: d54a705255921934c9d7e49fdc181f47, @@ -2701,6 +2453,30 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5896202355328681047} m_PrefabAsset: {fileID: 0} +--- !u!114 &197104109494813717 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6012241632869826626, guid: d54a705255921934c9d7e49fdc181f47, + type: 3} + m_PrefabInstance: {fileID: 5896202355328681047} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8989088974266968825 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3273039434490064558, guid: d54a705255921934c9d7e49fdc181f47, + type: 3} + m_PrefabInstance: {fileID: 5896202355328681047} + m_PrefabAsset: {fileID: 0} +--- !u!1 &763285129751173082 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6576450648925541261, guid: d54a705255921934c9d7e49fdc181f47, + type: 3} + m_PrefabInstance: {fileID: 5896202355328681047} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6016196942305301805 PrefabInstance: m_ObjectHideFlags: 0 @@ -2716,7 +2492,7 @@ PrefabInstance: - target: {fileID: 5190045006183204375, guid: 8c6ca06ea3133cd4f8c7798a423b65f8, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 5190045006183204375, guid: 8c6ca06ea3133cd4f8c7798a423b65f8, type: 3} @@ -3066,24 +2842,6 @@ PrefabInstance: objectReference: {fileID: 8989088974132902757} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 984b45bb8f473594a90406837fcc03f6, type: 3} ---- !u!1 &8989088974680782485 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3151635505209770847, guid: 984b45bb8f473594a90406837fcc03f6, - type: 3} - m_PrefabInstance: {fileID: 6269981554021496266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1410451707985475524 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4940903284276904462, guid: 984b45bb8f473594a90406837fcc03f6, - type: 3} - m_PrefabInstance: {fileID: 6269981554021496266} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8989088974680782485} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 25058e2ef49af6545a955cef5bced6cb, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &6263020595006076978 stripped GameObject: m_CorrespondingSourceObject: {fileID: 137864518997446136, guid: 984b45bb8f473594a90406837fcc03f6, @@ -3102,12 +2860,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5ce6686d7065cf4986b2ed3e2773c96, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &8989088974680782485 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3151635505209770847, guid: 984b45bb8f473594a90406837fcc03f6, + type: 3} + m_PrefabInstance: {fileID: 6269981554021496266} + m_PrefabAsset: {fileID: 0} --- !u!224 &8989088974680782486 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3151635505209770844, guid: 984b45bb8f473594a90406837fcc03f6, type: 3} m_PrefabInstance: {fileID: 6269981554021496266} m_PrefabAsset: {fileID: 0} +--- !u!114 &1410451707985475524 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4940903284276904462, guid: 984b45bb8f473594a90406837fcc03f6, + type: 3} + m_PrefabInstance: {fileID: 6269981554021496266} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8989088974680782485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25058e2ef49af6545a955cef5bced6cb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6353855248690981509 PrefabInstance: m_ObjectHideFlags: 0 @@ -3242,18 +3018,6 @@ PrefabInstance: objectReference: {fileID: 7376382230776530698} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e3560bff46556f4b8dcdd3e31f54a32, type: 3} ---- !u!114 &8989088974616621303 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2635385769247464050, guid: 4e3560bff46556f4b8dcdd3e31f54a32, - type: 3} - m_PrefabInstance: {fileID: 6353855248690981509} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!224 &8989088973446767647 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2635385768219430554, guid: 4e3560bff46556f4b8dcdd3e31f54a32, @@ -3284,6 +3048,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &8989088974616621303 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2635385769247464050, guid: 4e3560bff46556f4b8dcdd3e31f54a32, + type: 3} + m_PrefabInstance: {fileID: 6353855248690981509} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6741842186263786144 PrefabInstance: m_ObjectHideFlags: 0 @@ -3685,18 +3461,18 @@ PrefabInstance: objectReference: {fileID: 8989088974132902757} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8d555f103a7dc374c9fe923c5a06f8d3, type: 3} ---- !u!1 &5471285212197136237 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2640600915461231640, guid: 8d555f103a7dc374c9fe923c5a06f8d3, - type: 3} - m_PrefabInstance: {fileID: 8018839883092652917} - m_PrefabAsset: {fileID: 0} --- !u!224 &8473402708461312073 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1936326553840626492, guid: 8d555f103a7dc374c9fe923c5a06f8d3, type: 3} m_PrefabInstance: {fileID: 8018839883092652917} m_PrefabAsset: {fileID: 0} +--- !u!1 &5471285212197136237 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2640600915461231640, guid: 8d555f103a7dc374c9fe923c5a06f8d3, + type: 3} + m_PrefabInstance: {fileID: 8018839883092652917} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8116026125585663092 PrefabInstance: m_ObjectHideFlags: 0 @@ -3817,92 +3593,17 @@ PrefabInstance: m_RemovedComponents: - {fileID: 873207985097786796, guid: 4ebcda84dcabb7c478414af24f21764b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4ebcda84dcabb7c478414af24f21764b, type: 3} ---- !u!1 &8989088974196407082 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 873207984212787038, guid: 4ebcda84dcabb7c478414af24f21764b, - type: 3} - m_PrefabInstance: {fileID: 8116026125585663092} - m_PrefabAsset: {fileID: 0} --- !u!224 &8989088974196407083 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 873207984212787039, guid: 4ebcda84dcabb7c478414af24f21764b, type: 3} m_PrefabInstance: {fileID: 8116026125585663092} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8893324566044400241 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8989088974132902754} - m_Modifications: - - target: {fileID: 8893324564416866145, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_Name - value: ExampleInputCapture - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalPosition.x - value: 1019.75134 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalPosition.y - value: 521.43976 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalPosition.z - value: 15.910962 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0b306d249f4833444b11dd61db95dcad, type: 3} ---- !u!4 &1627815186 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8893324564416866147, guid: 0b306d249f4833444b11dd61db95dcad, +--- !u!1 &8989088974196407082 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 873207984212787038, guid: 4ebcda84dcabb7c478414af24f21764b, type: 3} - m_PrefabInstance: {fileID: 8893324566044400241} + m_PrefabInstance: {fileID: 8116026125585663092} m_PrefabAsset: {fileID: 0} --- !u!1001 &8896866077704013097 PrefabInstance: @@ -4188,6 +3889,18 @@ PrefabInstance: objectReference: {fileID: 5576515969151178355} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, type: 3} +--- !u!1 &8989088974207088660 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 560606090551311677, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, + type: 3} + m_PrefabInstance: {fileID: 8896866077704013097} + m_PrefabAsset: {fileID: 0} +--- !u!1 &6753836796470259977 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2792924766965019680, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, + type: 3} + m_PrefabInstance: {fileID: 8896866077704013097} + m_PrefabAsset: {fileID: 0} --- !u!114 &1893516735231219151 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7007350328927686886, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, @@ -4200,27 +3913,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1893516735102037498 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7007350329050589395, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, - type: 3} - m_PrefabInstance: {fileID: 8896866077704013097} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974207088660 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 560606090551311677, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, +--- !u!224 &8989088974283087999 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 560606090467960150, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, type: 3} m_PrefabInstance: {fileID: 8896866077704013097} m_PrefabAsset: {fileID: 0} ---- !u!1 &6753836796470259977 stripped +--- !u!1 &1893516735102037498 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 2792924766965019680, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, - type: 3} - m_PrefabInstance: {fileID: 8896866077704013097} - m_PrefabAsset: {fileID: 0} ---- !u!224 &8989088974283087999 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 560606090467960150, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, + m_CorrespondingSourceObject: {fileID: 7007350329050589395, guid: 6b45abbbd75a04c4eba1c3b9ad9e5ad7, type: 3} m_PrefabInstance: {fileID: 8896866077704013097} m_PrefabAsset: {fileID: 0} @@ -4393,18 +4094,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9002323654564509994} m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974637467834 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 22805387498254736, guid: 0a464bb150d6dbe46b938abf56a57201, - type: 3} - m_PrefabInstance: {fileID: 9002323654564509994} - m_PrefabAsset: {fileID: 0} --- !u!224 &8989088974637467835 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22805387498254737, guid: 0a464bb150d6dbe46b938abf56a57201, type: 3} m_PrefabInstance: {fileID: 9002323654564509994} m_PrefabAsset: {fileID: 0} +--- !u!1 &8989088974637467834 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 22805387498254736, guid: 0a464bb150d6dbe46b938abf56a57201, + type: 3} + m_PrefabInstance: {fileID: 9002323654564509994} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9002439468039494841 PrefabInstance: m_ObjectHideFlags: 0 @@ -4544,63 +4245,63 @@ PrefabInstance: objectReference: {fileID: 8989088974132902757} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 767ce36082d6519459c23650a28a5f29, type: 3} ---- !u!1 &5051438322736751593 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4248379458315599696, guid: 767ce36082d6519459c23650a28a5f29, +--- !u!224 &8989088974781053212 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 22727128957527461, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974781053211 stripped +--- !u!1 &4937160983271311031 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 22727128957527458, guid: 767ce36082d6519459c23650a28a5f29, + m_CorrespondingSourceObject: {fileID: 4065421421365254670, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088973366545821 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 22727129952653604, guid: 767ce36082d6519459c23650a28a5f29, +--- !u!114 &5576515969151178355 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3570463100115077834, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &8989088974003534252 stripped + m_GameObject: {fileID: 8989088974781053211} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f256e83bf0cc2d2429e619e70800b638, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2327659950358824763 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 22727130323297557, guid: 767ce36082d6519459c23650a28a5f29, + m_CorrespondingSourceObject: {fileID: 6675060994369772418, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &4937160983271311031 stripped +--- !u!1 &1893516735354700757 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4065421421365254670, guid: 767ce36082d6519459c23650a28a5f29, + m_CorrespondingSourceObject: {fileID: 7397172900146470764, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &2327659950358824763 stripped +--- !u!1 &8989088974003534252 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 6675060994369772418, guid: 767ce36082d6519459c23650a28a5f29, + m_CorrespondingSourceObject: {fileID: 22727130323297557, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!1 &1893516735354700757 stripped +--- !u!1 &8989088973366545821 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7397172900146470764, guid: 767ce36082d6519459c23650a28a5f29, + m_CorrespondingSourceObject: {fileID: 22727129952653604, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} ---- !u!114 &5576515969151178355 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3570463100115077834, guid: 767ce36082d6519459c23650a28a5f29, +--- !u!1 &5051438322736751593 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4248379458315599696, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8989088974781053211} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f256e83bf0cc2d2429e619e70800b638, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &8989088974781053212 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 22727128957527461, guid: 767ce36082d6519459c23650a28a5f29, +--- !u!1 &8989088974781053211 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 22727128957527458, guid: 767ce36082d6519459c23650a28a5f29, type: 3} m_PrefabInstance: {fileID: 9002439468039494841} m_PrefabAsset: {fileID: 0} @@ -4829,21 +4530,27 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!1 &1893516734596061666 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7221019452671754842, guid: e504c2c7b46822f4a9fd6549967f71b8, +--- !u!224 &8989088973629451876 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 202241233251530204, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!1 &3463848345821676872 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5648400315019566832, guid: e504c2c7b46822f4a9fd6549967f71b8, +--- !u!114 &1042237076222423165 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8072680918941051845, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!1 &6263020593954170217 stripped + m_GameObject: {fileID: 8989088973629451875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2c4cf586272b55a4497783f1478c1c6b, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1893516736268411314 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 2926092443703885521, guid: e504c2c7b46822f4a9fd6549967f71b8, + m_CorrespondingSourceObject: {fileID: 7221019454488820234, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} @@ -4853,15 +4560,15 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!1 &1893516736268411314 stripped +--- !u!1 &6263020594179064106 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7221019454488820234, guid: e504c2c7b46822f4a9fd6549967f71b8, + m_CorrespondingSourceObject: {fileID: 2926092444486032018, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!1 &6263020594179064106 stripped +--- !u!1 &6263020593954170217 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 2926092444486032018, guid: e504c2c7b46822f4a9fd6549967f71b8, + m_CorrespondingSourceObject: {fileID: 2926092443703885521, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} @@ -4877,9 +4584,15 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} ---- !u!224 &8989088973629451876 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 202241233251530204, guid: e504c2c7b46822f4a9fd6549967f71b8, +--- !u!1 &3463848345821676872 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5648400315019566832, guid: e504c2c7b46822f4a9fd6549967f71b8, + type: 3} + m_PrefabInstance: {fileID: 9111109284383726520} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1893516734596061666 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7221019452671754842, guid: e504c2c7b46822f4a9fd6549967f71b8, type: 3} m_PrefabInstance: {fileID: 9111109284383726520} m_PrefabAsset: {fileID: 0} diff --git a/UI/Prefabs/5DigitInputPopup/5DigitInput.prefab b/UI/Prefabs/5DigitInputPopup/5DigitInput.prefab index 4b6379e..9a55ea1 100644 --- a/UI/Prefabs/5DigitInputPopup/5DigitInput.prefab +++ b/UI/Prefabs/5DigitInputPopup/5DigitInput.prefab @@ -60,7 +60,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.02745098, g: 0.75686276, b: 0.84705883, a: 0.011764706} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -653,7 +653,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.02745098, g: 0.75686276, b: 0.84705883, a: 0.011764706} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -1153,10 +1153,10 @@ RectTransform: m_Father: {fileID: 5619593777148905370} 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: 440, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -92} + m_SizeDelta: {x: 720, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3099736032738202516 MonoBehaviour: @@ -1558,9 +1558,9 @@ RectTransform: m_Father: {fileID: 3099736032738202514} 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: 360, y: -20} m_SizeDelta: {x: 720, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3099736033898908255 @@ -1687,6 +1687,7 @@ MonoBehaviour: m_EditorClassIdentifier: reference: Email authentication text: {fileID: 3099736033898908254} + translatedLanguageFontPairingOverrides: {fileID: 0} --- !u!1 &3099736033961590443 GameObject: m_ObjectHideFlags: 0 @@ -1703,7 +1704,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3099736033961590444 RectTransform: m_ObjectHideFlags: 0 @@ -1766,6 +1767,7 @@ MonoBehaviour: m_EditorClassIdentifier: reference: Back text: {fileID: 4270668820921917304} + translatedLanguageFontPairingOverrides: {fileID: 0} --- !u!1 &3710923771882365936 GameObject: m_ObjectHideFlags: 0 @@ -1866,7 +1868,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.02745098, g: 0.75686276, b: 0.84705883, a: 0.011764706} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -2156,7 +2158,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.02745098, g: 0.75686276, b: 0.84705883, a: 0.011764706} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -2273,10 +2275,10 @@ RectTransform: m_Father: {fileID: 5619593777148905370} 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: 440, y: 0} - m_SizeDelta: {x: 720, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 440, y: -195.415} + m_SizeDelta: {x: 720, y: 22.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5619593777038678715 CanvasRenderer: @@ -2445,7 +2447,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 880, y: 0} + m_SizeDelta: {x: 880, y: 334.83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5619593777148905364 CanvasRenderer: @@ -2789,6 +2791,17 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: + - m_Target: {fileID: 5662042383669831732} + m_MethodName: CancelButton + 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 - m_Target: {fileID: 0} m_MethodName: Close m_Mode: 1 @@ -2833,9 +2846,9 @@ RectTransform: m_Father: {fileID: 5619593777148905370} m_RootOrder: 3 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: 440, y: -246.83} m_SizeDelta: {x: 800, y: 48} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5619593778049157049 @@ -2877,6 +2890,7 @@ MonoBehaviour: m_EditorClassIdentifier: reference: Submit text: {fileID: 6754485822241212579} + translatedLanguageFontPairingOverrides: {fileID: 0} --- !u!1 &7096349534278033345 GameObject: m_ObjectHideFlags: 0 @@ -3436,7 +3450,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.011764706} + m_Color: {r: 0.02745098, g: 0.75686276, b: 0.84705883, a: 0.011764706} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -3811,7 +3825,7 @@ PrefabInstance: - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: FinishButton + value: ContinueButton objectReference: {fileID: 0} - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, type: 3} @@ -4037,6 +4051,36 @@ PrefabInstance: propertyPath: m_Navigation.m_Mode value: 0 objectReference: {fileID: 0} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 5662042383669831732} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: CancelButton + objectReference: {fileID: 0} + - target: {fileID: 7318288332265493699, guid: 9bde00a16f32d6d42a1280198365e78b, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7873473676537387376, guid: 9bde00a16f32d6d42a1280198365e78b, type: 3} propertyPath: m_Type diff --git a/UI/Prefabs/ExampleInputCapture.prefab b/UI/Prefabs/ExampleInputCapture.prefab deleted file mode 100644 index cd7884a..0000000 --- a/UI/Prefabs/ExampleInputCapture.prefab +++ /dev/null @@ -1,59 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8893324564416866145 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8893324564416866147} - - component: {fileID: 8893324564416866144} - m_Layer: 0 - m_Name: ExampleInputCapture - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8893324564416866147 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8893324564416866145} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1019.75134, y: 521.43976, z: 15.910962} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8893324564416866144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8893324564416866145} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f95d137321812dd41a3ac7750adf5684, type: 3} - m_Name: - m_EditorClassIdentifier: - Cancel: 331 - Alternate: 332 - Options: 333 - TabLeft: 334 - TabRight: 335 - Search: 339 - Menu: 337 - controllerAndKeyboardInput: - - Horizontal - - Vertical - mouseInput: - - Mouse X - - Mouse Y - verticalControllerInput: Vertical diff --git a/UI/Prefabs/ExampleInputCapture.prefab.meta b/UI/Prefabs/ExampleInputCapture.prefab.meta deleted file mode 100644 index 6bf36e8..0000000 --- a/UI/Prefabs/ExampleInputCapture.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0b306d249f4833444b11dd61db95dcad -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UI/Scripts/Browser.cs b/UI/Scripts/Browser.cs index cdabc54..0fdf81c 100644 --- a/UI/Scripts/Browser.cs +++ b/UI/Scripts/Browser.cs @@ -10,7 +10,6 @@ namespace ModIOBrowser { - /// /// The main handler for opening and closing the mod IO Browser. /// Use Browser.Open() to open and Browser.Close() to close. @@ -72,7 +71,17 @@ public enum VirtualKeyboardType // this to true and open the browser the moment we have been initialized static bool openOnInitialize = false; + public static bool IsOpen = false; + // Use Awake() to setup the Singleton for Browser.cs and initialize the plugin + protected override void Awake() + { + base.Awake(); + + SharedUi.settings = uiConfig; + SharedUi.colorScheme = colorScheme; + } + void Start() { if (autoInitialize) @@ -156,6 +165,7 @@ public static void Close() // Deactivate the Canvas Instance?.BrowserCanvas?.SetActive(false); + IsOpen = false; OnClose?.Invoke(); SelectionManager.Instance.gameObject.SetActive(false); @@ -334,6 +344,7 @@ static void IsInitialized() if(!Instance.BrowserCanvas.activeSelf) { Instance.BrowserCanvas.SetActive(true); + IsOpen = true; } Collection.Instance.CacheLocalSubscribedModStatuses(); diff --git a/UI/Scripts/BrowserSpawnIn.cs b/UI/Scripts/BrowserSpawnIn.cs index 836dc5f..13c7e37 100644 --- a/UI/Scripts/BrowserSpawnIn.cs +++ b/UI/Scripts/BrowserSpawnIn.cs @@ -6,15 +6,15 @@ namespace ModIOBrowser public class BrowserSpawnIn : MonoBehaviour { public GameObject browserPrefab; + GameObject spawnedBrowser; - bool hasSpawned = false; + bool hasSpawned => spawnedBrowser != null; public void SpawnIn() { if(!hasSpawned) { - Instantiate(browserPrefab); - hasSpawned = true; + spawnedBrowser = Instantiate(browserPrefab); } Browser.Open(null); diff --git a/UI/Scripts/InputReceiver.cs b/UI/Scripts/InputReceiver.cs index 6af0a4e..5be51af 100644 --- a/UI/Scripts/InputReceiver.cs +++ b/UI/Scripts/InputReceiver.cs @@ -21,7 +21,7 @@ public static class InputReceiver /// public static void OnCancel() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.Cancel(); @@ -37,7 +37,7 @@ public static void OnCancel() /// public static void OnAlternate() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.Alternate(); @@ -52,7 +52,7 @@ public static void OnAlternate() /// public static void OnOptions() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.Options(); @@ -64,7 +64,7 @@ public static void OnOptions() /// public static void OnTabRight() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.TabRight(); @@ -76,7 +76,7 @@ public static void OnTabRight() /// public static void OnTabLeft() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.TabLeft(); @@ -91,7 +91,7 @@ public static void OnTabLeft() /// public static void OnSearch() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); SearchPanel.Instance.ToggleState(); @@ -106,7 +106,7 @@ public static void OnSearch() /// public static void OnMenu() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.MenuInput(); @@ -122,7 +122,7 @@ public static void OnMenu() /// public static void OnControllerScroll(float direction) { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); Navigating.Scroll(direction); @@ -134,7 +134,7 @@ public static void OnControllerScroll(float direction) /// public static void OnSetToControllerNavigation() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToController(); } @@ -145,7 +145,7 @@ public static void OnSetToControllerNavigation() /// public static void OnSetToMouseNavigation() { - if(Browser.Instance.BrowserCanvas.activeSelf) + if(Browser.IsOpen) { InputNavigation.Instance.SetToMouse(); } diff --git a/UI/Scripts/Mods.cs b/UI/Scripts/Mods.cs index 2f4a7f8..9a92917 100644 --- a/UI/Scripts/Mods.cs +++ b/UI/Scripts/Mods.cs @@ -189,7 +189,7 @@ public static void ModManagementEvent(ModManagementEventType type, ModId id, Res } } - if(!Browser.Instance.BrowserCanvas.activeSelf) + if(!Browser.IsOpen) { return; } diff --git a/UI/Scripts/Panels/Collection.cs b/UI/Scripts/Panels/Collection.cs index 1f477c9..3d13fa7 100644 --- a/UI/Scripts/Panels/Collection.cs +++ b/UI/Scripts/Panels/Collection.cs @@ -197,7 +197,7 @@ public void RefreshList() } } - string accentHashColor = ColorUtility.ToHtmlStringRGBA(Browser.Instance.colorScheme.GetSchemeColor(ColorSetterType.Highlight)); + string accentHashColor = ColorUtility.ToHtmlStringRGBA(SharedUi.colorScheme.GetSchemeColor(ColorSetterType.Highlight)); if(subscribedMods == null) { @@ -247,7 +247,7 @@ public void RefreshList() continue; } - ListItem li = ListItem.GetListItem(CollectionPanelModListItem, CollectionPanelModListItemParent, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(CollectionPanelModListItem, CollectionPanelModListItemParent, SharedUi.colorScheme); if(li is CollectionModListItem item) { diff --git a/UI/Scripts/Panels/Details.cs b/UI/Scripts/Panels/Details.cs index 3cb90aa..89b90ba 100644 --- a/UI/Scripts/Panels/Details.cs +++ b/UI/Scripts/Panels/Details.cs @@ -150,7 +150,7 @@ void Refresh(ModProfile profile) // if we have more than one image make pips for navigation if(images.Count > 1) { - ListItem li = ListItem.GetListItem(ModDetailsGalleryNavButtonPrefab, ModDetailsGalleryNavButtonParent, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(ModDetailsGalleryNavButtonPrefab, ModDetailsGalleryNavButtonParent, SharedUi.colorScheme); li.Setup(delegate { this.OnNavButtonClicked(thisPosition); }); _listItems.Add(li); } @@ -200,7 +200,7 @@ void Refresh(ModProfile profile) ModDetailsGalleryFailedToLoadIcon.gameObject.SetActive(true); Image image = GetCurrentGalleryImageComponent(); image.sprite = null; - image.color = Browser.Instance.colorScheme.GetSchemeColor(ColorSetterType.Inactive3); + image.color = SharedUi.colorScheme.GetSchemeColor(ColorSetterType.Inactive3); } } }; @@ -479,7 +479,7 @@ IEnumerator TransitionGalleryImage(int index) if(next.sprite == null) { ModDetailsGalleryFailedToLoadIcon.gameObject.SetActive(true); - next.color = Browser.Instance.colorScheme.GetSchemeColor(ColorSetterType.Inactive3); + next.color = SharedUi.colorScheme.GetSchemeColor(ColorSetterType.Inactive3); } else { diff --git a/UI/Scripts/Panels/DownloadQueue.cs b/UI/Scripts/Panels/DownloadQueue.cs index e3121ba..ae67324 100644 --- a/UI/Scripts/Panels/DownloadQueue.cs +++ b/UI/Scripts/Panels/DownloadQueue.cs @@ -105,7 +105,7 @@ internal void RefreshDownloadHistoryPanel() continue; } - ListItem li = ListItem.GetListItem(DownloadQueueListItem, DownloadQueueList, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(DownloadQueueListItem, DownloadQueueList, SharedUi.colorScheme); li.Setup(mod); li.SetViewportRestraint(DownloadQueueList as RectTransform, DownloadQueueListViewport); pendingModsInQueue = true; diff --git a/UI/Scripts/Panels/Home.cs b/UI/Scripts/Panels/Home.cs index 0429e1a..7b7ceea 100644 --- a/UI/Scripts/Panels/Home.cs +++ b/UI/Scripts/Panels/Home.cs @@ -390,7 +390,7 @@ internal void AddPlaceholdersToList(Transform list, GameObject prefab, int pl { for(int i = 0; i < placeholders; i++) { - ListItem li = ListItem.GetListItem(prefab, list, Browser.Instance.colorScheme, true); + ListItem li = ListItem.GetListItem(prefab, list, SharedUi.colorScheme, true); li.PlaceholderSetup(); li.SetViewportRestraint(SearchResults.Instance.SearchResultsListItemParent as RectTransform, null); } @@ -428,6 +428,11 @@ void ClearModListItemRowDictionary() /// the mods retrieved, if any void AddModProfilesToFeaturedCarousel(ResultAnd response) { + if(!Browser.IsOpen) + { + return; + } + if(!response.result.Succeeded()) { // TODO we need to setup a reattempt option similar to mod list rows diff --git a/UI/Scripts/Panels/ModioContextMenu.cs b/UI/Scripts/Panels/ModioContextMenu.cs index 75b548f..adf2c6d 100644 --- a/UI/Scripts/Panels/ModioContextMenu.cs +++ b/UI/Scripts/Panels/ModioContextMenu.cs @@ -3,6 +3,10 @@ using UnityEngine; using UnityEngine.UI; +#if ENABLE_INPUT_SYSTEM +using UnityEngine.InputSystem; +#endif + namespace ModIOBrowser.Implementation { class ModioContextMenu : SelfInstancingMonoSingleton @@ -56,9 +60,9 @@ internal void Open(Transform t, List options, Selectable prev foreach(var option in options) { - ListItem li = ListItem.GetListItem(ContextMenuListItemPrefab, ContextMenuList, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(ContextMenuListItemPrefab, ContextMenuList, SharedUi.colorScheme); li.Setup(TranslationManager.Instance.Get(option.nameTranslationReference), option.action); - li.SetColorScheme(Browser.Instance.colorScheme); + li.SetColorScheme(SharedUi.colorScheme); // Setup custom navigation { @@ -118,7 +122,7 @@ void Update() { // if we detect a scroll, left or right mouse click, check if mouse is inside context // menu bounds. If not, then close context menu - if(Input.GetKeyDown(KeyCode.Mouse0) || Input.GetKeyDown(KeyCode.Mouse1) || Input.GetAxis("Mouse ScrollWheel") != 0f) + if(IsMouseInUse()) { // check if the mouse is within the bounds of the contextMenu RectTransform contextRect = transform as RectTransform; @@ -134,5 +138,14 @@ void Update() } } } + + bool IsMouseInUse() + { +#if ENABLE_INPUT_SYSTEM + return Mouse.current.leftButton.wasPressedThisFrame || Mouse.current.rightButton.wasPressedThisFrame || Mouse.current.scroll.y.ReadValue() != 0f; +#else + return Input.GetKeyDown(KeyCode.Mouse0) || Input.GetKeyDown(KeyCode.Mouse1) || Input.GetAxis("Mouse ScrollWheel") != 0f; +#endif + } } } diff --git a/UI/Scripts/Panels/Notifications.cs b/UI/Scripts/Panels/Notifications.cs index b1ee570..63ec1d3 100644 --- a/UI/Scripts/Panels/Notifications.cs +++ b/UI/Scripts/Panels/Notifications.cs @@ -141,7 +141,7 @@ IEnumerator ShowNextNotice() NotificationPanelTitle.text = notice.title; NotificationPanelDescription.text = notice.description; NotificationPanelIconBackgroundImage.color = notice.positiveAccent ? - Browser.Instance.colorScheme.PositiveAccent : Browser.Instance.colorScheme.NegativeAccent; + Browser.Instance.colorScheme.PositiveAccent : SharedUi.colorScheme.NegativeAccent; NotificationPanelIconImage.sprite = notice.positiveAccent ? NotificationCheckmarkIcon : NotificationErrorIcon; diff --git a/UI/Scripts/Panels/SearchPanel.cs b/UI/Scripts/Panels/SearchPanel.cs index e3e0c18..6cee00c 100644 --- a/UI/Scripts/Panels/SearchPanel.cs +++ b/UI/Scripts/Panels/SearchPanel.cs @@ -110,7 +110,7 @@ void CreateTagCategoryListItems(TagCategory[] tags) //this can add the items to a list foreach(TagCategory category in tags) { - ListItem categoryListItem = ListItem.GetListItem(SearchPanelTagCategoryPrefab, SearchPanelTagParent, Browser.Instance.colorScheme); + ListItem categoryListItem = ListItem.GetListItem(SearchPanelTagCategoryPrefab, SearchPanelTagParent, SharedUi.colorScheme); categoryListItem.Setup(category.name); IEnumerable v = CreateTagListItems(category); @@ -203,7 +203,7 @@ IEnumerable CreateTagListItems(TagCategory category) foreach(ModIO.Tag tag in category.tags) { - ListItem tagListItem = ListItem.GetListItem(SearchPanelTagPrefab, SearchPanelTagParent, Browser.Instance.colorScheme); + ListItem tagListItem = ListItem.GetListItem(SearchPanelTagPrefab, SearchPanelTagParent, SharedUi.colorScheme); tagListItem.Setup(tag.name, category.name); tagListItem.SetViewportRestraint(SearchPanelTagParent as RectTransform, SearchPanelTagViewport); diff --git a/UI/Scripts/Panels/SearchResults.cs b/UI/Scripts/Panels/SearchResults.cs index 5591231..991ad75 100644 --- a/UI/Scripts/Panels/SearchResults.cs +++ b/UI/Scripts/Panels/SearchResults.cs @@ -318,7 +318,7 @@ void Populate(ModProfile[] mods) { for(int i = 0; i < mods.Length; i++) { - ListItem li = ListItem.GetListItem(SearchResultsListItemPrefab, SearchResultsListItemParent, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(SearchResultsListItemPrefab, SearchResultsListItemParent, SharedUi.colorScheme); li.Setup(mods[i]); li.SetViewportRestraint(SearchResultsListItemParent as RectTransform, null); diff --git a/UI/Scripts/SharedUi.cs b/UI/Scripts/SharedUi.cs new file mode 100644 index 0000000..728eb0a --- /dev/null +++ b/UI/Scripts/SharedUi.cs @@ -0,0 +1,10 @@ +using ModIO.Util; + +namespace ModIOBrowser +{ + public class SharedUi + { + public static UiSettings settings; + public static ColorScheme colorScheme; + } +} diff --git a/UI/Scripts/Sound.cs.meta b/UI/Scripts/SharedUi.cs.meta similarity index 83% rename from UI/Scripts/Sound.cs.meta rename to UI/Scripts/SharedUi.cs.meta index b6240a9..0492c16 100644 --- a/UI/Scripts/Sound.cs.meta +++ b/UI/Scripts/SharedUi.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 330dee88cac6dfb4480530e3ba360e33 +guid: c1ac33898cc730a4d8b1e0e1572ad412 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/UI/Scripts/Sound.cs b/UI/Scripts/Sound.cs deleted file mode 100644 index d79629b..0000000 --- a/UI/Scripts/Sound.cs +++ /dev/null @@ -1,76 +0,0 @@ -// using System; -// using System.Collections; -// using ModIO; -// using ModIOBrowser.Implementation; -// using UnityEngine; -// using static ModIO.Utility; -// -// namespace ModIOBrowser -// { -// /// -// /// Plays a sound -// /// -// class Sound : MonoBehaviour -// { -// const float soundFatiguePreventionTime = 0.05f; -// const float UNSET_VOLUME = -1f; -// -// static float lastPlayedHoverSoundSeconds; -// -// public const string Click = "SoundClick"; -// public const string Hover = "SoundHover"; -// -// public AudioSource audioSource; -// public float originalVolume = UNSET_VOLUME; -// -// /// -// /// Play a clicking sound. -// /// -// public static void PlayClick() => Play(Click); -// -// /// -// /// Play a hovering sound. -// /// -// public static void PlayHover() -// { -// //This prevents an "rrrrrr" sound if you pass through many objects -// if(lastPlayedHoverSoundSeconds + soundFatiguePreventionTime > Time.realtimeSinceStartup) -// { -// return; -// } -// lastPlayedHoverSoundSeconds = Time.realtimeSinceStartup; -// -// Play(Hover); -// } -// -// /// -// /// Plays a sound from the path. The path will be used as an ID/key -// /// for the object pool. The sound will automatically allocate and -// /// return itself to the pool. -// /// -// /// -// public static void Play(string idPath) -// { -// var mm = PrefabPool.Instance.Get(idPath); -// -// if(mm.originalVolume == UNSET_VOLUME) -// { -// mm.originalVolume = mm.audioSource.volume; -// } -// -// mm.audioSource.volume = mm.originalVolume * Browser.Instance.uiConfig.volume; -// mm.audioSource.Play(); -// -// CoroutineRunner.Instance.Run(mm.Return(idPath, mm.audioSource.clip.length)); -// } -// -// /// -// /// Return the sound to the pool after a given amount of time. -// /// -// private IEnumerator Return(string id, float delay) -// { -// yield return new WaitForSeconds(delay); -// PrefabPool.Instance.Return(id, this); -// } -// } -// } diff --git a/UI/Scripts/SoundPlayer.cs b/UI/Scripts/SoundPlayer.cs index c39fd91..d788713 100644 --- a/UI/Scripts/SoundPlayer.cs +++ b/UI/Scripts/SoundPlayer.cs @@ -65,9 +65,8 @@ public static void SetVolume(float volume) { if(Browser.SingletonIsInstantiated()) { - Browser.Instance.uiConfig.volume = volume; - } - + SharedUi.settings.volume = volume; + } } /// @@ -85,7 +84,7 @@ public static AudioSource AudioSource() void PlaySound(SoundEffect sfx) { - if(!Browser.SingletonIsInstantiated()) + if(SharedUi.settings == null || sfx == null) { return; } @@ -97,7 +96,7 @@ void PlaySound(SoundEffect sfx) } lastPlayedHoverSoundSeconds = Time.realtimeSinceStartup; - AudioSource().PlayOneShot(sfx.clip, sfx.defaultVolume * Browser.Instance.uiConfig.volume); + AudioSource().PlayOneShot(sfx.clip, sfx.defaultVolume * SharedUi.settings.volume); } public static void PlayClick() => Instance.PlaySound(Instance.SoundClick); diff --git a/UI/Translations/Translatable.cs b/UI/Translations/Translatable.cs index 0260fc1..9dbf877 100644 --- a/UI/Translations/Translatable.cs +++ b/UI/Translations/Translatable.cs @@ -79,6 +79,8 @@ private void OnValidate() /// public void MarkAsUntranslated() => text.text = $"{text.text}"; + private SimpleMessageUnsubscribeToken subToken; + /// /// Immediately translates item /// Also hooks Translatable up so it listens to the MessageUpdateTranslations message, @@ -86,7 +88,7 @@ private void OnValidate() /// private void Awake() { - SimpleMessageHub.Instance.Subscribe( + subToken = SimpleMessageHub.Instance.Subscribe( (s)=>ApplyTranslation()); } @@ -116,5 +118,9 @@ private void ApplyTranslation() } } + private void OnDestroy() + { + subToken.Unsubscribe(); + } } } diff --git a/UI/Translations/TranslationManager.cs b/UI/Translations/TranslationManager.cs index 3ddec08..ba198fd 100644 --- a/UI/Translations/TranslationManager.cs +++ b/UI/Translations/TranslationManager.cs @@ -70,9 +70,11 @@ public class TranslationManager : SelfInstancingMonoSingleton image = image == null ? GetComponent() : image; - void Awake() + void Start() { UpdateGlyphs(); - SimpleMessageHub.Instance.Subscribe(x => UpdateGlyphs()); + subToken = SimpleMessageHub.Instance.Subscribe(x => UpdateGlyphs()); } public void UpdateGlyphs() @@ -36,7 +37,7 @@ public void UpdateGlyphs() } } - private Sprite GetGlyphFromDisplayType() + Sprite GetGlyphFromDisplayType() { switch(Glyphs.Instance.PlatformType) { @@ -50,5 +51,10 @@ private Sprite GetGlyphFromDisplayType() Debug.LogWarning($"{gameObject.name} is missing configuration for {Glyphs.Instance.PlatformType}"); return Glyphs.Instance.fallbackSprite; } + + void OnDestroy() + { + subToken?.Unsubscribe(); + } } } diff --git a/UI/Utility/Glyphs.cs b/UI/Utility/Glyphs.cs index 13b6972..48d663f 100644 --- a/UI/Utility/Glyphs.cs +++ b/UI/Utility/Glyphs.cs @@ -23,9 +23,9 @@ class Glyphs : SelfInstancingMonoSingleton private void Start() { - colorScheme = Browser.Instance.colorScheme; + colorScheme = SharedUi.colorScheme; if(this.PlatformType == default) - ChangeGlyphs(Browser.Instance.uiConfig.GlyphPlatform); + ChangeGlyphs(SharedUi.settings.GlyphPlatform); } public void SetColor(ColorSetterType colorSetter, Action setter) diff --git a/UI/Utility/InputFieldCoadjutant.cs b/UI/Utility/InputFieldCoadjutant.cs index 5924d27..da72d65 100644 --- a/UI/Utility/InputFieldCoadjutant.cs +++ b/UI/Utility/InputFieldCoadjutant.cs @@ -30,7 +30,7 @@ void Reset() void OnEnable() { - if(!Browser.Instance.uiConfig.ShouldWeUseVirtualKeyboardDelegate()) + if(!SharedUi.settings.ShouldWeUseVirtualKeyboardDelegate()) { Destroy(this); } @@ -38,7 +38,7 @@ void OnEnable() public void OnSelect(BaseEventData eventData) { - if (Browser.Instance.uiConfig.ShouldWeUseVirtualKeyboardDelegate()) + if (SharedUi.settings.ShouldWeUseVirtualKeyboardDelegate()) { if(editOnFocus) { @@ -61,7 +61,7 @@ IEnumerator UnFocusByDefault() public void OnDeselect(BaseEventData eventData) { - if (Browser.Instance.uiConfig.ShouldWeUseVirtualKeyboardDelegate()) + if (SharedUi.settings.ShouldWeUseVirtualKeyboardDelegate()) { if(InputReceiver.currentSelectedInputField == this) { @@ -72,7 +72,7 @@ public void OnDeselect(BaseEventData eventData) public void OnSubmit(BaseEventData eventData) { - if (Browser.Instance.uiConfig.ShouldWeUseVirtualKeyboardDelegate()) + if (SharedUi.settings.ShouldWeUseVirtualKeyboardDelegate()) { // Check if the user has specified an OS virtual keyboard OpenKeyboard(); diff --git a/UI/Utility/ModListRow.cs b/UI/Utility/ModListRow.cs index 89c758d..174beca 100644 --- a/UI/Utility/ModListRow.cs +++ b/UI/Utility/ModListRow.cs @@ -154,6 +154,11 @@ public void RetryGetMods() void GetModsResponse(ResultAnd response) { + if(!Browser.IsOpen) + { + return; + } + LoadingPanel.SetActive(false); if(response.result.Succeeded()) @@ -181,7 +186,7 @@ void PopulateRowFromModPage(ModPage page) foreach(ModProfile mod in page.modProfiles) { - ListItem li = ListItem.GetListItem(ModListItemPrefab, ModListItemContainer, Browser.Instance.colorScheme); + ListItem li = ListItem.GetListItem(ModListItemPrefab, ModListItemContainer, SharedUi.colorScheme); li.Setup(mod); li.SetViewportRestraint(ModListItemContainer as RectTransform, null); Home.Instance.AddModListItemToRowDictionaryCache(li, ModListItemContainer.gameObject);