From 6d4134f2b1c5a98a19024503f2eca91da0cbafc3 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 17 Mar 2020 17:12:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=8E=E5=A6=96=E6=95=B0=E6=8D=AE=E8=BF=87?= =?UTF-8?q?=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/expedition/ExpeditionLogic.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 55730f8da..9fbeefd2c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -144,7 +144,11 @@ public class ExpeditionLogic { } } //移除已经删除的hero - Set removeId = heroHP.keySet().stream().filter(k -> !heroMap.keySet().contains(k)).collect(Collectors.toSet()); + Set removeId = heroHP.keySet().stream().filter(k -> { + if(!heroMap.keySet().contains(k)) + return true; + return heroMap.get(k).getLevel()<20; + }).collect(Collectors.toSet()); removeId.forEach(heroHP::remove); Set heroInfoSet = new HashSet<>(); for (Map.Entry entry : heroHP.entrySet()) { @@ -214,7 +218,7 @@ public class ExpeditionLogic { } int minFoce = sExpeditionSetting.getMatchForce()[0]; int manFoce = sExpeditionSetting.getMatchForce()[1]; - int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * (minFoce / 10000f) + nodeInfo.getLay() / size * (manFoce - minFoce)); + int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * ((minFoce / 10000f) + ((float) nodeInfo.getLay()) / size * ((float) (manFoce - minFoce)/10000f))); float randomForce = (standerFoce * ((sExpeditionSetting.getMatchForceRange()[0] + (int) (Math.random() * (sExpeditionSetting.getMatchForceRange()[1] - sExpeditionSetting.getMatchForceRange()[0]))) / 10000f)); if(nodeInfo.getType()==NODETYPE_ADVANCE){