From 9153efbc6290cd722efadeca0dbba4af31375e18 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 25 Jun 2020 10:51:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=90=88=E6=88=90=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E6=9C=80=E5=A4=A7=E5=BE=AA=E7=8E=AF=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/fight/CombatLogic.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 050cef351..693817b24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -986,6 +986,12 @@ public class CombatLogic { } } + + /** + * 将挂机和急速探索的装备合成起来 + * @param equipMap + * @return + */ private static Map equipAutoCombine(Map equipMap){ if(equipMap.isEmpty()) return equipMap; @@ -1024,7 +1030,7 @@ public class CombatLogic { isOver = false; } count++; - }while(!isOver&&count<5); + }while(!isOver&&count<10); equipMap = tempMap; return equipMap; }