diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 37459426b..7644d27f4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -869,21 +869,24 @@ public class CombatLogic { return ""; } - public static Map> elementEffect(User user){ - Map> heroAllAttributeMap = user.getMapManager().getHeroAllAttributeMap(); + public static List elementEffect(User user){ Map heroMap = user.getHeroManager().getHeroMap(); Map configMap = SElementalResonanceConfig.configMap; + int curTeamPosId = user.getTeamPosManager().getCurTeamPosId(); + List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(curTeamPosId); + //找出上场的Id - Set heroes = heroAllAttributeMap.keySet(); - List heroFind = new ArrayList<>(heroes.size()); - for(String key :heroes){ + List heroFind = new ArrayList<>(teamPosHeroInfos.size()); + for(TeamPosHeroInfo key :teamPosHeroInfos){ for(Map.Entry entry :heroMap.entrySet()){ - if(key.equals(entry.getKey())){ + if(key.getHeroId().equals(entry.getKey())){ heroFind.add(entry.getValue().getTemplateId()); } } } + + Map propertiesMap = new HashMap<>(); for(Integer heroId:heroFind){ int propertyName = SCHero.sCHero.get(heroId).getPropertyName(); @@ -958,7 +961,7 @@ public class CombatLogic { System.out.println(next[0][0]+","+next[0][1]); } - return heroAllAttributeMap; + return resultEffect; } public static > Map sortByValueDescending(Map map)