LiRuochen_WorkFlow/XericUIActionVessel
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

修复表格冻结

Browse Source
This commit is contained in:
lrss3
2026-07-29 10:10:46 +08:00
parent 98c2173ade
commit 5c51d35d8e
9 changed files with 453 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Runtime/XTable/Rendering/Elements/CellAssembler.cs
+10 -4
View File
@@ -96,11 +96,14 @@ namespace XericUI.XTable.Rendering.Elements
#region 池操作
/// <summary>为指定 cellId 获取一个池化 Image</summary>
public PooledImage GetImage(int cellId, string name = "cell_img", string styleNamespace = null)
public PooledImage GetImage(int cellId, string name = "cell_img", string styleNamespace = null,
Transform parent = null)
{
var item = m_ImagePool.Acquire(cellId);
if (item == null) return null;
if (parent != null && item.Root.transform.parent != parent)
item.Root.transform.SetParent(parent, false);
item.CellId = cellId;
item.Root.name = name;
ResetImageDefaults(item);
@@ -109,11 +112,14 @@ namespace XericUI.XTable.Rendering.Elements
}
/// <summary>为指定 cellId 获取一个池化 TMP_Text</summary>
public PooledText GetText(int cellId, string name = "cell_text", string styleNamespace = null)
public PooledText GetText(int cellId, string name = "cell_text", string styleNamespace = null,
Transform parent = null)
{
var item = m_TextPool.Acquire(cellId);
if (item == null) return null;
if (parent != null && item.Root.transform.parent != parent)
item.Root.transform.SetParent(parent, false);
item.CellId = cellId;
item.Root.name = name;
ResetTextDefaults(item);
@@ -155,7 +161,7 @@ namespace XericUI.XTable.Rendering.Elements
{
if (item == null) return;
item.Style?.Unbind();
m_ImagePool.Release(item.CellId);
m_ImagePool.ReleaseByObject(item);
}
/// <summary>归还单个 Text 池对象（通过 CellId 定位槽位并移入 FrozenSlots）</summary>
@@ -163,7 +169,7 @@ namespace XericUI.XTable.Rendering.Elements
{
if (item == null) return;
item.Style?.Unbind();
m_TextPool.Release(item.CellId);
m_TextPool.ReleaseByObject(item);
}
#endregion
Runtime/XTable/Rendering/Elements/PrefabPrototypePool.cs
+9 -12
View File
@@ -75,15 +75,20 @@ namespace XericUI.XTable.Rendering.Elements
/// 为指定 cellId 获取预制体实例。
/// 若该 cellId 已有绑定的实例，直接返回；否则创建新实例（需未达上限）。
/// </summary>
public GameObject Acquire(GameObject prefab, int cellId)
public GameObject Acquire(GameObject prefab, int cellId, Transform parent = null)
{
if (prefab == null) return null;
var pool = GetOrCreatePool(prefab);
Transform targetParent = parent ?? m_Parent;
// 已绑定 → 直接复用
// 已绑定 → 直接复用并迁移到当前渲染区域。
if (pool.Slots.TryGetValue(cellId, out var existing))
{
if (targetParent != null && existing.transform.parent != targetParent)
existing.transform.SetParent(targetParent, false);
return existing;
}
// 创建新实例
if (m_TotalCreated >= MAX_PREFAB_ITEMS)
@@ -92,7 +97,7 @@ namespace XericUI.XTable.Rendering.Elements
return null;
}
var instance = Object.Instantiate(prefab, m_Parent);
var instance = Object.Instantiate(prefab, targetParent);
instance.hideFlags = POOL_FLAGS;
instance.name = $"_prefab_{cellId}";
m_TotalCreated++;
@@ -142,17 +147,9 @@ namespace XericUI.XTable.Rendering.Elements
KillObject(instance);
}
/// <summary>将所有活跃槽位清空并销毁对象</summary>
/// <summary>结束当前渲染周期。实例保留在全局槽位中，以便跨区域复用。</summary>
public void ReturnAll()
{
foreach (var kv in m_Pools)
{
var pool = kv.Value;
foreach (var instance in pool.Slots.Values)
KillObject(instance);
pool.Slots.Clear();
}
m_TotalCreated = 0;
}
/// <summary>获取当前所有活跃实例（用于外部遍历回调）</summary>
Runtime/XTable/Rendering/Elements/SlotCounterPool.cs
+11 -41
View File
@@ -7,8 +7,8 @@ namespace XericUI.XTable.Rendering.Elements
{
/// <summary>
/// 基于计数器的槽位对象池（泛型）。
/// 每个 cellId 映射到固定索引的 SlotCounter，槽位在计数器间通过 FrozenSlots 流转复用。
/// 避免 Queue 模式下对象与位置解耦导致的堆叠问题，同时不触发 SetActive/SetParent 等生命周期事件。
/// 每个 cellId 映射到固定索引的 SlotCounter，释放槽位保留在原计数器内复用。
/// 避免跨计数器拆分碰撞组导致的对象位置冲突。
/// </summary>
/// <typeparam name="T">池对象类型</typeparam>
public class SlotCounterPool<T> where T : class
@@ -37,9 +37,6 @@ namespace XericUI.XTable.Rendering.Elements
private SlotCounter[] m_Counters = new SlotCounter[POOL_SIZE];
/// <summary>冻结槽位列表——全局可偷取的休眠槽位（末尾偷取，避免 Canvas 重建）</summary>
private List<Slot> m_FrozenSlots = new List<Slot>();
/// <summary>已创建对象总数（不含预制体 Instantiate）</summary>
private int m_CreatedCount;
@@ -64,7 +61,7 @@ namespace XericUI.XTable.Rendering.Elements
/// <summary>
/// 为指定 cellId 获取一个池对象。
/// 优先复用本计数器内的空闲槽位，其次从 FrozenSlots 偷取，最后创建新对象。
/// 优先复用本计数器内的空闲槽位，最后创建新对象。
/// </summary>
public T Acquire(int cellId)
{
@@ -88,18 +85,7 @@ namespace XericUI.XTable.Rendering.Elements
}
}
// 2. 从 FrozenSlots 末尾偷取
if (m_FrozenSlots.Count > 0)
{
int lastIdx = m_FrozenSlots.Count - 1;
var stolen = m_FrozenSlots[lastIdx];
m_FrozenSlots.RemoveAt(lastIdx);
stolen.CellId = cellId;
counter.Slots.Add(stolen);
return stolen.PooledObject;
}
// 3. 创建新对象
// 2. 创建新对象。槽位不能跨计数器流转，避免破坏碰撞单元格的稳定关系。
if (m_CreatedCount < POOL_SIZE)
{
var obj = m_Factory();
@@ -115,7 +101,7 @@ namespace XericUI.XTable.Rendering.Elements
}
/// <summary>
/// 释放指定 cellId 占用的槽位，将其移入 FrozenSlots 供其他计数器复用。
/// 释放指定 cellId 占用的槽位，并保留在原计数器中供相同碰撞组复用。
/// </summary>
public void Release(int cellId)
{
@@ -129,10 +115,7 @@ namespace XericUI.XTable.Rendering.Elements
{
if (counter.Slots[i].CellId == cellId)
{
var slot = counter.Slots[i];
counter.Slots.RemoveAt(i);
slot.CellId = -1;
m_FrozenSlots.Add(slot);
counter.Slots[i].CellId = -1;
return;
}
}
@@ -156,10 +139,7 @@ namespace XericUI.XTable.Rendering.Elements
{
if (ReferenceEquals(counter.Slots[i].PooledObject, pooledObject))
{
var slot = counter.Slots[i];
counter.Slots.RemoveAt(i);
slot.CellId = -1;
m_FrozenSlots.Add(slot);
counter.Slots[i].CellId = -1;
return true;
}
}
@@ -167,26 +147,20 @@ namespace XericUI.XTable.Rendering.Elements
return false;
}
/// <summary>将所有活跃槽位移入 FrozenSlots</summary>
/// <summary>释放所有活跃槽位，但保留其所属计数器。</summary>
public void ReturnAll()
{
for (int ci = 0; ci < POOL_SIZE; ci++)
{
var counter = m_Counters[ci];
if (counter == null) continue;
for (int i = counter.Slots.Count - 1; i >= 0; i--)
{
var slot = counter.Slots[i];
counter.Slots.RemoveAt(i);
slot.CellId = -1;
m_FrozenSlots.Add(slot);
}
for (int i = 0; i < counter.Slots.Count; i++)
counter.Slots[i].CellId = -1;
}
}
/// <summary>
/// 彻底销毁所有池对象（包括计数器内活跃槽位和 FrozenSlots 中的冻结槽位）。
/// 彻底销毁所有池对象。
/// </summary>
public void DestroyAll(Action<T> destroyFunc)
{
@@ -202,10 +176,6 @@ namespace XericUI.XTable.Rendering.Elements
counter.Slots.Clear();
}
foreach (var slot in m_FrozenSlots)
destroyFunc(slot.PooledObject);
m_FrozenSlots.Clear();
m_CreatedCount = 0;
}