From 45b304a551bce24c86c6b872dd088a506220fb24 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Tue, 18 Aug 2020 00:26:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E6=96=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java | 3 ++- .../ljsd/jieling/logic/expedition/ExpeditionLogic.java | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java index 6e39e1159..3605613a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_role_gm.java @@ -158,6 +158,7 @@ public class Cmd_role_gm extends GmRoleAbstract { Map heroStarsMap = sArenaRobotConfig.getStarOfHeroMap(); Map bossHP = new HashMap<>(); + int inner=1; for (Map.Entry item : heroStarsMap.entrySet()) { StringBuilder skillSb = new StringBuilder(); Integer heroTid = item.getKey(); @@ -174,7 +175,7 @@ public class Cmd_role_gm extends GmRoleAbstract { int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv(); int robotLevel = sArenaRobotConfig.getRoleLv(); Map robotHeroAttribute = HeroLogic.getInstance().calRobotHeroAttribute(scHero, robotLevel, sArenaRobotConfig.getBreakId(), differDemonsId, differDemonsLv, false); - heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute)); + heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute,inner++)); // String property = HeroLogic.getInstance().getRobotHeroProperty(sArenaRobotConfig,scHero,propertySb,robotHeroAttribute).toString(); } 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 c94ae9a93..5a2d7cfa3 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 @@ -315,13 +315,7 @@ public class ExpeditionLogic { int minFoce = sExpeditionSetting.getMatchForce()[leve-1][0]; int manFoce = sExpeditionSetting.getMatchForce()[leve-1][1]; - float v = user.getPlayerInfoManager().getMaxForce() * ((minFoce / 10000f)); - System.out.println("v = " + v); - float v1 = (minFoce / 10000f) + ((float) nodeInfo.getLay()) / 11 * ((float) (manFoce - minFoce) / 10000f); - System.out.println("v1 = " + v1); int standerFoce = (int) (user.getPlayerInfoManager().getMaxForce() * ((minFoce / 10000f) + ((float) nodeInfo.getLay()) / 11 * ((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){ @@ -523,6 +517,7 @@ public class ExpeditionLogic { Map heroStarsMap = sArenaRobotConfig.getStarOfHeroMap(); Map bossHP = new HashMap<>(); + int innerPosition= 1; for (Map.Entry item : heroStarsMap.entrySet()) { StringBuilder skillSb = new StringBuilder(); Integer heroTid = item.getKey(); @@ -539,7 +534,7 @@ public class ExpeditionLogic { int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv(); int robotLevel = sArenaRobotConfig.getRoleLv(); Map robotHeroAttribute = HeroLogic.getInstance().calRobotHeroAttribute(scHero, robotLevel, sArenaRobotConfig.getBreakId(), differDemonsId, differDemonsLv, false); - heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute)); + heroAllAttribute.put(heroTid.toString(), new FamilyHeroInfo(heroTid, robotLevel, heroStar, robotHeroAttribute,innerPosition++)); // String property = HeroLogic.getInstance().getRobotHeroProperty(sArenaRobotConfig,scHero,propertySb,robotHeroAttribute).toString(); }