From 16a90aa94d8579cc120c9962d389b59bda5e7398 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 28 八月 2025 22:23:34 +0800
Subject: [PATCH] 95 【主界面】自动挂机
---
Main/System/Equip/EquipModel.cs | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/Main/System/Equip/EquipModel.cs b/Main/System/Equip/EquipModel.cs
index 5cf7211..b4c4148 100644
--- a/Main/System/Equip/EquipModel.cs
+++ b/Main/System/Equip/EquipModel.cs
@@ -9,7 +9,7 @@
public class EquipModel : GameSystemManager<EquipModel>
{
public const int TotleEquip = 12; //瑁呭鏍忓ぇ灏�
- public bool waitEquipOPPack = false;
+ public bool waitEquipOPPack = false; // 绌挎埓瑁呭鐨勬搷浣� 涓嶅惈鍒嗚В
public event Action<bool, int> OnEquipOPResultAction; //鏄惁鎹笂浜嗘柊瑁呭涓斿垎瑙ｄ簡 瑁呭绱㈠紩
public event Action<List<int>, RectTransform> OnItemDropEvent;
@@ -23,7 +23,7 @@
public int[] equipUIGirdEffects; //瑁呭鏍煎瓙鐗规晥
public ItemModel selectFloorEquip; //閫変腑鐨勫湴鏉胯澶�
public int lastShowEquipIndex = -1; //涓婁竴娆＄晫闈㈡樉绀鸿澶囩殑绱㈠紩锛屾嬀鍙栧悗鐗╁搧娑堝け闇�璁板綍涓嬪仛琛ㄧ幇
- public Queue<int> waitEquipOP = new Queue<int>(); //绛夊緟鎿嶄綔鐨勮澶囷紝闇�瑕佸拰UI浜や簰纭
+ public Queue<int> waitEquipOP = new Queue<int>(); //绛夊緟鎿嶄綔鐨勮澶囷紝闇�瑕佸拰UI浜や簰纭 涓嶅惈鍒嗚В
public override void Init()
{
@@ -238,6 +238,13 @@
// if (!IsEquip(equip))
// return false;
+ if (AutoFightModel.Instance.TryAutoFightDoEquip(equip))
+ {
+ //鑷姩鎴樺姏瀵规瘮, 鏉′欢涓嶆弧瓒崇殑鍒嗚В
+ return false;
+ }
+
+ // 濂藉嚑浠惰澶囬渶瑕佸鐞嗙殑鎯呭喌瀛樿捣鏉�
waitEquipOP.Enqueue(equip.gridIndex);
//鏈洖澶嶈澶囨搷浣滅粨鏋滐紝鍚﹀垯浼氭樉绀烘棫瑁呭
if (waitEquipOPPack)
@@ -252,10 +259,12 @@
return false;
}
-
+
selectFloorEquip = GetSelectFloorEquip();
+ if (selectFloorEquip == null)
+ return false;
+
UIManager.Instance.OpenWindow<EquipExchangeWin>();
-
return true;
}
@@ -266,18 +275,12 @@
if (waitEquipOP.Count == 0)
return null;
- ItemModel item = PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());
- if (AutoFightModel.Instance.isAutoAttack)
- {
- //鑷姩鎴樺姏瀵规瘮, 鏉′欢涓嶆弧瓒崇殑鍒嗚В
- return null;
+ return PackManager.Instance.GetItemByIndex(PackType.DropItem, waitEquipOP.Dequeue());
- }
-
- return item;
}
+
//绛夌骇
public int GetEquipLV(ItemModel equip)
{
--
Gitblit v1.8.0