From f41cf48f3b397930cdc7323e3d4e0459ac76e1c0 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 24 Feb 2020 15:57:11 +0800 Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1005747=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E7=8C=8E=E5=A6=96=E4=B9=8B=E8=B7=AF=E4=BC=98=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9=20=E5=8E=BB=E6=8E=89=E6=AF=8F=E6=97=A5=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E5=BF=AB=E7=85=A7=20=E5=8F=96=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E6=88=98=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/UserManager.java | 2 +- .../com/ljsd/jieling/logic/expedition/ExpeditionLogic.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index 12bde5102..62f04de28 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -110,7 +110,7 @@ public class UserManager { teamPosManager.addTeamOfInitPlayer(teamHeros); int force = HeroLogic.getInstance().calTeamTotalForce(user, 1, true); playerManager.setMaxForce(force); - user.getExpeditionManager().setForceSnap(force); + // user.getExpeditionManager().setForceSnap(force); KtEventUtils.onKtEvent(user, ParamEventBean.UserRegister); } 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 2d21e952f..55730f8da 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 @@ -64,7 +64,6 @@ public class ExpeditionLogic { //每日重置 public void flushUserdataEveryDay(User user) throws Exception { ExpeditionManager manager = user.getExpeditionManager(); - manager.setForceSnap(user.getPlayerInfoManager().getMaxForce()); takeAllReward(user); manager.clearExpeditionNodeInfos(); manager.setLay(1); @@ -215,7 +214,7 @@ public class ExpeditionLogic { } int minFoce = sExpeditionSetting.getMatchForce()[0]; int manFoce = sExpeditionSetting.getMatchForce()[1]; - int standerFoce = (int) (user.getExpeditionManager().getForceSnap() * (minFoce / 10000f) + nodeInfo.getLay() / size * (manFoce - minFoce)); + int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * (minFoce / 10000f) + nodeInfo.getLay() / size * (manFoce - minFoce)); float randomForce = (standerFoce * ((sExpeditionSetting.getMatchForceRange()[0] + (int) (Math.random() * (sExpeditionSetting.getMatchForceRange()[1] - sExpeditionSetting.getMatchForceRange()[0]))) / 10000f)); if(nodeInfo.getType()==NODETYPE_ADVANCE){