From 10f68072a3e9f1f097c7a4ab7ec30c64abce5a22 Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Wed, 26 Jun 2024 19:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90Bug=E3=80=91=E9=80=89=E5=85=B3?=
 =?UTF-8?q?=E7=89=B9=E6=95=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Forest/Assets/Config/Level/level6.json        |  6 ++---
 .../Gameplay/UI/Level/UILevelSelectItem.cs    | 24 ++++++++++++-------
 .../Gameplay/UI/Shop/UIMainShopController.cs  |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Forest/Assets/Config/Level/level6.json b/Forest/Assets/Config/Level/level6.json
index 0a64a0f..f562ded 100644
--- a/Forest/Assets/Config/Level/level6.json
+++ b/Forest/Assets/Config/Level/level6.json
@@ -1,9 +1,9 @@
 {
   "columnCount": 5,
   "rowCount": 5,
-  "undoCount": 1,
-  "addTimeCount": 1,
-  "openHoleCount": 1,
+  "undoCount": 0,
+  "addTimeCount": 0,
+  "openHoleCount": 0,
   "resetCount": 1,
   "holesIndex": [
     0,
diff --git a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectItem.cs b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectItem.cs
index aa67c83..d9d01c3 100644
--- a/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectItem.cs
+++ b/Forest/Assets/Scripts/Gameplay/UI/Level/UILevelSelectItem.cs
@@ -32,24 +32,22 @@ public class UILevelSelectItem : UIListItem<UILevelDataArray>
         var groupIndex = passLevelIndex / LevelConstants.LevelSelectCount;
         var levelIndex = passLevelIndex % LevelConstants.LevelSelectCount;
 
+        DebugUtil.LogError("通关是:{0}", passLevelIndex);
         //根据数据绑定UI
         for (int i = 0; i < LevelConstants.LevelSelectCount; i++)
         {
             _btns[i] = _go.GetItem<Button>(string.Format(BtnPath, i));
             _levelIDTexts[i] = _go.GetItem<TextMeshProUGUI>(string.Format(LevelIDPath, i));
             _locks[i] = _go.GetItem<Image>(string.Format(LockPath, i));
-            if (groupIndex == data.LevelIndex && levelIndex == i)
-            {
-                LevelSelectManager.Instance.CurBtnObj = _go.FindObj(string.Format(BtnPath, i));
-                LevelSelectManager.Instance.GfxSelectLevel.transform.position =
-                    LevelSelectManager.Instance.CurBtnObj.transform.position;
-            }
         }
 
-        if (data.LevelIndex == groupIndex - 1 && levelIndex == 0)
+        //最后一关
+        var gfx = false;
+        if (passLevelIndex == LevelSelectManager.Instance.CurAllLevelDatas.Count &&
+            groupIndex * LevelConstants.LevelSelectCount == passLevelIndex)
         {
-            var tempIndex = _btns.Length - 1;
-            LevelSelectManager.Instance.CurBtnObj = _go.FindObj(string.Format(BtnPath, tempIndex));
+            gfx = true;
+            LevelSelectManager.Instance.CurBtnObj = _go.FindObj(string.Format(BtnPath, _btns.Length - 1));
             LevelSelectManager.Instance.GfxSelectLevel.transform.position =
                 LevelSelectManager.Instance.CurBtnObj.transform.position;
         }
@@ -59,6 +57,14 @@ public class UILevelSelectItem : UIListItem<UILevelDataArray>
         {
             if (data.LevelID[i] != null)
             {
+                //特效表现
+                if (groupIndex == data.LevelIndex && levelIndex == i && !gfx)
+                {
+                    LevelSelectManager.Instance.CurBtnObj = _go.FindObj(string.Format(BtnPath, i));
+                    LevelSelectManager.Instance.GfxSelectLevel.transform.position =
+                        LevelSelectManager.Instance.CurBtnObj.transform.position;
+                }
+                
                 //上锁表现
                 if (data.LevelIndex * LevelConstants.LevelSelectCount + i >
                     LevelSelectManager.Instance.CurPassLevelIndex)
diff --git a/Forest/Assets/Scripts/Gameplay/UI/Shop/UIMainShopController.cs b/Forest/Assets/Scripts/Gameplay/UI/Shop/UIMainShopController.cs
index 01b2f16..ab0cacb 100644
--- a/Forest/Assets/Scripts/Gameplay/UI/Shop/UIMainShopController.cs
+++ b/Forest/Assets/Scripts/Gameplay/UI/Shop/UIMainShopController.cs
@@ -40,7 +40,7 @@ public class UIMainShopController : UIWindow
         {
             _biEventFirst = EventFirst.fte_buy_coin_large;
             _biEvent = Event.click_buy_coin_large;
-            ShopToBuy(platform + "_CoinBox_1200");
+            ShopToBuy(platform + "_CoinBox_1600");
         });
     }