From 0cc1a89b4da17312e2602d5bda4cce409196da08 Mon Sep 17 00:00:00 2001 From: LiRuoChen <571244399@qq.com> Date: Mon, 29 Jun 2026 19:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=BF=AB?= =?UTF-8?q?=E6=8D=B7=E7=94=A8=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Editor/OverrideUI/XericStyleImageEditor.cs | 67 +++++++++++++++---- Editor/SuperStyleSheet/StyleFieldDrawer.cs | 16 ++++- .../Rendering/Component/XericUIActionTable.cs | 2 + 3 files changed, 71 insertions(+), 14 deletions(-) diff --git a/Editor/OverrideUI/XericStyleImageEditor.cs b/Editor/OverrideUI/XericStyleImageEditor.cs index f345d08..3623cab 100644 --- a/Editor/OverrideUI/XericStyleImageEditor.cs +++ b/Editor/OverrideUI/XericStyleImageEditor.cs @@ -1,3 +1,4 @@ +using UnityEngine; using UnityEditor; using UnityEditor.UI; @@ -6,8 +7,9 @@ using XericUI.OverrideUI; namespace XericUIEditor.OverrideUI { /// - /// XericStyleImage 的 Inspector 编辑器——继承 GraphicEditor， - /// 额外展示颜色、纹理、材质三个 StyleField 和自动刷新开关。 + /// XericStyleImage 的 Inspector 编辑器—— + /// 仅显示颜色样式字段 + raycastTarget / raycastPadding / maskable。 + /// 不展示原始 Color/Sprite/Material（被样式表接管）。 /// [CustomEditor(typeof(XericStyleImage), true)] [CanEditMultipleObjects] @@ -16,30 +18,71 @@ namespace XericUIEditor.OverrideUI private SerializedProperty m_ColorStyleProp; private SerializedProperty m_TextureStyleProp; private SerializedProperty m_MaterialStyleProp; - private SerializedProperty m_AutoRefreshProp; + private SerializedProperty m_RaycastTargetProp; + private SerializedProperty m_RaycastPaddingProp; + private SerializedProperty m_MaskableProp; + private SerializedProperty m_ColorProp; + + // 折叠状态 + private static bool s_ColorFoldout = false; + private static bool s_TextureFoldout = false; + private static bool s_MaterialFoldout = false; protected override void OnEnable() { base.OnEnable(); - m_ColorStyleProp = serializedObject.FindProperty("m_ColorStyle"); + m_ColorStyleProp = serializedObject.FindProperty("m_ColorStyle"); m_TextureStyleProp = serializedObject.FindProperty("m_TextureStyle"); m_MaterialStyleProp = serializedObject.FindProperty("m_MaterialStyle"); - m_AutoRefreshProp = serializedObject.FindProperty("m_AutoRefresh"); + m_RaycastTargetProp = serializedObject.FindProperty("m_RaycastTarget"); + m_RaycastPaddingProp = serializedObject.FindProperty("m_RaycastPadding"); + m_MaskableProp = serializedObject.FindProperty("m_Maskable"); + m_ColorProp = serializedObject.FindProperty("m_Color"); } public override void OnInspectorGUI() { - base.OnInspectorGUI(); - EditorGUILayout.Space(); - serializedObject.Update(); + // === 颜色样式（主要展示） === EditorGUILayout.LabelField("样式表配置", EditorStyles.boldLabel); - EditorGUILayout.PropertyField(m_ColorStyleProp); - EditorGUILayout.PropertyField(m_TextureStyleProp); - EditorGUILayout.PropertyField(m_MaterialStyleProp); - EditorGUILayout.PropertyField(m_AutoRefreshProp); + EditorGUILayout.Space(2); + if (m_ColorStyleProp != null) + EditorGUILayout.PropertyField(m_ColorStyleProp, new GUIContent("颜色样式")); + + // 纹理和材质样式折叠（通常不需要改动） + s_TextureFoldout = EditorGUILayout.Foldout(s_TextureFoldout, "纹理 / 材质样式（高级）", true); + if (s_TextureFoldout) + { + EditorGUI.indentLevel++; + if (m_TextureStyleProp != null) + EditorGUILayout.PropertyField(m_TextureStyleProp, new GUIContent("纹理样式")); + if (m_MaterialStyleProp != null) + EditorGUILayout.PropertyField(m_MaterialStyleProp, new GUIContent("材质样式")); + EditorGUI.indentLevel--; + } + + EditorGUILayout.Space(8); + + // === 颜色预览（只读） === + if (m_ColorProp != null) + { + EditorGUI.BeginDisabledGroup(true); + EditorGUILayout.PropertyField(m_ColorProp, new GUIContent("颜色（预览）")); + EditorGUI.EndDisabledGroup(); + } + + EditorGUILayout.Space(4); + + // === Raycast 与 Mask === + EditorGUILayout.LabelField("交互", EditorStyles.boldLabel); + if (m_RaycastTargetProp != null) + EditorGUILayout.PropertyField(m_RaycastTargetProp, new GUIContent("Raycast Target")); + if (m_RaycastPaddingProp != null) + EditorGUILayout.PropertyField(m_RaycastPaddingProp, new GUIContent("Raycast Padding")); + if (m_MaskableProp != null) + EditorGUILayout.PropertyField(m_MaskableProp, new GUIContent("Maskable")); serializedObject.ApplyModifiedProperties(); } diff --git a/Editor/SuperStyleSheet/StyleFieldDrawer.cs b/Editor/SuperStyleSheet/StyleFieldDrawer.cs index 888e6db..2d86818 100644 --- a/Editor/SuperStyleSheet/StyleFieldDrawer.cs +++ b/Editor/SuperStyleSheet/StyleFieldDrawer.cs @@ -26,6 +26,11 @@ namespace XericUIEditor public override float GetPropertyHeight(SerializedProperty property, GUIContent label) { + var nsProp = property.FindPropertyRelative("Namespace"); + var pathProp = property.FindPropertyRelative("StylePath"); + if (nsProp == null || pathProp == null) + return LINE_HEIGHT + PADDING * 2; + string key = GetFoldKey(property); bool expanded = s_FoldoutStates.TryGetValue(key, out bool f) && f; @@ -37,7 +42,7 @@ namespace XericUIEditor // 有值才显示值类型行 string ns = GetNamespace(property); - string path = property.FindPropertyRelative("StylePath").stringValue; + string path = pathProp.stringValue; StyleValue val = StyleManager.GetValue(ns, path); if (val != null && val.ValueType != null) rowCount++; @@ -59,6 +64,12 @@ namespace XericUIEditor SerializedProperty nsProp = property.FindPropertyRelative("Namespace"); SerializedProperty pathProp = property.FindPropertyRelative("StylePath"); + if (nsProp == null || pathProp == null) + { + EditorGUI.LabelField(position, label, "(StyleField 未初始化)"); + return; + } + // === 标题行：折叠箭头 + 标签 + 路径下拉 === Rect headerRect = new Rect(position.x, position.y + PADDING, position.width, LINE_HEIGHT); @@ -213,7 +224,8 @@ namespace XericUIEditor private static string GetNamespace(SerializedProperty property) { - string ns = property.FindPropertyRelative("Namespace").stringValue; + var nsProp = property.FindPropertyRelative("Namespace"); + string ns = nsProp?.stringValue; return string.IsNullOrEmpty(ns) ? "default" : ns; } diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs index aacd167..d7d4adc 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.cs @@ -93,6 +93,8 @@ namespace XericUI.XTable.Rendering.Component } } + public XTableCellData this[int row, int col] => TableData.GetOrCreateCell(row, col); + public float[] RowHeights => m_RowHeights; public float[] ColWidths => m_ColWidths;