From 379e85704d4c6e0e4302fde3e25df4a89655a351 Mon Sep 17 00:00:00 2001
From: yuanshuai <243578945@qq.com>
Date: Tue, 26 Oct 2021 17:18:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E7=9B=B8=E5=85=B3=E4=B8=BB?=
 =?UTF-8?q?=E8=A7=92=E6=8A=80=E8=83=BD=E6=80=A7=E5=88=AB=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ljsd/jieling/logic/fight/FightUtil.java    | 2 +-
 .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

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<CommonProto.FightUnitInfo> getCrossPokemon(CrossArenaManager crossArenaManager) {
+    public List<CommonProto.FightUnitInfo> getCrossPokemon(CrossArenaManager crossArenaManager,int sex) {
         //todo 灵兽
         Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemonMap = crossArenaManager.getPokemons();
         Map<Integer, String> teamMap = crossArenaManager.getPokemonTeamMap();
-
         Map<Integer, com.ljsd.jieling.thrift.idl.Pokemon> pokemons = new HashMap<>();
         List<CommonProto.FightUnitInfo> 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;
     }