From eb95ff1b41a825b153d757c4514d50d0c06028b4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 15 一月 2026 23:54:57 +0800
Subject: [PATCH] 429 【主界面】自动挂机-补充自动挑战自动任务
---
Main/System/Main/AutoFightModel.cs | 6 +++---
Main/System/Equip/EquipExchangeWin.cs | 7 +++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/Main/System/Equip/EquipExchangeWin.cs b/Main/System/Equip/EquipExchangeWin.cs
index ba25835..0eaab9c 100644
--- a/Main/System/Equip/EquipExchangeWin.cs
+++ b/Main/System/Equip/EquipExchangeWin.cs
@@ -53,6 +53,13 @@
}
else
{
+ if (oldEquip.guid == EquipModel.Instance.selectFloorEquip.guid)
+ {
+ Debug.LogError("Display: 鏂版棫瑁呭鐩稿悓GUID 瀹㈡埛绔富鍔ㄥ垹闄よ儗鍖呯墿鍝佺储寮�=" + EquipModel.Instance.selectFloorEquip.gridIndex);
+ PackManager.Instance.GetSinglePack(PackType.DropItem).RemoveItem(EquipModel.Instance.selectFloorEquip.gridIndex);
+ CloseWindow();
+ return;
+ }
oldEquipObj.SetActive(true);
newEquipObj.SetActive(true);
oldEquipObj.Display(oldEquip, false);
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index f76e468..01e7e94 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -103,10 +103,10 @@
{
m_NowChallengeCount = value;
lastChallengeTime = value == 0 ? 0 : Time.time;
- Debug.Log($"褰撳墠鍦ㄤ富绾緽oss鎴樿触浜唟m_NowChallengeCount}娆�,涓婃鎴樿触鏃堕棿鏄瘂lastChallengeTime}");
+ // Debug.Log($"褰撳墠鍦ㄤ富绾緽oss鎴樿触浜唟m_NowChallengeCount}娆�,涓婃鎴樿触鏃堕棿鏄瘂lastChallengeTime}");
if (m_NowChallengeCount >= tryChallengeCount)
{
- m_NowChallengeCount = -1; //浠ｈ〃鍋滄缁х画鎸戞垬
+ m_NowChallengeCount = -1; //浠ｈ〃鍋滄缁х画鎸戞垬BOSS, 浣嗕笉鏄仠姝㈡垬鏂�
}
}
}
@@ -117,7 +117,7 @@
get
{
int value = QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.AutoFight_TryChallengeCount, 0);
- return Math.Min(Math.Max(value, 1), maxCost);
+ return Math.Min(Math.Max(value, 1), maxTryChallengeCount);
}
set
{
--
Gitblit v1.8.0