From a7ce860f56b8ba66050674125ac2ad4e22608c3b Mon Sep 17 00:00:00 2001
From: LiRuoChen <571244399@qq.com>
Date: Thu, 9 Apr 2026 10:04:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E6=B1=A0=E9=97=AE=E9=A2=98=EF=BC=8C=E5=90=8E=E7=BB=AD?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E7=9B=B4=E6=8E=A5=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E5=AE=9E=E7=8E=B0=E5=B0=B1=E8=A1=8C=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E4=B8=8D=E6=8F=90=E4=BE=9B=E5=A4=8D=E6=9D=82?=
 =?UTF-8?q?=E7=9A=84backup=E6=B5=81=E7=A8=8B=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Runtime/FlipPage/FlipPageComponentManager.cs  | 25 +++--
 .../FlipPage/XericFlipPageIndexVesselBase.cs  | 91 ++++++-------------
 2 files changed, 46 insertions(+), 70 deletions(-)

diff --git a/Runtime/FlipPage/FlipPageComponentManager.cs b/Runtime/FlipPage/FlipPageComponentManager.cs
index 14c25fc..2765db8 100644
--- a/Runtime/FlipPage/FlipPageComponentManager.cs
+++ b/Runtime/FlipPage/FlipPageComponentManager.cs
@@ -217,7 +217,7 @@ namespace XericUI.FlipPage
         protected override void Awake()
         {
             // 使用默认的
-            HowToCreatPageInfo = () => AddPage();
+            HowToCreatPageInfo = () => new PageComponentInfo();
             
             base.Awake();
             
@@ -231,8 +231,13 @@ namespace XericUI.FlipPage
                 buttoneEndPage.Target.onClick.AddListener(FlipPageToEnd);
             if (inputFieldFlipPageIndex.IsValidVessel()) // 翻到指定
                 inputFieldFlipPageIndex.Target.onValueChanged.AddListener(s => FlipPage(s));
-            pageButtonPool.Init();
-
+            pageButtonPool.Initialize();
+            pageButtonPool.joinOnRelease += o =>
+            {
+                SwitchSelectableVesselType(o.GetComponent<Selectable>(), 
+                    button => button.onClick.RemoveAllListeners(),
+                    toggle => toggle.onValueChanged.RemoveAllListeners());
+            };
             // 根据组件类型创建相关内容
             // var prefabSelectable = pageButtonPool.Prefab.GetComponent<Selectable>();
         }
@@ -269,7 +274,6 @@ namespace XericUI.FlipPage
 
             RefreshPageIndeButtonState();
         }
-
         
         public override PageInfo AddPage(PageInfo pageInfo = null, bool isFirstOtherwiseLast = false)
         {
@@ -334,11 +338,16 @@ namespace XericUI.FlipPage
             pageSelectButton.Add(pageIndexSelectable);
 
             SwitchSelectableVesselType(pageIndexSelectable.Target0,
-                button => { button.onClick.AddListener(() => FlipPage(pageInfo.pageNumber)); },
+                button =>
+                {
+                    button.onClick.RemoveAllListeners();
+                    button.onClick.AddListener(() => FlipPage(pageInfo.pageNumber));
+                },
                 toggle =>
                 {
-                    toggle.isOn = pageInfo.pageNumber == currentPageIndex;
+                    toggle.SetIsOnWithoutNotify(pageInfo.pageNumber == currentPageIndex);
                     toggle.group = ToggleGroup;
+                    toggle.onValueChanged.RemoveAllListeners();
                     toggle.onValueChanged.AddListener(b =>
                     {
                         if (b) FlipPage(pageInfo.pageNumber);
@@ -436,6 +445,8 @@ namespace XericUI.FlipPage
             }
         }
 
+        
+        
         /// <summary>
         /// 处理可选对象类型.(如果要支持更多的类型，应优先改此方法，以便获得其他所有位置的编译器提示)
         /// </summary>
@@ -443,7 +454,7 @@ namespace XericUI.FlipPage
         /// <param name="asButton">如果是按钮</param>
         /// <param name="asToggle">如果是单选项</param>
         /// <returns></returns>
-        protected static bool SwitchSelectableVesselType(Selectable selectable, 
+        private static bool SwitchSelectableVesselType(Selectable selectable, 
             Action<Button> asButton = null,
             Action<Toggle> asToggle = null)
         {
diff --git a/Runtime/FlipPage/XericFlipPageIndexVesselBase.cs b/Runtime/FlipPage/XericFlipPageIndexVesselBase.cs
index 71f2a5d..cc2b8da 100644
--- a/Runtime/FlipPage/XericFlipPageIndexVesselBase.cs
+++ b/Runtime/FlipPage/XericFlipPageIndexVesselBase.cs
@@ -73,6 +73,9 @@ namespace XericUI.FlipPage
 
         #region �ֶ�����
 
+        /// <summary>
+        /// ҳ�����أ�����ؽ�����ҳ�汾�����������κ����������Ĺ�����
+        /// </summary>
         protected ObjectPool<PageInfo> PageInfoPool = null;
         public Func<PageInfo> HowToCreatPageInfo = () => throw new Exception("��Ҫ��ҳ������ʵ����Ӧ��ҳ�洴���߼�������д����Ĭ�����ݷ�����ſ���ʹ�á�");
 
@@ -337,7 +340,7 @@ namespace XericUI.FlipPage
 #endif
         public void FlipPageToEnd()
             => FlipPage(_pageInfos.Count - 1);
-        
+
         /// <summary>
         /// ����ҳ���ڿ�ͷ
         /// </summary>
@@ -347,17 +350,7 @@ namespace XericUI.FlipPage
         public virtual PageInfo AddPage(PageInfo pageInfo = null, bool isFirstOtherwiseLast = false)
         {
             if (pageInfo == null)
-            {
                 pageInfo = PageInfoPool.Get();
-                // ִ��ҳ����������
-                if (!GetPageInfoWithoutCollection(pageInfo))
-                {
-                    Debug.LogError("��������ҳ������ķ������̴���");
-                    return pageInfo;
-                }
-            }
-            else
-                GetPageInfo(pageInfo);
             
             if (isFirstOtherwiseLast)
             {
@@ -373,6 +366,9 @@ namespace XericUI.FlipPage
                 // ����ҳ��
                 _pageInfos.AddLast(pageInfo);
             }
+            // GetPageInfo(pageInfo);
+            // ִ��ҳ����������
+            pageInfo.OnPageCreated(this);
             // ˢ��ҳ��
             FlipPage(currentPageIndex, true);
             return pageInfo;
@@ -384,10 +380,6 @@ namespace XericUI.FlipPage
         /// <param name="pageInfo"></param>
         public virtual void RemovePage(PageInfo pageInfo)
         {
-            // �ͷ�ҳ��
-            PageInfoPool.Release(pageInfo);
-            // ˢ��ҳ��
-            FlipPage(currentPageIndex, true);
             var index = PageInfos.IndexOf(a => a == pageInfo);
             RemovePage(index);
         }
@@ -405,7 +397,7 @@ namespace XericUI.FlipPage
 
             // ��ȡҳ��ڵ�
             var page = _pageInfos.GetOrderNode().LandedIndex(pageIndex);
-            // ���º���ҳ�������
+            // ����ɾ����ҳ�������
             var tempPage = page;
             var tempPageNumber = page.Value.pageNumber;
             while (tempPage.Next != null)
@@ -414,8 +406,6 @@ namespace XericUI.FlipPage
                 tempPage.Value.pageNumber = tempPageNumber++;
             }
             
-            // �ͷ�ҳ��
-            PageInfoPool.Release(page.Value);
             // ˢ��ҳ��
             FlipPage(currentPageIndex, true);
         }
@@ -460,10 +450,7 @@ namespace XericUI.FlipPage
             foreach (var pageInfo in tempPageInfo)
             {
                 pageInfo.ItemInfos.Clear();
-                if (!resetPool)
-                    PageInfoPool.Release(pageInfo);
-                else
-                    ReleasePageInfoWithoutCollection(pageInfo); // ֱ�ӵ����ͷ��¼�
+                PageInfoPool.Release(pageInfo);
             }
             ListPool<PageInfo>.Release(tempPageInfo);
             // ��ճ�
@@ -552,49 +539,29 @@ namespace XericUI.FlipPage
         /// �����������ִ�л�ȡҳ�����¼�
         /// </summary>
         /// <param name="info"></param>
-        protected void GetPageInfo(PageInfo info)
+        protected virtual void GetPageInfo(PageInfo info)
         {
-            if (!GetPageInfoWithoutCollection(info))
+            // ���������ظ�����
+            if (!info.IsAlreadyRelease)
+            {
+                Debug.LogError($"���̴���ҳ�波���ظ���ȡ�������������({info.GetHashCode():X16})\n_>{info.name}");
                 return;
-            _pageInfos.AddLast(info);
+            }
+            info.OnPageCreated(this);
+            return;
         }
 
         /// <summary>
         /// �����������ִ���ͷ�ҳ�����¼�
         /// </summary>
         /// <param name="info"></param>
-        protected void ReleasePageInfo(PageInfo info)
-        {
-            if (!ReleasePageInfoWithoutCollection(info))
-                return;
-            _pageInfos.Remove(info);
-        }
-
-        /// <summary>
-        /// �����������ִ�л�ȡҳ�������¼������������Լ��ϵIJ���
-        /// </summary>
-        /// <param name="info"></param>
-        protected virtual bool GetPageInfoWithoutCollection(PageInfo info)
-        {
-            if (!info.IsAlreadyRelease)
-            {
-                Debug.LogError("���̴���ҳ�波���ظ���ȡ�������������");
-                return false;
-            }
-            info.OnPageCreated(this);
-            return true;
-        }
-        
-        /// <summary>
-        /// �����������ִ���ͷ�ҳ�����¼������������Լ��ϵIJ���
-        /// </summary>
-        /// <param name="info"></param>
-        protected virtual bool ReleasePageInfoWithoutCollection(PageInfo info)
+        protected virtual void ReleasePageInfo(PageInfo info)
         {
+            // ���������ظ�����
             if (info.IsAlreadyRelease)
             {
                 Debug.LogError("���̴���ҳ�波���ظ��ͷţ������������");
-                return false;
+                return;
             }
             if (CurrentPageNode != null && Currentpage == info)
             {
@@ -604,7 +571,7 @@ namespace XericUI.FlipPage
 
             info.OnPageDestroy(this);
             _pageInfos.Remove(info);
-            return true;
+            return;
         }
 
         /// <summary>
@@ -623,11 +590,11 @@ namespace XericUI.FlipPage
         /// ����һ��������Ŀ(�������Ż�)
         /// </summary>
         /// <param name="items"></param>
-        /// <param name="customGetPage"></param>
-        public virtual void AddItems(IEnumerable<ItemInfo> items, Func<PageInfo> customGetPage = null)
+        /// <param name="customPage"></param>
+        public virtual void AddItems(IEnumerable<ItemInfo> items, PageInfo customPage = null)
         {
             foreach (var item in items)
-                AddItem(item, customGetPage);
+                AddItem(item, customPage);
         }
 
         /// <summary>
@@ -637,7 +604,7 @@ namespace XericUI.FlipPage
         /// <typeparam name="T">�ṩһ��ָ�����������ͣ�Ĭ������������͵�ҳ��</typeparam>
         public virtual void AddItem<T>(ItemInfo item)
             where T : PageInfo, new()
-            => AddItem(item, () => new T());
+            => AddItem(item, new T());
 
         /// <summary>
         /// ����������Ŀ
@@ -645,7 +612,7 @@ namespace XericUI.FlipPage
         /// <remarks>
         /// ������Ŀ��ҳ����
         /// </remarks>
-        public virtual void AddItem(ItemInfo item, Func<PageInfo> customGetPage = null)
+        public virtual void AddItem(ItemInfo item, PageInfo customPage = null)
         {
             var page = _pageInfos.Count <= 0 ? null : _pageInfos.Last.Value;
             if (page != null &&
@@ -658,9 +625,8 @@ namespace XericUI.FlipPage
             }
 
             // �½�һ��ҳ��������
-            page = customGetPage == null ? PageInfoPool.Get() : customGetPage();
-            if (customGetPage == null)
-                _pageInfos.AddLast(page);
+            page = customPage ?? PageInfoPool.Get();
+            AddPage(page);
             page.ItemInfos.Add(item);
             _itemInfos.Add(item);
         }
@@ -767,7 +733,6 @@ namespace XericUI.FlipPage
             protected internal virtual void OnPageCreated(XericFlipPageIndexVesselBase parent)
             {
                 IsAlreadyRelease = false;
-                pageNumber = 0;
             }
 
             /// <summary>