diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs index eb6a625..2015f3e 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.Border.cs @@ -39,9 +39,9 @@ namespace XericUI.XTable.Rendering.Component { // 顺带自愈旧对象的标记:运行期渲染物一律不可编辑,编辑期改动才不会被记成预制体覆盖。 existing.gameObject.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy | HideFlags.NotEditable; - // 认领回来的旧对象可能还带着上一版的中心锚点,先钉回左上角。 - PinTopLeftRect(existing.transform as RectTransform, - new Vector2(m_ContentOffset, -m_ContentOffset)); + // 图元渲染器的顶点原点是 rect 中心:把中心摆到左上角(pivot 0.5 + 锚位 0)。 + PinPrimitiveRect(existing.transform as RectTransform, + new Vector2(m_ContentOffset, -m_ContentOffset), m_TotalWidth, m_TotalHeight); return m_BorderRenderer; } } @@ -52,12 +52,10 @@ namespace XericUI.XTable.Rendering.Component go.transform.SetParent(contentT, false); RectTransform rt = go.GetComponent(); - rt.anchorMin = new Vector2(0, 1); - rt.anchorMax = new Vector2(0, 1); - rt.pivot = new Vector2(0, 1); float pad = m_ContentOffset * 2f; - rt.anchoredPosition = new Vector2(m_ContentOffset, -m_ContentOffset); - rt.sizeDelta = new Vector2(m_TotalWidth + pad, m_TotalHeight + pad); + // 图元渲染器的顶点原点是 rect 中心:中心摆到左上角,边框坐标就与文本同一套语义。 + PinPrimitiveRect(rt, new Vector2(m_ContentOffset, -m_ContentOffset), + m_TotalWidth + pad, m_TotalHeight + pad); m_BorderRenderer = go.GetComponent(); m_BorderRenderer.raycastTarget = false; @@ -85,7 +83,7 @@ namespace XericUI.XTable.Rendering.Component var renderer = GetOrCreateBorderRenderer(); renderer.ClearAll(); - PinTopLeftRect(renderer.rectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), + PinPrimitiveRect(renderer.rectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), m_TotalWidth, m_TotalHeight); int rows = m_RowHeights.Length; @@ -100,7 +98,7 @@ namespace XericUI.XTable.Rendering.Component { if (renderer == null || rowStart >= rowEnd || colStart >= colEnd) return; renderer.ClearAll(); - PinTopLeftRect(renderer.rectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), + PinPrimitiveRect(renderer.rectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), m_TotalWidth, m_TotalHeight); for (int boundary = rowStart; boundary <= rowEnd; boundary++) SubmitHorizontalBoundary(renderer, boundary, colStart, colEnd); @@ -185,9 +183,8 @@ namespace XericUI.XTable.Rendering.Component go.hideFlags = HideFlags.DontSave | HideFlags.HideInHierarchy; go.transform.SetParent(parent, false); var rt = go.GetComponent(); - rt.anchorMin = new Vector2(0, 1); - rt.anchorMax = new Vector2(0, 1); - rt.pivot = new Vector2(0, 1); + // 同上:中心落在容器的左上角,冻结边框与冻结区的文本对得上。 + PinPrimitiveRect(rt, Vector2.zero, 0f, 0f); renderer = go.GetComponent(); renderer.raycastTarget = false; return renderer; diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs index c49659e..99bfffd 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.Editor.cs @@ -104,21 +104,34 @@ namespace XericUI.XTable.Rendering.Component #endif } - /// 设置所有动态子对象的可见性(仅编辑器) + /// + /// 设置所有动态子对象的可见性(仅编辑器)。覆盖整棵生成层级:模板(Viewport/Content/ + /// 滚动条)、背景、边框、冻结层、池化单元格都挂 DontSave,这里统一把 HideInHierarchy 去掉。 + /// public void SetChildrenVisible(bool visible) { m_ChildrenVisible = visible; #if UNITY_EDITOR - Transform t = ContentTransform; - if (t == null) return; - for (int i = t.childCount - 1; i >= 0; i--) - { - var child = t.GetChild(i); - child.gameObject.hideFlags = visible - ? HideFlags.DontSave - : HideFlags.DontSave | HideFlags.HideInHierarchy; - } + ApplyGeneratedVisibility(transform, visible); #endif } + +#if UNITY_EDITOR + private static void ApplyGeneratedVisibility(Transform parent, bool visible) + { + for (int i = 0; i < parent.childCount; i++) + { + var child = parent.GetChild(i); + if ((child.gameObject.hideFlags & HideFlags.DontSave) != 0) + { + // NotEditable 保留:看得见、不误改(编辑期改动不会被记成预制体覆盖)。 + child.gameObject.hideFlags = visible + ? HideFlags.DontSave | HideFlags.NotEditable + : HideFlags.DontSave | HideFlags.NotEditable | HideFlags.HideInHierarchy; + } + ApplyGeneratedVisibility(child, visible); + } + } +#endif } } diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs index 428a586..a7caf5a 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.RendererFilter.cs @@ -537,7 +537,7 @@ namespace XericUI.XTable.Rendering.Component // 每次更新都按尺寸钉死:认领回来的旧对象可能还带着上一版的中心锚点, // 只改尺寸就会画成"以父组件中心为左上角"。 - PinTopLeftRect(m_BackgroundRenderer.rectTransform, + PinPrimitiveRect(m_BackgroundRenderer.rectTransform, new Vector2(m_ContentOffset, -m_ContentOffset), m_TotalWidth, m_TotalHeight); string baseNamespace = GetSingleStyleNamespace(); var rects = new List diff --git a/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs b/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs index 55d8023..d2861bf 100644 --- a/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs +++ b/Runtime/XTable/Rendering/Component/XericUIActionTable.ScrollTemplate.cs @@ -222,6 +222,24 @@ namespace XericUI.XTable.Rendering.Component if (rt.anchoredPosition != position) rt.anchoredPosition = position; } + /// + /// 图元渲染器(背景/边框)专用:它们的子块铺满本渲染器且轴心 0.5,顶点原点=rect 的中心。 + /// 所以让这个 rect 的"中心"落在左上角(pivot 0.5 + 锚点 (0,1) + 锚位 0), + /// 绘图代码就能继续用左上角坐标,和文本(UGUI 左上角语义)对得上。 + /// + private static void PinPrimitiveRect(RectTransform rt, Vector2 position, float width, float height) + { + if (rt == null) return; + Vector2 topLeft = new Vector2(0f, 1f); + Vector2 center = new Vector2(0.5f, 0.5f); + if (rt.anchorMin != topLeft) rt.anchorMin = topLeft; + if (rt.anchorMax != topLeft) rt.anchorMax = topLeft; + if (rt.pivot != center) rt.pivot = center; + if (rt.anchoredPosition != position) rt.anchoredPosition = position; + var size = new Vector2(width, height); + if (rt.sizeDelta != size) rt.sizeDelta = size; + } + /// 同上,顺带把尺寸一起钉死。 private static void PinTopLeftRect(RectTransform rt, Vector2 position, float width, float height) { diff --git a/Runtime/XTable/Rendering/Elements/XTableBackgroundRenderer.cs b/Runtime/XTable/Rendering/Elements/XTableBackgroundRenderer.cs index 0b009b1..31c13bb 100644 --- a/Runtime/XTable/Rendering/Elements/XTableBackgroundRenderer.cs +++ b/Runtime/XTable/Rendering/Elements/XTableBackgroundRenderer.cs @@ -27,13 +27,10 @@ namespace XericUI.XTable.Rendering.Elements ClearAll(); if (rects == null) return; - // 图元坐标是"以矩形左上角为原点",而基类把顶点直接放在渲染器的本地空间 - // (本地原点是轴心,不是左上角)。这里按 rectTransform.rect 把两套原点对上: - // 轴心是 (0,1) 还是 (0.5,0.5) 结果都一样——不再依赖调用方先把 pivot 摆对。 - Rect local = rectTransform.rect; - float originX = local.x; - float originY = local.y + local.height; - + // 图元坐标是"以矩形左上角为原点"。基类把顶点放在子块本地空间里,而子块是铺满本渲染器 + // 且轴心 0.5 的 —— 子块原点是本渲染器 rect 的中心。所以本渲染器的 rect 必须 + // 以"中心 = 左上角"摆放(PinPrimitiveRect:pivot 0.5 + 锚位在左上角), + // 这里的坐标才和文本(UGUI 左上角语义)对得上。 for (int i = 0; i < rects.Count; i++) { RectData rectData = rects[i]; @@ -42,8 +39,7 @@ namespace XericUI.XTable.Rendering.Elements { type = PrimitiveType.Rectangle, sizeMode = SizeMode.InscribedEllipse, - center = new Vector2(originX + rect.x + rect.width * 0.5f, - originY - (rect.y + rect.height * 0.5f)), + center = new Vector2(rect.x + rect.width * 0.5f, -(rect.y + rect.height * 0.5f)), size = rect.size, @params = new PrimitiveParams {