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){