diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities.meta b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities.meta new file mode 100644 index 0000000..cec6dc6 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2bbd3ec7c248414b8c38a14664fda348 +timeCreated: 1673000558 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs new file mode 100644 index 0000000..50fa891 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs @@ -0,0 +1,41 @@ +#nullable enable +using System; +using UnityEngine; + +namespace Nuclear.WindowsManager +{ + public static class StaticWindowsManager + { + private static IWindowsManager? _instance; + + public static void Init(WindowsManagerSettings settings) + { + if (_instance != null) + { + Debug.LogError("WindowsManager already initialized"); + return; + } + + _instance = new WindowsManager(settings); + } + + public static Window CreateWindow(string path, Action? setupWindow = null) => + _instance != null + ? _instance.CreateWindow(path, setupWindow) + : throw new ArgumentException("WindowsManager not initialized"); + + public static void PrefetchWindow(string path) + { + if (_instance != null) + _instance.PrefetchWindow(path); + else + throw new ArgumentException("WindowsManager not initialized"); + } + + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] + private static void Reset() + { + _instance = null!; + } + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs.meta new file mode 100644 index 0000000..bf7e7aa --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/AdditionalUtilities/StaticWindowsManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 106ebaa0851248df98a698731900b66f +timeCreated: 1673000638 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation.meta new file mode 100644 index 0000000..4ee2b49 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 080867aece984840a82c71d6d0119cc7 +timeCreated: 1673000537 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/BackButtonEventManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/BackButtonEventManager.cs new file mode 100644 index 0000000..3c1d25f --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/BackButtonEventManager.cs @@ -0,0 +1,17 @@ +#nullable enable +using System; +using UnityEngine; + +namespace NuclearBand +{ + public class BackButtonEventManager : MonoBehaviour + { + public event Action OnBackButtonPressed = delegate { }; + + private void Update() + { + if(Input.GetKeyDown(KeyCode.Escape) ) + OnBackButtonPressed.Invoke(); + } + } +} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/BackButtonEventManager.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/BackButtonEventManager.cs.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/BackButtonEventManager.cs.meta rename to Assets/com.nuclearband.windowsmanager/Runtime/Implementation/BackButtonEventManager.cs.meta diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/Window.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/Window.cs new file mode 100644 index 0000000..5fe1281 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/Window.cs @@ -0,0 +1,112 @@ +#nullable enable +using System; +using UnityEngine; + +namespace Nuclear.WindowsManager +{ + public class Window : MonoBehaviour + { + public event Action OnShown = delegate { }; + public event Action OnHidden = delegate { }; + public event Action OnStartShow = delegate { }; + public event Action OnStartHide = delegate { }; + + private enum WindowState + { + Opened, Closed, Opening, Closing + } + + public bool WithInputBlockForBackground; + public bool DestroyOnClose; + public bool ProcessBackButton = true; + + [SerializeField] private WindowAnimation? _showAnimation; + [SerializeField] private WindowAnimation? _hideAnimation; + + private WindowState _windowState = WindowState.Closed; + + private GameObject? _inputBlock; + private Action? _customBackButtonAction; + private Action _customDeInitActions = delegate { }; + + public virtual void Init() + { + if (_showAnimation != null) + _showAnimation.OnEnd += EndShowAnimationCallback; + + if (_hideAnimation != null) + _hideAnimation.OnEnd += CloseInternal; + } + + public void Show(bool immediate = false) + { + OnStartShow.Invoke(this); + _windowState = WindowState.Opening; + if (_showAnimation != null && !immediate) + _showAnimation.Play(); + else + EndShowAnimationCallback(); + } + + public void Close() + { + _windowState = WindowState.Closing; + OnStartHide.Invoke(this); + if (_hideAnimation != null) + _hideAnimation.Play(); + else + CloseInternal(); + } + + public void ProcessBackButtonPress() + { + if (_windowState == WindowState.Closing) + return; + + if (_customBackButtonAction != null) + _customBackButtonAction.Invoke(); + else + Close(); + } + + protected void SetCustomBackButtonAction(Action? action) => + _customBackButtonAction = action; + + public void AddDeInitAction(Action action) => + _customDeInitActions += action; + + private void EndShowAnimationCallback() + { + OnShown.Invoke(this); + _windowState = WindowState.Opened; + } + + private void CloseInternal() + { + _windowState = WindowState.Closed; + var onHidden = OnHidden; + DeInit(); + if (DestroyOnClose) + Destroy(gameObject); + else + gameObject.SetActive(false); + onHidden(this); + } + + private void DeInit() + { + OnStartShow = delegate { }; + OnShown = delegate { }; + OnStartHide = delegate { }; + OnHidden = delegate { }; + if (_showAnimation != null) + _showAnimation.OnEnd -= EndShowAnimationCallback; + + if (_hideAnimation != null) + _hideAnimation.OnEnd -= CloseInternal; + + _customDeInitActions.Invoke(); + _customDeInitActions = delegate { }; + } + } +} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Window.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/Window.cs.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Runtime/Window.cs.meta rename to Assets/com.nuclearband.windowsmanager/Runtime/Implementation/Window.cs.meta diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs new file mode 100644 index 0000000..03363dc --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs @@ -0,0 +1,14 @@ +using System; +using UnityEngine; + +namespace Nuclear.WindowsManager +{ + public abstract class WindowAnimation : MonoBehaviour + { + public event Action OnEnd = delegate { }; + + public abstract void Play(); + + public void End() => OnEnd.Invoke(); + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs.meta new file mode 100644 index 0000000..6b9148d --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowAnimation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 704f3f2543354e348841709440f53e6b +timeCreated: 1673004286 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowsManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowsManager.cs new file mode 100644 index 0000000..088967f --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowsManager.cs @@ -0,0 +1,186 @@ +#nullable enable +using UnityEngine; +using System.Collections.Generic; +using System; +using System.Collections.ObjectModel; +using NuclearBand; +using Object = UnityEngine.Object; + +namespace Nuclear.WindowsManager +{ + public class WindowsManager : IWindowsManager + { + public event Action OnWindowCreated = delegate { }; + public event Action OnWindowClosed = delegate { }; + + private readonly ReadOnlyDictionary> _suffixesWithPredicates; + private readonly Transform _root ; + private readonly GameObject _inputBlockPrefab; + + private readonly List _windows = new(); + private readonly Dictionary _loadedWindowPrefabs = new(); + private readonly Dictionary> _invisibleWindows = new(); + + public WindowsManager(WindowsManagerSettings settings) + { + _suffixesWithPredicates = settings.SuffixesWithPredicates; + + _inputBlockPrefab = Resources.Load(settings.InputBlockPath) ?? + throw new ArgumentException("WindowsManager: Wrong path to InputBlock"); + + var rootPrefab = Resources.Load(settings.RootPath) ?? + throw new ArgumentException("WindowsManager: Wrong path to root"); + + _root = Object.Instantiate(rootPrefab).transform; + _root.name = _root.name.Replace("(Clone)", string.Empty); + var backButtonEventManager = _root.gameObject.AddComponent(); + backButtonEventManager.OnBackButtonPressed += OnBackButtonPressedCallback; + Object.DontDestroyOnLoad(_root.gameObject); + } + + Window IWindowsManager.CreateWindow(string path, Action? setupWindow) + { + var suffix = FindSuffixFor(path); + var window = InstantiateWindow(path + suffix); + + _windows.Add(window); + setupWindow?.Invoke(window); + window.OnHidden += WindowOnHidden; + InstantiateInputBlockIfNeeded(window); + window.Init(); + + window.Show(); + OnWindowCreated(window); + return window; + } + + private void InstantiateInputBlockIfNeeded(Window window) + { + if (!window.WithInputBlockForBackground) + return; + + var inputBlock = Object.Instantiate(_inputBlockPrefab, window.transform); + inputBlock.name = inputBlock.name.Replace("(Clone)", string.Empty); + inputBlock.transform.SetAsFirstSibling(); + } + + private void DestroyInputBlockIfNotNeeded(Window window) + { + if (!window.WithInputBlockForBackground) + return; + + var inputBlock = window.transform.GetChild(0); + Object.Destroy(inputBlock.gameObject); + } + + void IWindowsManager.PrefetchWindow(string path) + { + var suffix = FindSuffixFor(path); + var window = InstantiateWindow(path + suffix); + window.gameObject.SetActive(false); + } + + private Window InstantiateWindow(string fullWindowPath) + { + Window window; + var windowName = fullWindowPath.Split('/')[^1]; + if (_invisibleWindows.ContainsKey(windowName)) + { + var windowList = _invisibleWindows[windowName]; + if (windowList.Count != 0) + { + window = windowList[^1]; + window.gameObject.SetActive(true); + window.transform.SetAsLastSibling(); + windowList.RemoveAt(windowList.Count - 1); + return window; + } + } + + var windowPrefab = GetWindowPrefab(fullWindowPath); + + window = Object.Instantiate(windowPrefab, _root).GetComponent() ?? + throw new ArgumentException($"WindowsManager: missing Window script on window {fullWindowPath}"); + + window.name = window.name.Replace("(Clone)", string.Empty); + + return window; + } + + private void OnBackButtonPressedCallback() + { + for (var i = _windows.Count - 1; i >= 0; --i) + { + var curWindow = _windows[i]; + if (!curWindow.ProcessBackButton) + continue; + curWindow.ProcessBackButtonPress(); + break; + } + } + + private string FindSuffixFor(string windowPath) + { + foreach (var (suffix, predicate) in _suffixesWithPredicates) + { + if (!predicate.Invoke()) + continue; + + var windowName = windowPath.Split('/')[^1]; + if (_invisibleWindows.ContainsKey(windowName + suffix)) + return suffix; + + if (CheckWindowPrefabExistence(windowPath + suffix)) + return suffix; + } + + return string.Empty; + } + + private bool CheckWindowPrefabExistence(string path) + { + if (_loadedWindowPrefabs.ContainsKey(path)) + return true; + return Resources.Load(path) != null; + } + + private GameObject GetWindowPrefab(string path) + { + GameObject windowPrefab; + if (_loadedWindowPrefabs.ContainsKey(path)) + windowPrefab = _loadedWindowPrefabs[path]; + else + { + windowPrefab = Resources.Load(path) ?? + throw new ArgumentException($"Can't load prefab with such path {path}"); + + _loadedWindowPrefabs.Add(path, windowPrefab); + } + + return windowPrefab; + } + + private void WindowOnHidden(Window window) + { + window.OnHidden -= WindowOnHidden; + + for (var i = 0; i < _windows.Count; ++i) + { + if (_windows[i] != window) + continue; + if (!window.DestroyOnClose) + { + DestroyInputBlockIfNotNeeded(window); + if (!_invisibleWindows.ContainsKey(window.name)) + _invisibleWindows.Add(window.name, new List {window}); + else + _invisibleWindows[window.name].Add(window); + } + + _windows.RemoveAt(i); + OnWindowClosed.Invoke(window); + return; + } + } + } +} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManager.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowsManager.cs.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Runtime/WindowsManager.cs.meta rename to Assets/com.nuclearband.windowsmanager/Runtime/Implementation/WindowsManager.cs.meta diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces.meta new file mode 100644 index 0000000..86b89b6 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5d66632dfe3446c7ae6df9524c3d93df +timeCreated: 1673000480 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs new file mode 100644 index 0000000..59094ab --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs @@ -0,0 +1,14 @@ +#nullable enable +using System; + +namespace Nuclear.WindowsManager +{ + public interface IWindowsManager + { + event Action OnWindowCreated; + event Action OnWindowClosed; + + Window CreateWindow(string path, Action? setupWindow = null); + void PrefetchWindow(string path); + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs.meta new file mode 100644 index 0000000..d3b7900 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/Interfaces/IWindowsManager.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a4730c6847b1441ea5d23a1a929fad1e +timeCreated: 1673000137 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities.meta b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities.meta new file mode 100644 index 0000000..c5e1b57 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: e0b3af1cfca7495794d819b1840740e0 +timeCreated: 1673010799 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs new file mode 100644 index 0000000..45a0024 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs @@ -0,0 +1,9 @@ +#nullable enable +using System; + +namespace Nuclear.WindowsManager +{ + public interface IDisposableWindowViewModel : IWindowViewModel, IDisposable + { + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs.meta new file mode 100644 index 0000000..f34a52c --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IDisposableWindowViewModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2f184b47dce843d1b46ef5b0b9c4af6c +timeCreated: 1673000493 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs new file mode 100644 index 0000000..8098e47 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs @@ -0,0 +1,8 @@ +#nullable enable + +namespace Nuclear.WindowsManager +{ + public interface IWindowViewModel + { + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs.meta new file mode 100644 index 0000000..ca6cde0 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/IWindowViewModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 50b6bf39575547ccba9c0f364ef491cf +timeCreated: 1649001549 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs new file mode 100644 index 0000000..7d75489 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs @@ -0,0 +1,34 @@ +#nullable enable +using System; +using System.Linq; + +namespace Nuclear.WindowsManager +{ + public static class MvvmExtensions + { + public static void SetViewModel(this Window window, ref TViewModel currentValue, TViewModel newValue) + where TViewModel : IWindowViewModel + { +#if UNITY_EDITOR + if (typeof(TViewModel).GetInterfaces().ToList().Contains(typeof(IDisposable))) + throw new ArgumentException("MVVM extension validation - SetViewModel with IDisposable type {0}", + typeof(TViewModel).FullName); +#endif + currentValue = newValue; + } + + public static void SetChildViewModel(this Window window, + ref TViewModel currentValue, TViewModel newValue) + where TViewModel : IWindowViewModel + { + currentValue = newValue; + } + + public static void SetDisposableViewModel(this Window window, + ref TViewModel currentValue, TViewModel newValue) where TViewModel : IDisposableWindowViewModel + { + currentValue = newValue; + window.AddDeInitAction(newValue.Dispose); + } + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs.meta new file mode 100644 index 0000000..b2656b0 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Runtime/MVVMUtilities/MVVMExtensions.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0a68b566db924ef08e513fceae31d96a +timeCreated: 1673010919 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers.meta b/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers.meta deleted file mode 100644 index 6b6bf76..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b1983c10b20f894b9af5aff9b0f5f7c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/BackButtonEventManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/BackButtonEventManager.cs deleted file mode 100644 index 10987bf..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/BackButtonEventManager.cs +++ /dev/null @@ -1,23 +0,0 @@ -#nullable enable -using System; -using UnityEngine; - -namespace NuclearBand -{ - public class BackButtonEventManager : MonoBehaviour - { - public event Action? OnBackButtonPressed; - public static BackButtonEventManager Instance { get; private set; } = null!; - - private void Awake() - { - Instance = this; - } - - private void Update() - { - if(Input.GetKeyDown(KeyCode.Escape) ) - OnBackButtonPressed?.Invoke(); - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs deleted file mode 100644 index 989e99d..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs +++ /dev/null @@ -1,64 +0,0 @@ -#nullable enable -using System; -using UnityEngine; - -namespace NuclearBand -{ - public class OrientationEventManager : MonoBehaviour - { - public static OrientationEventManager Instance { get; private set; } = null!; - - private enum DeviceScreenOrientation - { - Landscape, - Portrait - } - - public event Action? OnOrientationChanged; - private DeviceScreenOrientation orientation; -#if UNITY_EDITOR - private int prevWidth; - private int prevHeight; -#endif - - private void Awake() - { - Instance = this; - orientation = CalculateOrientation(); -#if UNITY_EDITOR - prevWidth = Screen.width; - prevHeight = Screen.height; -#endif - } - - private void Update() - { -#if UNITY_EDITOR - if (Screen.width != prevWidth || Screen.height != prevHeight) - { - prevWidth = Screen.width; - prevHeight = Screen.height; - OnOrientationChanged?.Invoke(); - } - - return; -#endif -#pragma warning disable CS0162 - var curOrientation = CalculateOrientation(); - if (curOrientation != orientation) - { - orientation = curOrientation; - OnOrientationChanged?.Invoke(); - } -#pragma warning restore CS0162 - } - - private DeviceScreenOrientation CalculateOrientation() - { - if (Screen.width >= Screen.height) - return DeviceScreenOrientation.Landscape; - else - return DeviceScreenOrientation.Portrait; - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs.meta deleted file mode 100644 index 5bb1976..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/UtilityManagers/OrientationEventManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c7703bf5494d3e347bc1b920c89d3477 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/Window.cs b/Assets/com.nuclearband.windowsmanager/Runtime/Window.cs deleted file mode 100644 index 21671db..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/Window.cs +++ /dev/null @@ -1,201 +0,0 @@ -#nullable enable -using System; -using UnityEngine; - -namespace NuclearBand -{ - /// - /// Basic class for all game windows. - /// - public class Window : MonoBehaviour - { - #region WindowRebuildPart - - public class WindowTransientData - { - public event Action? OnStartShow; - public event Action? OnShown; - public event Action? OnStartHide; - public event Action? OnHidden; - public event Action? OnInitAfterRebuild; - - public readonly WindowState WindowState; - - - public WindowTransientData(Window window) - { - OnStartShow = window.OnStartShow; - OnShown = window.OnShown; - OnStartHide = window.OnStartHide; - OnHidden = window.OnHidden; - OnInitAfterRebuild = window.OnInitAfterRebuild; - WindowState = window.windowState; - } - - public virtual void RestoreWindow(Window window) - { - window.OnStartHide = OnStartHide; - window.OnHidden = OnHidden; - window.OnStartShow = OnStartShow; - window.OnShown = OnShown; - window.OnInitAfterRebuild = OnInitAfterRebuild; - window.windowState = WindowState; - } - } - - public virtual WindowTransientData GetTransientData() - { - return new WindowTransientData(this); - } - - public virtual void InitAfterRebuild(WindowTransientData windowTransientData) - { - windowTransientData.RestoreWindow(this); - if (WithInputBlockForBackground && inputBlock == null) - { - inputBlock = Instantiate(WindowsManager.InputBlockPrefab, transform); - inputBlock.name = inputBlock.name.Replace("(Clone)", string.Empty); - inputBlock.transform.SetAsFirstSibling(); - } - OnInitAfterRebuild?.Invoke(this); - switch (windowState) - { - case WindowState.Opened: - case WindowState.Closed: - break; - case WindowState.Opening: - EndShowAnimationCallback(); - break; - case WindowState.Closing: - EndHideAnimationCallback(); - break; - default: - throw new ArgumentOutOfRangeException(); - } - } - - public virtual void CloseForRebuild() - { - OnCloseForRebuild?.Invoke(this); - CloseInternal(); - } - #endregion - public event Action? OnShown; - public event Action? OnHidden; - public event Action? OnStartShow; - public event Action? OnStartHide; - public event Action? OnCloseForRebuild; - public event Action? OnInitAfterRebuild; - - - public enum WindowState - { - Opened, Closed, Opening, Closing - } - - public bool WithShowAnimation = true; - public bool WithHideAnimation = true; - public bool WithInputBlockForBackground = false; - public bool DestroyOnClose = false; - public bool ProcessBackButton = true; - - protected WindowState windowState = WindowState.Closed; - - private GameObject? inputBlock; - - public virtual void Init() - { - OnStartShow?.Invoke(this); - - if (!WithInputBlockForBackground && inputBlock != null) - { - Destroy(inputBlock); - inputBlock = null; - } - - if (WithInputBlockForBackground && inputBlock == null) - { - inputBlock = Instantiate(WindowsManager.InputBlockPrefab, transform); - inputBlock.name = inputBlock.name.Replace("(Clone)", string.Empty); - inputBlock.transform.SetAsFirstSibling(); - } - } - - public void Show(bool immediate = false) - { - windowState = WindowState.Opening; - if (WithShowAnimation && !immediate) - StartShowAnimation(); - else - EndShowAnimationCallback(); - } - - public virtual void Close() - { - windowState = WindowState.Closing; - OnStartHide?.Invoke(this); - if (WithHideAnimation) - StartHideAnimation(); - else - EndHideAnimationCallback(); - } - - protected virtual void StartShowAnimation() - { - EndShowAnimationCallback(); - } - protected virtual void EndShowAnimationCallback() - { - OnShown?.Invoke(this); - windowState = WindowState.Opened; - } - - protected virtual void StartHideAnimation() - { - EndHideAnimationCallback(); - } - - protected virtual void EndHideAnimationCallback() - { - CloseInternal(); - } - - private void CloseInternal() - { - windowState = WindowState.Closed; - var onClose = OnHidden; - DeInit(); - if (DestroyOnClose) - Destroy(gameObject); - else - gameObject.SetActive(false); - onClose?.Invoke(this); - } - - protected virtual void DeInit() - { - ClearEvents(); - } - - protected virtual void OnDestroy() - { - ClearEvents(); - } - - public virtual void OnBackButtonPressedCallback() - { - if (windowState != WindowState.Closing) - Close(); - } - - protected virtual void ClearEvents() - { - OnStartShow = null; - OnShown = null; - OnStartHide = null; - OnHidden = null; - OnInitAfterRebuild = null; - OnCloseForRebuild = null; - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs b/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs deleted file mode 100644 index 45b0df4..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs +++ /dev/null @@ -1,33 +0,0 @@ -#nullable enable -using UnityEngine; - -namespace NuclearBand -{ - public static class WindowPredicates - { - public static bool IsPortrait() - { -#if UNITY_EDITOR - return Screen.width < Screen.height; -#endif -#pragma warning disable CS0162 - return Screen.orientation is ScreenOrientation.Portrait or ScreenOrientation.PortraitUpsideDown; -#pragma warning restore CS0162 - } - - public static bool IsLandscape() - { -#if UNITY_EDITOR - return Screen.width >= Screen.height; -#endif -#pragma warning disable CS0162 - return Screen.orientation is ScreenOrientation.LandscapeLeft or ScreenOrientation.LandscapeRight; -#pragma warning restore CS0162 - } - - public static bool IsLandscape43() - { - return Mathf.Approximately(Screen.width / (1.0f * Screen.height), 4.0f / 3.0f); - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs.meta deleted file mode 100644 index 87d48be..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowPredicates.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b804be3999428f74cb983c0662bbfebf -timeCreated: 1497874242 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs b/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs deleted file mode 100644 index c4281cd..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs +++ /dev/null @@ -1,21 +0,0 @@ -#nullable enable -namespace NuclearBand -{ - public class WindowReference - { - public Window Window { get; private set; } - - public WindowReference(Window window) - { - Window = window; - window.OnInitAfterRebuild += OnInitAfterRebuildCallback; - } - - private void OnInitAfterRebuildCallback(Window window) - { - Window.OnInitAfterRebuild -= OnInitAfterRebuildCallback; - Window = window; - Window.OnInitAfterRebuild += OnInitAfterRebuildCallback; - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs.meta b/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs.meta deleted file mode 100644 index 00bfbb1..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowReference.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0c255a7402144f2c8e74ad0f7307e95c -timeCreated: 1578171489 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManager.cs b/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManager.cs deleted file mode 100644 index b1016b4..0000000 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManager.cs +++ /dev/null @@ -1,279 +0,0 @@ -#nullable enable -using UnityEngine; -using System.Collections.Generic; -using System; - -namespace NuclearBand -{ - public static class WindowsManager - { - private class WindowBuildData - { - public string WindowPath { get; } - public string Suffix { get; set; } - - public Action? SetupWindow { get; } - - public WindowBuildData(string windowPath, string suffix, Action? setupWindow) - { - this.WindowPath = windowPath; - this.Suffix = suffix; - this.SetupWindow = setupWindow; - } - } - - public static event Action? OnWindowCreated; - public static event Action? OnWindowClosed; - public static bool InputBlocked { get; private set; } - public static GameObject InputBlockPrefab { get; private set; } = null!; - - private static Dictionary> suffixesWithPredicates = new Dictionary>(); - private static Transform root = null!; - - private static GameObject inputBlock = null!; - private static int numBlocks; - private static readonly List windows = new List(); - private static readonly List windowBuildDataList = new List(); - private static readonly Dictionary loadedWindowPrefabs = new Dictionary(); - private static readonly Dictionary> invisibleWindows = new Dictionary>(); - - public static void Init(WindowsManagerSettings settings) - { - suffixesWithPredicates = settings.SuffixesWithPredicates; - - InputBlockPrefab = Resources.Load(settings.InputBlockPath) ?? - throw new ArgumentException("WindowsManager: Wrong path to InputBlock"); - - InputBlocked = false; - var rootPrefab = Resources.Load(settings.RootPath) ?? - throw new ArgumentException("WindowsManager: Wrong path to root"); - - root = GameObject.Instantiate(rootPrefab).transform; - root.name = root.name.Replace("(Clone)", string.Empty); - GameObject.DontDestroyOnLoad(root.gameObject); - } - - public static WindowReference CreateWindow(string windowPath, Action? setupWindow = null) - { - var suffix = FindSuffixFor(windowPath); - var window = InstantiateWindow(windowPath + suffix); - - var windowReference = new WindowReference(window); - windows.Add(windowReference); - windowBuildDataList.Add(new WindowBuildData(windowPath, suffix, setupWindow)); - - setupWindow?.Invoke(window); - window.OnHidden += WindowOnHidden; - window.OnCloseForRebuild += WindowOnCloseForRebuild; - window.Init(); - - window.Show(); - OnWindowCreated?.Invoke(window); - return windowReference; - } - - private static Window InstantiateWindow(string fullWindowPath) - { - Window window; - if (invisibleWindows.ContainsKey(fullWindowPath)) - { - var windowList = invisibleWindows[fullWindowPath]; - if (windowList.Count != 0) - { - window = windowList[windowList.Count - 1]; - window.gameObject.SetActive(true); - window.transform.SetAsLastSibling(); - windowList.RemoveAt(windowList.Count - 1); - return window; - } - } - - var windowPrefab = GetWindowPrefab(fullWindowPath); - - window = GameObject.Instantiate(windowPrefab, root).GetComponent() ?? - throw new ArgumentException($"WindowsManager: missing Window script on window {fullWindowPath}"); - - window.name = window.name.Replace("(Clone)", string.Empty); - - return window; - } - - public static void PrefetchWindow(string windowPath) - { - var suffix = FindSuffixFor(windowPath); - var window = InstantiateWindow(windowPath + suffix); - window.gameObject.SetActive(false); - } - - public static void RefreshLayout() - { - for (var i = 0; i < windows.Count; ++i) - { - var windowReference = windows[i]; - var path = windowBuildDataList[i].WindowPath; - var suffix = FindSuffixFor(path); - - if (windowBuildDataList[i].Suffix != suffix) - { - var windowTransientData = windowReference.Window.GetTransientData(); - windowReference.Window.CloseForRebuild(); - windowBuildDataList[i].Suffix = suffix; - var newWindow = InstantiateWindow(path + suffix); - windowBuildDataList[i].SetupWindow?.Invoke(newWindow); - newWindow.OnCloseForRebuild += WindowOnCloseForRebuild; - newWindow.InitAfterRebuild(windowTransientData); - } - else - { - windowReference.Window.transform.SetAsLastSibling(); - } - } - } - - public static void ProcessBackButton() - { - for (var i = windows.Count - 1; i >= 0; --i) - { - var curWindow = windows[i].Window; - if (!curWindow.ProcessBackButton) - continue; - curWindow.OnBackButtonPressedCallback(); - break; - } - } - - public static void BringOnTop(Window window) - { - window.transform.SetAsLastSibling(); - for (var i = 0; i < windows.Count; ++i) - { - var windowReference = windows[i]; - if (windowReference.Window != window) - continue; - windows.RemoveAt(i); - windows.Add(windowReference); - var windowsBuildData = windowBuildDataList[i]; - windowBuildDataList.RemoveAt(i); - windowBuildDataList.Add(windowsBuildData); - break; - } - } - - public static void BlockInput() - { - numBlocks++; - if (InputBlocked) - return; - - if (inputBlock == null) - { - inputBlock = GameObject.Instantiate(InputBlockPrefab, root); - inputBlock.name = inputBlock.name.Replace("(Clone)", string.Empty); - } - - inputBlock.transform.SetAsLastSibling(); - inputBlock.gameObject.SetActive(true); - InputBlocked = true; - } - - public static void UnblockInput(bool forced = false) - { - if (!InputBlocked) - return; - numBlocks--; - if (forced) - numBlocks = 0; - - if (numBlocks != 0) - return; - InputBlocked = false; - inputBlock.gameObject.SetActive(false); - } - - private static string FindSuffixFor(string windowPath) - { - foreach (var suffixWithPredicate in suffixesWithPredicates) - { - if (!suffixWithPredicate.Value.Invoke()) - continue; - - var suffix = suffixWithPredicate.Key; - if (invisibleWindows.ContainsKey(windowPath + suffix)) - return suffix; - - if (CheckWindowPrefabExistence(windowPath + suffix)) - return suffix; - } - - return string.Empty; - } - - private static bool CheckWindowPrefabExistence(string path) - { - if (loadedWindowPrefabs.ContainsKey(path)) - return true; - return Resources.Load(path) != null; - } - - private static GameObject GetWindowPrefab(string path) - { - GameObject windowPrefab; - if (loadedWindowPrefabs.ContainsKey(path)) - windowPrefab = loadedWindowPrefabs[path]; - else - { - windowPrefab = Resources.Load(path) ?? - throw new ArgumentException($"Can't load prefab with such path {path}"); - - loadedWindowPrefabs.Add(path, windowPrefab); - } - - return windowPrefab; - } - - private static void WindowOnHidden(Window window) - { - window.OnHidden -= WindowOnHidden; - window.OnCloseForRebuild -= WindowOnCloseForRebuild; - - for (var i = 0; i < windows.Count; ++i) - { - if (windows[i].Window != window) - continue; - var windowPath = windowBuildDataList[i].WindowPath + windowBuildDataList[i].Suffix; - if (!window.DestroyOnClose) - { - if (!invisibleWindows.ContainsKey(windowPath)) - invisibleWindows.Add(windowPath, new List {window}); - else - invisibleWindows[windowPath].Add(window); - } - - windows.RemoveAt(i); - windowBuildDataList.RemoveAt(i); - OnWindowClosed?.Invoke(window); - return; - } - } - - private static void WindowOnCloseForRebuild(Window window) - { - window.OnCloseForRebuild -= WindowOnCloseForRebuild; - - for (var i = 0; i < windows.Count; ++i) - { - if (windows[i].Window != window) - continue; - var windowPath = windowBuildDataList[i].WindowPath + windowBuildDataList[i].Suffix; - if (window.DestroyOnClose) - return; - - if (!invisibleWindows.ContainsKey(windowPath)) - invisibleWindows.Add(windowPath, new List {window}); - else - invisibleWindows[windowPath].Add(window); - return; - } - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManagerSettings.cs b/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManagerSettings.cs index 6060598..41dcd81 100644 --- a/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManagerSettings.cs +++ b/Assets/com.nuclearband.windowsmanager/Runtime/WindowsManagerSettings.cs @@ -1,13 +1,24 @@ #nullable enable using System; using System.Collections.Generic; +using System.Collections.ObjectModel; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class WindowsManagerSettings { - public string RootPath = "Root"; - public string InputBlockPath = "InputBlock"; - public Dictionary> SuffixesWithPredicates = new(); + public string RootPath { get; } + public string InputBlockPath { get; } + public ReadOnlyDictionary> SuffixesWithPredicates { get; } = new (new Dictionary>()); + + public WindowsManagerSettings(string rootPath = "Root", + string inputBlockPath = "InputBlock", + IDictionary>? suffixesWithPredicates = null) + { + RootPath = rootPath; + InputBlockPath = inputBlockPath; + if (suffixesWithPredicates != null) + SuffixesWithPredicates = new ReadOnlyDictionary>(suffixesWithPredicates); + } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1.cs index 0aa7c10..3d628f4 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1.cs @@ -1,19 +1,17 @@ #nullable enable using UnityEngine; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example1 : MonoBehaviour { - void Start() + private void Awake() { - var rootPath = "NuclearBand/Examples_WindowsManager/Example1/"; - WindowsManager.Init(new WindowsManagerSettings() - { - RootPath = rootPath + "Canvas", - InputBlockPath = rootPath + "InputBlocker" - }); - WindowsManager.CreateWindow(Example1Window1.Path); + const string rootPath = "com.nuclearband.windowsmanager/Examples/Example1/"; + StaticWindowsManager.Init(new WindowsManagerSettings(rootPath + "Canvas", + rootPath + "InputBlocker" + )); + StaticWindowsManager.CreateWindow(Example1Window1.Path); } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window1.cs index 43b0c4d..2204a7f 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window1.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window1.cs @@ -1,22 +1,19 @@ #nullable enable +using UnityEngine; using UnityEngine.UI; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example1Window1 : Window { - public const string Path = "NuclearBand/Examples_WindowsManager/Example1/TestWindow1"; + public const string Path = "com.nuclearband.windowsmanager/Examples/Example1/TestWindow1"; - public InputField inputField = null!; + [SerializeField] private InputField _inputField = null!; - public void OpenTestWindow1Click() - { - WindowsManager.CreateWindow(Example1Window1.Path); - } + public void OpenTestWindow1Click() => + StaticWindowsManager.CreateWindow(Example1Window1.Path); - public void OpenTestWindow2Click() - { - Example1Window2.CreateWindow(Example1Window2.Path, inputField.text); - } + public void OpenTestWindow2Click() => + Example1Window2.CreateWindow(Example1Window2.Path, _inputField.text); } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window2.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window2.cs index fd9b6ac..d01f602 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window2.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example1/Example1Window2.cs @@ -1,23 +1,24 @@ #nullable enable +using UnityEngine; using UnityEngine.UI; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example1Window2 : Window { - public const string Path = "NuclearBand/Examples_WindowsManager/Example1/TestWindow2"; + public const string Path = "com.nuclearband.windowsmanager/Examples/Example1/TestWindow2"; + + [SerializeField] private Text _text = null!; + + private string _title = null!; - protected string title = null!; - public Text text = null!; public override void Init() { base.Init(); - text.text = title; + _text.text = _title; } - public static WindowReference CreateWindow(string path, string title) - { - return WindowsManager.CreateWindow(path, window => (window as Example1Window2)!.title = title); - } + public static Window CreateWindow(string path, string title) => + StaticWindowsManager.CreateWindow(path, window => ((Example1Window2)window)._title = title); } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2.cs index 6ec6539..2b95396 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2.cs @@ -1,19 +1,17 @@ #nullable enable using UnityEngine; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example2 : MonoBehaviour { - private void Start() + private void Awake() { - const string rootPath = "NuclearBand/Examples_WindowsManager/Example1/"; - WindowsManager.Init(new WindowsManagerSettings() - { - RootPath = rootPath + "Canvas", - InputBlockPath = rootPath + "InputBlocker" - }); - WindowsManager.CreateWindow(Example2Window1.Path); + const string rootPath = "com.nuclearband.windowsmanager/Examples/Example1/"; + StaticWindowsManager.Init(new WindowsManagerSettings(rootPath + "Canvas", + rootPath + "InputBlocker" + )); + StaticWindowsManager.CreateWindow(Example2Window1.Path); } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window1.cs index 94d7904..b154a19 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window1.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window1.cs @@ -1,18 +1,19 @@ #nullable enable -namespace NuclearBand +using UnityEngine; +using UnityEngine.UI; + +namespace Nuclear.WindowsManager { - public class Example2Window1 : Example1Window1 + public class Example2Window1 : Window { - public new const string Path = "NuclearBand/Examples_WindowsManager/Example2/TestWindow1"; + public const string Path = "com.nuclearband.windowsmanager/Examples/Example2/TestWindow1"; + + [SerializeField] private InputField _inputField = null!; - public new void OpenTestWindow1Click() - { - WindowsManager.CreateWindow(Path); - } + public void OpenTestWindow1Click() => + StaticWindowsManager.CreateWindow(Path); - public new void OpenTestWindow2Click() - { - Example2Window2.CreateWindow(Example2Window2.Path, inputField.text); - } + public void OpenTestWindow2Click() => + Example1Window2.CreateWindow(Example2Window2.Path, _inputField.text); } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window2.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window2.cs index 675a96f..e9f8d0e 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window2.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/Example2Window2.cs @@ -1,52 +1,9 @@ #nullable enable -using System.Collections; -using UnityEngine; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example2Window2 : Example1Window2 { - public new const string Path = "NuclearBand/Examples_WindowsManager/Example2/TestWindow2"; - public CanvasGroup canvasGroup = null!; - - protected override void StartShowAnimation() - { - canvasGroup.alpha = 0.0f; - StartCoroutine(Appear()); - } - - protected override void StartHideAnimation() - { - StartCoroutine(Fade()); - } - - IEnumerator Fade() - { - for (var alpha = 1.0f; alpha >= -0.05f; alpha -= 0.1f) - { - canvasGroup.alpha = alpha; - yield return new WaitForSeconds(0.15f); - } - - EndHideAnimationCallback(); - } - - IEnumerator Appear() - { - for (var alpha = 0.0f; alpha <= 1.05f; alpha += 0.1f) - { - canvasGroup.alpha = alpha; - yield return new WaitForSeconds(0.15f); - } - - EndShowAnimationCallback(); - } - - protected override void DeInit() - { - base.DeInit(); - StopAllCoroutines(); - canvasGroup.alpha = 1.0f; - } + public new const string Path = "com.nuclearband.windowsmanager/Examples/Example2/TestWindow2"; } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs new file mode 100644 index 0000000..c972c6e --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs @@ -0,0 +1,52 @@ +#nullable enable +using System.Collections; +using UnityEngine; + +namespace Nuclear.WindowsManager +{ + public class TweenAlphaWindowAnimation : WindowAnimation + { + private CanvasGroup _canvasGroup = null!; + + [SerializeField] + private bool _showAnimation; + + private void Awake() => _canvasGroup = GetComponent(); + + public override void Play() + { + if (_showAnimation) + { + _canvasGroup.alpha = 0.0f; + StartCoroutine(Appear()); + } + else + { + _canvasGroup.alpha = 1.0f; + StartCoroutine(Fade()); + } + } + + private IEnumerator Fade() + { + for (var alpha = 1.0f; alpha >= -0.05f; alpha -= 0.1f) + { + _canvasGroup.alpha = alpha; + yield return new WaitForSeconds(0.15f); + } + + End(); + } + + private IEnumerator Appear() + { + for (var alpha = 0.0f; alpha <= 1.05f; alpha += 0.1f) + { + _canvasGroup.alpha = alpha; + yield return new WaitForSeconds(0.15f); + } + + End(); + } + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs.meta new file mode 100644 index 0000000..512ff1f --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example2/TweenAlphaWindowAnimation.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 0bd1711700d147569fda88d9c846a04e +timeCreated: 1673008610 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3.meta index e634fc9..7a52cab 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fe66bad45227a6f43891d64c9102db20 +guid: 418b4f58c384e7543a505cf0f2e15ba3 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs index 45ca074..9f0900c 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs @@ -1,26 +1,17 @@ #nullable enable -using System; -using System.Collections.Generic; using UnityEngine; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example3 : MonoBehaviour { - void Start() + private void Start() { - var rootPath = "NuclearBand/Examples_WindowsManager/Example1/"; - WindowsManager.Init(new WindowsManagerSettings() - { - RootPath = rootPath + "Canvas", - InputBlockPath = rootPath + "InputBlocker", - SuffixesWithPredicates = new Dictionary> - { - {"_p", WindowPredicates.IsPortrait} - } - }); - OrientationEventManager.Instance.OnOrientationChanged += WindowsManager.RefreshLayout; - WindowsManager.CreateWindow(Example3Window1.Path); + const string rootPath = "com.nuclearband.windowsmanager/Examples/Example1/"; + StaticWindowsManager.Init(new WindowsManagerSettings(rootPath + "Canvas", + rootPath + "InputBlocker" + )); + StaticWindowsManager.CreateWindow(Example3Window1.Path); } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs.meta index 7dff598..adf7cbb 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 172ea92952af91c4493998a2fd1b195b +guid: 0fd3d63aa0631e047ace40edbc0e1b4b MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs index a90c3e1..40764c2 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs @@ -1,19 +1,11 @@ #nullable enable - -namespace NuclearBand +namespace Nuclear.WindowsManager { - public class Example3Window1 : Example2Window1 + public class Example3Window1 : Window { - public new const string Path = "NuclearBand/Examples_WindowsManager/Example3/TestWindow1"; - - public new void OpenTestWindow1Click() - { - WindowsManager.CreateWindow(Example3Window1.Path); - } + public const string Path = "com.nuclearband.windowsmanager/Examples/Example3/TestWindow1"; - public new void OpenTestWindow2Click() - { - Example3Window2.CreateWindow(Example3Window2.Path, inputField.text); - } + public void OpenTestWindow1Click() => + StaticWindowsManager.CreateWindow(Example3Window2.Path, Example3Window2.SetupWindow(1.0f)); } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs.meta index 76fafb3..02cf692 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window1.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ed2b41203aab3df45a35ea66d3a172ba +guid: 692ecd501bcd8c647aa1abad8a2729d7 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs index 638e232..482ca77 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs @@ -1,53 +1,32 @@ #nullable enable +using System; +using UnityEngine; using UnityEngine.UI; +using Random = UnityEngine.Random; -namespace NuclearBand +namespace Nuclear.WindowsManager { - public class Example3Window2 : Example2Window2 + public class Example3Window2 : Window { - public new const string Path = "NuclearBand/Examples_WindowsManager/Example3/TestWindow2"; - public Text rebuildText = null!; - private int rebuildNum; + public const string Path = "com.nuclearband.windowsmanager/Examples/Example3/TestWindow2"; - class Example3Window2_WindowTransientData : WindowTransientData - { - private readonly int rebuildNum; - - public Example3Window2_WindowTransientData(Window window) : base(window) - { - rebuildNum = (window as Example3Window2)!.rebuildNum; - } - - public override void RestoreWindow(Window window) - { - base.RestoreWindow(window); - (window as Example3Window2)!.rebuildNum = rebuildNum; - } - } - - public override WindowTransientData GetTransientData() - { - return new Example3Window2_WindowTransientData(this); - } + [SerializeField] private Image _background = null!; + private float _size; public override void Init() { base.Init(); - rebuildNum = 0; - DrawRebuildNum(); + _background.color = new Color(Random.Range(0.0f, 1.0f), Random.Range(0.0f, 1.0f), Random.Range(0.0f, 1.0f)); + _background.rectTransform.localScale = Vector3.one * _size; } - public override void InitAfterRebuild(WindowTransientData windowTransientData) - { - base.InitAfterRebuild(windowTransientData); - text.text = title; - ++rebuildNum; - DrawRebuildNum(); - } + public static Action SetupWindow(float size) => + window => ((Example3Window2) window)._size = size; - void DrawRebuildNum() + public void OpenTestWindow1Click() { - rebuildText.text = rebuildNum.ToString(); + var w = StaticWindowsManager.CreateWindow(Path, SetupWindow(_size * 0.9f)); + w.OnStartHide += _ => Close(); } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs.meta index 59c593e..c1c3cb1 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3/Example3Window2.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8d0eabd0e699cad4f9aebe2f7f032cbf +guid: cd994c86e34a1b04e9541c0d062107e3 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity.meta deleted file mode 100644 index 6efc7a2..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ccdd1d0930ac56c4eb2c2e0deb5b7993 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_WindowChains.unity b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_WindowChains.unity similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_WindowChains.unity rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_WindowChains.unity diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_WindowChains.unity.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_WindowChains.unity.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_WindowChains.unity.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_WindowChains.unity.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4.meta index 7a52cab..0a3bc2e 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4.meta @@ -1,8 +1,3 @@ fileFormatVersion: 2 -guid: 418b4f58c384e7543a505cf0f2e15ba3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: +guid: 81b6e5dbc41e4f72ba18c26f22708fb2 +timeCreated: 1673010207 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs index 12d65f4..4fbff05 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs @@ -1,19 +1,18 @@ #nullable enable using UnityEngine; -namespace NuclearBand +namespace Nuclear.WindowsManager { public class Example4 : MonoBehaviour { - void Start() + private void Start() { - var rootPath = "NuclearBand/Examples_WindowsManager/Example1/"; - WindowsManager.Init(new WindowsManagerSettings() - { - RootPath = rootPath + "Canvas", - InputBlockPath = rootPath + "InputBlocker", - }); - WindowsManager.CreateWindow(Example4Window1.Path); + const string rootPath = "com.nuclearband.windowsmanager/Examples/Example1/"; + StaticWindowsManager.Init(new WindowsManagerSettings(rootPath + "Canvas", + rootPath + "InputBlocker" + )); + + Example4Window1.CreateWindow(new Example4Window1ViewModel("Test")); } } } diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs.meta index adf7cbb..0f9edbd 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0fd3d63aa0631e047ace40edbc0e1b4b +guid: 6f8d98b02e4872742ae584c958221e76 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs deleted file mode 100644 index 289a8bb..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs +++ /dev/null @@ -1,13 +0,0 @@ -#nullable enable -namespace NuclearBand -{ - public class Example4Window1 : Window - { - public const string Path = "NuclearBand/Examples_WindowsManager/Example4/TestWindow1"; - - public void OpenTestWindow1Click() - { - WindowsManager.CreateWindow(Example4Window2.Path, Example4Window2.SetupWindow(1.0f)); - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs deleted file mode 100644 index 6290a91..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs +++ /dev/null @@ -1,34 +0,0 @@ -#nullable enable -using System; -using UnityEngine; -using UnityEngine.UI; -using Random = UnityEngine.Random; - -namespace NuclearBand -{ - public class Example4Window2 : Window - { - public const string Path = "NuclearBand/Examples_WindowsManager/Example4/TestWindow2"; - public Image background = null!; - float size; - - - public override void Init() - { - base.Init(); - background.color = new Color(Random.Range(0.0f, 1.0f), Random.Range(0.0f, 1.0f), Random.Range(0.0f, 1.0f)); - background.rectTransform.localScale = Vector3.one * size; - } - - public static Action SetupWindow(float size) - { - return window => (window as Example4Window2)!.size = size; - } - - public void OpenTestWindow1Click() - { - var w = WindowsManager.CreateWindow(Path, SetupWindow(size * 0.9f)).Window; - w.OnStartHide += window => Close(); - } - } -} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs.meta deleted file mode 100644 index c1c3cb1..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window2.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cd994c86e34a1b04e9541c0d062107e3 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1.meta new file mode 100644 index 0000000..33fb535 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1d107b2876c74a9e9d8ff90734f7070b +timeCreated: 1673012180 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs new file mode 100644 index 0000000..74f8ecc --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs @@ -0,0 +1,29 @@ +#nullable enable +using UnityEngine; +using UnityEngine.UI; + +namespace Nuclear.WindowsManager +{ + public class Example4Window1 : Window + { + #region Creation + private const string Path = "com.nuclearband.windowsmanager/Examples/Example4/TestWindow1"; + + public static Example4Window1 CreateWindow(IExample4Window1ViewModel viewModel) => + (Example4Window1)StaticWindowsManager.CreateWindow(Path, window => + window.SetViewModel(ref ((Example4Window1)window)._viewModel, viewModel)); + #endregion + + [SerializeField] private Text _label = null!; + + private IExample4Window1ViewModel _viewModel = null!; + + public override void Init() + { + base.Init(); + _label.text = _viewModel.Text; + } + + public void ButtonClicked() => _viewModel.HandleButtonClick(); + } +} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs.meta similarity index 83% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs.meta index 02cf692..ee12b36 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Example4Window1.cs.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/Example4Window1.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 692ecd501bcd8c647aa1abad8a2729d7 +guid: bd996989d31e949419481c2279d6c2ef MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels.meta new file mode 100644 index 0000000..4c20af1 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 454a63e2dd1c4b1cbed5198093fe8e50 +timeCreated: 1673012214 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs new file mode 100644 index 0000000..79651f4 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs @@ -0,0 +1,16 @@ +#nullable enable +using UnityEngine; + +namespace Nuclear.WindowsManager +{ + public class Example4Window1ViewModel : IExample4Window1ViewModel + { + private readonly string _text; + + public Example4Window1ViewModel(string text) => _text = text; + + void IExample4Window1ViewModel.HandleButtonClick() => Debug.Log("Button clicked"); + + string IExample4Window1ViewModel.Text => _text; + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs.meta new file mode 100644 index 0000000..fd92554 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/Example4Window1ViewModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d44696dfcfeb48158a479bc8f88a977d +timeCreated: 1673010399 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs new file mode 100644 index 0000000..dcf4fe0 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs @@ -0,0 +1,10 @@ +#nullable enable + +namespace Nuclear.WindowsManager +{ + public interface IExample4Window1ViewModel : IWindowViewModel + { + string Text { get; } + void HandleButtonClick(); + } +} \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs.meta new file mode 100644 index 0000000..c48ee1f --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4/Window1/ViewModels/IExample4Window1ViewModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ae56d3da44b746cdb17ab5c89c44f231 +timeCreated: 1673010363 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity similarity index 90% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity index f810533..9bb2aa2 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example3_OrientationControl.unity +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity @@ -67,9 +67,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -98,13 +95,13 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 2095070734} + m_LightingSettings: {fileID: 1803302921} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +114,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -133,7 +130,6 @@ GameObject: m_Component: - component: {fileID: 549008642} - component: {fileID: 549008643} - - component: {fileID: 549008644} m_Layer: 0 m_Name: GameStarter m_TagString: Untagged @@ -151,6 +147,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -164,19 +161,7 @@ MonoBehaviour: m_GameObject: {fileID: 549008641} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172ea92952af91c4493998a2fd1b195b, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &549008644 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 549008641} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c7703bf5494d3e347bc1b920c89d3477, type: 3} + m_Script: {fileID: 11500000, guid: 6f8d98b02e4872742ae584c958221e76, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1 &1171959573 @@ -219,9 +204,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -258,18 +251,19 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 305.99023, y: 788.4904, z: 13.188577} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!850595691 &2095070734 +--- !u!850595691 &1803302921 LightingSettings: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Settings.lighting - serializedVersion: 2 + serializedVersion: 7 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -280,9 +274,10 @@ LightingSettings: m_UsingShadowmask: 1 m_BakeBackend: 1 m_LightmapMaxSize: 1024 + m_LightmapSizeFixed: 0 m_BakeResolution: 40 m_Padding: 2 - m_TextureCompression: 1 + m_LightmapCompression: 3 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -297,9 +292,6 @@ LightingSettings: m_RealtimeResolution: 2 m_ForceWhiteAlbedo: 0 m_ForceUpdates: 0 - m_FinalGather: 0 - m_FinalGatherRayCount: 256 - m_FinalGatherFiltering: 1 m_PVRCulling: 1 m_PVRSampling: 1 m_PVRDirectSampleCount: 32 @@ -308,8 +300,8 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRRussianRouletteStartBounce: 2 - m_PVREnvironmentMIS: 0 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 m_PVRFilteringMode: 2 m_PVRDenoiserTypeDirect: 0 m_PVRDenoiserTypeIndirect: 0 @@ -323,3 +315,5 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity.meta new file mode 100644 index 0000000..5d7026b --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Example4_MVVM.unity.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 932f4f38043b4a0d866b5b1325b4bf01 +timeCreated: 1673010228 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3.meta deleted file mode 100644 index de411cf..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4a284ea10add5934aabd71cdb212ef1a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab deleted file mode 100644 index 5f9badf..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab +++ /dev/null @@ -1,302 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &5483058705372230986 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6339334590711057309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 11500000, guid: ed2b41203aab3df45a35ea66d3a172ba, type: 3} - m_Name: - m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 - WithInputBlockForBackground: 0 - DestroyOnClose: 0 - inputField: {fileID: 8757316907582145389} ---- !u!1001 &830301105032940765 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6664207379585271616, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_Name - value: TestWindow1 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7482867336135443427, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3697132692251707051, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 8492329667217839238} - - target: {fileID: 3697132692251707051, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 5483058705372230986} - - target: {fileID: 3697132692251707051, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OpenTestWindow1Click - objectReference: {fileID: 0} - - target: {fileID: 8785832405199962892, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 6783274949368165752} - - target: {fileID: 8785832405199962892, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 5483058705372230986} - - target: {fileID: 8785832405199962892, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OpenTestWindow2Click - objectReference: {fileID: 0} - - target: {fileID: 8777837246651406201, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 2143278076625539263} - - target: {fileID: 8777837246651406201, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 5483058705372230986} - - target: {fileID: 8777837246651406201, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Close - objectReference: {fileID: 0} - - target: {fileID: 8218487819831513008, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 4760357630946591670} - - target: {fileID: 8218487819831513008, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_TextComponent - value: - objectReference: {fileID: 1172227517154328516} - - target: {fileID: 8218487819831513008, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: m_Placeholder - value: - objectReference: {fileID: 2714838373324566150} - - target: {fileID: 4847760219722791129, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - propertyPath: inputField - value: - objectReference: {fileID: 8757316907582145389} - m_RemovedComponents: - - {fileID: 4847760219722791129, guid: 478d95fb5eee6e0428c9c8379f957f5f, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 478d95fb5eee6e0428c9c8379f957f5f, type: 3} ---- !u!1 &6339334590711057309 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6664207379585271616, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8492329667217839238 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9105999867382962267, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &6783274949368165752 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6171860944449141157, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2143278076625539263 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1602057138232859746, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4760357630946591670 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5302393173710868331, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &8757316907582145389 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8218487819831513008, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2714838373324566150 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3326147371259552347, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1172227517154328516 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1999955317696344857, guid: 478d95fb5eee6e0428c9c8379f957f5f, - type: 3} - m_PrefabInstance: {fileID: 830301105032940765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab deleted file mode 100644 index b11ee36..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab +++ /dev/null @@ -1,398 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &110412261508862518 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 513038388295632594} - - component: {fileID: 7624939916842320282} - - component: {fileID: 6562899384563409169} - m_Layer: 5 - m_Name: RebuildNum - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &513038388295632594 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110412261508862518} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000005, y: 1.0000005, z: 1.0000005} - m_Children: [] - m_Father: {fileID: 8293546860291451716} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 8.4, y: -281.7} - m_SizeDelta: {x: 360, y: 77.36} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7624939916842320282 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110412261508862518} - m_CullTransparentMesh: 0 ---- !u!114 &6562899384563409169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 110412261508862518} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: -1 ---- !u!1 &703811047082649316 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3676877348023557330} - - component: {fileID: 4139549003716988014} - - component: {fileID: 9006893996683477087} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3676877348023557330 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703811047082649316} - 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: 8293546860291451716} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0000045775, y: -180} - m_SizeDelta: {x: 360, y: 104.77} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4139549003716988014 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703811047082649316} - m_CullTransparentMesh: 0 ---- !u!114 &9006893996683477087 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 703811047082649316} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: This is landscape window ---- !u!114 &1780968439429256809 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2525424537210398984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d0eabd0e699cad4f9aebe2f7f032cbf, type: 3} - m_Name: - m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 - WithInputBlockForBackground: 1 - DestroyOnClose: 0 - ProcessBackButton: 1 - Title: - text: {fileID: 1399947526222193912} - canvasGroup: {fileID: 1357206467514961437} - rebuildText: {fileID: 6562899384563409169} ---- !u!1001 &3160018864938880076 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 636899077753939268, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_Name - value: TestWindow2 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000061035156 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.00012207031 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7861060091348597151, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7861060091348597151, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -41 - objectReference: {fileID: 0} - - target: {fileID: 2293896168012129467, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 9106645346993152306} - - target: {fileID: 2293896168012129467, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1780968439429256809} - - target: {fileID: 2293896168012129467, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Close - objectReference: {fileID: 0} - - target: {fileID: 7123647583536593860, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7123647583536593860, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 158 - objectReference: {fileID: 0} - - target: {fileID: 7123647583536593860, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_SizeDelta.x - value: 221.6 - objectReference: {fileID: 0} - - target: {fileID: 7123647583536593860, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: m_SizeDelta.y - value: 96.4 - objectReference: {fileID: 0} - - target: {fileID: 658244495541882139, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: text - value: - objectReference: {fileID: 1399947526222193912} - - target: {fileID: 658244495541882139, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - propertyPath: canvasGroup - value: - objectReference: {fileID: 1357206467514961437} - m_RemovedComponents: - - {fileID: 658244495541882139, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, type: 3} ---- !u!1 &2525424537210398984 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 636899077753939268, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - m_PrefabInstance: {fileID: 3160018864938880076} - m_PrefabAsset: {fileID: 0} ---- !u!224 &8293546860291451716 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6395740975356798728, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - m_PrefabInstance: {fileID: 3160018864938880076} - m_PrefabAsset: {fileID: 0} ---- !u!225 &1357206467514961437 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 4111611075590390353, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - m_PrefabInstance: {fileID: 3160018864938880076} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1399947526222193912 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4086797523289516212, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - m_PrefabInstance: {fileID: 3160018864938880076} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &9106645346993152306 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6177788444480810366, guid: 5b4c9b1c90ef4e24faefdb2ae695244e, - type: 3} - m_PrefabInstance: {fileID: 3160018864938880076} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab.meta deleted file mode 100644 index 6353c6b..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f70b5e275805e1246a3fcac332beeaf9 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab deleted file mode 100644 index 28de86f..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab +++ /dev/null @@ -1,208 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4745560586408167382 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2525424537210398984, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Name - value: TestWindow2_p - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000061035156 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000091552734 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8293546860291451716, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3751263207227468023, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 4592215336061347556} - - target: {fileID: 3751263207227468023, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6443766414110675391} - - target: {fileID: 1780968439429256809, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: text - value: - objectReference: {fileID: 5959954379310965550} - - target: {fileID: 1780968439429256809, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: canvasGroup - value: - objectReference: {fileID: 5984820059915389387} - - target: {fileID: 7256902229857296704, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Color.r - value: 0.5019608 - objectReference: {fileID: 0} - - target: {fileID: 7256902229857296704, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Color.g - value: 0.94509804 - objectReference: {fileID: 0} - - target: {fileID: 7256902229857296704, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Color.b - value: 0.7404741 - objectReference: {fileID: 0} - - target: {fileID: 3676877348023557330, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 9006893996683477087, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - propertyPath: m_Text - value: This is portrait window - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f70b5e275805e1246a3fcac332beeaf9, type: 3} ---- !u!225 &5984820059915389387 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 1357206467514961437, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - m_PrefabInstance: {fileID: 4745560586408167382} - m_PrefabAsset: {fileID: 0} ---- !u!114 &6443766414110675391 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1780968439429256809, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - m_PrefabInstance: {fileID: 4745560586408167382} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d0eabd0e699cad4f9aebe2f7f032cbf, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &5959954379310965550 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1399947526222193912, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - m_PrefabInstance: {fileID: 4745560586408167382} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &4592215336061347556 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 9106645346993152306, guid: f70b5e275805e1246a3fcac332beeaf9, - type: 3} - m_PrefabInstance: {fileID: 4745560586408167382} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab.meta deleted file mode 100644 index 2225a4b..0000000 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow2_p.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2366396d10aeebd468e9ae9f9affb608 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/Canvas.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/Canvas.prefab similarity index 96% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/Canvas.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/Canvas.prefab index 2effd3e..d951937 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/Canvas.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/Canvas.prefab @@ -29,6 +29,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 4013086838226150} m_Father: {fileID: 0} @@ -57,6 +58,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -82,6 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114080615996893236 MonoBehaviour: m_ObjectHideFlags: 0 @@ -98,7 +101,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 55 + m_Bits: 4294967295 --- !u!1 &1976602676265526 GameObject: m_ObjectHideFlags: 0 @@ -127,6 +130,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -571, y: -353.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224296329765784942} m_RootOrder: 0 @@ -158,6 +162,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_HorizontalAxis: Horizontal m_VerticalAxis: Vertical m_SubmitButton: Submit diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/Canvas.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/Canvas.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/Canvas.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/Canvas.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/InputBlocker.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/InputBlocker.prefab similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/InputBlocker.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/InputBlocker.prefab diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/InputBlocker.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/InputBlocker.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/InputBlocker.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/InputBlocker.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow1.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow1.prefab similarity index 89% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow1.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow1.prefab index 5af5b93..e0de8f3 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow1.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow1.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731640669553350182} m_RootOrder: 0 @@ -54,17 +55,17 @@ MonoBehaviour: m_GameObject: {fileID: 617130277390168297} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.49803922} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -107,6 +108,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7404739091149697936} m_RootOrder: 0 @@ -133,17 +135,17 @@ MonoBehaviour: m_GameObject: {fileID: 1009411857676684280} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -187,6 +189,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3919772109347591230} m_Father: {fileID: 4971411155482542152} @@ -214,17 +217,17 @@ MonoBehaviour: m_GameObject: {fileID: 3038182703573231155} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.18396229, b: 0.18396229, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -234,6 +237,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &1182378183008978176 MonoBehaviour: m_ObjectHideFlags: 0 @@ -243,11 +247,12 @@ MonoBehaviour: m_GameObject: {fileID: 3038182703573231155} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -257,17 +262,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 6735553854002437104} @@ -275,6 +283,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 8503331351814920583} + m_TargetAssemblyTypeName: m_MethodName: OpenTestWindow1Click m_Mode: 1 m_Arguments: @@ -285,8 +294,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &3750913212939768837 GameObject: m_ObjectHideFlags: 0 @@ -315,6 +322,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4971411155482542152} m_RootOrder: 0 @@ -341,17 +349,17 @@ MonoBehaviour: m_GameObject: {fileID: 3750913212939768837} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -361,6 +369,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4528777059289802441 GameObject: m_ObjectHideFlags: 0 @@ -390,6 +399,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4522966721413634643} - {fileID: 1831015512177225812} @@ -418,17 +428,17 @@ MonoBehaviour: m_GameObject: {fileID: 4528777059289802441} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -438,6 +448,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &5848930212207070235 MonoBehaviour: m_ObjectHideFlags: 0 @@ -447,11 +458,12 @@ MonoBehaviour: m_GameObject: {fileID: 4528777059289802441} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, 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} @@ -461,17 +473,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 7688663083324509376} @@ -485,16 +500,15 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_OnEndEdit: + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnDidEndEdit: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_OnValueChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} @@ -502,6 +516,7 @@ MonoBehaviour: m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 + m_ShouldActivateOnSelect: 1 --- !u!1 &5765901310119071023 GameObject: m_ObjectHideFlags: 0 @@ -530,6 +545,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5520850779397501587} m_RootOrder: 0 @@ -556,17 +572,17 @@ MonoBehaviour: m_GameObject: {fileID: 5765901310119071023} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -610,6 +626,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 985444272598002354} m_Father: {fileID: 4971411155482542152} @@ -637,17 +654,17 @@ MonoBehaviour: m_GameObject: {fileID: 7697638860063708496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.18396229, b: 0.18396229, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -657,6 +674,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &6542586959704277159 MonoBehaviour: m_ObjectHideFlags: 0 @@ -666,11 +684,12 @@ MonoBehaviour: m_GameObject: {fileID: 7697638860063708496} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -680,17 +699,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 8539008499885472270} @@ -698,6 +720,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 8503331351814920583} + m_TargetAssemblyTypeName: m_MethodName: OpenTestWindow2Click m_Mode: 1 m_Arguments: @@ -708,8 +731,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &8248239502543137797 GameObject: m_ObjectHideFlags: 0 @@ -738,6 +759,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5645064451066361851} m_RootOrder: 0 @@ -764,17 +786,17 @@ MonoBehaviour: m_GameObject: {fileID: 8248239502543137797} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -817,6 +839,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1731640669553350182} m_RootOrder: 1 @@ -843,17 +866,17 @@ MonoBehaviour: m_GameObject: {fileID: 8357911275521806139} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -897,6 +920,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2832377537709147874} m_Father: {fileID: 4971411155482542152} @@ -924,17 +948,17 @@ MonoBehaviour: m_GameObject: {fileID: 8852238998462083564} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.18396229, b: 0.18396229, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -944,6 +968,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &6554804887770633426 MonoBehaviour: m_ObjectHideFlags: 0 @@ -953,11 +978,12 @@ MonoBehaviour: m_GameObject: {fileID: 8852238998462083564} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -967,17 +993,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 3827455311161466825} @@ -985,6 +1014,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 8503331351814920583} + m_TargetAssemblyTypeName: m_MethodName: Close m_Mode: 1 m_Arguments: @@ -995,8 +1025,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &9176780664026825963 GameObject: m_ObjectHideFlags: 0 @@ -1025,6 +1053,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5897085789269573915} - {fileID: 5645064451066361851} @@ -1032,7 +1061,7 @@ RectTransform: - {fileID: 5520850779397501587} - {fileID: 1731640669553350182} m_Father: {fileID: 0} - 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} @@ -1063,9 +1092,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ca14df35b341164b8bf6df924c85b39, type: 3} m_Name: m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 WithInputBlockForBackground: 0 DestroyOnClose: 0 ProcessBackButton: 1 - inputField: {fileID: 5848930212207070235} + _showAnimation: {fileID: 0} + _hideAnimation: {fileID: 0} + _inputField: {fileID: 5848930212207070235} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow1.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow1.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow1.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow1.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow2.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow2.prefab similarity index 90% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow2.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow2.prefab index 01fd35e..f6b8485 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow2.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow2.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915448839736472576} m_RootOrder: 0 @@ -54,17 +55,17 @@ MonoBehaviour: m_GameObject: {fileID: 2519793888140053551} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.50284797, g: 0.75455546, b: 0.9433962, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -74,6 +75,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2979062742409820493 GameObject: m_ObjectHideFlags: 0 @@ -102,6 +104,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1915448839736472576} m_RootOrder: 1 @@ -128,17 +131,17 @@ MonoBehaviour: m_GameObject: {fileID: 2979062742409820493} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -181,12 +184,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 758459279686085108} - {fileID: 2345093005324904652} - {fileID: 3408994660640975511} m_Father: {fileID: 0} - 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} @@ -217,13 +221,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 216d876b65824c746a1029aa2c4a785c, type: 3} m_Name: m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 WithInputBlockForBackground: 1 DestroyOnClose: 0 ProcessBackButton: 1 - Title: - text: {fileID: 8854092965065161660} + _showAnimation: {fileID: 0} + _hideAnimation: {fileID: 0} + _text: {fileID: 2699993061526429317} --- !u!1 &7330129368119237935 GameObject: m_ObjectHideFlags: 0 @@ -253,6 +256,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5317302942813720511} m_Father: {fileID: 1915448839736472576} @@ -280,17 +284,17 @@ MonoBehaviour: m_GameObject: {fileID: 7330129368119237935} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.9549054, b: 0.18431371, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -300,6 +304,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &6738150837758883763 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,11 +314,12 @@ MonoBehaviour: m_GameObject: {fileID: 7330129368119237935} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -323,17 +329,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1723998834048826998} @@ -341,6 +350,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 3378414817353621821} + m_TargetAssemblyTypeName: m_MethodName: Close m_Mode: 1 m_Arguments: @@ -351,8 +361,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &7385296600224220118 GameObject: m_ObjectHideFlags: 0 @@ -381,6 +389,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3408994660640975511} m_RootOrder: 0 @@ -407,17 +416,17 @@ MonoBehaviour: m_GameObject: {fileID: 7385296600224220118} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow2.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow2.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example1/TestWindow2.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example1/TestWindow2.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow1.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow1.prefab similarity index 82% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow1.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow1.prefab index d7ae4ad..4708a5a 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow1.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow1.prefab @@ -1,160 +1,148 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &4847760219722791129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6664207379585271616} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 11500000, guid: f06adef09d05a6045856baa2b155bf9f, type: 3} - m_Name: - m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 - WithInputBlockForBackground: 0 - DestroyOnClose: 0 - inputField: {fileID: 8218487819831513008} --- !u!1001 &2532848356200907691 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, + - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_Name - value: TestWindow1 + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 9105999867382962267} + - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 4847760219722791129} + - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OpenTestWindow1Click objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + propertyPath: m_Pivot.x + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + propertyPath: m_Pivot.y + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 + propertyPath: m_RootOrder + value: -1 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_AnchorMax.x + value: 1 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_RootOrder + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchoredPosition.x + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchorMin.x + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchorMax.x - value: 1 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: m_LocalEulerAnglesHint.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: m_LocalEulerAnglesHint.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 4971411155482542152, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_Pivot.y - value: 0.5 + propertyPath: m_LocalEulerAnglesHint.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8503331351814920583, guid: 0e664cf4079cc5b42a21074f6718b2b1, + - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: inputField + propertyPath: m_Placeholder value: - objectReference: {fileID: 8218487819831513008} - - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, + objectReference: {fileID: 3326147371259552347} + - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} propertyPath: m_TargetGraphic value: - objectReference: {fileID: 9105999867382962267} - - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, + objectReference: {fileID: 5302393173710868331} + - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + propertyPath: m_TextComponent value: - objectReference: {fileID: 4847760219722791129} - - target: {fileID: 1182378183008978176, guid: 0e664cf4079cc5b42a21074f6718b2b1, - type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OpenTestWindow1Click - objectReference: {fileID: 0} + objectReference: {fileID: 1999955317696344857} - target: {fileID: 6542586959704277159, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} propertyPath: m_TargetGraphic @@ -185,67 +173,68 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: Close objectReference: {fileID: 0} - - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, - type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 5302393173710868331} - - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, + - target: {fileID: 8503331351814920583, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_TextComponent + propertyPath: inputField value: - objectReference: {fileID: 1999955317696344857} - - target: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, + objectReference: {fileID: 8218487819831513008} + - target: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} - propertyPath: m_Placeholder - value: - objectReference: {fileID: 3326147371259552347} + propertyPath: m_Name + value: TestWindow1 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 8503331351814920583, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4847760219722791129} + - targetCorrespondingSourceObject: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5276924327336618890} + - targetCorrespondingSourceObject: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5312822961580280771} m_SourcePrefab: {fileID: 100100000, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} ---- !u!1 &6664207379585271616 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, - type: 3} - m_PrefabInstance: {fileID: 2532848356200907691} - m_PrefabAsset: {fileID: 0} ---- !u!114 &9105999867382962267 stripped +--- !u!114 &1602057138232859746 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6735553854002437104, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_CorrespondingSourceObject: {fileID: 3827455311161466825, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &6171860944449141157 stripped +--- !u!114 &1999955317696344857 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8539008499885472270, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_CorrespondingSourceObject: {fileID: 4100308567322013874, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1602057138232859746 stripped +--- !u!114 &3326147371259552347 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3827455311161466825, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_CorrespondingSourceObject: {fileID: 940871068003852784, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: --- !u!114 &5302393173710868331 stripped @@ -257,46 +246,92 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &8218487819831513008 stripped +--- !u!114 &6171860944449141157 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_CorrespondingSourceObject: {fileID: 8539008499885472270, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 575553740, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &3326147371259552347 stripped +--- !u!1 &6664207379585271616 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9176780664026825963, guid: 0e664cf4079cc5b42a21074f6718b2b1, + type: 3} + m_PrefabInstance: {fileID: 2532848356200907691} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4847760219722791129 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 940871068003852784, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6664207379585271616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f06adef09d05a6045856baa2b155bf9f, type: 3} + m_Name: + m_EditorClassIdentifier: + WithInputBlockForBackground: 0 + DestroyOnClose: 0 + ProcessBackButton: 1 + _showAnimation: {fileID: 5276924327336618890} + _hideAnimation: {fileID: 5312822961580280771} + _inputField: {fileID: 8218487819831513008} +--- !u!114 &5276924327336618890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6664207379585271616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0bd1711700d147569fda88d9c846a04e, type: 3} + m_Name: + m_EditorClassIdentifier: + _showAnimation: 1 +--- !u!114 &5312822961580280771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6664207379585271616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0bd1711700d147569fda88d9c846a04e, type: 3} + m_Name: + m_EditorClassIdentifier: + _showAnimation: 0 +--- !u!114 &8218487819831513008 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5848930212207070235, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1999955317696344857 stripped +--- !u!114 &9105999867382962267 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4100308567322013874, guid: 0e664cf4079cc5b42a21074f6718b2b1, + m_CorrespondingSourceObject: {fileID: 6735553854002437104, guid: 0e664cf4079cc5b42a21074f6718b2b1, type: 3} m_PrefabInstance: {fileID: 2532848356200907691} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow1.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow1.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow1.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow1.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow2.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow2.prefab similarity index 76% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow2.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow2.prefab index e461701..12ffe5d 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow2.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow2.prefab @@ -1,141 +1,127 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &658244495541882139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 636899077753939268} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 11500000, guid: 6b3e754a83323e442a84387941acff81, type: 3} - m_Name: - m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 - WithInputBlockForBackground: 1 - DestroyOnClose: 0 - Title: - text: {fileID: 4086797523289516212} - canvasGroup: {fileID: 4111611075590390353} --- !u!1001 &4780348996828812040 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5368728653061191244, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_Name - value: TestWindow2 + propertyPath: m_Pivot.x + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 + propertyPath: m_Pivot.y + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 + propertyPath: m_RootOrder + value: -1 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 + propertyPath: m_AnchorMax.x + value: 1 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + propertyPath: m_AnchorMax.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalRotation.y + propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalRotation.z + propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 + propertyPath: m_SizeDelta.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_RootOrder + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000061035156 + propertyPath: m_LocalRotation.w + value: 1 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000091552734 + propertyPath: m_LocalRotation.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchorMin.x - value: 0 + propertyPath: m_AnchoredPosition.x + value: -0.000061035156 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchorMin.y - value: 0 + propertyPath: m_AnchoredPosition.y + value: -0.000091552734 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchorMax.x - value: 1 + propertyPath: m_LocalEulerAnglesHint.x + value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: m_LocalEulerAnglesHint.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_Pivot.x - value: 0.5 + propertyPath: m_LocalEulerAnglesHint.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1915448839736472576, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + - target: {fileID: 3378414817353621821, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} - propertyPath: m_Pivot.y - value: 0.5 + propertyPath: text + value: + objectReference: {fileID: 4086797523289516212} + - target: {fileID: 5368728653061191244, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + type: 3} + propertyPath: m_Name + value: TestWindow2 objectReference: {fileID: 0} - target: {fileID: 6738150837758883763, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} @@ -152,13 +138,23 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: Close objectReference: {fileID: 0} - - target: {fileID: 3378414817353621821, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, - type: 3} - propertyPath: text - value: - objectReference: {fileID: 4086797523289516212} m_RemovedComponents: - {fileID: 3378414817353621821, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5368728653061191244, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 658244495541882139} + - targetCorrespondingSourceObject: {fileID: 5368728653061191244, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7825246942265656675} + - targetCorrespondingSourceObject: {fileID: 5368728653061191244, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 750536678824749431} m_SourcePrefab: {fileID: 100100000, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} --- !u!1 &636899077753939268 stripped GameObject: @@ -166,12 +162,62 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4780348996828812040} m_PrefabAsset: {fileID: 0} ---- !u!225 &4111611075590390353 stripped -CanvasGroup: - m_CorrespondingSourceObject: {fileID: 8887948873541144921, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, +--- !u!114 &658244495541882139 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636899077753939268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3e754a83323e442a84387941acff81, type: 3} + m_Name: + m_EditorClassIdentifier: + WithInputBlockForBackground: 1 + DestroyOnClose: 0 + ProcessBackButton: 1 + _showAnimation: {fileID: 7825246942265656675} + _hideAnimation: {fileID: 750536678824749431} + _text: {fileID: 7435297263832599949} +--- !u!114 &7825246942265656675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636899077753939268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0bd1711700d147569fda88d9c846a04e, type: 3} + m_Name: + m_EditorClassIdentifier: + _showAnimation: 1 +--- !u!114 &750536678824749431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 636899077753939268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0bd1711700d147569fda88d9c846a04e, type: 3} + m_Name: + m_EditorClassIdentifier: + _showAnimation: 0 +--- !u!114 &4086797523289516212 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8854092965065161660, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} m_PrefabInstance: {fileID: 4780348996828812040} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &6177788444480810366 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1723998834048826998, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, @@ -181,20 +227,18 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &4086797523289516212 stripped +--- !u!114 &7435297263832599949 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8854092965065161660, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, + m_CorrespondingSourceObject: {fileID: 2699993061526429317, guid: a1a22a4ccbc0ed948bd841b9a4e5dd4e, type: 3} m_PrefabInstance: {fileID: 4780348996828812040} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow2.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow2.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example2/TestWindow2.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example2/TestWindow2.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow1.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow1.prefab similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow1.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow1.prefab diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow1.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow1.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow1.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow1.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow2.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow2.prefab similarity index 90% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow2.prefab rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow2.prefab index e36bcb4..0a77367 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow2.prefab +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow2.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1790393821470639154} m_RootOrder: 0 @@ -54,17 +55,17 @@ MonoBehaviour: m_GameObject: {fileID: 213791185307332951} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 @@ -107,6 +108,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5474417113554947352} m_RootOrder: 0 @@ -133,17 +135,17 @@ MonoBehaviour: m_GameObject: {fileID: 1553031061910689794} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.50284797, g: 0.75455546, b: 0.9433962, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 @@ -153,6 +155,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2218057577987365937 GameObject: m_ObjectHideFlags: 0 @@ -181,12 +184,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1510695024917357229} - {fileID: 1790393821470639154} - {fileID: 5727983052895625395} m_Father: {fileID: 0} - 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} @@ -217,13 +221,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cd994c86e34a1b04e9541c0d062107e3, type: 3} m_Name: m_EditorClassIdentifier: - WithShowAnimation: 1 - WithHideAnimation: 1 WithInputBlockForBackground: 0 DestroyOnClose: 0 ProcessBackButton: 1 - Size: 0 - background: {fileID: 4049215858171959999} + _showAnimation: {fileID: 0} + _hideAnimation: {fileID: 0} + _background: {fileID: 4049215858171959999} --- !u!1 &4342617788757189116 GameObject: m_ObjectHideFlags: 0 @@ -253,6 +256,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1922163666990093592} m_Father: {fileID: 5474417113554947352} @@ -280,17 +284,17 @@ MonoBehaviour: m_GameObject: {fileID: 4342617788757189116} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.9549054, b: 0.18431371, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -300,6 +304,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &65946296532290867 MonoBehaviour: m_ObjectHideFlags: 0 @@ -309,11 +314,12 @@ MonoBehaviour: m_GameObject: {fileID: 4342617788757189116} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -323,17 +329,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 3247245008987240421} @@ -341,6 +350,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 8421825158784906379} + m_TargetAssemblyTypeName: m_MethodName: OpenTestWindow1Click m_Mode: 1 m_Arguments: @@ -351,8 +361,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &8269847742236596736 GameObject: m_ObjectHideFlags: 0 @@ -382,6 +390,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1278102431122630475} m_Father: {fileID: 5474417113554947352} @@ -409,17 +418,17 @@ MonoBehaviour: m_GameObject: {fileID: 8269847742236596736} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.9549054, b: 0.18431371, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -429,6 +438,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &3763707459381582381 MonoBehaviour: m_ObjectHideFlags: 0 @@ -438,11 +448,12 @@ MonoBehaviour: m_GameObject: {fileID: 8269847742236596736} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + 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} @@ -452,17 +463,20 @@ MonoBehaviour: 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: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 7240430641212408266} @@ -470,6 +484,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 8421825158784906379} + m_TargetAssemblyTypeName: m_MethodName: Close m_Mode: 1 m_Arguments: @@ -480,8 +495,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &8629212873221398464 GameObject: m_ObjectHideFlags: 0 @@ -510,6 +523,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5727983052895625395} m_RootOrder: 0 @@ -536,17 +550,17 @@ MonoBehaviour: m_GameObject: {fileID: 8629212873221398464} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 40 diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow2.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow2.prefab.meta similarity index 100% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example4/TestWindow2.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example3/TestWindow2.prefab.meta diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4.meta new file mode 100644 index 0000000..49baf8c --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2993ec9130564388a8407398b62da786 +timeCreated: 1673010217 \ No newline at end of file diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab new file mode 100644 index 0000000..ae88f64 --- /dev/null +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab @@ -0,0 +1,362 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1273960023121549952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5436088322447373215} + - component: {fileID: 8272940149661816504} + - component: {fileID: 4177565085806771940} + - component: {fileID: 6649927510121667057} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5436088322447373215 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1273960023121549952} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7563061092692301504} + m_Father: {fileID: 5589090800002891037} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000015259, y: 8} + m_SizeDelta: {x: 247.9, y: 261.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8272940149661816504 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1273960023121549952} + m_CullTransparentMesh: 0 +--- !u!114 &4177565085806771940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1273960023121549952} + 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: 0.18396229, b: 0.18396229, 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_Sprite: {fileID: 10905, 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!114 &6649927510121667057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1273960023121549952} + 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: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4177565085806771940} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 9044413698055827989} + m_TargetAssemblyTypeName: Nuclear.WindowsManager.Example4Window1, Assembly-CSharp + m_MethodName: ButtonClicked + 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 &1901062940201878045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7563061092692301504} + - component: {fileID: 2378237386597283866} + - component: {fileID: 4073028685790247236} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7563061092692301504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901062940201878045} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5436088322447373215} + 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, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2378237386597283866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901062940201878045} + m_CullTransparentMesh: 0 +--- !u!114 &4073028685790247236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1901062940201878045} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Open TestWindow2 +--- !u!1 &2319493289817744875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 249237980255278416} + - component: {fileID: 9098325236715527879} + - component: {fileID: 2413840291679757278} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &249237980255278416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319493289817744875} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5589090800002891037} + 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, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9098325236715527879 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319493289817744875} + m_CullTransparentMesh: 0 +--- !u!114 &2413840291679757278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2319493289817744875} + 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: 1} + 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!1 &6173165922639761215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5589090800002891037} + - component: {fileID: 7627922088662363146} + - component: {fileID: 9044413698055827989} + m_Layer: 5 + m_Name: TestWindow1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5589090800002891037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6173165922639761215} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 249237980255278416} + - {fileID: 5436088322447373215} + m_Father: {fileID: 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!225 &7627922088662363146 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6173165922639761215} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &9044413698055827989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6173165922639761215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bd996989d31e949419481c2279d6c2ef, type: 3} + m_Name: + m_EditorClassIdentifier: + WithInputBlockForBackground: 0 + DestroyOnClose: 0 + ProcessBackButton: 1 + _showAnimation: {fileID: 0} + _hideAnimation: {fileID: 0} + _label: {fileID: 4073028685790247236} diff --git a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab.meta b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab.meta similarity index 74% rename from Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab.meta rename to Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab.meta index 5f77f25..8097e3a 100644 --- a/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/NuclearBand/Examples_WindowsManager/Example3/TestWindow1.prefab.meta +++ b/Assets/com.nuclearband.windowsmanager/Samples/Sample/Resources/com.nuclearband.windowsmanager/Examples/Example4/TestWindow1.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: da8a4ebea5813b24c8bad0ba9846d788 +guid: 200cd7792b7ccbd47a8e9919a843db3c PrefabImporter: externalObjects: {} userData: diff --git a/Assets/com.nuclearband.windowsmanager/package.json b/Assets/com.nuclearband.windowsmanager/package.json index 59ca154..653c789 100644 --- a/Assets/com.nuclearband.windowsmanager/package.json +++ b/Assets/com.nuclearband.windowsmanager/package.json @@ -1,6 +1,6 @@ { "name": "com.nuclearband.windowsmanager", - "displayName": "Windows Manager", + "displayName": "Nuclear Windows Manager", "version": "1.2.2", "description": "Windows Manager utility", "author": { @@ -13,14 +13,15 @@ "utilities", "library", "windowsmanager", - "nuclearband" + "nuclearband", + "nuclear" ], - "repository": "https://github.com/NuclearBand/UnityWindowsManager.git#upm", + "repository": "https://github.com/NuclearBand/NuclearWindowsManager.git#upm", "license": "MIT", "samples": [ { "displayName": "Four examples", - "description": "Windows manipulations, animations, Orientation control and Windows chains", + "description": "Windows manipulations, animations, windows chains", "path": "Samples~/Sample" } ], diff --git a/Packages/manifest.json b/Packages/manifest.json index 6e20207..b364bfe 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,8 +1,8 @@ { "dependencies": { - "com.unity.ide.rider": "3.0.15", - "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.vscode": "1.2.5", + "com.unity.ai.navigation": "1.1.1", + "com.unity.ide.rider": "3.0.17", + "com.unity.ide.visualstudio": "2.0.17", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 13ec0e9..d3d98da 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,14 +1,23 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.3", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.15", + "version": "3.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -17,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.16", + "version": "2.0.17", "depth": 0, "source": "registry", "dependencies": { @@ -25,19 +34,12 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.3.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -184,17 +186,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 4ca3fed..1a3f914 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -3,8 +3,7 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 - m_ExternalVersionControlSupport: Hidden Meta Files + serializedVersion: 12 m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 1 @@ -12,25 +11,38 @@ EditorSettings: m_PrefabUIEnvironment: {fileID: 102900000, guid: 517d3e7ad3bbc2e4995d9dc40b484559, type: 3} m_SpritePackerMode: 2 + m_SpritePackerCacheSize: 10 m_SpritePackerPaddingPower: 1 + m_Bc7TextureCompressor: 0 m_EtcTextureCompressorBehavior: 0 m_EtcTextureFastCompressor: 2 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 5 m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref m_ProjectGenerationRootNamespace: - m_CollabEditorSettings: - inProgressEnabled: 1 m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_EnableEditorAsyncCPUTextureLoading: 0 m_AsyncShaderCompilation: 1 - m_EnterPlayModeOptionsEnabled: 0 - m_EnterPlayModeOptions: 3 - m_ShowLightmapResolutionOverlay: 1 + m_PrefabModeAllowAutoSave: 1 + m_EnterPlayModeOptionsEnabled: 1 + m_EnterPlayModeOptions: 1 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 + m_InspectorUseIMGUIDefaultInspector: 0 m_UseLegacyProbeSampleCount: 1 + m_SerializeInlineMappingsOnOneLine: 0 + m_DisableCookiesInLightmapper: 1 m_AssetPipelineMode: 1 + m_RefreshImportMode: 0 m_CacheServerMode: 0 m_CacheServerEndpoint: m_CacheServerNamespacePrefix: default m_CacheServerEnableDownload: 1 m_CacheServerEnableUpload: 1 + m_CacheServerEnableAuth: 0 + m_CacheServerEnableTls: 0 + m_CacheServerValidationMode: 2 + m_CacheServerDownloadBatchSize: 128 + m_EnableEnlightenBakedGI: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 150dbfd..b3acdc2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: ad899e75ab29af244b00489cf382d4ed AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,15 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -74,6 +75,7 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidApplicationEntry: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -92,6 +94,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 + meshDeformation: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -119,8 +122,11 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -128,12 +134,7 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 1.0 preloadedAssets: [] metroInputSource: 0 @@ -145,16 +146,18 @@ PlayerSettings: enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: Android: com.Company.ProductName - Standalone: unity.DefaultCompany.WindowManager + Standalone: com.DefaultCompany.WindowManager Tizen: com.Company.ProductName iPhone: com.Company.ProductName tvOS: com.Company.ProductName @@ -174,15 +177,16 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 214 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 13.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -246,6 +250,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 5 AndroidTargetDevices: 0 @@ -253,6 +258,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 @@ -266,11 +272,11 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: iPhone @@ -463,6 +469,7 @@ PlayerSettings: m_Kind: 0 m_SubKind: m_BuildTargetBatching: [] + m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: - m_BuildTarget: MacStandaloneSupport m_GraphicsJobs: 0 @@ -500,7 +507,7 @@ PlayerSettings: m_APIs: 10000000 m_Automatic: 1 - m_BuildTarget: AndroidPlayer - m_APIs: 0b00000008000000 + m_APIs: 0b000000 m_Automatic: 0 m_BuildTargetVRSettings: - m_BuildTarget: Android @@ -557,6 +564,8 @@ PlayerSettings: - m_BuildTarget: tvOS m_Enabled: 0 m_Devices: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -571,7 +580,15 @@ PlayerSettings: m_EncodingQuality: 1 - m_BuildTarget: PS4 m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: + - m_BuildTarget: Standalone + m_EncodingQuality: 2 + - m_BuildTarget: XboxOne + m_EncodingQuality: 2 + - m_BuildTarget: PS4 + m_EncodingQuality: 2 m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -584,6 +601,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -595,6 +613,7 @@ PlayerSettings: switchLTOSetting: 0 switchApplicationID: 0x0005000C10000001 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -722,6 +741,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 0 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -796,6 +816,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] @@ -808,6 +829,7 @@ PlayerSettings: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 0 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -820,6 +842,13 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: @@ -831,19 +860,21 @@ PlayerSettings: WebPlayer: 0 iPhone: 1 il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 0 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Android: 3 + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: WindowManager @@ -923,8 +954,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 qualitySettingsNames: [] @@ -932,6 +969,6 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 1 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index a68fd91..cce8f16 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.1.13f1 -m_EditorVersionWithRevision: 2022.1.13f1 (22856944e6d2) +m_EditorVersion: 2023.1.0a25 +m_EditorVersionWithRevision: 2023.1.0a25 (eac607654885) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/README.md b/README.md index 087e344..2d73d16 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ Unity 2020.1.4 or later (C# 8) ## Installation You can install via git url by adding this entry in your **manifest.json** ``` -"com.nuclearband.windowsmanager": "https://github.com/NuclearBand/UnityWindowsManager.git#upm" +"com.nuclearband.windowsmanager": "https://github.com/NuclearBand/NuclearWindowsManager.git#upm" ``` -## Documentation -- [Documentation](https://github.com/Tr0sT/UnityWindowsManager/blob/master/Assets/com.nuclearband.windowsmanager/Documentation/DOCUMENTATION.md) -- [Документация](https://github.com/NuclearBand/UnityWindowsManager/blob/master/Assets/com.nuclearband.windowsmanager/Documentation/Documentation.ru.md) +## Documentation (outdated) +- [Documentation](https://github.com/Tr0sT/NuclearWindowsManager/blob/master/Assets/com.nuclearband.windowsmanager/Documentation/DOCUMENTATION.md) +- [Документация](https://github.com/NuclearBand/NuclearWindowsManager/blob/master/Assets/com.nuclearband.windowsmanager/Documentation/Documentation.ru.md) ## Contributing diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 2486c3a..cda62d5 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,8 +6,20 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: + value: 00525002545159025e5e0d2145755c4413154a297e2d7634282b4831b5b96d6b + flags: 0 + RecentlyUsedSceneGuid-1: value: 5552520403075a0a5c585c2716255e444f4e4f7b29707f667b281c65e1b4373d flags: 0 + RecentlyUsedSceneGuid-2: + value: 025452055756590b5b5b5e23417b5b44474f1d287d2e7f63297a4d60b3b76069 + flags: 0 + RecentlyUsedSceneGuid-3: + value: 005300025c03085e095f5e7b16750d44424e48722d717463757d1c67e1b4606b + flags: 0 + RecentlyUsedSceneGuid-4: + value: 5a02060051535a035d5a5f2044220f144e414e28792a77637f7c1f67e0e66469 + flags: 0 RecentlyUsedScenePath-0: value: 224247031146466b011b0b2b1e30103e0314142f2d3a0431232d5216fae13928eee225d6d03331383615fc1105300038f718462eee0a071b1d0ba93126f61e171ed23bcd1bc1110f850c12c7d904 flags: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 6a0b8ed..8cbb515 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 2249 - y: 302.5 - width: 1206 - height: 715 + x: -1152 + y: -835.2 + width: 1152 + height: 1964.8 m_ShowMode: 4 - m_Title: - m_RootView: {fileID: 6} + m_Title: Project + m_RootView: {fileID: 9} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -32,24 +32,102 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 496.80002 + y: 320.80002 + width: 1346.4 + height: 557.60004 + m_ShowMode: 0 + m_Title: Package Manager + m_RootView: {fileID: 4} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 8096} + m_Maximized: 0 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: PackageManagerWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1346.4 + height: 557.60004 + m_MinSize: {x: 800, y: 250} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} + m_Panes: + - {fileID: 22} + - {fileID: 23} + - {fileID: 17} + - {fileID: 16} + - {fileID: 15} + m_Selected: 2 + m_LastSelected: 4 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1346.4 + height: 557.60004 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 8096, y: 8096} + vertical: 0 + controlID: 229 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 12} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1206 - height: 665 - m_MinSize: {x: 679, y: 492} - m_MaxSize: {x: 14002, y: 14042} + width: 1152 + height: 1914.8 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} vertical: 0 - controlID: 119 ---- !u!114 &3 + controlID: 339 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -59,23 +137,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: InspectorWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 921 + x: 770.4 y: 0 - width: 285 - height: 665 + width: 381.59998 + height: 1914.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 13} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &4 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -85,23 +163,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: + m_Name: SceneHierarchyWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 228 - height: 394 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 14} + width: 770.4 + height: 1152 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 21} m_Panes: + - {fileID: 21} - {fileID: 14} + - {fileID: 18} + - {fileID: 13} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &5 + m_LastSelected: 4 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -117,18 +198,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 394 - width: 921 - height: 271 + y: 1152 + width: 770.4 + height: 762.80005 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 12} - - {fileID: 17} + - {fileID: 19} + - {fileID: 24} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &6 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -141,18 +222,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 2} - - {fileID: 8} + - {fileID: 10} + - {fileID: 5} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1206 - height: 715 + width: 1152 + height: 1964.8 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &7 + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -169,14 +254,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1206 + width: 1152 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LoadedToolbars: [] - m_MainToolbar: {fileID: 18} - m_LastLoadedLayoutName: Default ---- !u!114 &8 + m_LastLoadedLayoutName: Tr0sT +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -192,12 +275,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 695 - width: 1206 + y: 1944.8 + width: 1152 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &9 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -210,19 +293,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 5} + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 921 - height: 665 - m_MinSize: {x: 403, y: 492} - m_MaxSize: {x: 10001, y: 14042} + width: 770.4 + height: 1914.8 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 92 ---- !u!114 &10 + controlID: 254 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -230,24 +313,55 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 13855, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: - - {fileID: 4} - - {fileID: 11} - m_Position: + m_MinSize: {x: 310, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Preferences + m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 0 - y: 0 - width: 921 - height: 394 - m_MinSize: {x: 403, y: 221} - m_MaxSize: {x: 8003, y: 4021} - vertical: 0 - controlID: 93 ---- !u!114 &11 + x: -1152 + y: 73.6 + width: 769.4 + height: 1131 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 0} + m_Scope: 0 + m_SplitterFlex: 0.2 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -255,26 +369,608 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 0 + m_Script: {fileID: 13401, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Test Runner + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: serializedVersion: 2 - x: 228 - y: 0 - width: 693 - height: 394 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &12 + x: -1152 + y: 73.6 + width: 769.4 + height: 1131 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_Spl: + ID: 216 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: + - 795.2 + - 265.60004 + relativeSizes: + - 0.75 + - 0.25 + minSizes: + - 32 + - 32 + maxSizes: + - 0 + - 0 + lastTotalSize: 1060.8 + splitSize: 6 + xOffset: 0 + m_Version: 1 + oldRealSizes: + oldMinSizes: + oldMaxSizes: + oldSplitSize: 0 + m_TestTypeToolbarIndex: 1 + m_PlayModeTestListGUI: + m_Window: {fileID: 0} + m_NewResultList: [] + m_ResultText: + m_ResultStacktrace: + m_TestListState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_TestRunnerUIFilter: + PassedHidden: 0 + FailedHidden: 0 + NotRunHidden: 0 + m_SearchString: + selectedCategoryMask: 0 + availableCategories: [] + m_SelectedOption: 0 + m_EditModeTestListGUI: + m_Window: {fileID: 14} + m_NewResultList: + - id: 1000 + uniqueId: '[Hustle Castle][suite]' + name: Hustle Castle + fullName: Hustle Castle + resultStatus: 1 + duration: 15.52841 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: + parentUniqueId: + - id: 1005 + uniqueId: '[Tests.dll][suite]' + name: Tests.dll + fullName: C:/Projects/Nord/ShelterClient/Library/ScriptAssemblies/Tests.dll + resultStatus: 1 + duration: 13.304892 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1000 + parentUniqueId: '[Hustle Castle][suite]' + - id: 1006 + uniqueId: Tests.dll/[SH][suite] + name: SH + fullName: SH + resultStatus: 1 + duration: 13.220174 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1005 + parentUniqueId: '[Tests.dll][suite]' + - id: 1007 + uniqueId: Tests.dll/SH/[Tests][suite] + name: Tests + fullName: SH.Tests + resultStatus: 1 + duration: 13.194787 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1006 + parentUniqueId: Tests.dll/[SH][suite] + - id: 1001 + uniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOffline][suite] + name: ServerConnectorTests_TestOffline + fullName: SH.Tests.ServerConnectorTests_TestOffline + resultStatus: 1 + duration: 0.0097286 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1007 + parentUniqueId: Tests.dll/SH/[Tests][suite] + - id: 1002 + uniqueId: Tests.dll/SH/Tests/ServerConnectorTests_TestOffline/[Tests][SH.Tests.ServerConnectorTests_TestOffline.TestOffline] + name: TestOffline + fullName: SH.Tests.ServerConnectorTests_TestOffline.TestOffline + resultStatus: 1 + duration: 1.3522089 + messages: + output: "GameUrls.LoadDefaultServerUrl\r\nServer url changed to 'http://localhost:8442' + caused by 'LoadDefaultServerUrl'\r\nGameSettings.LoadDynamicSettings '{\n + \"SERVER_CONFIGURATION\": \"OFFLINE\",\n \"DEVICE_ID\": \"\",\n \"RESET_NEW_SHOP_GOODS\": + false,\n \"OFFLINE_DATA\": true,\n \"RESET_SERVER\": true,\n \"DEBUG_MODE\": + true,\n \"USE_HTTP_CLIENT\": true,\n \"ALLOW_PARALLEL_REQUESTS\": true,\n + \"HTTP_TIMEOUT\": 5,\n \"HTTP_TIMEOUT_NO_RESULT\": 1,\n \"HTTP_RECONNECT_COUNT\": + 3,\n \"HTTP_RECONNECT_DELAY\": 0.1,\n \"UNIT_QUEUE_COUNT\": 10,\n + \"RECREATE_HTTP_CLIENT_AFTER_ERROR\": true,\n \"TIME_CALCULATION\": \"UNITY\",\n + \"GENERATE_DISABLED_ROOMS\": false,\n \"AUTO_PROFILE_UNITY_OBJECTS\": + true,\n \"NO_INPUT_TIMEOUT\": 360,\n \"SERVER_SESSION_LENGTH\": 120,\n + \"ENABLE_GUI_LOGGER\": true,\n \"COMPROMISED_HTTP_URLS\": [\n \"wi-fi.ru/midsession\",\n + \"unblock.mts.ru\",\n \"oplata_umnyeseti\",\n \"money-limit\"\n + ],\n \"ACCEPT_GZIP_RESPONSES\": true,\n \"SERVER_CONFIGURATIONS\": + [\n {\n \"ID\": \"OFFLINE\",\n \"SERVER_URL\": + \"http://localhost:8442\",\n \"RESOURCES_URL\": \"http://localhost/www/\"\n + }\n ],\n \"CLAN_CHAT_REFRESH_PERIOD\": 180\n}'\r\nServer url changed + to 'http://localhost:8442' caused by 'ReadSettings'\r\nResources url changed + to 'http://localhost/www/0.01/'\r\nFacebookRedirect url changed to ''\r\nMemoryStatistics.ctor() + - Main.Instance == null\r\nClient Command: http://localhost:8442\r\n type: + GET_CLIENT_VERSION_INFO number: 1 sessionId: null operationTime: 0 resendTryNumber: + 1 s: 0 [GetClientVersionInfoRequest] { platform: WINDOWS_PLATFORM version: + \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 (HttpClient)\r\nResendInfo + prepare resend (1)\r\nHttpCommand.HttpError in 'http://localhost:8442': 'HTTP + timeout exceeded.' code: -1 no retries left\r\nNetwork error : HttpCommand.HttpError + in 'http://localhost:8442': 'HTTP timeout exceeded.' code: -1 no retries + left\r\nResendInfo prepare resend (2)\r\n" + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 0 + categories: + - Uncategorized + parentId: 1001 + parentUniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOffline][suite] + - id: 1005 + uniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithoutParallel][suite] + name: ServerConnectorTests_TestOfflineWithoutParallel + fullName: SH.Tests.ServerConnectorTests_TestOfflineWithoutParallel + resultStatus: 1 + duration: 13.177257 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1011 + parentUniqueId: Tests.dll/SH/[Tests][suite] + - id: 1006 + uniqueId: Tests.dll/SH/Tests/ServerConnectorTests_TestOfflineWithoutParallel/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithoutParallel.TestOffline] + name: TestOffline + fullName: SH.Tests.ServerConnectorTests_TestOfflineWithoutParallel.TestOffline + resultStatus: 1 + duration: 13.140759 + messages: + output: "GameUrls.LoadDefaultServerUrl\r\nServer url changed to 'http://localhost:8442' + caused by 'LoadDefaultServerUrl'\r\nGameSettings.LoadDynamicSettings '{\n + \"SERVER_CONFIGURATION\": \"OFFLINE\",\n \"DEVICE_ID\": \"\",\n \"RESET_NEW_SHOP_GOODS\": + false,\n \"OFFLINE_DATA\": true,\n \"RESET_SERVER\": true,\n \"DEBUG_MODE\": + true,\n \"USE_HTTP_CLIENT\": true,\n \"ALLOW_PARALLEL_REQUESTS\": false,\n + \"HTTP_TIMEOUT\": 10,\n \"HTTP_TIMEOUT_NO_RESULT\": 4,\n \"HTTP_RECONNECT_COUNT\": + 2,\n \"HTTP_RECONNECT_DELAY\": 0.1,\n \"UNIT_QUEUE_COUNT\": 10,\n + \"RECREATE_HTTP_CLIENT_AFTER_ERROR\": true,\n \"TIME_CALCULATION\": \"UNITY\",\n + \"GENERATE_DISABLED_ROOMS\": false,\n \"AUTO_PROFILE_UNITY_OBJECTS\": + true,\n \"NO_INPUT_TIMEOUT\": 360,\n \"SERVER_SESSION_LENGTH\": 120,\n + \"ENABLE_GUI_LOGGER\": true,\n \"COMPROMISED_HTTP_URLS\": [\n \"wi-fi.ru/midsession\",\n + \"unblock.mts.ru\",\n \"oplata_umnyeseti\",\n \"money-limit\"\n + ],\n \"ACCEPT_GZIP_RESPONSES\": true,\n \"SERVER_CONFIGURATIONS\": + [\n {\n \"ID\": \"OFFLINE\",\n \"SERVER_URL\": + \"http://localhost:8442\",\n \"RESOURCES_URL\": \"http://localhost/www/\"\n + }\n ],\n \"CLAN_CHAT_REFRESH_PERIOD\": 180\n}'\r\nServer url changed + to 'http://localhost:8442' caused by 'ReadSettings'\r\nResources url changed + to 'http://localhost/www/0.01/'\r\nFacebookRedirect url changed to ''\r\nMemoryStatistics.ctor() + - Main.Instance == null\r\nClient Command: http://localhost:8442\r\n type: + GET_CLIENT_VERSION_INFO number: 1 sessionId: null operationTime: 0 resendTryNumber: + 1 s: 0 [GetClientVersionInfoRequest] { platform: WINDOWS_PLATFORM version: + \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 (HttpClient)\r\nHttpCommand.HttpError + in 'http://localhost:8442': 'HTTP timeout exceeded.' code: -1 no retries + left\r\nNetwork error : HttpCommand.HttpError in 'http://localhost:8442': + 'HTTP timeout exceeded.' code: -1 no retries left\r\nResendInfo prepare resend + (1)\r\nServerConnector.Resend try 1\r\nResendInfo.ResendStarted\r\nClient + Command: http://localhost:8442\r\n type: GET_CLIENT_VERSION_INFO number: + 1 sessionId: null operationTime: 0 resendTryNumber: 1 s: 0 [GetClientVersionInfoRequest] + { platform: WINDOWS_PLATFORM version: \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 + (HttpClient)\r\nHttpCommand.HttpError in 'http://localhost:8442': 'Failed: + SendAsync / exception e= An error occurred while sending the request r=' + code: -1 no retries left\r\nNetwork error : HttpCommand.HttpError in 'http://localhost:8442': + 'Failed: SendAsync / exception e= An error occurred while sending the request + r=' code: -1 no retries left\r\nResendInfo prepare resend (2)\r\nServerConnector.Resend + try 2\r\nResendInfo.ResendStarted\r\nClient Command: http://localhost:8442\r\ntype: + GET_CLIENT_VERSION_INFO number: 1 sessionId: null operationTime: 0 resendTryNumber: + 2 s: 0 [GetClientVersionInfoRequest] { platform: WINDOWS_PLATFORM version: + \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 (HttpClient)\r\nHttpCommand.HttpError + in 'http://localhost:8442': 'Failed: SendAsync / exception e= An error occurred + while sending the request r=' code: -1 no retries left\r\nNetwork error : + HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync / exception + e= An error occurred while sending the request r=' code: -1 no retries left\r\nResendInfo + resend count limit is reached\r\nGameUrls.CanSelectNextServerUrl current + is http://localhost:8442 found index is 0 of 1\r\nprocess unrecoverable error: + HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync / exception + e= An error occurred while sending the request r=' code: -1 no retries left\r\nCritical + Error: HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync + / exception e= An error occurred while sending the request r=' code: -1 no + retries left\r\nGameUrls.LoadDefaultServerUrl\r\nGameUrls.LoadDefaultServerUrl + overriden http://localhost:8442\r\nServer url changed to 'http://localhost:8442' + caused by 'LoadDefaultServerUrl'\r\nHttpCommandImplementationFactoryServerConnector.UnrecoverableError + setting _httpClientIsForceDisabledAfterErrorTime\r\nServerConnector.Reset\r\n" + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 0 + categories: + - Uncategorized + parentId: 1005 + parentUniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithoutParallel][suite] + - id: 1003 + uniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithResend][suite] + name: ServerConnectorTests_TestOfflineWithResend + fullName: SH.Tests.ServerConnectorTests_TestOfflineWithResend + resultStatus: 1 + duration: 8.819283 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1009 + parentUniqueId: Tests.dll/SH/[Tests][suite] + - id: 1004 + uniqueId: Tests.dll/SH/Tests/ServerConnectorTests_TestOfflineWithResend/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithResend.TestOffline] + name: TestOffline + fullName: SH.Tests.ServerConnectorTests_TestOfflineWithResend.TestOffline + resultStatus: 1 + duration: 8.790065 + messages: + output: "GameUrls.LoadDefaultServerUrl\r\nServer url changed to 'http://localhost:8442' + caused by 'LoadDefaultServerUrl'\r\nGameSettings.LoadDynamicSettings '{\n + \"SERVER_CONFIGURATION\": \"OFFLINE\",\n \"DEVICE_ID\": \"\",\n \"RESET_NEW_SHOP_GOODS\": + false,\n \"OFFLINE_DATA\": true,\n \"RESET_SERVER\": true,\n \"DEBUG_MODE\": + true,\n \"USE_HTTP_CLIENT\": true,\n \"ALLOW_PARALLEL_REQUESTS\": true,\n + \"HTTP_TIMEOUT\": 10,\n \"HTTP_TIMEOUT_NO_RESULT\": 4,\n \"HTTP_RECONNECT_COUNT\": + 2,\n \"HTTP_RECONNECT_DELAY\": 0.1,\n \"UNIT_QUEUE_COUNT\": 10,\n + \"RECREATE_HTTP_CLIENT_AFTER_ERROR\": true,\n \"TIME_CALCULATION\": \"UNITY\",\n + \"GENERATE_DISABLED_ROOMS\": false,\n \"AUTO_PROFILE_UNITY_OBJECTS\": + true,\n \"NO_INPUT_TIMEOUT\": 360,\n \"SERVER_SESSION_LENGTH\": 120,\n + \"ENABLE_GUI_LOGGER\": true,\n \"COMPROMISED_HTTP_URLS\": [\n \"wi-fi.ru/midsession\",\n + \"unblock.mts.ru\",\n \"oplata_umnyeseti\",\n \"money-limit\"\n + ],\n \"ACCEPT_GZIP_RESPONSES\": true,\n \"SERVER_CONFIGURATIONS\": + [\n {\n \"ID\": \"OFFLINE\",\n \"SERVER_URL\": + \"http://localhost:8442\",\n \"RESOURCES_URL\": \"http://localhost/www/\"\n + }\n ],\n \"CLAN_CHAT_REFRESH_PERIOD\": 180\n}'\r\nServer url changed + to 'http://localhost:8442' caused by 'ReadSettings'\r\nResources url changed + to 'http://localhost/www/0.01/'\r\nFacebookRedirect url changed to ''\r\nMemoryStatistics.ctor() + - Main.Instance == null\r\nClient Command: http://localhost:8442\r\n type: + GET_CLIENT_VERSION_INFO number: 1 sessionId: null operationTime: 0 resendTryNumber: + 1 s: 0 [GetClientVersionInfoRequest] { platform: WINDOWS_PLATFORM version: + \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 (HttpClient)\r\nResendInfo + prepare resend (1)\r\nHttpCommand.HttpError in 'http://localhost:8442': 'Failed: + SendAsync / exception e= An error occurred while sending the request r=' + code: -1 no retries left\r\nNetwork error : HttpCommand.HttpError in 'http://localhost:8442': + 'Failed: SendAsync / exception e= An error occurred while sending the request + r=' code: -1 no retries left\r\nResendInfo prepare resend (2)\r\nServerConnector.Resend + try 2\r\nResendInfo.ResendStarted\r\nClient Command: http://localhost:8442\r\ntype: + GET_CLIENT_VERSION_INFO number: 1 sessionId: null operationTime: 0 resendTryNumber: + 2 s: 0 [GetClientVersionInfoRequest] { platform: WINDOWS_PLATFORM version: + \"0.01\" }\r\nHttpCommand.Start: http://localhost:8442 (HttpClient)\r\nHttpCommand.HttpError + in 'http://localhost:8442': 'Failed: SendAsync / exception e= An error occurred + while sending the request r=' code: -1 no retries left\r\nNetwork error : + HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync / exception + e= An error occurred while sending the request r=' code: -1 no retries left\r\nResendInfo + resend count limit is reached\r\nGameUrls.CanSelectNextServerUrl current + is http://localhost:8442 found index is 0 of 1\r\nprocess unrecoverable error: + HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync / exception + e= An error occurred while sending the request r=' code: -1 no retries left\r\nCritical + Error: HttpCommand.HttpError in 'http://localhost:8442': 'Failed: SendAsync + / exception e= An error occurred while sending the request r=' code: -1 no + retries left\r\nGameUrls.LoadDefaultServerUrl\r\nGameUrls.LoadDefaultServerUrl + overriden http://localhost:8442\r\nServer url changed to 'http://localhost:8442' + caused by 'LoadDefaultServerUrl'\r\nHttpCommandImplementationFactoryServerConnector.UnrecoverableError + setting _httpClientIsForceDisabledAfterErrorTime\r\nServerConnector.Reset\r\n" + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 0 + categories: + - Uncategorized + parentId: 1003 + parentUniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOfflineWithResend][suite] + - id: 1003 + uniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOnline][suite] + name: ServerConnectorTests_TestOnline + fullName: SH.Tests.ServerConnectorTests_TestOnline + resultStatus: 1 + duration: 0.1984562 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 1 + categories: [] + parentId: 1007 + parentUniqueId: Tests.dll/SH/[Tests][suite] + - id: 1004 + uniqueId: Tests.dll/SH/Tests/ServerConnectorTests_TestOnline/[Tests][SH.Tests.ServerConnectorTests_TestOnline.TestOnline] + name: TestOnline + fullName: SH.Tests.ServerConnectorTests_TestOnline.TestOnline + resultStatus: 1 + duration: 0.1917969 + messages: + output: + stacktrace: + notRunnable: 0 + ignoredOrSkipped: 0 + description: + isSuite: 0 + categories: + - Uncategorized + parentId: 1003 + parentUniqueId: Tests.dll/SH/Tests/[Tests][SH.Tests.ServerConnectorTests_TestOnline][suite] + m_ResultText: ServerConnectorTests_TestOfflineWithoutParallel (13,177s) + m_ResultStacktrace: + m_TestListState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: b9b121c1 + m_LastClickedID: -1054756423 + m_ExpandedIDs: 75e6828e938ca19c5cb071af1404cbd09d7c51f5e557abf73f3af701ffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_TestRunnerUIFilter: + PassedHidden: 0 + FailedHidden: 0 + NotRunHidden: 0 + m_SearchString: + selectedCategoryMask: 0 + availableCategories: + - Uncategorized +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 496.80002 + y: 320.80002 + width: 1346.4 + height: 536.60004 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1107674293460335856, guid: cad27ccf86e6179428a34504b6ffea5d, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: cad27ccf86e6179428a34504b6ffea5d, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1107674293460335856, guid: cad27ccf86e6179428a34504b6ffea5d, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 246.40001 + y: 210.40001 + width: 1534.4 + height: 687 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 43990 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13953, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 800, y: 250} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Package Manager + m_Image: {fileID: 5076950121296946556, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 496.80002 + y: 320.80002 + width: 1346.4 + height: 536.60004 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: -1152 + y: 73.6 + width: 847.8 + height: 1113.4 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 151 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -2280 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,15 +986,19 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: -1152 + y: 347.19995 + width: 769.4 + height: 741.80005 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SearchFilter: m_NameFilter: m_ClassNames: [] @@ -311,22 +1011,21 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets + m_Folders: [] m_Globs: [] - m_ViewMode: 1 + m_OriginalText: + m_ViewMode: 0 m_StartGridSize: 64 - m_LastFolders: - - Assets + m_LastFolders: [] m_LastFoldersGridSize: -1 - m_LastProjectPath: U:\layout + m_LastProjectPath: C:\Projects\NuclearBand\UnityWindowsManager m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f4350000 - m_LastClickedID: 13812 - m_ExpandedIDs: 00000000f435000000ca9a3b + m_SelectedIDs: 3e380600 + m_LastClickedID: 407614 + m_ExpandedIDs: 00000000f04c0000f24c0000f44c0000f64c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -354,7 +1053,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f4350000 + m_ExpandedIDs: ffffffff00000000f04c0000f24c0000f44c0000f64c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -370,7 +1069,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -398,7 +1097,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 8} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -410,7 +1109,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &13 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -426,29 +1125,33 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 3170 - y: 332.5 - width: 284 - height: 644 + x: -381.59998 + y: -804.80005 + width: 380.59998 + height: 1893.8 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 160 + m_CachedPref: 533 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 - m_AssetGUID: - m_InstanceID: 0 + m_GlobalObjectId: + m_InspectorMode: 0 m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &14 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -464,21 +1167,25 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 332.5 - width: 227 - height: 373 + x: -1152 + y: -804.80005 + width: 769.4 + height: 1131 m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 18f7ffff m_LastClickedID: 0 - m_ExpandedIDs: 42fbffff + m_ExpandedIDs: 508efeff1495feff3895feff5c95feff369afeff409afeff449afeff06a3feffc4a3feff1aa5feffbca5fefff8a6feff9ca7feff38a8feffdca8feff88a9feff2aaafeff1aabfeffb6abfeffeaacfeff98adfeff82aefeff20b1feffbab1fefff4b2feff96b3feff32b4feffc8b5feff76b6feff68b7feff1eb9feffcab9feff6ebafeff2ebdfeff74befeff46c0feff4ac1feffecc1feff8ec2feff34c3feffd6c3feff70c4feff5ac5feff50c6feff36c7feffdac7feffc2c8feff64c9fefffec9feffa0cafeff3acbfeff22ccfeff5ccdfeff6ecdfeff74d0feff78dbffff5addffff50deffff5adffffface0ffffcce1fffff4e6ffff90e7ffffd2e8ffff6ee9ffff12eaffff04ebffffb0ebffffa0ecffff3cedffff36eeffffdaeeffffbcefffff5af0ffff2af1ffff0cf2ffff98f3ffff3cf4ffffe0f4ffff84f5ffff26f6ffff40f6ffff7afaffff50fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -494,7 +1201,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -502,7 +1209,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &15 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -518,22 +1225,245 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2477 - y: 332.5 - width: 691 - height: 373 + x: 232.8 + y: 125.6 + width: 1534.4 + height: 687 m_ViewDataDictionary: {fileID: 0} - m_ShowContextualTools: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: 149} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 67.5, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 0 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 2 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 3 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 7 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 8 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 9 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 10 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 1 m_SceneLighting: 1 - m_2DMode: 0 + m_2DMode: 1 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 @@ -548,15 +1478,15 @@ MonoBehaviour: section: Shading Mode m_ValidateTrueMetals: 0 m_DoValidateTrueMetals: 0 - m_ExposureSliderValue: 0 m_SceneViewState: + m_AlwaysRefresh: 0 showFog: 1 - showMaterialUpdate: 0 showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 showVisualEffectGraphs: 1 + m_FxEnabled: 1 m_Grid: xGrid: m_Fade: @@ -568,35 +1498,35 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0} + m_Size: {x: 1, y: 1} m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Target: {x: 0, y: 0, z: 0, w: 1} speed: 2 - m_Value: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: m_Target: 10 speed: 2 m_Value: 10 m_Ortho: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_CameraSettings: m_Speed: 1 m_SpeedNormalized: 0.5 @@ -605,19 +1535,19 @@ MonoBehaviour: m_EasingEnabled: 1 m_EasingDuration: 0.4 m_AccelerationEnabled: 1 - m_FieldOfView: 90 + m_FieldOfViewHorizontalOrVertical: 60 m_NearClip: 0.03 m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0, y: 0, z: 0, w: 0} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &16 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -633,47 +1563,56 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 507 - y: 94 - width: 1532 - height: 790 + x: 521.60004 + y: 316.80002 + width: 1346.4 + height: 536.60004 m_ViewDataDictionary: {fileID: 0} - m_SerializedViewsNames: [] - m_SerializedViewsValues: [] + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_SerializedViewNames: [] + m_SerializedViewValues: [] m_PlayModeViewName: GameView m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 640, y: 480} + m_TargetSize: {x: 1346.4, y: 515.60004} m_TextureFilterMode: 0 m_TextureHideFlags: 61 - m_RenderIMGUI: 0 - m_MaximizeOnPlay: 0 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_fullscreenMonitorIdx: 0 + m_playModeBehaviorIdx: 0 m_UseMipMap: 0 + m_isFullscreen: 0 + m_suppressRenderingForFullscreen: 0 m_VSyncEnabled: 0 + m_PlayFocused: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 00000000000000001c00000013000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -766 - m_HBaseRangeMax: 766 - m_VBaseRangeMin: -395 - m_VBaseRangeMax: 395 + m_HBaseRangeMin: -538.56 + m_HBaseRangeMax: 538.56 + m_VBaseRangeMin: -206.24002 + m_VBaseRangeMax: 206.24002 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 0 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -683,30 +1622,32 @@ MonoBehaviour: m_DrawArea: serializedVersion: 2 x: 0 - y: 0 - width: 1532 - height: 790 + y: 21 + width: 1346.4 + height: 515.60004 m_Scale: {x: 1, y: 1} - m_Translation: {x: 766, y: 395} + m_Translation: {x: 673.2, y: 257.80002} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -766 - y: -395 - width: 1532 - height: 790 + x: -673.2 + y: -257.80002 + width: 1346.4 + height: 515.60004 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1532, y: 790} + m_LastWindowPixelSize: {x: 1683, y: 670.75006} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &17 + m_showToolbar: 1 + m_showToolbarOnFullscreen: 0 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -722,25 +1663,16 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2249 - y: 726.5 - width: 920 - height: 250 + x: -1152 + y: 347.19995 + width: 769.4 + height: 741.80005 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &18 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 13963, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_DontSaveToLayout: 0 + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfe..06ce84e 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,73 @@ -{} \ No newline at end of file +trackSelection = true +refreshSearchWindowsInPlayMode = false +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + asset = { + active = true + priority = 25 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + packages = { + active = true + priority = 90 + defaultAction = null + } + store = { + active = true + priority = 100 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + presets_provider = { + active = false + priority = -10 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = false +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" \ No newline at end of file