diff --git a/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta b/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta index fd84162f..4f6ea2cd 100644 --- a/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta +++ b/Assets/Image/UI/Panel_ObjectDetails/Rectangle 64.png.meta @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 15, z: 0, w: 15} + spriteBorder: {x: 16, y: 16, z: 16, w: 16} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/Prefabs/AAA/Panel_APISetting.prefab b/Assets/Prefabs/AAA/Panel_APISetting.prefab index 6f1cd578..3cdd029b 100644 --- a/Assets/Prefabs/AAA/Panel_APISetting.prefab +++ b/Assets/Prefabs/AAA/Panel_APISetting.prefab @@ -227,13 +227,12 @@ RectTransform: m_Children: - {fileID: 7330605729473467856} - {fileID: 9010945254377347865} - - {fileID: 4967853432408004068} m_Father: {fileID: 4536383871410992554} 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: -15} - m_SizeDelta: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: -17.5} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6653012135198171495 CanvasRenderer: @@ -289,10 +288,10 @@ RectTransform: - {fileID: 6402120625795957218} m_Father: {fileID: 6691755070911261169} 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: 25} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 286.5, y: -12.5} + m_SizeDelta: {x: 573, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1131445508177178942 CanvasRenderer: @@ -655,7 +654,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -663,7 +662,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!1 &3905365314351557767 GameObject: m_ObjectHideFlags: 0 @@ -693,6 +692,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3538150327327642966} + - {fileID: 4967853432408004068} - {fileID: 1003142542951200780} m_Father: {fileID: 6023788723247703297} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1385,6 +1385,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3} m_Name: m_EditorClassIdentifier: + header: {fileID: 0} Area: {fileID: 0} state: 0 resizeDirection: 0 @@ -1460,7 +1461,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1468,7 +1469,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &937857520092457360 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1638,7 +1639,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4908418670581876778} - m_Father: {fileID: 3538150327327642966} + m_Father: {fileID: 4536383871410992554} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1749,7 +1750,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Prefabs/AAA/Panel_AssetSetting.prefab b/Assets/Prefabs/AAA/Panel_AssetSetting.prefab index d5347dda..4ffc84b0 100644 --- a/Assets/Prefabs/AAA/Panel_AssetSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_AssetSetting.prefab @@ -34,8 +34,8 @@ RectTransform: 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: 10, y: 10} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 10, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8309550141671835622 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -74,7 +74,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!1 &702700444486434170 GameObject: m_ObjectHideFlags: 0 @@ -610,8 +610,8 @@ RectTransform: 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: -10, y: -10} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1403518221973745675 GameObject: @@ -769,7 +769,7 @@ MonoBehaviour: m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 6259202582067685909} m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 1 m_HorizontalScrollbarSpacing: -3 m_VerticalScrollbarSpacing: -3 m_OnValueChanged: @@ -1219,7 +1219,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -6, y: -1} - m_SizeDelta: {x: 15, y: -18} + m_SizeDelta: {x: 10, y: -18} m_Pivot: {x: 1, y: 1} --- !u!222 &9160260616006377246 CanvasRenderer: @@ -1249,7 +1249,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1258,7 +1258,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &8289467855309802760 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1556,7 +1556,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: 0} + m_SizeDelta: {x: -12, y: -12} m_Pivot: {x: 0, y: 1} --- !u!222 &2371798722619063628 CanvasRenderer: @@ -1985,8 +1985,8 @@ RectTransform: 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: 10, y: 10} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 10, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2110257543691917756 CanvasRenderer: @@ -2016,7 +2016,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2025,7 +2025,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!1 &3708687645258132285 GameObject: m_ObjectHideFlags: 0 @@ -2183,7 +2183,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -12, y: 0} + m_SizeDelta: {x: -12, y: -12} m_Pivot: {x: 0, y: 1} --- !u!222 &8339613067977679465 CanvasRenderer: @@ -3253,7 +3253,7 @@ MonoBehaviour: m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 8289467855309802760} m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 1 m_HorizontalScrollbarSpacing: -3 m_VerticalScrollbarSpacing: -3 m_OnValueChanged: @@ -4105,8 +4105,8 @@ RectTransform: 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: -10, y: -10} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7893358657509629700 GameObject: @@ -4358,7 +4358,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -6, y: -1} - m_SizeDelta: {x: 15, y: -18} + m_SizeDelta: {x: 10, y: -18} m_Pivot: {x: 1, y: 1} --- !u!222 &2134743442907977708 CanvasRenderer: @@ -4388,7 +4388,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4397,7 +4397,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &6259202582067685909 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/AAA/Panel_Hierarchy.prefab b/Assets/Prefabs/AAA/Panel_Hierarchy.prefab index 22fba8e9..9401d0d4 100644 --- a/Assets/Prefabs/AAA/Panel_Hierarchy.prefab +++ b/Assets/Prefabs/AAA/Panel_Hierarchy.prefab @@ -418,8 +418,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 208.94434, y: -154.58943} - m_SizeDelta: {x: 379.8972, y: 309.1779} + m_AnchoredPosition: {x: 208.94, y: -239.58} + m_SizeDelta: {x: 379.8972, y: 309.17786} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3101259340876616321 MonoBehaviour: @@ -495,7 +495,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -0.00034048597, y: 0.00004343147} + m_AnchoredPosition: {x: -0.00034048597, y: 0.00037136686} m_SizeDelta: {x: 282.99957, y: 2} m_Pivot: {x: 0, y: 1} --- !u!114 &8511847140840865857 @@ -1365,8 +1365,8 @@ RectTransform: 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: -42.497} - m_SizeDelta: {x: 0, y: -84.995} + m_AnchoredPosition: {x: 0, y: 0.00024414062} + m_SizeDelta: {x: 0, y: -0.00048828} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5647078525317105949 GameObject: @@ -1515,6 +1515,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3} m_Name: m_EditorClassIdentifier: + header: {fileID: 0} Area: {fileID: 0} state: 0 resizeDirection: 0 @@ -2402,7 +2403,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1456553455777821898} m_Direction: 2 m_Value: 0 - m_Size: 0.9999941 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab b/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab index 571383a0..1c9108f5 100644 --- a/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab +++ b/Assets/Prefabs/AAA/Panel_MQTTSetting.prefab @@ -196,7 +196,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.9529412, g: 0.9529412, b: 0.9529412, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -577,6 +577,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9c6f8c6f0c462a4ab09d615c0d0db6c, type: 3} m_Name: m_EditorClassIdentifier: + header: {fileID: 0} Area: {fileID: 0} state: 0 resizeDirection: 0 @@ -613,6 +614,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4848133918839780870} + - {fileID: 7327674350019384346} - {fileID: 6332159985048176241} m_Father: {fileID: 5526574206638406261} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -655,10 +657,10 @@ RectTransform: - {fileID: 6015914731583279537} m_Father: {fileID: 6170707829871908408} 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: 25} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 286.5, y: -12.5} + m_SizeDelta: {x: 573, y: 25} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2662598266185177957 CanvasRenderer: @@ -802,7 +804,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -810,7 +812,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &1203360775691188198 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1283,13 +1285,12 @@ RectTransform: m_Children: - {fileID: 2696512530260289514} - {fileID: 8873675426699895800} - - {fileID: 7327674350019384346} m_Father: {fileID: 6065905194162777582} 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: -15} - m_SizeDelta: {x: 0, y: 30} + m_AnchoredPosition: {x: 0, y: -17.5} + m_SizeDelta: {x: 0, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4231886982462112987 CanvasRenderer: @@ -1377,7 +1378,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: f1cb146576e19ef44982428e10cc95cc, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1385,7 +1386,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!1 &8220806185953508040 GameObject: m_ObjectHideFlags: 0 @@ -1416,7 +1417,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6269155309670994543} - m_Father: {fileID: 4848133918839780870} + m_Father: {fileID: 6065905194162777582} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs index 214a7e08..7d31db50 100644 --- a/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs +++ b/Assets/Scripts/Studio/UI/Tag/UI_GUIWindow.cs @@ -78,6 +78,7 @@ namespace Studio.UI onEnableEvent += (a)=>InitializeState(); onDisableEvent += (a) => InitializeState(); } + public void OnPointerDown(PointerEventData eventData) { SetPanelAsLastSibling(); @@ -86,6 +87,8 @@ namespace Studio.UI public void OnPointerUp(PointerEventData eventData) { + var resizeDirection = GetHandleDirection(); + cursorManager.ChangeMouseCursor(resizeDirection); InitializeState(); } @@ -350,6 +353,7 @@ namespace Studio.UI { state = GUIState.None; SetPanelPivot(initialPivot); + } public void SetPanelAsLastSibling()