From 5d125f70ff61e5f2bf78863f6e463615b84711c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Fri, 25 Jul 2025 20:08:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/Editor Handlers/UIEditorSkinHelper.cs | 111 ----------------- Editor/{Editor Handlers.meta => Helper.meta} | 0 .../ExtensionHelper.cs | 2 +- .../ExtensionHelper.cs.meta | 0 Editor/Helper/GUISkinHelper.cs | 114 ++++++++++++++++++ .../GUISkinHelper.cs.meta} | 0 Editor/UX/UXButtonEditor.cs | 10 +- 7 files changed, 120 insertions(+), 117 deletions(-) delete mode 100644 Editor/Editor Handlers/UIEditorSkinHelper.cs rename Editor/{Editor Handlers.meta => Helper.meta} (100%) rename Editor/{Editor Handlers => Helper}/ExtensionHelper.cs (95%) rename Editor/{Editor Handlers => Helper}/ExtensionHelper.cs.meta (100%) create mode 100644 Editor/Helper/GUISkinHelper.cs rename Editor/{Editor Handlers/UIEditorSkinHelper.cs.meta => Helper/GUISkinHelper.cs.meta} (100%) diff --git a/Editor/Editor Handlers/UIEditorSkinHelper.cs b/Editor/Editor Handlers/UIEditorSkinHelper.cs deleted file mode 100644 index 9dedead..0000000 --- a/Editor/Editor Handlers/UIEditorSkinHelper.cs +++ /dev/null @@ -1,111 +0,0 @@ - -using System; -using UnityEngine; -using UnityEditor; -public static class UIEditorSkinHelper -{ - public static void DrawProperty(SerializedProperty property, GUISkin skin, string content) - { - GUILayout.BeginHorizontal(EditorStyles.helpBox); - - EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); - EditorGUILayout.PropertyField(property, new GUIContent("")); - - GUILayout.EndHorizontal(); - } - - public static void DrawProperty(SerializedProperty property, GUISkin skin, string content, string btnName, Action callback) - { - GUILayout.BeginHorizontal(EditorStyles.helpBox); - if (GUILayout.Button(btnName)) - { - callback?.Invoke(); - } - EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); - EditorGUILayout.PropertyField(property, new GUIContent("")); - - GUILayout.EndHorizontal(); - } - - public static void DrawPropertyPlain(SerializedProperty property, GUISkin skin, string content) - { - GUILayout.BeginHorizontal(); - - EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); - EditorGUILayout.PropertyField(property, new GUIContent("")); - - GUILayout.EndHorizontal(); - } - - public static void DrawPropertyCW(SerializedProperty property, GUISkin skin, string content, float width) - { - GUILayout.BeginHorizontal(EditorStyles.helpBox); - - EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(width)); - EditorGUILayout.PropertyField(property, new GUIContent("")); - - GUILayout.EndHorizontal(); - } - - public static void DrawPropertyPlainCW(SerializedProperty property, GUISkin skin, string content, float width) - { - GUILayout.BeginHorizontal(); - - EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(width)); - EditorGUILayout.PropertyField(property, new GUIContent("")); - - GUILayout.EndHorizontal(); - } - - public static int DrawTabs(int tabIndex, GUIContent[] tabs, GUISkin skin) - { - GUILayout.BeginHorizontal(); - GUILayout.Space(17); - - tabIndex = GUILayout.Toolbar(tabIndex, tabs, skin.FindStyle("Tab Indicator")); - - GUILayout.EndHorizontal(); - GUILayout.Space(-40); - GUILayout.BeginHorizontal(); - GUILayout.Space(17); - - return tabIndex; - } - - public static void DrawComponentHeader(GUISkin skin, string content) - { - GUILayout.BeginHorizontal(); - GUILayout.Box(new GUIContent(""), skin.FindStyle(content)); - GUILayout.EndHorizontal(); - GUILayout.Space(-42); - } - - public static void DrawHeader(GUISkin skin, string content, int space) - { - GUILayout.Space(space); - GUILayout.Box(new GUIContent(""), skin.FindStyle(content)); - } - - public static bool DrawToggle(bool value, GUISkin skin, string content) - { - GUILayout.BeginHorizontal(EditorStyles.helpBox); - - value = GUILayout.Toggle(value, new GUIContent(content), skin.FindStyle("Toggle")); - value = GUILayout.Toggle(value, new GUIContent(""), skin.FindStyle("Toggle Helper")); - - GUILayout.EndHorizontal(); - return value; - } - - public static bool DrawTogglePlain(bool value, GUISkin skin, string content) - { - GUILayout.BeginHorizontal(); - - value = GUILayout.Toggle(value, new GUIContent(content), skin.FindStyle("Toggle")); - value = GUILayout.Toggle(value, new GUIContent(""), skin.FindStyle("Toggle Helper")); - - GUILayout.EndHorizontal(); - return value; - } -} - diff --git a/Editor/Editor Handlers.meta b/Editor/Helper.meta similarity index 100% rename from Editor/Editor Handlers.meta rename to Editor/Helper.meta diff --git a/Editor/Editor Handlers/ExtensionHelper.cs b/Editor/Helper/ExtensionHelper.cs similarity index 95% rename from Editor/Editor Handlers/ExtensionHelper.cs rename to Editor/Helper/ExtensionHelper.cs index ca881bc..d5f27f2 100644 --- a/Editor/Editor Handlers/ExtensionHelper.cs +++ b/Editor/Helper/ExtensionHelper.cs @@ -3,7 +3,7 @@ using System.Reflection; using UnityEditor; using UnityEngine; -namespace AlicizaX.UI.Extension.Editor.Editor.Editor_Handlers +namespace AlicizaX.UI.Extension.Editor { public static class ExtensionHelper { diff --git a/Editor/Editor Handlers/ExtensionHelper.cs.meta b/Editor/Helper/ExtensionHelper.cs.meta similarity index 100% rename from Editor/Editor Handlers/ExtensionHelper.cs.meta rename to Editor/Helper/ExtensionHelper.cs.meta diff --git a/Editor/Helper/GUISkinHelper.cs b/Editor/Helper/GUISkinHelper.cs new file mode 100644 index 0000000..36c8b55 --- /dev/null +++ b/Editor/Helper/GUISkinHelper.cs @@ -0,0 +1,114 @@ +namespace AlicizaX.UI.Extension.Editor +{ + using System; + using UnityEngine; + using UnityEditor; + + public static class GUISkinHelper + { + public static void DrawProperty(SerializedProperty property, GUISkin skin, string content) + { + GUILayout.BeginHorizontal(EditorStyles.helpBox); + + EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); + EditorGUILayout.PropertyField(property, new GUIContent("")); + + GUILayout.EndHorizontal(); + } + + public static void DrawProperty(SerializedProperty property, GUISkin skin, string content, string btnName, Action callback) + { + GUILayout.BeginHorizontal(EditorStyles.helpBox); + if (GUILayout.Button(btnName)) + { + callback?.Invoke(); + } + + EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); + EditorGUILayout.PropertyField(property, new GUIContent("")); + + GUILayout.EndHorizontal(); + } + + public static void DrawPropertyPlain(SerializedProperty property, GUISkin skin, string content) + { + GUILayout.BeginHorizontal(); + + EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(120)); + EditorGUILayout.PropertyField(property, new GUIContent("")); + + GUILayout.EndHorizontal(); + } + + public static void DrawPropertyCW(SerializedProperty property, GUISkin skin, string content, float width) + { + GUILayout.BeginHorizontal(EditorStyles.helpBox); + + EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(width)); + EditorGUILayout.PropertyField(property, new GUIContent("")); + + GUILayout.EndHorizontal(); + } + + public static void DrawPropertyPlainCW(SerializedProperty property, GUISkin skin, string content, float width) + { + GUILayout.BeginHorizontal(); + + EditorGUILayout.LabelField(new GUIContent(content), skin.FindStyle("Text"), GUILayout.Width(width)); + EditorGUILayout.PropertyField(property, new GUIContent("")); + + GUILayout.EndHorizontal(); + } + + public static int DrawTabs(int tabIndex, GUIContent[] tabs, GUISkin skin) + { + GUILayout.BeginHorizontal(); + GUILayout.Space(17); + + tabIndex = GUILayout.Toolbar(tabIndex, tabs, skin.FindStyle("Tab Indicator")); + + GUILayout.EndHorizontal(); + GUILayout.Space(-40); + GUILayout.BeginHorizontal(); + GUILayout.Space(17); + + return tabIndex; + } + + public static void DrawComponentHeader(GUISkin skin, string content) + { + GUILayout.BeginHorizontal(); + GUILayout.Box(new GUIContent(""), skin.FindStyle(content)); + GUILayout.EndHorizontal(); + GUILayout.Space(-42); + } + + public static void DrawHeader(GUISkin skin, string content, int space) + { + GUILayout.Space(space); + GUILayout.Box(new GUIContent(""), skin.FindStyle(content)); + } + + public static bool DrawToggle(bool value, GUISkin skin, string content) + { + GUILayout.BeginHorizontal(EditorStyles.helpBox); + + value = GUILayout.Toggle(value, new GUIContent(content), skin.FindStyle("Toggle")); + value = GUILayout.Toggle(value, new GUIContent(""), skin.FindStyle("Toggle Helper")); + + GUILayout.EndHorizontal(); + return value; + } + + public static bool DrawTogglePlain(bool value, GUISkin skin, string content) + { + GUILayout.BeginHorizontal(); + + value = GUILayout.Toggle(value, new GUIContent(content), skin.FindStyle("Toggle")); + value = GUILayout.Toggle(value, new GUIContent(""), skin.FindStyle("Toggle Helper")); + + GUILayout.EndHorizontal(); + return value; + } + } +} diff --git a/Editor/Editor Handlers/UIEditorSkinHelper.cs.meta b/Editor/Helper/GUISkinHelper.cs.meta similarity index 100% rename from Editor/Editor Handlers/UIEditorSkinHelper.cs.meta rename to Editor/Helper/GUISkinHelper.cs.meta diff --git a/Editor/UX/UXButtonEditor.cs b/Editor/UX/UXButtonEditor.cs index f3c721a..bd82132 100644 --- a/Editor/UX/UXButtonEditor.cs +++ b/Editor/UX/UXButtonEditor.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using AlicizaX.UI.Extension.Editor.Editor.Editor_Handlers; +using AlicizaX.UI.Extension.Editor; using UnityEditor; using UnityEditorInternal; using UnityEditor.UI; @@ -187,7 +187,7 @@ public class UXButtonEditor : Editor EditorGUILayout.PropertyField(m_Mode); EditorGUI.EndDisabledGroup(); - var interactable = UIEditorSkinHelper.DrawToggle(m_Interactable.boolValue, customSkin, "Interactable"); + var interactable = GUISkinHelper.DrawToggle(m_Interactable.boolValue, customSkin, "Interactable"); m_Interactable.boolValue = interactable; GUILayout.Space(1); @@ -216,14 +216,14 @@ public class UXButtonEditor : Editor private void DrawAudioTab() { - UIEditorSkinHelper.DrawProperty(hoverAudioClip, customSkin, "Hover Sound", "Play", () => + GUISkinHelper.DrawProperty(hoverAudioClip, customSkin, "Hover Sound", "Play", () => { if (hoverAudioClip.objectReferenceValue != null) { PlayAudio((AudioClip)hoverAudioClip.objectReferenceValue); } }); - UIEditorSkinHelper.DrawProperty(clickAudioClip, customSkin, "Click Sound", "Play", () => + GUISkinHelper.DrawProperty(clickAudioClip, customSkin, "Click Sound", "Play", () => { if (hoverAudioClip.objectReferenceValue != null) { @@ -251,7 +251,7 @@ public class UXButtonEditor : Editor if (m_Mode.enumValueIndex == (int)ButtonModeType.Toggle) { - UIEditorSkinHelper.DrawProperty(m_UXGroup, customSkin, "UXGroup"); + GUISkinHelper.DrawProperty(m_UXGroup, customSkin, "UXGroup"); UXGroup newGroup = (UXGroup)m_UXGroup.objectReferenceValue; if (newGroup != group)