From 1cb4038fea8c4f2f50e21c919414c63c2e47e091 Mon Sep 17 00:00:00 2001 From: jmaniuvc Date: Thu, 20 Mar 2025 16:24:11 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=9D=EC=97=85=EC=B0=BD=20Canvas=5FPopup?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/0.22.7.unity | 495 ++++++++---------- .../Studio/AssetTool/CustomAssetConnector.cs | 8 +- .../Scripts/Studio/Managers/EventConnector.cs | 29 +- .../Scripts/Studio/UI/Canvas/Canvas_Popup.cs | 9 + .../Studio/UI/Canvas/Canvas_Windows.cs | 19 - .../Studio/UI/Canvas/Canvas_Windows.cs.meta | 2 - .../TreeView/ScrollViewMenu_ImportExport.cs | 2 +- 7 files changed, 246 insertions(+), 318 deletions(-) delete mode 100644 Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs delete mode 100644 Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs.meta diff --git a/Assets/Scenes/0.22.7.unity b/Assets/Scenes/0.22.7.unity index 4aae1a26..978c28e1 100644 --- a/Assets/Scenes/0.22.7.unity +++ b/Assets/Scenes/0.22.7.unity @@ -812,7 +812,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -820,7 +820,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -860,11 +860,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -307 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2062,7 +2062,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_Pivot.x @@ -2114,15 +2114,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 272558446133743867, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_AnchoredPosition.x @@ -2158,23 +2158,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4926694108229151116, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4926694108229151116, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_AnchorMax.y - value: 0.999996 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7037160010838976915, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7037160010838976915, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7037160010838976915, guid: 82511e73cbe6181438fd98254170e476, type: 3} propertyPath: m_SizeDelta.x - value: -20 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2533,7 +2533,7 @@ RectTransform: - {fileID: 496682178} - {fileID: 451864585} - {fileID: 535540531} - m_Father: {fileID: 1187423310} + m_Father: {fileID: 545811781} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3049,9 +3049,9 @@ RectTransform: - {fileID: 1099009056} m_Father: {fileID: 394283230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 767.3595, y: -254.05751} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1416.52, y: 121.95996} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &480540347 @@ -3530,7 +3530,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -3538,7 +3538,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -3578,11 +3578,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -77 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3650,9 +3650,9 @@ RectTransform: - {fileID: 1809156808} m_Father: {fileID: 394283230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 767.3595, y: -79.105515} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1414.6205, y: 88.47803} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &502356474 @@ -3981,9 +3981,9 @@ RectTransform: - {fileID: 1647579089} m_Father: {fileID: 394283230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 767.3595, y: -2220.1094} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1499.436, y: 3670.678} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &538683121 @@ -4069,6 +4069,16 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6877782817204804254} + - {fileID: 7047787819321409150} + - {fileID: 6779400300325097680} + - {fileID: 394283230} + - {fileID: 670251071} + - {fileID: 1071471325} + - {fileID: 3320607267831372970} + - {fileID: 297039008} + - {fileID: 5012894770760959717} + - {fileID: 2627550138014681917} - {fileID: 483642140} - {fileID: 1615364367} - {fileID: 1439596647} @@ -4094,6 +4104,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9280d9db3dd3f748be73c34921dd1b8, type: 3} m_Name: m_EditorClassIdentifier: + panel_accessibilitysettings: {fileID: 0} + panel_colorpicker: {fileID: 0} + panel_componentlibrary: {fileID: 0} + panel_assetlibrary: {fileID: 0} + panel_interworkingdatalist: {fileID: 0} + panel_assetproperties: {fileID: 0} + panel_predefinedtype: {fileID: 0} + panel_objectinfo: {fileID: 0} + panel_objectalign: {fileID: 0} agvnodepopup: {fileID: 0} agvnodemodepopup: {fileID: 0} panel_tooltip: {fileID: 0} @@ -4582,7 +4601,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4590,7 +4609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -4630,11 +4649,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -123 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4894,7 +4913,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -4902,7 +4921,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -4942,11 +4961,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -31 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5551,7 +5570,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -5559,7 +5578,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -5599,11 +5618,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -123 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -6788,7 +6807,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -6796,7 +6815,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -6836,11 +6855,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -215 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7866,19 +7885,19 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1861513170031678913, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1861513170031678913, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1861513170031678913, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_SizeDelta.x - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_Pivot.x @@ -7930,15 +7949,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2790108437195061205, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchoredPosition.x @@ -7962,11 +7981,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3131647868451843046, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3131647868451843046, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchorMax.y - value: 0.9999977 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7067661970156389449, guid: 3335bcff08be47a4baa17f7fde07b24e, type: 3} propertyPath: m_AnchoredPosition.y @@ -8498,7 +8517,7 @@ RectTransform: m_Father: {fileID: 205918191} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -8672,7 +8691,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -8680,7 +8699,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -8720,11 +8739,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -261 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8872,7 +8891,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -8880,7 +8899,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -8920,11 +8939,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -77 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8960,139 +8979,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} m_PrefabInstance: {fileID: 606802390} m_PrefabAsset: {fileID: 0} ---- !u!1 &1187423309 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187423310} - - component: {fileID: 1187423314} - - component: {fileID: 1187423313} - - component: {fileID: 1187423312} - - component: {fileID: 1187423316} - m_Layer: 5 - m_Name: Canvas_Window - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1187423310 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187423309} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3320607267831372970} - - {fileID: 6877782817204804254} - - {fileID: 7047787819321409150} - - {fileID: 6779400300325097680} - - {fileID: 394283230} - - {fileID: 670251071} - - {fileID: 1071471325} - - {fileID: 297039008} - - {fileID: 5012894770760959717} - - {fileID: 2627550138014681917} - m_Father: {fileID: 1981809316} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1187423312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187423309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1187423313 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187423309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 1 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1187423314 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187423309} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &1187423316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187423309} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79743f1c37d29b54b9bf38654b053cec, type: 3} - m_Name: - m_EditorClassIdentifier: - panel_accessibilitysettings: {fileID: 0} - panel_colorpicker: {fileID: 0} - panel_componentlibrary: {fileID: 0} - panel_assetlibrary: {fileID: 0} - panel_interworkingdatalist: {fileID: 0} - panel_assetproperties: {fileID: 0} - panel_predefinedtype: {fileID: 0} - panel_objectinfo: {fileID: 0} - panel_objectalign: {fileID: 0} --- !u!1 &1195629653 GameObject: m_ObjectHideFlags: 0 @@ -12464,6 +12350,22 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 545811781} m_Modifications: + - target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4384165591848502711, guid: fd428f69696481b45a252d4ae922627b, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7320545626431284971, guid: fd428f69696481b45a252d4ae922627b, type: 3} propertyPath: m_Name value: Panel_AssetEdit @@ -13073,7 +12975,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -13081,7 +12983,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -13121,11 +13023,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -77 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13786,7 +13688,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -13794,7 +13696,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -13834,11 +13736,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -169 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -15123,9 +15025,9 @@ RectTransform: m_Father: {fileID: 1647579089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -40.880127, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1580286601 MonoBehaviour: @@ -15929,7 +15831,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -15937,7 +15839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -15977,11 +15879,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -31 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16059,7 +15961,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.x @@ -16067,7 +15969,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_SizeDelta.x @@ -16107,11 +16009,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.x - value: 153.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -31 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6291666171046911034, guid: 1bc9e043f1497cd4fbb8e241c26966c1, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16938,11 +16840,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1356985954954393889, guid: b7fb9c984bb17994ca59c9312245bd9e, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1356985954954393889, guid: b7fb9c984bb17994ca59c9312245bd9e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2668157905828016383, guid: b7fb9c984bb17994ca59c9312245bd9e, type: 3} propertyPath: m_Name @@ -18791,59 +18693,59 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 64.125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 64760076949688941, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 64.125 + value: 0 objectReference: {fileID: 0} - target: {fileID: 322483231651427656, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 495174325582678740, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 25.18 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1389570078669053979, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -61.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1670299614426086028, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_Pivot.x @@ -18927,39 +18829,39 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1733309631157010962, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -121.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2815481224497491875, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 38.26 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 9.52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3263565422826670613, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 19.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 13.83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3759358454249268061, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 19.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y @@ -18971,7 +18873,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 19.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3963263371466394407, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x @@ -18983,59 +18885,59 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 217.875 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4383763207084752213, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 8.972496 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4734915358213925375, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -9.55 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 9.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4815791146998578607, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 19.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 141 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6150045885068456404, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -181.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y @@ -19047,7 +18949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 27.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6823706270529186750, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x @@ -19059,35 +18961,35 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: -36 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6929874536063340863, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: -53.639984 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.x - value: 217.875 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7422702907034326837, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_AnchoredPosition.y - value: -14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.x - value: 13.83 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8351774369622538081, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_SizeDelta.y - value: 19.1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9168477493309714298, guid: db3e2e7e03663874a9b223063e7ea2d9, type: 3} propertyPath: m_Name @@ -19132,9 +19034,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1791423234} - - {fileID: 1187423310} - - {fileID: 1602773718} - {fileID: 545811781} + - {fileID: 1602773718} - {fileID: 574297195} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -20523,7 +20424,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 244072468918833335, guid: 029e40b61e54c29428cb83bfc78fcfcb, type: 3} propertyPath: m_AnchorMax.x @@ -23383,12 +23284,36 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 430074430064432629, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_Name value: Panel_PredefinedType objectReference: {fileID: 0} + - target: {fileID: 4517638182175266178, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517638182175266178, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517638182175266178, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517638182175266178, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5825340999620663738, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5825340999620663738, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -23439,15 +23364,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6423067481742790457, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} propertyPath: m_AnchoredPosition.x @@ -23469,6 +23394,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6862402591765169615, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6862402591765169615, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6862402591765169615, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6862402591765169615, guid: 1a4a3a308b4f164409014c76c9164cb5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -29466,7 +29407,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5790197470390812593} - m_Father: {fileID: 1187423310} + m_Father: {fileID: 545811781} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -29517,7 +29458,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1187423310} + m_TransformParent: {fileID: 545811781} m_Modifications: - target: {fileID: 1047865254305374389, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_Name @@ -29609,15 +29550,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4604531885542700645, guid: dc00f08d5af79bf438ee98d2587e2b8a, type: 3} propertyPath: m_AnchoredPosition.x @@ -29751,7 +29692,7 @@ RectTransform: - {fileID: 7635026778084752981} - {fileID: 6553320678001530876} - {fileID: 2479832392127339957} - m_Father: {fileID: 1187423310} + m_Father: {fileID: 545811781} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -30039,7 +29980,7 @@ RectTransform: - {fileID: 5533699144896118009} - {fileID: 7528326959283957096} - {fileID: 4779764822393240170} - m_Father: {fileID: 1187423310} + m_Father: {fileID: 545811781} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -30186,7 +30127,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 141, y: -13.55} - m_SizeDelta: {x: 282, y: 27.1} + m_SizeDelta: {x: 282, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7239713819191536078 MonoBehaviour: @@ -31124,7 +31065,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 161.97249, y: -9.55} - m_SizeDelta: {x: 240, y: 19.1} + m_SizeDelta: {x: 240, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7829205138695445807 MonoBehaviour: diff --git a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs index 4fd8057e..7bf61a0c 100644 --- a/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs +++ b/Assets/Scripts/Studio/AssetTool/CustomAssetConnector.cs @@ -45,10 +45,10 @@ namespace XED.Asset } void Start() { - assetScrollRect = FindSingle().panel_assetlibrary.scrollRect; - assetScrollView = FindSingle().panel_assetlibrary.scrollView; - componentScrollView = FindSingle().panel_componentlibrary.scrollView; - InterworkingDataScrollView = FindSingle().panel_interworkingdatalist.scrollView; + assetScrollRect = FindSingle().panel_assetlibrary.scrollRect; + assetScrollView = FindSingle().panel_assetlibrary.scrollView; + componentScrollView = FindSingle().panel_componentlibrary.scrollView; + InterworkingDataScrollView = FindSingle().panel_interworkingdatalist.scrollView; renderObjectPrefab = Resources.Load("Prefabs/PRF_RenderObject"); assetScrollRect.onDragBegin.AddListener(OnAssetSelected); diff --git a/Assets/Scripts/Studio/Managers/EventConnector.cs b/Assets/Scripts/Studio/Managers/EventConnector.cs index 5452311f..04a71dba 100644 --- a/Assets/Scripts/Studio/Managers/EventConnector.cs +++ b/Assets/Scripts/Studio/Managers/EventConnector.cs @@ -21,7 +21,6 @@ namespace XED.Manage var canvas_static = FindSingle(); var canvas_Popup = FindSingle(); - var canvas_Windows = FindSingle(); var canvas_DragArea = FindSingle(); var agvManager = FindSingle(); @@ -33,9 +32,9 @@ namespace XED.Manage var customAssetConnector = FindSingle(); var renderObjectHandler = FindFirstObjectByType(); - GameObject assetWindow = canvas_Windows.panel_assetlibrary.gameObject; + GameObject assetWindow = canvas_Popup.panel_assetlibrary.gameObject; SaveLoadFBXData saveLoadFBXData = customAssetConnector.saveLoadFBXData; - GameObject componentWindow = canvas_Windows.panel_componentlibrary.gameObject; + GameObject componentWindow = canvas_Popup.panel_componentlibrary.gameObject; UIConnection(); StatusConnection(); @@ -45,22 +44,22 @@ namespace XED.Manage void ManagerConnection() { customAssetConnector.onRemoveObjects += renderObjectHandler.DeselectAll; - customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectinfo.gameObject.SetActive(true); }); - customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Windows.panel_objectalign.gameObject.SetActive(true); }); - customAssetConnector.onSelectObjects += canvas_Windows.panel_objectinfo.SetObjectInfo; - customAssetConnector.onRemoveObjects += canvas_Windows.panel_objectinfo.ResetObjectInfo; - customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectinfo.gameObject.SetActive(false); }); - customAssetConnector.onDeselectObjects += (() => { canvas_Windows.panel_objectalign.gameObject.SetActive(false); }); + customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectinfo.gameObject.SetActive(true); }); + customAssetConnector.onSelectObjects += ((name, objects) => { canvas_Popup.panel_objectalign.gameObject.SetActive(true); }); + customAssetConnector.onSelectObjects += canvas_Popup.panel_objectinfo.SetObjectInfo; + customAssetConnector.onRemoveObjects += canvas_Popup.panel_objectinfo.ResetObjectInfo; + customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectinfo.gameObject.SetActive(false); }); + customAssetConnector.onDeselectObjects += (() => { canvas_Popup.panel_objectalign.gameObject.SetActive(false); }); //customAssetConnector.onAssetDropped += (() => componentWindow.SetActive(true)); - renderObjectHandler.onDeselectAll += canvas_Windows.panel_objectinfo.ResetObjectInfo; - renderObjectHandler.onTransformChanged += canvas_Windows.panel_objectinfo.OnTransformChanged; + renderObjectHandler.onDeselectAll += canvas_Popup.panel_objectinfo.ResetObjectInfo; + renderObjectHandler.onTransformChanged += canvas_Popup.panel_objectinfo.OnTransformChanged; renderObjectHandler.onDragBegin += canvas_DragArea.panel_draghandler.OnBeginDrag; renderObjectHandler.onDragEnd += canvas_DragArea.panel_draghandler.OnEndDrag; renderObjectHandler.onDragForceEnd += canvas_DragArea.panel_draghandler.ForceEndDrag; saveLoadFBXData.onBeginLoadAsset += (() => assetWindow.SetActive(true)); - canvas_Windows.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; + canvas_Popup.panel_objectinfo.onTransformChanged += renderObjectHandler.OnTransformChanged; agvNodeManager.onNodeConnectionAdded += agvNodeLinkManager.AddLine; agvNodeManager.onNodeConnectionUpdated += agvNodeLinkManager.UpdateLine; @@ -115,9 +114,9 @@ namespace XED.Manage canvas_static.panel_toolbar.onClickAGVMode += () => statusPanel.SetMode(ModePanel.ProgramMode.AGVPathDrawing); canvas_static.panel_toolbar.onClickStartDrawWall += ()=>statusPanel.SetMode(ModePanel.ProgramMode.WallDrawing); - canvas_Windows.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Windows.panel_assetproperties.Open); - canvas_Windows.panel_assetproperties.onClickPreview += canvas_Windows.panel_predefinedtype.Open; - canvas_Windows.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData; + canvas_Popup.panel_assetlibrary.scrollView.onSelect.AddListener(canvas_Popup.panel_assetproperties.Open); + canvas_Popup.panel_assetproperties.onClickPreview += canvas_Popup.panel_predefinedtype.Open; + canvas_Popup.panel_assetproperties.onOpen += saveLoadFBXData.GetCustomAssetData; } void StatusConnection() diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs index 3ad05e34..254fdee3 100644 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs +++ b/Assets/Scripts/Studio/UI/Canvas/Canvas_Popup.cs @@ -9,6 +9,15 @@ namespace XED { public class Canvas_Popup : CanvasBase { + public Panel_AccessibilitySettings panel_accessibilitysettings; + public Panel_ColorPicker panel_colorpicker; + public Panel_ComponentLibrary panel_componentlibrary; + public Panel_AssetLibrary panel_assetlibrary; + public Panel_InterworkingDataList panel_interworkingdatalist; + public Panel_AssetProperties panel_assetproperties; + public Panel_PredefinedType panel_predefinedtype; + public Panel_ObjectInfo panel_objectinfo; + public Panel_ObjectAlign panel_objectalign; public AGVNodePopup agvnodepopup; public AGVNodeModePopup agvnodemodepopup; public Panel_Tooltip panel_tooltip; diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs b/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs deleted file mode 100644 index 6dd28990..00000000 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs +++ /dev/null @@ -1,19 +0,0 @@ -using UnityEngine; -using XRLib; -using XRLib.UI; - -namespace XED.UI -{ - public class Canvas_Windows : CanvasBase - { - public Panel_AccessibilitySettings panel_accessibilitysettings; - public Panel_ColorPicker panel_colorpicker; - public Panel_ComponentLibrary panel_componentlibrary; - public Panel_AssetLibrary panel_assetlibrary; - public Panel_InterworkingDataList panel_interworkingdatalist; - public Panel_AssetProperties panel_assetproperties; - public Panel_PredefinedType panel_predefinedtype; - public Panel_ObjectInfo panel_objectinfo; - public Panel_ObjectAlign panel_objectalign; - } -} diff --git a/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs.meta b/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs.meta deleted file mode 100644 index b062102c..00000000 --- a/Assets/Scripts/Studio/UI/Canvas/Canvas_Windows.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 79743f1c37d29b54b9bf38654b053cec \ No newline at end of file diff --git a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs index 5d9f4e29..539cd9c7 100644 --- a/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs +++ b/Assets/Scripts/Studio/UI/TreeView/ScrollViewMenu_ImportExport.cs @@ -37,7 +37,7 @@ namespace XED.UI var customAssetConnector = FindSingle(); btnExport.onClick.AddListener(customAssetConnector.assetDataHandler.SaveSelectedAssetDatasToLocal); btnImport.onClick.AddListener(customAssetConnector.assetDataHandler.LoadLocalAssetDatas); - scrollRect = FindSingle().panel_assetlibrary.scrollRect; + scrollRect = FindSingle().panel_assetlibrary.scrollRect; scrollRect.menuPopup = gameObject; SetActive(false); }