From 3a49847e8b00d517875a7ecf53a325a5343b3d29 Mon Sep 17 00:00:00 2001 From: Kirurobo Date: Thu, 11 Jun 2020 20:25:50 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=97=E6=8C=99=E4=BD=93=E7=AD=89?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A4=89=E6=9B=B4=E3=80=82=E5=88=9D=E6=9C=9F?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=8C=E6=99=82=E9=96=93=E5=B7=AE=E3=81=A7?= =?UTF-8?q?=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=82=B3=E3=83=AB=E3=83=BC=E3=83=81=E3=83=B3=E3=82=92=E7=94=A8?= =?UTF-8?q?=E6=84=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/UniWinApi.cs | 22 ++++++------- Scripts/WindowController.cs | 64 +++++++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/Scripts/UniWinApi.cs b/Scripts/UniWinApi.cs index 774c717..b8eaefa 100644 --- a/Scripts/UniWinApi.cs +++ b/Scripts/UniWinApi.cs @@ -108,8 +108,8 @@ public override string ToString() public enum TransparentType { None = 0, - DWM = 1, - LayereredWindows = 2, + Alpha = 1, + ColorKey = 2, } @@ -155,8 +155,8 @@ public enum TransparentType /// /// ウィンドウ透過方式 /// - public TransparentType TransparentMethod = TransparentType.DWM; - private TransparentType currentTransparentType = TransparentType.DWM; + public TransparentType TransparentMethod = TransparentType.Alpha; + private TransparentType _currentTransparentType = TransparentType.Alpha; /// /// Layered Windows で透過する色 @@ -541,10 +541,10 @@ public void EnableTransparent(bool enable) switch (TransparentMethod) { - case TransparentType.DWM: + case TransparentType.Alpha: EnableTransparentByDWM(); break; - case TransparentType.LayereredWindows: + case TransparentType.ColorKey: EnableTransparentBySetLayered(); break; } @@ -552,12 +552,12 @@ public void EnableTransparent(bool enable) else { // 現在の指定ではなく、透過にした時点の指定に基づいて無効化 - switch (currentTransparentType) + switch (_currentTransparentType) { - case TransparentType.DWM: + case TransparentType.Alpha: DisableTransparentByDWM(); break; - case TransparentType.LayereredWindows: + case TransparentType.ColorKey: DisableTransparentBySetLayered(); break; } @@ -569,7 +569,7 @@ public void EnableTransparent(bool enable) EnableClickThrough(false); } - currentTransparentType = TransparentMethod; + _currentTransparentType = TransparentMethod; // サイズ変更イベントを発生させる SetSize(GetSize()); @@ -666,7 +666,7 @@ public void EnableClickThrough(bool isClickThrough) if (!IsActive) return; // Layered Window での透過時は、操作透過はOSで行われる - if (currentTransparentType == TransparentType.LayereredWindows) return; + if (_currentTransparentType == TransparentType.ColorKey) return; #if UNITY_EDITOR // エディタの場合は操作の透過はやめておく diff --git a/Scripts/WindowController.cs b/Scripts/WindowController.cs index b79fa32..e7a3a15 100644 --- a/Scripts/WindowController.cs +++ b/Scripts/WindowController.cs @@ -5,9 +5,11 @@ * License: CC0 https://creativecommons.org/publicdomain/zero/1.0/ */ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; #if UNITY_EDITOR using UnityEditor; using System.Reflection; @@ -64,7 +66,7 @@ public bool isTransparent /// public bool isTopmost { - get { return ((uniWin == null) ? _isTopmost : _isTopmost = uniWin.IsTopmost); } + get { return ((uniWin == null || !uniWin.IsActive) ? _isTopmost : _isTopmost = uniWin.IsTopmost); } set { SetTopmost(value); } } [SerializeField, BoolProperty, Tooltip("Check to set topmost on startup")] @@ -75,7 +77,7 @@ public bool isTopmost /// public bool isMaximized { - get { return ((uniWin == null) ? _isMaximized : _isMaximized = uniWin.IsMaximized); } + get { return ((uniWin == null || !uniWin.IsActive) ? _isMaximized : _isMaximized = uniWin.IsMaximized); } set { SetMaximized(value); } } [SerializeField, BoolProperty, Tooltip("Check to set maximized on startup")] @@ -86,12 +88,16 @@ public bool isMaximized /// public bool isMinimized { - get { return ((uniWin == null) ? _isMinimized : _isMinimized = uniWin.IsMinimized); } + get { return ((uniWin == null || !uniWin.IsActive) ? _isMinimized : _isMinimized = uniWin.IsMinimized); } set { SetMinimized(value); } } [SerializeField, BoolProperty, Tooltip("Check to set minimized on startup")] private bool _isMinimized = false; + private bool isInitiallyTopmost; + private bool isInitiallyMaximized; + private bool isInitiallyMinimized; + /// /// ファイルドロップを有効にするならば最初からtrueにしておく /// @@ -116,7 +122,7 @@ public bool enableFileDrop /// /// 透過方式の指定 /// - public UniWinApi.TransparentType transparentMethod = UniWinApi.TransparentType.DWM; + [FormerlySerializedAs("transparentMethod")] public UniWinApi.TransparentType transparentType = UniWinApi.TransparentType.Alpha; // カメラの背景をアルファゼロの黒に置き換えるため、本来の背景を保存しておく変数 private CameraClearFlags originalCameraClearFlags; @@ -177,7 +183,6 @@ public bool enableFileDrop /// private Touch? firstTouch = null; - /// /// ファイルドロップ時のイベントハンドラー。 UniWinApiの OnFilesDropped にそのまま渡す。 /// @@ -202,6 +207,11 @@ public event UniWinApi.FilesDropped OnFilesDropped // Use this for initialization void Awake() { + // ウィンドウが準備できたタイミングで初期値を設定できるよう保存しておく + isInitiallyTopmost = _isTopmost; + isInitiallyMaximized = _isMaximized; + isInitiallyMinimized = _isMinimized; + Input.simulateMouseWithTouches = false; if (!currentCamera) @@ -232,7 +242,7 @@ void Awake() uniWin = new UniWinApi(); // 透過方式の指定 - uniWin.TransparentMethod = transparentMethod; + uniWin.TransparentMethod = transparentType; // 自分のウィンドウを取得 FindMyWindow(); @@ -250,6 +260,9 @@ void Start() { // マウスカーソル直下の色を取得するコルーチンを開始 StartCoroutine(PickColorCoroutine()); + + // エディタの場合、ウィンドウの準備ができるまで時間がかかるようなのでコルーチンで最大化などの初期状態を設定してみる + StartCoroutine((ApplyInitialStyle())); } void OnDestroy() @@ -521,7 +534,7 @@ private bool GetOnOpaquePixel(Vector2 mousePos) if (!_isTransparent) return true; // LayeredWindowならばクリックスルーはOSに任せるため、ウィンドウ内ならtrueを返しておく - if (transparentMethod == UniWinApi.TransparentType.LayereredWindows) return true; + if (transparentType == UniWinApi.TransparentType.ColorKey) return true; // 指定座標の描画結果を見て判断 try // WaitForEndOfFrame のタイミングで実行すればtryは無くても大丈夫？ @@ -560,14 +573,39 @@ private void FindMyWindow() // 見つかったウィンドウを利用開始 uniWin.SetWindow(window); - // 初期状態を反映 - SetTopmost(_isTopmost); - SetMaximized(_isMaximized); - SetMinimized(_isMinimized); + // // 初期設定を反映 + // SetTopmost(_isTopmost); + // SetMaximized(_isMaximized); + // SetMinimized(_isMinimized); + SetTopmost(isInitiallyTopmost); + SetMaximized(isInitiallyMaximized); + SetMinimized(isInitiallyMinimized); + SetTransparent(_isTransparent); if (_enableFileDrop) BeginFileDrop(); } + /// + /// + /// + /// + IEnumerator ApplyInitialStyle() + { + // ウインドウの準備ができるまで待つ + while (uniWin == null) + { + yield return null; + } + + // さらに1フレーム待つ + yield return null; + + // 初期値を設定 + SetTopmost(isInitiallyTopmost); + SetMaximized(isInitiallyMaximized); + SetMinimized(isInitiallyMinimized); + } + /// /// 自分のウィンドウハンドルが不確かならば探しなおす /// @@ -628,7 +666,7 @@ void SetCameraBackground(bool isTransparent) if (isTransparent) { currentCamera.clearFlags = CameraClearFlags.SolidColor; - if (uniWin.TransparentMethod == UniWinApi.TransparentType.LayereredWindows) + if (uniWin.TransparentMethod == UniWinApi.TransparentType.ColorKey) { currentCamera.backgroundColor = uniWin.ChromakeyColor; } @@ -674,7 +712,7 @@ public void SetTransparentMethod(UniWinApi.TransparentType method) // 透過モード変更 uniWin.TransparentMethod = method; - transparentMethod = uniWin.TransparentMethod; + transparentType = uniWin.TransparentMethod; if (isTransparent) { // 透明化状態だったならば再度透明化を設定し直す From 931e6ac888de3e7d20796f104fa2999fef0f44b3 Mon Sep 17 00:00:00 2001 From: Kirurobo Date: Sun, 9 Aug 2020 16:33:12 +0900 Subject: [PATCH 2/3] =?UTF-8?q?DwmApi=E3=81=A7struct=E3=81=8Cclass?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E3=82=82?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/Wrappers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Wrappers b/Scripts/Wrappers index a440567..3f1ba97 160000 --- a/Scripts/Wrappers +++ b/Scripts/Wrappers @@ -1 +1 @@ -Subproject commit a44056702716395b498850e6c2e1bed1fa74abe8 +Subproject commit 3f1ba973303dd1650d808c46aaae93767a81e300 From 825a500fbf8e48c7a3a4dca8f515d0831cab173b Mon Sep 17 00:00:00 2001 From: Kirurobo Date: Mon, 10 Aug 2020 09:41:19 +0900 Subject: [PATCH 3/3] =?UTF-8?q?DwmApi=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C=E3=80=82=E3=83=AA=E3=82=B5=E3=82=A4=E3=82=BA=E3=82=A4?= =?UTF-8?q?=E3=83=99=E3=83=B3=E3=83=88=E3=82=92=E7=A2=BA=E5=AE=9F=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82=E9=80=8F=E6=98=8E=E5=8C=96=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E5=90=8D?= =?UTF-8?q?=E7=AD=89=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Examples/01_SimpleSample/SimpleSample.unity | 210 +- Examples/02_OnOffSample/OnOffController.cs | 22 + Examples/02_OnOffSample/OnOffSample.unity | 2074 +++++++++++++++---- Examples/Images.meta | 8 + Examples/Images/gradation.png | Bin 0 -> 24510 bytes Examples/Images/gradation.png.meta | 88 + Prefabs/WindowController.prefab | 49 +- Prefabs/WindowController.prefab.meta | 6 +- README.md | 33 + Scripts/UniWinApi.cs | 74 +- Scripts/WindowController.cs | 57 +- Scripts/Wrappers | 2 +- version.txt | 2 +- 13 files changed, 2102 insertions(+), 523 deletions(-) create mode 100644 Examples/Images.meta create mode 100644 Examples/Images/gradation.png create mode 100644 Examples/Images/gradation.png.meta diff --git a/Examples/01_SimpleSample/SimpleSample.unity b/Examples/01_SimpleSample/SimpleSample.unity index 0ad39cb..607a0bc 100644 --- a/Examples/01_SimpleSample/SimpleSample.unity +++ b/Examples/01_SimpleSample/SimpleSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,26 +39,25 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -88,8 +87,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -109,13 +109,16 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &144805234 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 144805236} - component: {fileID: 144805235} @@ -129,8 +132,9 @@ GameObject: --- !u!108 &144805235 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144805234} m_Enabled: 1 serializedVersion: 8 @@ -156,6 +160,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 4 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -165,8 +170,9 @@ Light: --- !u!4 &144805236 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144805234} m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.10938166, w: 0.8754261} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -175,59 +181,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1985544146 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 114356007855815214, guid: 1a68be57637a61842b1d8ea2ccb106b5, - type: 2} - propertyPath: enableDragMove - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - m_IsPrefabParent: 0 --- !u!1 &2084589444 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2084589449} - component: {fileID: 2084589448} @@ -242,20 +202,27 @@ GameObject: --- !u!81 &2084589445 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_Enabled: 1 --- !u!20 &2084589448 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -277,16 +244,17 @@ Camera: m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &2084589449 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5} @@ -298,9 +266,10 @@ Transform: --- !u!1 &2124152612 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2124152616} - component: {fileID: 2124152615} @@ -316,15 +285,19 @@ GameObject: --- !u!23 &2124152613 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -337,6 +310,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -348,8 +322,9 @@ MeshRenderer: --- !u!65 &2124152614 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -360,15 +335,17 @@ BoxCollider: --- !u!33 &2124152615 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &2124152616 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_LocalRotation: {x: 0.35355338, y: 0.35355338, z: -0.1464466, w: 0.8535535} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -377,3 +354,72 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 45, y: 45.000004, z: 0} +--- !u!1001 &5633318868859177871 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1759613613979280798, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_Name + value: WindowController + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5900715206462665293, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} diff --git a/Examples/02_OnOffSample/OnOffController.cs b/Examples/02_OnOffSample/OnOffController.cs index 66a02e1..be4e0c8 100644 --- a/Examples/02_OnOffSample/OnOffController.cs +++ b/Examples/02_OnOffSample/OnOffController.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -12,6 +13,7 @@ public class OnOffController : MonoBehaviour { WindowController windowController; + public Dropdown transparentTypeDropdown; public Toggle transparentToggle; public Toggle topmostToggle; public Toggle maximizedToggle; @@ -19,6 +21,15 @@ public class OnOffController : MonoBehaviour public Toggle enableFileDropToggle; public Text droppedFilesText; + // ドロップダウンの選択肢順に合わせる + private Dictionary _transparentTypes = + new Dictionary() + { + {0, UniWinApi.TransparentTypes.None}, + {1, UniWinApi.TransparentTypes.Alpha}, + {2, UniWinApi.TransparentTypes.ColorKey}, + }; + // Use this for initialization void Start() { @@ -35,10 +46,21 @@ void Start() } }; + // ウィンドウ状態が変化した際にはUIも一致するよう更新 + windowController.OnStateChanged += () => { UpdateUI(); }; + // Toggleのチェック状態を、現在の状態に合わせる UpdateUI(); // Toggleを操作された際にはウィンドウに反映されるようにする + if (transparentTypeDropdown) + { + // 初期値を選択 + transparentTypeDropdown.value = + _transparentTypes.First(d => d.Value == windowController.transparentType).Key; + + transparentTypeDropdown.onValueChanged.AddListener(val => windowController.SetTransparentType(_transparentTypes[val])); + } if (transparentToggle) { transparentToggle.onValueChanged.AddListener(val => windowController.isTransparent = val); diff --git a/Examples/02_OnOffSample/OnOffSample.unity b/Examples/02_OnOffSample/OnOffSample.unity index 3f00a91..d9a3489 100644 --- a/Examples/02_OnOffSample/OnOffSample.unity +++ b/Examples/02_OnOffSample/OnOffSample.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,26 +39,25 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 11 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 8 + serializedVersion: 10 m_Resolution: 1 m_BakeResolution: 50 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 1 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -88,8 +87,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} - m_ShadowMaskMode: 2 + m_UseShadowmask: 0 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -109,13 +109,291 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &677780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 677781} + - component: {fileID: 677783} + - component: {fileID: 677782} + m_Layer: 5 + m_Name: Arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &677781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677780} + 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: 68773941} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -15, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &677782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677780} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10915, guid: 0000000000000000f000000000000000, type: 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 +--- !u!222 &677783 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 677780} + m_CullTransparentMesh: 0 +--- !u!1 &11469019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 11469020} + - component: {fileID: 11469022} + - component: {fileID: 11469021} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &11469020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11469019} + 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: 1783725269} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &11469021 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11469019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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 +--- !u!222 &11469022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 11469019} + m_CullTransparentMesh: 0 +--- !u!1 &68773940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 68773941} + - component: {fileID: 68773944} + - component: {fileID: 68773943} + - component: {fileID: 68773942} + m_Layer: 5 + m_Name: TransparentTypeDropdown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &68773941 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68773940} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 473102425} + - {fileID: 677781} + - {fileID: 2031999400} + - {fileID: 678982935} + m_Father: {fileID: 710011654} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -60} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0, y: 0} +--- !u!114 &68773942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68773940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 853051423, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 68773943} + m_Template: {fileID: 2031999400} + m_CaptionText: {fileID: 473102426} + m_CaptionImage: {fileID: 0} + m_ItemText: {fileID: 163927981} + m_ItemImage: {fileID: 0} + m_Value: 1 + m_Options: + m_Options: + - m_Text: None + m_Image: {fileID: 0} + - m_Text: Alpha + m_Image: {fileID: 0} + - m_Text: ColorKey + m_Image: {fileID: 0} + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &68773943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68773940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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 +--- !u!222 &68773944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 68773940} + m_CullTransparentMesh: 0 --- !u!1 &94403579 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 94403580} - component: {fileID: 94403582} @@ -130,8 +408,9 @@ GameObject: --- !u!224 &94403580 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 94403579} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -148,8 +427,9 @@ RectTransform: --- !u!114 &94403581 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 94403579} m_Enabled: 1 m_EditorHideFlags: 0 @@ -162,8 +442,6 @@ MonoBehaviour: 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: 14 @@ -181,15 +459,18 @@ MonoBehaviour: --- !u!222 &94403582 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 94403579} + m_CullTransparentMesh: 0 --- !u!1 &144805234 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 144805236} - component: {fileID: 144805235} @@ -203,8 +484,9 @@ GameObject: --- !u!108 &144805235 Light: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144805234} m_Enabled: 1 serializedVersion: 8 @@ -230,6 +512,7 @@ Light: serializedVersion: 2 m_Bits: 4294967295 m_Lightmapping: 1 + m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 @@ -239,22 +522,137 @@ Light: --- !u!4 &144805236 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 144805234} m_LocalRotation: {x: 0.40821794, y: -0.23456973, z: 0.10938166, w: 0.8754261} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &163927979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 163927980} + - component: {fileID: 163927982} + - component: {fileID: 163927981} + m_Layer: 5 + m_Name: Item Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &163927980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163927979} + 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: 1976701084} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 5, y: -0.5} + m_SizeDelta: {x: -30, y: -3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &163927981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163927979} + 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Option A +--- !u!222 &163927982 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 163927979} + m_CullTransparentMesh: 0 +--- !u!1 &222783620 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 222783621} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &222783621 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 222783620} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1976701084} + m_Father: {fileID: 1247615770} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 28} + m_Pivot: {x: 0.5, y: 1} --- !u!1 &271364532 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 271364533} - component: {fileID: 271364535} @@ -269,8 +667,9 @@ GameObject: --- !u!224 &271364533 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 271364532} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -287,8 +686,9 @@ RectTransform: --- !u!114 &271364534 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 271364532} m_Enabled: 1 m_EditorHideFlags: 0 @@ -301,8 +701,6 @@ MonoBehaviour: 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: 14 @@ -320,15 +718,18 @@ MonoBehaviour: --- !u!222 &271364535 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 271364532} + m_CullTransparentMesh: 0 --- !u!1 &286846892 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 286846893} - component: {fileID: 286846895} @@ -343,8 +744,9 @@ GameObject: --- !u!224 &286846893 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 286846892} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -362,8 +764,9 @@ RectTransform: --- !u!114 &286846894 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 286846892} m_Enabled: 1 m_EditorHideFlags: 0 @@ -376,8 +779,6 @@ MonoBehaviour: 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 @@ -386,18 +787,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &286846895 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 286846892} + m_CullTransparentMesh: 0 --- !u!1 &289439801 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 289439802} - component: {fileID: 289439804} @@ -412,8 +817,9 @@ GameObject: --- !u!224 &289439802 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289439801} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -430,8 +836,9 @@ RectTransform: --- !u!114 &289439803 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289439801} m_Enabled: 1 m_EditorHideFlags: 0 @@ -444,8 +851,6 @@ MonoBehaviour: 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: 14 @@ -463,15 +868,18 @@ MonoBehaviour: --- !u!222 &289439804 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 289439801} + m_CullTransparentMesh: 0 --- !u!1 &414893603 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 414893607} - component: {fileID: 414893606} @@ -487,8 +895,9 @@ GameObject: --- !u!114 &414893604 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414893603} m_Enabled: 1 m_EditorHideFlags: 0 @@ -503,8 +912,9 @@ MonoBehaviour: --- !u!114 &414893605 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414893603} m_Enabled: 1 m_EditorHideFlags: 0 @@ -524,8 +934,9 @@ MonoBehaviour: --- !u!223 &414893606 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414893603} m_Enabled: 1 serializedVersion: 3 @@ -544,8 +955,9 @@ Canvas: --- !u!224 &414893607 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414893603} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -553,7 +965,7 @@ RectTransform: m_Children: - {fileID: 710011654} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -563,9 +975,10 @@ RectTransform: --- !u!1 &460515801 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 460515805} - component: {fileID: 460515804} @@ -582,15 +995,19 @@ GameObject: --- !u!23 &460515802 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460515801} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -603,6 +1020,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -614,8 +1032,9 @@ MeshRenderer: --- !u!135 &460515803 SphereCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460515801} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -626,40 +1045,121 @@ SphereCollider: --- !u!33 &460515804 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460515801} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &460515805 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460515801} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &460515806 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 460515801} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f985bf036f5416a45b9dd4e31bc85075, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &473102424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 473102425} + - component: {fileID: 473102427} + - component: {fileID: 473102426} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &473102425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 473102424} + 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: 68773941} + 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: -7.5, y: -0.5} + m_SizeDelta: {x: -35, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &473102426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 473102424} + 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Alpha +--- !u!222 &473102427 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 473102424} + m_CullTransparentMesh: 0 --- !u!1 &511564869 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 511564870} - component: {fileID: 511564871} @@ -673,8 +1173,9 @@ GameObject: --- !u!224 &511564870 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 511564869} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -683,18 +1184,19 @@ RectTransform: - {fileID: 1629711318} - {fileID: 271364533} m_Father: {fileID: 710011654} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -150} + m_AnchoredPosition: {x: 20, y: -210} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &511564871 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 511564869} m_Enabled: 1 m_EditorHideFlags: 0 @@ -743,15 +1245,14 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 --- !u!1 &626014313 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 626014314} - component: {fileID: 626014315} @@ -765,8 +1266,9 @@ GameObject: --- !u!224 &626014314 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626014313} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -775,18 +1277,19 @@ RectTransform: - {fileID: 1430210944} - {fileID: 1797877552} m_Father: {fileID: 710011654} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -120} + m_AnchoredPosition: {x: 20, y: -180} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &626014315 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 626014313} m_Enabled: 1 m_EditorHideFlags: 0 @@ -835,15 +1338,163 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 +--- !u!1 &672778406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 672778407} + - component: {fileID: 672778409} + - component: {fileID: 672778408} + m_Layer: 5 + m_Name: Item Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &672778407 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672778406} + 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: 1976701084} + 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!114 &672778408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672778406} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_RaycastTarget: 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 +--- !u!222 &672778409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672778406} + m_CullTransparentMesh: 0 +--- !u!1 &678982934 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 678982935} + - component: {fileID: 678982937} + - component: {fileID: 678982936} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &678982935 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678982934} + 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: 68773941} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 30} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &678982936 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678982934} + 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Transparent type +--- !u!222 &678982937 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678982934} + m_CullTransparentMesh: 0 --- !u!1 &708693249 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 708693250} - component: {fileID: 708693252} @@ -858,8 +1509,9 @@ GameObject: --- !u!224 &708693250 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 708693249} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -876,8 +1528,9 @@ RectTransform: --- !u!114 &708693251 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 708693249} m_Enabled: 1 m_EditorHideFlags: 0 @@ -890,8 +1543,6 @@ MonoBehaviour: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -900,18 +1551,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &708693252 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 708693249} + m_CullTransparentMesh: 0 --- !u!1 &710011653 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 710011654} - component: {fileID: 710011656} @@ -926,32 +1581,36 @@ GameObject: --- !u!224 &710011654 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710011653} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 68773941} - {fileID: 1031988592} - {fileID: 805460079} - {fileID: 1720252016} - {fileID: 626014314} - {fileID: 511564870} - {fileID: 2020665903} + - {fileID: 1099172686} m_Father: {fileID: 414893607} m_RootOrder: 0 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: -200, y: 0} - m_SizeDelta: {x: 200, y: 300} + m_SizeDelta: {x: 200, y: 360} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &710011655 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710011653} m_Enabled: 1 m_EditorHideFlags: 0 @@ -964,8 +1623,6 @@ MonoBehaviour: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -974,18 +1631,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &710011656 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 710011653} + m_CullTransparentMesh: 0 --- !u!1 &737425910 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 737425911} - component: {fileID: 737425913} @@ -1000,8 +1661,9 @@ GameObject: --- !u!224 &737425911 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737425910} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1018,8 +1680,9 @@ RectTransform: --- !u!114 &737425912 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737425910} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1032,8 +1695,6 @@ MonoBehaviour: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1042,18 +1703,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &737425913 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 737425910} + m_CullTransparentMesh: 0 --- !u!1 &773044137 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 773044138} - component: {fileID: 773044140} @@ -1068,8 +1733,9 @@ GameObject: --- !u!224 &773044138 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773044137} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1087,8 +1753,9 @@ RectTransform: --- !u!114 &773044139 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773044137} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1101,8 +1768,6 @@ MonoBehaviour: 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 @@ -1111,18 +1776,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &773044140 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 773044137} + m_CullTransparentMesh: 0 --- !u!1 &792257166 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 792257167} - component: {fileID: 792257169} @@ -1137,8 +1806,9 @@ GameObject: --- !u!224 &792257167 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 792257166} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1155,8 +1825,9 @@ RectTransform: --- !u!114 &792257168 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 792257166} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1169,8 +1840,6 @@ MonoBehaviour: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1179,18 +1848,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &792257169 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 792257166} + m_CullTransparentMesh: 0 --- !u!1 &805460078 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 805460079} - component: {fileID: 805460080} @@ -1204,8 +1877,9 @@ GameObject: --- !u!224 &805460079 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 805460078} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1214,18 +1888,19 @@ RectTransform: - {fileID: 286846893} - {fileID: 1618028263} m_Father: {fileID: 710011654} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -60} + m_AnchoredPosition: {x: 20, y: -120} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &805460080 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 805460078} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1274,15 +1949,158 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 +--- !u!1 &987933806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 987933807} + - component: {fileID: 987933810} + - component: {fileID: 987933809} + - component: {fileID: 987933808} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &987933807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987933806} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1783725269} + m_Father: {fileID: 2031999400} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &987933808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987933806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 11469021} + m_HandleRect: {fileID: 11469020} + m_Direction: 2 + m_Value: 0 + m_Size: 0.2 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &987933809 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987933806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!222 &987933810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 987933806} + m_CullTransparentMesh: 0 +--- !u!1 &1007128220 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1759613613979280798, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + m_PrefabInstance: {fileID: 1830349476} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1007128221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007128220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b335a5bc9945c9469568d1aba1b14e8, type: 3} + m_Name: + m_EditorClassIdentifier: + transparentTypeDropdown: {fileID: 68773942} + transparentToggle: {fileID: 1031988593} + topmostToggle: {fileID: 805460080} + maximizedToggle: {fileID: 1720252017} + minimizedToggle: {fileID: 626014315} + enableFileDropToggle: {fileID: 511564871} + droppedFilesText: {fileID: 1570950903} --- !u!1 &1031988591 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1031988592} - component: {fileID: 1031988593} @@ -1296,8 +2114,9 @@ GameObject: --- !u!224 &1031988592 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1031988591} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1306,18 +2125,19 @@ RectTransform: - {fileID: 773044138} - {fileID: 289439802} m_Father: {fileID: 710011654} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -30} + m_AnchoredPosition: {x: 20, y: -90} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &1031988593 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1031988591} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1366,15 +2186,84 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 +--- !u!1 &1099172685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099172686} + - component: {fileID: 1099172688} + - component: {fileID: 1099172687} + m_Layer: 5 + m_Name: RawImageGradation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1099172686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099172685} + 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: 710011654} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1099172687 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099172685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: 245e14b35db013e4ebe9d93b4ba4214a, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1099172688 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099172685} + m_CullTransparentMesh: 0 --- !u!1 &1119816993 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1119816994} - component: {fileID: 1119816996} @@ -1389,8 +2278,9 @@ GameObject: --- !u!224 &1119816994 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119816993} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1408,8 +2298,9 @@ RectTransform: --- !u!114 &1119816995 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119816993} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1422,8 +2313,6 @@ MonoBehaviour: 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 @@ -1432,18 +2321,109 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1119816996 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1119816993} + m_CullTransparentMesh: 0 +--- !u!1 &1247615769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1247615770} + - component: {fileID: 1247615773} + - component: {fileID: 1247615772} + - component: {fileID: 1247615771} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1247615770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247615769} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 222783621} + m_Father: {fileID: 2031999400} + 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: -18, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1247615771 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247615769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10917, 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 +--- !u!222 &1247615772 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247615769} + m_CullTransparentMesh: 0 +--- !u!114 &1247615773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1247615769} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 --- !u!1 &1430210943 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1430210944} - component: {fileID: 1430210946} @@ -1458,8 +2438,9 @@ GameObject: --- !u!224 &1430210944 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430210943} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1477,8 +2458,9 @@ RectTransform: --- !u!114 &1430210945 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430210943} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1491,8 +2473,6 @@ MonoBehaviour: 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 @@ -1501,18 +2481,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1430210946 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430210943} + m_CullTransparentMesh: 0 --- !u!1 &1570950901 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1570950902} - component: {fileID: 1570950904} @@ -1527,8 +2511,9 @@ GameObject: --- !u!224 &1570950902 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570950901} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1545,8 +2530,9 @@ RectTransform: --- !u!114 &1570950903 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570950901} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1559,8 +2545,6 @@ MonoBehaviour: 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: 14 @@ -1578,15 +2562,18 @@ MonoBehaviour: --- !u!222 &1570950904 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1570950901} + m_CullTransparentMesh: 0 --- !u!1 &1606972148 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1606972149} - component: {fileID: 1606972151} @@ -1601,8 +2588,9 @@ GameObject: --- !u!224 &1606972149 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606972148} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1619,8 +2607,9 @@ RectTransform: --- !u!114 &1606972150 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606972148} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1633,8 +2622,6 @@ MonoBehaviour: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1643,18 +2630,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1606972151 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1606972148} + m_CullTransparentMesh: 0 --- !u!1 &1618028262 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1618028263} - component: {fileID: 1618028265} @@ -1669,8 +2660,9 @@ GameObject: --- !u!224 &1618028263 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1618028262} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1687,8 +2679,9 @@ RectTransform: --- !u!114 &1618028264 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1618028262} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1701,8 +2694,6 @@ MonoBehaviour: 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: 14 @@ -1722,15 +2713,18 @@ MonoBehaviour: --- !u!222 &1618028265 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1618028262} + m_CullTransparentMesh: 0 --- !u!1 &1629711317 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1629711318} - component: {fileID: 1629711320} @@ -1745,8 +2739,9 @@ GameObject: --- !u!224 &1629711318 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629711317} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1764,8 +2759,9 @@ RectTransform: --- !u!114 &1629711319 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629711317} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1778,8 +2774,6 @@ MonoBehaviour: 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 @@ -1788,18 +2782,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1629711320 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629711317} + m_CullTransparentMesh: 0 --- !u!1 &1720252015 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1720252016} - component: {fileID: 1720252017} @@ -1813,8 +2811,9 @@ GameObject: --- !u!224 &1720252016 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720252015} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1823,18 +2822,19 @@ RectTransform: - {fileID: 1119816994} - {fileID: 94403580} m_Father: {fileID: 710011654} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -90} + m_AnchoredPosition: {x: 20, y: -150} m_SizeDelta: {x: 160, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &1720252017 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1720252015} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1883,15 +2883,50 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null m_IsOn: 0 +--- !u!1 &1783725268 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1783725269} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1783725269 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1783725268} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 11469020} + m_Father: {fileID: 987933807} + 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!1 &1797877551 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1797877552} - component: {fileID: 1797877554} @@ -1906,8 +2941,9 @@ GameObject: --- !u!224 &1797877552 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797877551} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1924,8 +2960,9 @@ RectTransform: --- !u!114 &1797877553 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797877551} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1938,8 +2975,6 @@ MonoBehaviour: 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: 14 @@ -1957,98 +2992,103 @@ MonoBehaviour: --- !u!222 &1797877554 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797877551} + m_CullTransparentMesh: 0 --- !u!1001 &1830349476 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 1130469147956506, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} + propertyPath: m_Name + value: WindowController + objectReference: {fileID: 0} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} + - target: {fileID: 4103792190641498, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} - - target: {fileID: 1130469147956506, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - propertyPath: m_Name - value: WindowController - objectReference: {fileID: 0} - target: {fileID: 114356007855815214, guid: 1a68be57637a61842b1d8ea2ccb106b5, - type: 2} + type: 3} propertyPath: _isTransparent value: 0 objectReference: {fileID: 0} - target: {fileID: 114356007855815214, guid: 1a68be57637a61842b1d8ea2ccb106b5, - type: 2} + type: 3} propertyPath: enableDragMove value: 1 objectReference: {fileID: 0} - target: {fileID: 114356007855815214, guid: 1a68be57637a61842b1d8ea2ccb106b5, - type: 2} + type: 3} propertyPath: _isTopmost value: 1 objectReference: {fileID: 0} + - target: {fileID: 1759613613979280798, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5359781937870936129, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: transparentType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5359781937870936129, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5359781937870936129, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: transparentTypes + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5359781937870936129, guid: 1a68be57637a61842b1d8ea2ccb106b5, + type: 3} + propertyPath: _isTransparent + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 2} - m_IsPrefabParent: 0 ---- !u!1 &1830349477 stripped -GameObject: - m_PrefabParentObject: {fileID: 1130469147956506, guid: 1a68be57637a61842b1d8ea2ccb106b5, - type: 2} - m_PrefabInternal: {fileID: 1830349476} ---- !u!114 &1830349478 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1830349477} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b335a5bc9945c9469568d1aba1b14e8, type: 3} - m_Name: - m_EditorClassIdentifier: - transparentToggle: {fileID: 1031988593} - topmostToggle: {fileID: 805460080} - maximizedToggle: {fileID: 1720252017} - minimizedToggle: {fileID: 626014315} - enableFileDropToggle: {fileID: 511564871} - droppedFilesText: {fileID: 1570950903} + m_SourcePrefab: {fileID: 100100000, guid: 1a68be57637a61842b1d8ea2ccb106b5, type: 3} --- !u!1 &1843713363 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1843713364} - component: {fileID: 1843713366} @@ -2063,8 +3103,9 @@ GameObject: --- !u!224 &1843713364 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843713363} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2081,8 +3122,9 @@ RectTransform: --- !u!114 &1843713365 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843713363} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2095,8 +3137,6 @@ MonoBehaviour: 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: 10901, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -2105,18 +3145,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1843713366 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1843713363} + m_CullTransparentMesh: 0 --- !u!1 &1909436760 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1909436763} - component: {fileID: 1909436762} @@ -2131,8 +3175,9 @@ GameObject: --- !u!114 &1909436761 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1909436760} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2149,8 +3194,9 @@ MonoBehaviour: --- !u!114 &1909436762 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1909436760} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2163,22 +3209,107 @@ MonoBehaviour: --- !u!4 &1909436763 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1909436760} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1976701083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1976701084} + - component: {fileID: 1976701085} + m_Layer: 5 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1976701084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976701083} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 672778407} + - {fileID: 2049771192} + - {fileID: 163927980} + m_Father: {fileID: 222783621} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1976701085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976701083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2109663825, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 672778408} + toggleTransition: 1 + graphic: {fileID: 2049771193} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 1 --- !u!1 &2020665902 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2020665903} - component: {fileID: 2020665905} @@ -2193,8 +3324,9 @@ GameObject: --- !u!224 &2020665903 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020665902} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2202,18 +3334,19 @@ RectTransform: m_Children: - {fileID: 1570950902} m_Father: {fileID: 710011654} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 20, y: 10} - m_SizeDelta: {x: -40, y: -170} + m_SizeDelta: {x: -40, y: -230} m_Pivot: {x: 0, y: 0} --- !u!114 &2020665904 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020665902} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2226,8 +3359,6 @@ MonoBehaviour: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -2236,18 +3367,199 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &2020665905 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020665902} + m_CullTransparentMesh: 0 +--- !u!1 &2031999399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2031999400} + - component: {fileID: 2031999403} + - component: {fileID: 2031999402} + - component: {fileID: 2031999401} + m_Layer: 5 + m_Name: Template + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2031999400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031999399} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1247615770} + - {fileID: 987933807} + m_Father: {fileID: 68773941} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: 0, y: 150} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &2031999401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031999399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 222783621} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1247615770} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 987933808} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2031999402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031999399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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 +--- !u!222 &2031999403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2031999399} + m_CullTransparentMesh: 0 +--- !u!1 &2049771191 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2049771192} + - component: {fileID: 2049771194} + - component: {fileID: 2049771193} + m_Layer: 5 + m_Name: Item Checkmark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2049771192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049771191} + 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: 1976701084} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2049771193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049771191} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 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 +--- !u!222 &2049771194 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049771191} + m_CullTransparentMesh: 0 --- !u!1 &2084589444 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2084589449} - component: {fileID: 2084589448} @@ -2263,27 +3575,35 @@ GameObject: --- !u!81 &2084589445 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_Enabled: 1 --- !u!124 &2084589446 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_Enabled: 1 --- !u!20 &2084589448 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -2305,30 +3625,32 @@ Camera: m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &2084589449 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2084589444} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -4} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2124152612 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2124152616} - component: {fileID: 2124152615} @@ -2344,17 +3666,21 @@ GameObject: --- !u!23 &2124152613 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2365,6 +3691,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2376,8 +3703,9 @@ MeshRenderer: --- !u!65 &2124152614 BoxCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2388,20 +3716,22 @@ BoxCollider: --- !u!33 &2124152615 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &2124152616 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2124152612} m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 45.000004, z: 0} diff --git a/Examples/Images.meta b/Examples/Images.meta new file mode 100644 index 0000000..68f95aa --- /dev/null +++ b/Examples/Images.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53bfe3bf37ad86a40b555951c81c97d6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Examples/Images/gradation.png b/Examples/Images/gradation.png new file mode 100644 index 0000000000000000000000000000000000000000..0f55927e96e5e4ecde2548dde7a088d2d72a4e80 GIT binary patch literal 24510 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 literal 0 HcmV?d00001 diff --git a/Examples/Images/gradation.png.meta b/Examples/Images/gradation.png.meta new file mode 100644 index 0000000..d03be02 --- /dev/null +++ b/Examples/Images/gradation.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 245e14b35db013e4ebe9d93b4ba4214a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prefabs/WindowController.prefab b/Prefabs/WindowController.prefab index d366125..2ae9485 100644 --- a/Prefabs/WindowController.prefab +++ b/Prefabs/WindowController.prefab @@ -1,25 +1,15 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1130469147956506} - m_IsPrefabParent: 1 ---- !u!1 &1130469147956506 +--- !u!1 &1759613613979280798 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - component: {fileID: 4103792190641498} - - component: {fileID: 114356007855815214} + - component: {fileID: 5900715206462665293} + - component: {fileID: 5359781937870936129} m_Layer: 0 m_Name: WindowController m_TagString: Untagged @@ -27,12 +17,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4103792190641498 +--- !u!4 &5900715206462665293 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1130469147956506} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759613613979280798} 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} @@ -40,12 +31,13 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &114356007855815214 +--- !u!114 &5359781937870936129 MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1130469147956506} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759613613979280798} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 13bcdf69fdb73ac4388722569c356a3f, type: 3} @@ -56,5 +48,6 @@ MonoBehaviour: _isMaximized: 0 _isMinimized: 0 _enableFileDrop: 0 - enableDragMove: 0 + enableDragMove: 1 + transparentType: 1 pickedColor: {r: 0, g: 0, b: 0, a: 0} diff --git a/Prefabs/WindowController.prefab.meta b/Prefabs/WindowController.prefab.meta index aa08d40..979bb32 100644 --- a/Prefabs/WindowController.prefab.meta +++ b/Prefabs/WindowController.prefab.meta @@ -1,9 +1,7 @@ fileFormatVersion: 2 guid: 1a68be57637a61842b1d8ea2ccb106b5 -timeCreated: 1557030387 -licenseType: Pro -NativeFormatImporter: - mainObjectFileID: 100100000 +PrefabImporter: + externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/README.md b/README.md index 4a83b08..4918e5c 100644 --- a/README.md +++ b/README.md @@ -59,18 +59,35 @@ If you use file dropping, there is the event named `OnFilesDropped(string[] file I'm sorry that the document hasn't prepared. Please read the sample project (^-^; + ## Attention - Since I haven't known how to get window handle certainly, rarely you might operate with another window. - (On the other hand, you can designate and operate other windows) - You might be forced to down the application if the window lost the "Close" button or if you cannot see the window since the window goes to somewhere. + +## About transparent types + +- Alpha + - Alpha channel is enabled. + - If you use touch instead of a mouse, hit testing may cause discomfort. + - Internally, this library uses DWM (Desktop Window Manager) APIs. +- ColorKey + - Only one color you specify will be transparent. + - Hit testing is natural for touch. + - The key color can be specified in WindowController.keyColor. + - The default color is 0x010001. + - Internally, this library uses the layered window. + ## FAQ + - The transparent application looks false on Editor - This is because of the specification. You have to build to confirm the transparent appearance. - You cannot let the Game window transparent. I suppose it's because something paints the background. - Normally the operation object is Game View. If the view is docked with other views, the object is the whole window. + ## License [![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png "CC0")](http://creativecommons.org/publicdomain/zero/1.0/deed.ja) @@ -88,6 +105,7 @@ However, there is no operation guarantee. ## Change log +* 2020/08/09 Fix DwmApi. Rename transparent type enum * 2020/06/07 Support Unity 2019. Add layered winodow method * 2019/01/23 Add file open dialog. Return the way to acquire self window to be active window standard * 2018/12/28 Add namespace, Modify the way to acquire self window to be PID standard @@ -161,6 +179,20 @@ files にはドロップされたファイルのパスが入ります。 - （むしろ別のウィンドウもタイトルやクラス名で指定して操作できます。） - 閉じるボタンがなくなったり、ウィンドウを見失った場合、タスクマネージャから終了する必要が出るかも知れません。 + +## 透明化方式について +- Alpha + - 半透明が有効です。 + - マウスでなく、タッチで操作するとアクティブかどうかの判別が難しく、不自然に感じる場合があります。 + - 内部的には DWM (Desktop Window Manager) APIを使用します。 +- ColorKey + - 指定した一色のみが透明として扱います。 + - タッチでも自然な操作となります。 + - WindowController.keyColor で色を指定できます。 + - デフォルトは 0x010001 です。 + - 内部的には Layered Window を使用します。 + + ## FAQ - エディタ上で透明にすると表示がおかしいのですが。 - すみません。仕様です。透明化はビルドしたものでご確認ください。 @@ -184,6 +216,7 @@ UniWinApi は、CC0（パブリックドメイン）としています。 ## 更新履歴 +* 2020/08/09 DwmApiの不具合を修正。透過モードの名前変更。 * 2020/06/07 Unity 2019 対応。Layered Window による透過モードを追加。 * 2019/01/23 ファイルオープンダイアログ追加。自ウィンドウ取得方法をアクティブウィンドウ基準に戻した。 * 2018/12/28 namespaceを設定、自ウィンドウ取得をPIDを基準とする方法に修正 diff --git a/Scripts/UniWinApi.cs b/Scripts/UniWinApi.cs index b8eaefa..e16ec88 100644 --- a/Scripts/UniWinApi.cs +++ b/Scripts/UniWinApi.cs @@ -65,9 +65,9 @@ public WindowHandle(IntPtr hwnd) // プロセスIDを取得 - IntPtr pid; + long pid; WinApi.GetWindowThreadProcessId(hWnd, out pid); // IL2CPP かつ x86 だとクラッシュ？ - ProcessId = pid.ToInt32(); + ProcessId = (int)pid; #if ENABLE_IL2CPP // プロセス名を取得 @@ -105,7 +105,7 @@ public override string ToString() /// /// 透明化の方式 /// - public enum TransparentType + public enum TransparentTypes { None = 0, Alpha = 1, @@ -155,8 +155,8 @@ public enum TransparentType /// /// ウィンドウ透過方式 /// - public TransparentType TransparentMethod = TransparentType.Alpha; - private TransparentType _currentTransparentType = TransparentType.Alpha; + public TransparentTypes TransparentType = TransparentTypes.Alpha; + private TransparentTypes _currentTransparentType = TransparentTypes.Alpha; /// /// Layered Windows で透過する色 @@ -274,10 +274,41 @@ public void SetSize(Vector2 size) hWnd, IntPtr.Zero, 0, 0, (int)size.x, (int)size.y, + WinApi.SWP_NOMOVE | WinApi.SWP_NOZORDER + | WinApi.SWP_FRAMECHANGED | WinApi.SWP_NOOWNERZORDER + | WinApi.SWP_NOACTIVATE | WinApi.SWP_ASYNCWINDOWPOS + ); + } + + /// + /// Send window resize event. + /// + protected void ResetSize() + { + if (!IsActive) return; + + // 今のサイズを記憶 + Vector2 size = GetSize(); + + // 1px横幅を広げて、リサイズイベントを強制的に起こす + WinApi.SetWindowPos( + hWnd, + IntPtr.Zero, + 0, 0, (int)size.x + 1, (int)size.y, WinApi.SWP_NOMOVE | WinApi.SWP_NOZORDER | WinApi.SWP_FRAMECHANGED | WinApi.SWP_NOOWNERZORDER | WinApi.SWP_NOACTIVATE | WinApi.SWP_ASYNCWINDOWPOS ); + + // 元のサイズに戻す。この時もリサイズイベントは発生するはず + WinApi.SetWindowPos( + hWnd, + IntPtr.Zero, + 0, 0, (int)size.x, (int)size.y, + WinApi.SWP_NOMOVE | WinApi.SWP_NOZORDER + | WinApi.SWP_FRAMECHANGED | WinApi.SWP_NOOWNERZORDER + | WinApi.SWP_NOACTIVATE | WinApi.SWP_ASYNCWINDOWPOS + ); } /// @@ -451,7 +482,7 @@ static public WindowHandle FindWindowByClass(string classname) } [MonoPInvokeCallback(typeof(WinApi.EnumWindowsDelegate))] - private static bool EnumCallback(IntPtr hWnd, IntPtr lParam) + private static bool EnumCallback(IntPtr hWnd, long lParam) { hWndList.Add(hWnd); return true; @@ -503,6 +534,7 @@ public void SetFocus() /// /// ウィンドウスタイルを監視して、替わっていれば戻す + /// また変化があればTrueを返す /// public void Update() { @@ -539,12 +571,12 @@ public void EnableTransparent(bool enable) // 枠無しウィンドウにする EnableBorderless(true); - switch (TransparentMethod) + switch (TransparentType) { - case TransparentType.Alpha: + case TransparentTypes.Alpha: EnableTransparentByDWM(); break; - case TransparentType.ColorKey: + case TransparentTypes.ColorKey: EnableTransparentBySetLayered(); break; } @@ -554,10 +586,10 @@ public void EnableTransparent(bool enable) // 現在の指定ではなく、透過にした時点の指定に基づいて無効化 switch (_currentTransparentType) { - case TransparentType.Alpha: + case TransparentTypes.Alpha: DisableTransparentByDWM(); break; - case TransparentType.ColorKey: + case TransparentTypes.ColorKey: DisableTransparentBySetLayered(); break; } @@ -569,10 +601,10 @@ public void EnableTransparent(bool enable) EnableClickThrough(false); } - _currentTransparentType = TransparentMethod; + _currentTransparentType = TransparentType; - // サイズ変更イベントを発生させる - SetSize(GetSize()); + // ウィンドウ枠の分サイズが変わった際、Unityにリサイズイベントを発生させないとサイズがずれる + ResetSize(); // ウィンドウ再描画 WinApi.ShowWindow(hWnd, WinApi.SW_SHOW); @@ -589,7 +621,7 @@ private void DisableTransparentByDWM() // 枠のみGlassにする // ※ 本来のウィンドウが何らかの範囲指定でGlassにしていた場合は、残念ながら表示が戻りません DwmApi.MARGINS margins = new DwmApi.MARGINS(0, 0, 0, 0); - DwmApi.DwmExtendFrameIntoClientArea(hWnd, margins); + DwmApi.DwmExtendFrameIntoClientArea(hWnd, ref margins); } /// @@ -600,14 +632,14 @@ private void EnableTransparentBySetLayered() #if UNITY_EDITOR // エディタの場合、設定すると描画が更新されなくなってしまう #else - Color32 color32 = ChromakeyColor; - WinApi.COLORREF cref = new WinApi.COLORREF(color32.r, color32.g, color32.b); - WinApi.SetLayeredWindowAttributes(hWnd, cref, 0xFF, WinApi.LWA_COLORKEY); - long exstyle = this.CurrentWindowExStyle; exstyle |= WinApi.WS_EX_LAYERED; this.CurrentWindowExStyle = exstyle; WinApi.SetWindowLong(hWnd, WinApi.GWL_EXSTYLE, this.CurrentWindowExStyle); + + Color32 color32 = ChromakeyColor; + WinApi.COLORREF cref = new WinApi.COLORREF(color32.r, color32.g, color32.b); + WinApi.SetLayeredWindowAttributes(hWnd, cref, 0xFF, WinApi.LWA_COLORKEY); #endif } @@ -620,7 +652,7 @@ private void DisableTransparentBySetLayered() // エディタの場合、設定すると描画が更新されなくなってしまう #else WinApi.COLORREF cref = new WinApi.COLORREF(0, 0, 0); - WinApi.SetLayeredWindowAttributes(hWnd, cref, 0xFF, 0x00); + WinApi.SetLayeredWindowAttributes(hWnd, cref, 0xFF, WinApi.LWA_ALPHA); long exstyle = this.CurrentWindowExStyle; exstyle &= ~WinApi.WS_EX_LAYERED; @@ -666,7 +698,7 @@ public void EnableClickThrough(bool isClickThrough) if (!IsActive) return; // Layered Window での透過時は、操作透過はOSで行われる - if (_currentTransparentType == TransparentType.ColorKey) return; + if (_currentTransparentType == TransparentTypes.ColorKey) return; #if UNITY_EDITOR // エディタの場合は操作の透過はやめておく diff --git a/Scripts/WindowController.cs b/Scripts/WindowController.cs index e7a3a15..bc9ed0c 100644 --- a/Scripts/WindowController.cs +++ b/Scripts/WindowController.cs @@ -122,7 +122,7 @@ public bool enableFileDrop /// /// 透過方式の指定 /// - [FormerlySerializedAs("transparentMethod")] public UniWinApi.TransparentType transparentType = UniWinApi.TransparentType.Alpha; + [FormerlySerializedAs("transparentMethod")] public UniWinApi.TransparentTypes transparentType = UniWinApi.TransparentTypes.Alpha; // カメラの背景をアルファゼロの黒に置き換えるため、本来の背景を保存しておく変数 private CameraClearFlags originalCameraClearFlags; @@ -139,6 +139,15 @@ public bool enableFileDrop /// private float opaqueThreshold = 0.1f; + /// + /// The key color when the transparent type is color-key + /// + public Color32 keyColor + { + get { return (uniWin != null) ? uniWin.ChromakeyColor : new Color32(1, 0, 1, 0); } + set { if (uniWin != null) { uniWin.ChromakeyColor = value; } } + } + /// /// Pixel color under the mouse pointer. (Read only) /// @@ -242,8 +251,8 @@ void Awake() uniWin = new UniWinApi(); // 透過方式の指定 - uniWin.TransparentMethod = transparentType; - + uniWin.TransparentType = transparentType; + // 自分のウィンドウを取得 FindMyWindow(); #endif @@ -294,6 +303,26 @@ void Update() if (uniWin != null) { uniWin.Update(); + + // 最小化は外部要因で解除されがちなのでチェック + bool stateChanged = false; + if (_isMinimized != uniWin.IsMinimized) + { + _isMinimized = uniWin.IsMinimized; + stateChanged = true; + } + + // 最大化もチェック + if (_isMaximized != uniWin.IsMaximized) + { + _isMaximized = uniWin.IsMaximized; + stateChanged = true; + } + + if (stateChanged) + { + StateChangedEvent(); + } } } @@ -534,7 +563,7 @@ private bool GetOnOpaquePixel(Vector2 mousePos) if (!_isTransparent) return true; // LayeredWindowならばクリックスルーはOSに任せるため、ウィンドウ内ならtrueを返しておく - if (transparentType == UniWinApi.TransparentType.ColorKey) return true; + if (transparentType == UniWinApi.TransparentTypes.ColorKey) return true; // 指定座標の描画結果を見て判断 try // WaitForEndOfFrame のタイミングで実行すればtryは無くても大丈夫？ @@ -666,7 +695,7 @@ void SetCameraBackground(bool isTransparent) if (isTransparent) { currentCamera.clearFlags = CameraClearFlags.SolidColor; - if (uniWin.TransparentMethod == UniWinApi.TransparentType.ColorKey) + if (uniWin.TransparentType == UniWinApi.TransparentTypes.ColorKey) { currentCamera.backgroundColor = uniWin.ChromakeyColor; } @@ -685,17 +714,17 @@ void SetCameraBackground(bool isTransparent) /// /// 透明化状態を切替 /// - /// - public void SetTransparent(bool transparent) + /// + public void SetTransparent(bool enabled) { //if (_isTransparent == transparent) return; - _isTransparent = transparent; - SetCameraBackground(transparent); + _isTransparent = enabled; + SetCameraBackground(enabled); if (uniWin != null) { - uniWin.EnableTransparent(transparent); + uniWin.EnableTransparent(enabled); } UpdateClickThrough(); StateChangedEvent(); @@ -704,15 +733,15 @@ public void SetTransparent(bool transparent) /// /// 透明化方式を設定 /// - /// - public void SetTransparentMethod(UniWinApi.TransparentType method) + /// + public void SetTransparentType(UniWinApi.TransparentTypes type) { //Debug.Log(Screen.width + " : " + Screen.height); //uniWin.SetPosition(Vector2.zero); // 透過モード変更 - uniWin.TransparentMethod = method; - transparentType = uniWin.TransparentMethod; + uniWin.TransparentType = type; + transparentType = uniWin.TransparentType; if (isTransparent) { // 透明化状態だったならば再度透明化を設定し直す diff --git a/Scripts/Wrappers b/Scripts/Wrappers index 3f1ba97..b314e45 160000 --- a/Scripts/Wrappers +++ b/Scripts/Wrappers @@ -1 +1 @@ -Subproject commit 3f1ba973303dd1650d808c46aaae93767a81e300 +Subproject commit b314e454c9226404c3112e59a6af553ae5162f9a diff --git a/version.txt b/version.txt index 44bb5d1..79a2734 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.4.1 \ No newline at end of file +0.5.0 \ No newline at end of file