From c0949548df8c18eb2f68316c331bb4d143bcafdd Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Mon, 29 Apr 2019 18:46:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E9=80=9F=20=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=BC=82=E5=A6=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/map/CrossInfo.java | 6 ++++++ .../java/com/ljsd/jieling/handler/map/MapLogic.java | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java index f79d6c93d..e30fbe9eb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/CrossInfo.java @@ -11,6 +11,8 @@ public class CrossInfo { private Set heroIds = new HashSet<>(5); + private Set pokemons = new HashSet<>(3); + private long sendRewardTime; private int forces; @@ -40,6 +42,10 @@ public class CrossInfo { return heroIds; } + public Set getPokemons() { + return pokemons; + } + public int getForces() { return forces; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 6f0fb6656..6b40d6a01 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1278,6 +1278,7 @@ public class MapLogic { crossInfo.setLeastTime(useTime); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(mapManager.getTeamId()); int heroForces = 0; + // 妖灵师 crossInfo.getHeroIds().clear(); for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { Hero hero = user.getHeroManager().getHero(teamPosHeroInfo.getHeroId()); @@ -1287,6 +1288,16 @@ public class MapLogic { heroForces += HeroLogic.getInstance().calHeoForce(user, hero); crossInfo.getHeroIds().add(hero.getTemplateId()); } + // 异妖 + crossInfo.getPokemons().clear(); + List teamPosForPokenInfos = user.getTeamPosManager().getTeamPosForPoken().get(mapManager.getTeamId()); + for (TeamPosForPokenInfo teamPosForPokenInfo : teamPosForPokenInfos) { + Pokemon pokemon = user.getPokemonManager().getPokemonMap().get(teamPosForPokenInfo.getPokenId()); + if (pokemon == null) { + continue; + } + crossInfo.getPokemons().add(pokemon.getId()); + } crossInfo.setForces(heroForces); SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); if (sChallengeMapConfig.getIfRank() == 1) {