From 91e6f05fcce9820be10d22993ebce2418f08bbcc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 29 一月 2026 12:01:45 +0800
Subject: [PATCH] 63 【命格】命格问题

---
 Main/System/Mingge/MinggeWin.cs                 |   33 ++++++++++++++++++++++++++++++++-
 Main/System/FuncPreset/FuncPresetChooseCells.cs |    5 +++++
 2 files changed, 37 insertions(+), 1 deletions(-)

diff --git a/Main/System/FuncPreset/FuncPresetChooseCells.cs b/Main/System/FuncPreset/FuncPresetChooseCells.cs
index 23f94a1..bc2cfbc 100644
--- a/Main/System/FuncPreset/FuncPresetChooseCells.cs
+++ b/Main/System/FuncPreset/FuncPresetChooseCells.cs
@@ -44,6 +44,11 @@
         curFuncType = funcType;
 
         var selectID = FuncPresetManager.Instance.GetFuncPresetIDByBattleType(battleType, funcType);
+        if (unFoldID != 0 && selectID != unFoldID)
+        {
+            //鍏朵粬鍦版柟鍒囨崲浜嗘柟妗堬紝闇�瑕侀獙璇佸綋鍓嶅睍寮�鏄笉鏄悓涓�涓�
+            unFoldID = 0;
+        }
         var showCount = FuncPresetManager.Instance.GetShowFuncPresetCount(funcType);
         unFoldBtn.SetActive(showCount > 4);
         unFoldBtn.AddListener(() =>
diff --git a/Main/System/Mingge/MinggeWin.cs b/Main/System/Mingge/MinggeWin.cs
index 0bbe61b..8700eba 100644
--- a/Main/System/Mingge/MinggeWin.cs
+++ b/Main/System/Mingge/MinggeWin.cs
@@ -49,7 +49,7 @@
             }
             AttributeManager.Instance.OpenMinggeSimpleAttributeWin(MinggeManager.Instance.minggeAttrDict, skillDict);
         });
-        tyBtn.AddListener(SendTuiyan);
+        tyBtn.AddListener(CheckTuiyan);
         for (int i = 0; i < suiteNameTexts.Length; i++)
         {
             int index = i;
@@ -241,6 +241,37 @@
         moneyMoveByPathCell.PlayAnimation(MinggeManager.Instance.deitemID, 8, 2);
     }
 
+
+    void CheckTuiyan()
+    {
+        if (!MinggeManager.Instance.qlNotNotify && PackManager.Instance.GetItemCountByID(PackType.Item, MinggeManager.Instance.qlItemID) > 0)
+        {
+            ConfirmCancel.ToggleConfirmCancel(
+                Language.Get("L1003"),
+                Language.Get("Mingge31"),
+                Language.Get("TianziBillborad08"),
+                Language.Get("Mingge35"),
+                Language.Get("Mingge34"),
+                (bool isOK, bool isToggle) =>
+                {
+                    if (isOK)
+                    {
+                        UIManager.Instance.OpenWindow<MinggePrayWin>();
+                    }
+                    else
+                    {
+                        SendTuiyan();
+                    }
+
+                    MinggeManager.Instance.qlNotNotify = isToggle;
+                },
+                false
+            );
+            return;
+        }
+        SendTuiyan();
+    }
+
     void SendTuiyan()
     {
         if (MinggeManager.Instance.isStartAuto)

--
Gitblit v1.8.0