diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index a8821c194..048f06157 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -753,7 +753,7 @@ public class FightUtil { return CommonProto.FightTeamInfo. newBuilder() .addAllFightUnitList(heroFightInfos) - .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager)) + .addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager,csPlayer.getSex())) .setTeamPassiveList("") .setForceScore(crossArenaManager.getMaxHistoryForce()) .build(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 2d69b6b48..9469b1aa5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -2460,11 +2460,10 @@ public class HeroLogic { return pokemonInfos; } - public List getCrossPokemon(CrossArenaManager crossArenaManager) { + public List getCrossPokemon(CrossArenaManager crossArenaManager,int sex) { //todo 灵兽 Map pokemonMap = crossArenaManager.getPokemons(); Map teamMap = crossArenaManager.getPokemonTeamMap(); - Map pokemons = new HashMap<>(); List pokemonInfos = new ArrayList<>(); @@ -2488,7 +2487,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),0); + getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),sex); return pokemonInfos; }