循环列表、循环折叠列表功能完成

Author: GREAT1217

Assets/Scenes/TestCircularScrollView.unity

@@ -2,20 +2,23 @@
 using UnityEngine.Events;
 using UnityEngine.UI;
 
-public class Test : MonoBehaviour
+public class TestCircularScrollView : MonoBehaviour
 {
     public UICircularScrollView _circularH;
     public UICircularScrollView _circularV;
-    public UICircularFlodScrollView _flodCircular;
+    public UICircularFlodScrollView _flodCircularH;
+    public UICircularFlodScrollView _flodCircularV;
 
     void Start()
     {
         _circularH.Init(CellCallBack);
         _circularH.ShowList(1000);
         _circularV.Init(CellCallBack);
         _circularV.ShowList(1000);
-        _flodCircular.Init(FlodBtnCallback, FlodCellCallback);
-        _flodCircular.ShowList(2, 3, 4, 5, 6, 7, 8);
+        _flodCircularH.Init(FlodBtnCallback, FlodCellCallback);
+        _flodCircularH.ShowList(2, 3, 4, 5, 6, 7, 8);
+        _flodCircularV.Init(FlodBtnCallback, FlodCellCallback);
+        _flodCircularV.ShowList(2, 3, 4, 5, 6, 7, 8);
     }
 
     private void CellCallBack(GameObject cell, int index)

Assets/Scripts/TestCircularScrollView/Test.cs renamed to Assets/Scripts/TestCircularScrollView/TestCircularScrollView.cs

@@ -18,18 +18,16 @@ public class UICircularFlodScrollView : UICircularScrollView
     /// </summary>
     private struct FlodBtnInfo
     {
-        public int index;
         public GameObject obj;
         public bool isFlod;
         public CellInfo[] cellInfos;
         public float cellsSize;//子元素横向或纵尺寸
-        public int cellCount;
     }
     private FlodBtnInfo[] _flodBtnInfos;
 
     private UnityAction<GameObject, int> OnFlodBtnShow;
     private UnityAction<GameObject, int, int> OnFlodCellShow;
-    private UnityAction<int, bool, GameObject> OnFlodBtnClick;
+    private UnityAction<GameObject, int, bool> OnFlodBtnClick;
 
     public void Init(UnityAction<GameObject, int> onFlodBtnShow, UnityAction<GameObject, int, int> onFlodCellShow)
     {
@@ -54,49 +52,43 @@ public void Init(UnityAction<GameObject, int> onFlodBtnShow, UnityAction<GameObj
     public void ShowList(params int[] num)
     {
         RecycleItems();
-        int curCellCount = 0;//当前元素数量
-        int cellCount = 0;//元素总数量
-        int flodBtnCount = num.Length;//折叠按钮总数量
+        int flodBtnCount = num.Length;
         _flodBtnInfos = new FlodBtnInfo[flodBtnCount];
-        for (int k = 0; k < flodBtnCount; k++)
+        for (int i = 0; i < flodBtnCount; i++)
         {
             //====生成折叠按钮
             GameObject flodObj = ObjectPool.Instance.GetObject(FLODBTNPOOL, _content);
             flodObj.SetActive(true);
-            flodObj.name = k.ToString();
-            int count = num[k];
-            cellCount += count;
+            flodObj.name = i.ToString();
+            int count = num[i];
             //存储按钮数据
             FlodBtnInfo flodBtnInfo = new FlodBtnInfo
             {
-                index = k,
                 obj = flodObj,
-                cellCount = count,
                 cellInfos = new CellInfo[count],
                 isFlod = _defaultFlod,
                 cellsSize = _dir == UIDir.Vertical ? (_cellHeight + _spacing) * Mathf.CeilToInt((float)count / _crNum) : (_cellWight + _spacing) * Mathf.CeilToInt((float)count / _crNum)
             };
-            _flodBtnInfos[k] = flodBtnInfo;
-            Button btn = flodObj.GetComponent<Button>();
-            btn.onClick.AddListener(() => OnFlodClick(flodBtnInfo));
-            SetFlodBtnPos(flodBtnInfo, curCellCount);
+            _flodBtnInfos[i] = flodBtnInfo;
+            int flodIndex = i;
+            flodObj.GetComponent<Button>().onClick.AddListener(() => OnFlodClick(flodBtnInfo, flodIndex));
+            SetFlodBtnPos(i);
             //=====生成cell
-            for (int i = 0; i < count; i++)
+            for (int k = 0; k < count; k++)
             {
                 if (flodBtnInfo.isFlod) break;
                 CellInfo cellInfo = new CellInfo();
-                SetCellPos(ref cellInfo, k, i, curCellCount);
+                SetCellPos(ref cellInfo, i, k);
                 if (SetCellState(ref cellInfo))
                 {
-                    cellInfo.obj.name = k + "-" + i;
-                    OnFlodCellShow(cellInfo.obj, i, k);//cell显示回调
+                    cellInfo.obj.name = i + "-" + k;
+                    OnFlodCellShow(cellInfo.obj, k, i);//cell显示回调
                 }
-                flodBtnInfo.cellInfos[i] = cellInfo;
+                flodBtnInfo.cellInfos[k] = cellInfo;
             }
-            curCellCount += flodBtnInfo.isFlod ? 0 : count;
-            OnFlodBtnShow(flodObj, k);//flodBtn显示回调
+            OnFlodBtnShow(flodObj, i);//flodBtn显示回调
         }
-        SetContentSize(flodBtnCount, cellCount);
+        SetContentSize(flodBtnCount);
     }
 
     protected override void ScrollRectListener(Vector2 value)
@@ -106,7 +98,7 @@ protected override void ScrollRectListener(Vector2 value)
         {
             FlodBtnInfo flodBtnInfo = _flodBtnInfos[i];
             if (flodBtnInfo.isFlod) continue;
-            for (int k = 0; k < flodBtnInfo.cellCount; k++)
+            for (int k = 0; k < flodBtnInfo.cellInfos.Length; k++)
             {
                 CellInfo cellInfo = flodBtnInfo.cellInfos[k];
                 if (SetCellState(ref cellInfo))
@@ -119,6 +111,23 @@ protected override void ScrollRectListener(Vector2 value)
         }
     }
 
+    protected override void SetContentSize(int flodBtnCount)
+    {
+        int lastIndex = flodBtnCount - 1;
+        if (_dir == UIDir.Vertical)
+        {
+            float sizeY = -_flodBtnInfos[lastIndex].obj.transform.localPosition.y + _flodBtnHeight + _spacing;
+            sizeY += _defaultFlod ? 0 : _flodBtnInfos[lastIndex].cellsSize;
+            _content.sizeDelta = new Vector2(_content.sizeDelta.x, sizeY);
+        }
+        else
+        {
+            float sizeX = _flodBtnInfos[lastIndex].obj.transform.localPosition.x + _flodBtnWidth + _spacing;
+            sizeX += _defaultFlod ? 0 : _flodBtnInfos[lastIndex].cellsSize;
+            _content.sizeDelta = new Vector2(sizeX, _content.sizeDelta.y);
+        }
+    }
+
     private void RecycleItems()
     {
         if (!_isInited) return;
@@ -140,62 +149,47 @@ private void RecycleItems()
         }
     }
 
-    private void SetFlodBtnPos(FlodBtnInfo flod, int curCellCount)
+    private void SetFlodBtnPos(int index)
     {
         if (_dir == UIDir.Vertical)
         {
-            float pos =  _spacing;
-            if (flod.index > 0)
+            float posY = -_spacing;
+            if (index > 0)
             {
-                pos += _cellHeight;
-                pos += Mathf.Abs(_flodBtnInfos[flod.index - 1].obj.transform.localPosition.y);
-                pos += _flodBtnInfos[flod.index - 1].isFlod ? 0 : _flodBtnInfos[flod.index - 1].cellsSize;
+                posY -= _cellHeight;
+                posY += _flodBtnInfos[index - 1].obj.transform.localPosition.y;
+                posY -= _flodBtnInfos[index - 1].isFlod ? 0 : _flodBtnInfos[index - 1].cellsSize;
             }
-            flod.obj.transform.localPosition = new Vector2(_flodBtnX, -pos);
+            _flodBtnInfos[index].obj.transform.localPosition = new Vector2(_flodBtnX, posY);
         }
         else
         {
-            float pos = _flodBtnWidth * flod.index + _spacing * (flod.index + 1);
-            pos += flod.index > 0 ? (_cellWight + _spacing) * Mathf.CeilToInt((float)curCellCount / _crNum) : 0;
-            flod.obj.transform.localPosition = new Vector2(pos, _flodBtnY);
+            float posX = _spacing;
+            if (index > 0)
+            {
+                posX += _cellWight;
+                posX += _flodBtnInfos[index - 1].obj.transform.localPosition.x;
+                posX += _flodBtnInfos[index - 1].isFlod ? 0 : _flodBtnInfos[index - 1].cellsSize;
+            }
+            _flodBtnInfos[index].obj.transform.localPosition = new Vector2(posX, _flodBtnY);
         }
     }
 
-    private void SetCellPos(ref CellInfo cellInfo, int flodIndex, int cellIndex, int curCellCount)
+    private void SetCellPos(ref CellInfo cellInfo, int flodIndex, int cellIndex)
     {
         if (_dir == UIDir.Vertical)
         {
-            float posY = (_cellHeight + _spacing) * (Mathf.CeilToInt(cellIndex / _crNum) + 1) + Mathf.Abs(_flodBtnInfos[flodIndex].obj.transform.localPosition.y);
-            //posY += (_flodBtnHeight + _spacing) * (flodIndex + 1);
-            //posY += (_cellHeight + _spacing) * Mathf.CeilToInt((float)curCellCount / _crNum);
-            //posY += Mathf.Abs(_flodBtnInfos[flodIndex].obj.transform.localPosition.y) + _cellHeight;
             float posX = (_cellWight + _spacing) * (cellIndex % _crNum);
-            cellInfo.pos = new Vector2(posX, -posY);
-        }
-        else
-        {
-            float pos = _cellWight * Mathf.CeilToInt(cellIndex / _crNum) + _spacing * (Mathf.CeilToInt(cellIndex / _crNum) + 1);
-            pos += (_flodBtnWidth + _spacing) * (flodIndex + 1);
-            pos += (_cellHeight + _spacing) * Mathf.CeilToInt((float)curCellCount / _crNum);
-            float posY = _cellHeight * (cellIndex % _crNum) + _spacing * (cellIndex % _crNum);
-            cellInfo.pos = new Vector2(pos, -posY);
-        }
-    }
-
-    private void SetContentSize(int flodBtnCount, int cellCount)
-    {
-        if (_dir == UIDir.Vertical)
-        {
-            float contentSize = Mathf.Abs(_flodBtnInfos[flodBtnCount - 1].obj.transform.localPosition.y) + _flodBtnHeight + _spacing;
-            //  float contentSize = (_spacing + _flodBtnHeight) * flodBtnCount;
-            contentSize += _defaultFlod ? 0 : _flodBtnInfos[flodBtnCount - 1].cellsSize;
-            _content.sizeDelta = new Vector2(_content.sizeDelta.x, contentSize);
+            float posY = -(_cellHeight + _spacing) * (Mathf.CeilToInt(cellIndex / _crNum) + 1);
+            posY += _flodBtnInfos[flodIndex].obj.transform.localPosition.y;
+            cellInfo.pos = new Vector2(posX, posY);
         }
         else
         {
-            float contentSize = _defaultFlod ? 0 : (_spacing + _cellWight) * Mathf.CeilToInt((float)cellCount / _crNum);
-            contentSize += (_spacing + _flodBtnWidth) * flodBtnCount;
-            _content.sizeDelta = new Vector2(contentSize, _content.sizeDelta.y);
+            float posX = (_cellWight + _spacing) * (Mathf.CeilToInt(cellIndex / _crNum) + 1);
+            posX += _flodBtnInfos[flodIndex].obj.transform.localPosition.x;
+            float posY = -(_cellHeight + _spacing) * (cellIndex % _crNum);
+            cellInfo.pos = new Vector2(posX, posY);
         }
     }
 
@@ -214,12 +208,12 @@ private void SetContentSize(FlodBtnInfo flod)
         }
     }
 
-    private void OnFlodClick(FlodBtnInfo flod)
+    private void OnFlodClick(FlodBtnInfo flod,int index)
     {
-        OnFlodClick(flod.index);
+        OnFlodClick(index);
         if (OnFlodBtnClick != null)
         {
-            OnFlodBtnClick(flod.index, flod.isFlod, flod.obj);
+            OnFlodBtnClick(flod.obj, index, flod.isFlod);
         }
     }
 
@@ -228,15 +222,14 @@ private void OnFlodClick(int index)
         _flodBtnInfos[index].isFlod = !_flodBtnInfos[index].isFlod;
         //重置Content大小
         SetContentSize(_flodBtnInfos[index]);
-        int curCellCount = 0;
         //下面的折叠按钮，重新计算坐标显示处理
         for (int i = 0; i < _flodBtnInfos.Length; i++)
         {
             FlodBtnInfo flodBtnInfo = _flodBtnInfos[i];
-            int count = flodBtnInfo.cellCount;
+            int count = flodBtnInfo.cellInfos.Length;
             if (i >= index)
             {
-                SetFlodBtnPos(_flodBtnInfos[i], curCellCount);
+                SetFlodBtnPos(i);
                 for (int k = 0; k < count; k++)
                 {
                     if (flodBtnInfo.isFlod)
@@ -250,7 +243,7 @@ private void OnFlodClick(int index)
                     else
                     {
                         CellInfo cellInfo = flodBtnInfo.cellInfos[k];
-                        SetCellPos(ref cellInfo, i, k, curCellCount);
+                        SetCellPos(ref cellInfo, i, k);
                         if (SetCellState(ref cellInfo))
                         {
                             OnFlodCellShow(cellInfo.obj, i, k);//cell显示回调
@@ -260,10 +253,6 @@ private void OnFlodClick(int index)
                     }
                 }
             }
-            if (!_flodBtnInfos[i].isFlod)
-            {
-                curCellCount += count;
-            }
         }
     }
 }

Assets/Scripts/TestCircularScrollView/Test.cs.meta renamed to Assets/Scripts/TestCircularScrollView/TestCircularScrollView.cs.meta

@@ -23,7 +23,7 @@ public class UICircularScrollView : MonoBehaviour
     /// </summary>
     protected struct CellInfo
     {
-        public Vector3 pos;
+        public Vector2 pos;
         public GameObject obj;
     }
     protected CellInfo[] _cellInfos;
@@ -112,22 +112,11 @@ protected virtual void ScrollRectListener(Vector2 value)
         }
     }
 
-    /// <summary>
-    /// 设置RectTransform左上角锚点
-    /// </summary>
-    /// <param name="rectTrans"></param>
-    protected void SetTopLeftAnchor(RectTransform rectTrans)
-    {
-        rectTrans.pivot = Vector2.up;
-        rectTrans.anchorMin = Vector2.up;
-        rectTrans.anchorMax = Vector2.up;
-    }
-
     /// <summary>
     /// 设置Content尺寸
     /// </summary>
     /// <param name="count"></param>
-    protected void SetContentSize(int count)
+    protected virtual void SetContentSize(int count)
     {
         if (_dir == UIDir.Vertical)
         {
@@ -147,6 +136,17 @@ protected void SetContentSize(int count)
         }
     }
 
+    /// <summary>
+    /// 设置RectTransform左上角锚点
+    /// </summary>
+    /// <param name="rectTrans"></param>
+    protected void SetTopLeftAnchor(RectTransform rectTrans)
+    {
+        rectTrans.pivot = Vector2.up;
+        rectTrans.anchorMin = Vector2.up;
+        rectTrans.anchorMax = Vector2.up;
+    }
+
     /// <summary>
     /// 回收CellInfos
     /// </summary>
@@ -180,13 +180,13 @@ protected void SetCellPos(ref CellInfo cellInfo, int index)
         {
             float posY = -(_cellHeight * Mathf.CeilToInt(index / _crNum) + _spacing * Mathf.CeilToInt(index / _crNum));
             float posX = _cellWight * (index % _crNum) + _spacing * (index % _crNum);
-            cellInfo.pos = new Vector3(posX, posY, 0);
+            cellInfo.pos = new Vector2(posX, posY);
         }
         else
         {
             float posX = _cellWight * Mathf.CeilToInt(index / _crNum) + _spacing * Mathf.CeilToInt(index / _crNum);
             float PosY = -(_cellHeight * (index % _crNum) + _spacing * (index % _crNum));
-            cellInfo.pos = new Vector3(posX, PosY, 0);
+            cellInfo.pos = new Vector2(posX, PosY);
         }
     }