From f0df68bbdaa01187b4f11d17bd25c7e9781be6a2 Mon Sep 17 00:00:00 2001
From: CaiYanPeng <caiyanpeng@juze.pro>
Date: Wed, 12 Jan 2022 10:29:10 +0800
Subject: [PATCH] =?UTF-8?q?banner=20bug=EF=BC=9Bmaxranking=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/BannerController.cs                    | 22 +++++++++++++------
 Assets/Scripts/Scenes/MainController.cs       |  2 ++
 .../Scripts/UI/Prefab/Panel/HomeController.cs |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Assets/BannerController.cs b/Assets/BannerController.cs
index 784b8a2e..7fe45aa8 100644
--- a/Assets/BannerController.cs
+++ b/Assets/BannerController.cs
@@ -15,6 +15,7 @@ public class BannerController : MonoBehaviour
     private List<Vector3> standardPositions;
     private List<Recommand> list;
     private int currentIndex = 1;
+    private Dictionary<string, Texture> caches;
     void Awake()
     {
         itemList = new List<CanvasGroup>
@@ -23,6 +24,7 @@ public class BannerController : MonoBehaviour
             transform.Find("2").GetComponent<CanvasGroup>(),
             transform.Find("3").GetComponent<CanvasGroup>()
         };
+        caches = new Dictionary<string, Texture>();
         standardPositions = new List<Vector3>
         {
             transform.Find("1").localPosition,transform.Find("2").localPosition,transform.Find("3").localPosition
@@ -130,7 +132,7 @@ public class BannerController : MonoBehaviour
         {
             var area = list[index++];
 
-            c.GetComponent<RecommendController>().Initial(area);
+            c.GetComponent<RecommendController>().Initial(area, caches);
             c.GetComponent<Button>().onClick.RemoveAllListeners();
             if (c.alpha != 1)
             {
@@ -151,12 +153,14 @@ public class BannerController : MonoBehaviour
         currentIndex = 1;
         this.list = list;
     }
+    bool animateLock = false;
     private void Right()
     {
         int center = GetCenterIndex(),
            left = GetSideIndex(true),
            right = GetSideIndex(false);
-        if (center == -1 || left == -1 || right == -1) return;
+        if (center == -1 || left == -1 || right == -1 || animateLock) return;
+        animateLock = true;
         DOTween.CompleteAll();
         DORight(itemList[left], itemList[center], itemList[right]);
     }
@@ -168,12 +172,12 @@ public class BannerController : MonoBehaviour
         se.Join(center.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(-43, 0.3f));
         var area = list[((currentIndex++) + list.Count) % list.Count];
-        right.GetComponent<RecommendController>().Initial(area);
+        right.GetComponent<RecommendController>().Initial(area, caches);
         if (currentIndex >= list.Count) currentIndex = 0;
         se.Join(left.DOFade(1, 0.3f));
         se.Join(left.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
-        se.Play();
+        se.Play().onComplete = ()=> { animateLock = false; };
         left.transform.SetAsLastSibling();
         //事件改变
         left.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -189,7 +193,8 @@ public class BannerController : MonoBehaviour
         int center = GetCenterIndex(),
            left = GetSideIndex(true),
            right = GetSideIndex(false);
-        if (center == -1 || left == -1 || right == -1) return;
+        if (center == -1 || left == -1 || right == -1|| animateLock) return;
+        animateLock = true;
         DOTween.CompleteAll();
         DOLeft(itemList[left], itemList[center], itemList[right]);
     }
@@ -202,12 +207,12 @@ public class BannerController : MonoBehaviour
         se.Join(left.GetComponent<RectTransform>().DOLocalMoveX(43, 0.3f));
         var area = list[((currentIndex--) + list.Count) % list.Count];
         var centerArea = list[currentIndex + 1];
-        left.GetComponent<RecommendController>().Initial(area);
+        left.GetComponent<RecommendController>().Initial(area, caches);
         if (currentIndex < 0) currentIndex = list.Count - 1;
         se.Join(right.DOFade(1, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOScale(Vector3.one, 0.3f));
         se.Join(right.GetComponent<RectTransform>().DOLocalMoveX(0, 0.3f));
-        se.Play();
+        se.Play().onComplete = () => { animateLock = false; };
         right.transform.SetAsLastSibling();
         //事件改变
         right.GetComponent<Button>().onClick.RemoveAllListeners();
@@ -254,5 +259,8 @@ public class BannerController : MonoBehaviour
     {
         Debug.Log(248+"毁灭");
         TouchKit.removeGestureRecognizer(pan);
+        caches = null;
+        Resources.UnloadUnusedAssets();
+        GC.Collect();
     }
 }
diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs
index 1ea6bb9e..b865d5f4 100644
--- a/Assets/Scripts/Scenes/MainController.cs
+++ b/Assets/Scripts/Scenes/MainController.cs
@@ -185,6 +185,8 @@ public class MainController : BaseScene
 #endif
     private void DoMessage6(LinkedMessageEvent e)
     {
+        //Resources.UnloadUnusedAssets();
+        //GC.Collect();
         var selectIndex = msgIndex % 5;
         var m = msgs[selectIndex];
         if (msgIndex >= 5) //
diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
index fa09808d..e7fb1d7f 100644
--- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
@@ -317,7 +317,7 @@ public class HomeController : PFUIPanel
         if (res.result)
         {
             maxList = res.data;
-            if (maxList.Count >= 3)
+            if (maxList.Count > 0)
             {
                 maxdataTime = 3;
                 maxdataIndex = 0;