From 1092b579a7ca3dc489b835f7b521e0e197fb7e59 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 24 十月 2025 16:40:13 +0800
Subject: [PATCH] 0312 重连问题
---
Main/System/Equip/EquipModel.cs | 1 +
Main/System/Tip/ConfirmCancel.cs | 16 +++++++++++++++-
Main/System/Tip/MoneyIconToggleConfirmWin.cs | 15 +++++++++++++--
Main/System/GMCommand/GMCmdManager.cs | 1 -
4 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index b8c4317..14c7e7f 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -60,6 +60,7 @@
waitEquipOP.Clear();
lastShowEquipIndex = -1;
lastDropIndexs.Clear();
+ waitEquipOPPack = false;
}
diff --git a/Main/System/GMCommand/GMCmdManager.cs b/Main/System/GMCommand/GMCmdManager.cs
index 10ee5bb..4f53e5f 100644
--- a/Main/System/GMCommand/GMCmdManager.cs
+++ b/Main/System/GMCommand/GMCmdManager.cs
@@ -13,7 +13,6 @@
public override void Init()
{
- base.Init();
GetCmdArray();
LaunchInHot.Instance.OnApplicationOut += OnApplicationOut;
}
diff --git a/Main/System/Tip/ConfirmCancel.cs b/Main/System/Tip/ConfirmCancel.cs
index 88c0465..6fa1683 100644
--- a/Main/System/Tip/ConfirmCancel.cs
+++ b/Main/System/Tip/ConfirmCancel.cs
@@ -313,7 +313,7 @@
-
+ //璐у竵纭妗�:鏈夋樉绀哄嬀閫夌殑
public static Action<bool, bool> OnMoneyToggleConfirmAct;
public static void MoneyIconToggleConfirm(int moneyCnt, int _moneyType, string content, string toggleTxt, Action<bool, bool> func, bool _toggle = false)
{
@@ -329,6 +329,20 @@
}
}
+ //璐у竵纭妗�:涓嶆樉绀哄嬀閫夌殑
+ public static void MoneyIconConfirm(int moneyCnt, int _moneyType, string content, Action<bool, bool> func)
+ {
+ generalContent = content;
+ OnToggleConfirmEvent = func;
+ moneyType = _moneyType;
+ moneyNeedCount = moneyCnt;
+ if (!UIManager.Instance.IsOpened<MoneyIconToggleConfirmWin>())
+ {
+ UIManager.Instance.OpenWindow<MoneyIconToggleConfirmWin>();
+ }
+ }
+
+
}
public enum ToggleCheckType
diff --git a/Main/System/Tip/MoneyIconToggleConfirmWin.cs b/Main/System/Tip/MoneyIconToggleConfirmWin.cs
index cc580c7..5cd1157 100644
--- a/Main/System/Tip/MoneyIconToggleConfirmWin.cs
+++ b/Main/System/Tip/MoneyIconToggleConfirmWin.cs
@@ -25,8 +25,19 @@
protected override void OnPreOpen()
{
m_Content.text = ConfirmCancel.generalContent;
- m_ToggleTxt.text = ConfirmCancel.toggleContent;
- m_Toggle.isOn = ConfirmCancel.toggleOpenState;
+ //浠ｈ〃涓嶉渶瑕佹樉绀哄嬀閫夋
+ if (ConfirmCancel.toggleContent == "")
+ {
+ m_Toggle.SetActive(false);
+ m_Toggle.isOn = false;
+ }
+ else
+ {
+ m_Toggle.SetActive(true);
+ m_ToggleTxt.text = ConfirmCancel.toggleContent;
+ m_Toggle.isOn = ConfirmCancel.toggleOpenState;
+ }
+
moneyText.text = UIHelper.ShowUseMoney(ConfirmCancel.moneyType, ConfirmCancel.moneyNeedCount);
moneyIcon.SetIconWithMoneyType(ConfirmCancel.moneyType);
--
Gitblit v1.8.0