root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

跨服相关主角技能性别字段修改

back_recharge
yuanshuai 2021-10-26 17:18:19 +08:00
parent c366955468
commit 379e85704d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java
View File

@ -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();

5
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -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;
}