From c8856903e5c9502944b1e1fedc9d8345b5159796 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sun, 17 Jan 2021 17:23:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldserver/src/main/java/com/world/logic/HeroLogic.java | 3 +-- .../main/java/com/world/logic/arean/fight/FightUtil.java | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/worldserver/src/main/java/com/world/logic/HeroLogic.java b/worldserver/src/main/java/com/world/logic/HeroLogic.java index 360cf7585..fd21e5cc3 100644 --- a/worldserver/src/main/java/com/world/logic/HeroLogic.java +++ b/worldserver/src/main/java/com/world/logic/HeroLogic.java @@ -2252,9 +2252,8 @@ public class HeroLogic { int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv(); int heroLevel = sArenaRobotConfig.getRoleLv(); for(Integer heroTid :heroList){ - int heroBreakId = sArenaRobotConfig.getBreakId(); SCHero scHero = SCHero.getsCHero().get(heroTid); - Map robotHeroAttribute = calRobotHeroAttribute(scHero, heroLevel, heroBreakId, differDemonsId, differDemonsLv,true); + Map robotHeroAttribute = calRobotHeroAttribute(scHero, heroLevel, 0, differDemonsId, differDemonsLv,true); totalForce+=calForce(robotHeroAttribute); } return totalForce; diff --git a/worldserver/src/main/java/com/world/logic/arean/fight/FightUtil.java b/worldserver/src/main/java/com/world/logic/arean/fight/FightUtil.java index d9816d0fa..006774bc6 100644 --- a/worldserver/src/main/java/com/world/logic/arean/fight/FightUtil.java +++ b/worldserver/src/main/java/com/world/logic/arean/fight/FightUtil.java @@ -58,13 +58,13 @@ public class FightUtil { } private static CommonProto.FightTeamInfo getRobotFightTeamInfo(SArenaRobotConfig sArenaRobotConfig, Map remainHp) { List heroFightInfos = new ArrayList<>(); - Map heroStarsMap = sArenaRobotConfig.getStarOfHeroMap(); + Map heroMapList = sArenaRobotConfig.getHeroMapList(); int i=0; - for(Map.Entry item : heroStarsMap.entrySet()){ + for(Map.Entry item : heroMapList.entrySet()){ StringBuilder skillSb = new StringBuilder(); StringBuilder propertySb = new StringBuilder(); Integer heroTid = item.getKey(); - Integer heroStar = item.getValue(); + Integer heroStar = item.getValue().getStar(); SCHero scHero = SCHero.getsCHero().get(heroTid); List skillIds = scHero.getSkillListByStar(heroStar); String heroSkill = HeroLogic.getInstance().getRobotHeroSkills(skillIds,skillSb).toString(); @@ -72,7 +72,7 @@ public class FightUtil { int[] differDemonsId = sArenaRobotConfig.getDifferDemonsId(); int differDemonsLv = sArenaRobotConfig.getDifferDemonsLv(); int robotLevel = sArenaRobotConfig.getRoleLv(); - Map robotHeroAttribute =HeroLogic.getInstance(). calRobotHeroAttribute(scHero, robotLevel, sArenaRobotConfig.getBreakId(), differDemonsId, differDemonsLv,false); + Map robotHeroAttribute =HeroLogic.getInstance(). calRobotHeroAttribute(scHero, robotLevel, 0, differDemonsId, differDemonsLv,false); if(remainHp!=null&&remainHp.containsKey(heroTid.toString())){ robotHeroAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(),(int)(remainHp.getOrDefault(heroTid.toString(),1d)*robotHeroAttribute.get(HeroAttributeEnum.Hp.getPropertyId())));