From 786a48b136e34bfdcac9e8368535d4c7fbe0f1e5 Mon Sep 17 00:00:00 2001
From: pengjunwu <1263019465@qq.com>
Date: Fri, 27 Oct 2023 12:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Gameplay/UI/UI_LevelSelectController.cs   | 22 ++++++++++++-------
 .../Editor/Tools/AutoConfig/ConfigWindow.cs   |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_LevelSelectController.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_LevelSelectController.cs
index 85ddf511376..12de4d1326b 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_LevelSelectController.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_LevelSelectController.cs
@@ -88,7 +88,7 @@ public class UI_LevelSelectController : UIWindow
     private List<GameObject> _showStarReward = new();
 
     private float _totalMoveTime = 1f;
-    private CancellationTokenSource _cts = new();
+    private CancellationTokenSource _cts;
 
     public override void OnAwake()
     {
@@ -299,8 +299,8 @@ public class UI_LevelSelectController : UIWindow
         currStarCount = 6;
         var ratio = (float)currStarCount / maxTarget;
         Text_StarNum.text = currStarCount.ToString();
-        _cts.Cancel();
-        _cts.Dispose();
+        _cts?.Cancel();
+        _cts?.Dispose();
         _cts = new CancellationTokenSource();
         PlayProgressAnimation(ratio, progressLength, _cts.Token);
         Refresh();
@@ -516,12 +516,17 @@ public class UI_LevelSelectController : UIWindow
 
     private void OnClickBack()
     {
-        if (_currPage == PageType.Mode)
-            UIManager.Instance.CloseWindow(WindowName, true);
-        else
+        switch (_currPage)
         {
-            _currPage = (PageType)((int)_currPage - 1);
-            Refresh();
+            case PageType.Mode:
+                UIManager.Instance.CloseWindow(WindowName, true);
+                break;
+            case PageType.LevelGroup:
+                ExitSelectLevelGroup();
+                break;
+            case PageType.Level:
+                ExitSelectLevel();
+                break;
         }
     }
 
@@ -575,6 +580,7 @@ public class UI_LevelSelectController : UIWindow
         UnRegisterSignal();
         _currPage = PageType.Mode;
         _cts.Cancel();
+        _cts.Dispose();
     }
 
     #endregion
diff --git a/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigWindow.cs b/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigWindow.cs
index 9183a5f8433..a76f0cfe048 100644
--- a/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigWindow.cs
+++ b/ProjectNLD/Assets/Editor/Tools/AutoConfig/ConfigWindow.cs
@@ -92,6 +92,7 @@ public class ConfigWindow : EditorWindow
 
                 m_Configs.Add(ci);
             }
+            m_Configs.Sort((a,b)=>a.Name.CompareTo(b.Name));
         }
         else
         {