From 4afff38ff3bc7bae7798b07c53eae8bc0a27db2f Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 20 Feb 2020 09:34:08 +0800 Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1005460=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=8E=A9=E6=B3=95=E9=9C=80=E6=B1=82=E3=80=91=E7=8C=8E=E5=A6=96?= =?UTF-8?q?=E4=B9=8B=E8=B7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/BaseHandler.java | 2 +- .../Expedition/EndExpeditionBattleRequest.java | 2 +- .../jieling/logic/expedition/ExpeditionLogic.java | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java index 9870f99a2..aa556bf24 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java @@ -74,7 +74,7 @@ public abstract class BaseHandler { @SuppressWarnings("unchecked") private boolean getTClassIsNull() { Type superClass = this.getClass().getGenericSuperclass(); - if (superClass instanceof ParameterizedType) { + if (superClass instanceof ParameterizedType) {//带<>的类型 ParameterizedType parameterizedType = (ParameterizedType) superClass; protoClazz = (Class) parameterizedType.getActualTypeArguments()[0]; return null == protoClazz; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java index bbc27b1d3..22be5995c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/Expedition/EndExpeditionBattleRequest.java @@ -86,7 +86,7 @@ public class EndExpeditionBattleRequest extends BaseHandler expeditionHolyConfigs = ExpeditionLogic.getFirstRankHoly(expeditionManager); 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 6108ca502..c6bb83c77 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 @@ -197,7 +197,7 @@ public class ExpeditionLogic { */ private void reSetNode(User user) throws Exception { - //创建节点数据 + //创建节点束河 Set nodeSets = createNodeSet(); //存储并设置英雄快照 @@ -214,13 +214,12 @@ 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 randomForce = (int) (standerFoce * ((sExpeditionSetting.getMatchForceRange()[0] + (int) (Math.random() * (sExpeditionSetting.getMatchForceRange()[1] - sExpeditionSetting.getMatchForceRange()[0]))) / 10000f)); + float randomForce = (standerFoce * ((sExpeditionSetting.getMatchForceRange()[0] + (int) (Math.random() * (sExpeditionSetting.getMatchForceRange()[1] - sExpeditionSetting.getMatchForceRange()[0]))) / 10000f)); - //TODO 战斗节点 不同类型 额外战力加成 走配置 if(nodeInfo.getType()==NODETYPE_ADVANCE){ - randomForce+=1000; + randomForce*=(sExpeditionSetting.getPowerfulForce()[1][1]/10000f+1); }else if(nodeInfo.getType()==NODETYPE_BOSS){ - randomForce+=3000; + randomForce*=(sExpeditionSetting.getPowerfulForce()[2][1]/10000f+1); } Set> typedTuples = RedisUtil.getInstence().rangeByScoreWithScores(RedisKey.AREDEF_TEAM_FORCE_RANK, "", 0, randomForce); @@ -232,7 +231,7 @@ public class ExpeditionLogic { //// } // int robotId = set.iterator().next(); //提前战力排序 支持战力查找机器人 - int robotId= SArenaRobotStaticConfig.getFloorForce2robotId(randomForce); + int robotId= SArenaRobotStaticConfig.getFloorForce2robotId((int)randomForce); SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(robotId); snapOneFightInfo(nodeInfo, sArenaRobotConfig); } else {