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..e2964d59b 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)) .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 92193461a..5011e1d67 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 @@ -27,6 +27,7 @@ import com.ljsd.jieling.logic.activity.eventhandler.HeroFiveStarGetEventHandler; import com.ljsd.jieling.logic.activity.eventhandler.PokemonFiveStarGetEventHandler; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.logic.dao.*; +import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.gm.ArenaOfHero; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.root.User; @@ -2371,7 +2372,7 @@ public class HeroLogic { } ///获取修行技能数据 - public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce) { + public void getPracticeSkill(List infoList, Map practiceSkillMap,long maxForce,int sex,int userLv) { if (practiceSkillMap.isEmpty()) { return; } @@ -2390,8 +2391,10 @@ public class HeroLogic { .setUnitSkillIds(skillStr.toString()) .setProperty("0") .setPosition(100) + .setStar(userLv) .setSkinId(0) .setForceScore(maxForce) + .setPlayerSex(sex) .build(); infoList.add(skillInfo); } @@ -2431,7 +2434,7 @@ public class HeroLogic { .build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce()); + getPracticeSkill(pokemonInfos, user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel()); return pokemonInfos; } @@ -2459,7 +2462,7 @@ public class HeroLogic { return pokemonInfos; } - public List getCrossPokemon(CrossArenaManager crossArenaManager) { + public List getCrossPokemon(CrossArenaManager crossArenaManager, CSPlayer csPlayer) { //todo 灵兽 Map pokemonMap = crossArenaManager.getPokemons(); Map teamMap = crossArenaManager.getPokemonTeamMap(); @@ -2487,7 +2490,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce()); + getPracticeSkill(pokemonInfos,crossArenaManager.getPracticeSkillMap(),crossArenaManager.getMaxHistoryForce(),csPlayer.getSex(),csPlayer.getLevel()); return pokemonInfos; } @@ -2520,7 +2523,7 @@ public class HeroLogic { .setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build(); pokemonInfos.add(info); } - getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce()); + getPracticeSkill(pokemonInfos,user.getHeroManager().getPracticeSkillMap(),user.getPlayerInfoManager().getMaxForce(),user.getPlayerInfoManager().getSex(),user.getPlayerInfoManager().getLevel()); return pokemonInfos; }