默认值修改
parent
cda3ad53a7
commit
b99117fe0b
|
@ -123,19 +123,17 @@ public class BloodLogic {
|
|||
.build();
|
||||
heroDefendFightInfos.add(heroFightInfo);
|
||||
}
|
||||
List<CommonProto.FightUnitInfo> pokemonSkills = null;
|
||||
List<CommonProto.FightUnitInfo> pokemonSkills = new ArrayList<>();
|
||||
User user = UserManager.getUser(uid, true);
|
||||
if(user!=null&&!user.getPokemonManager().getPokemonTeamMap().isEmpty()){
|
||||
pokemonSkills = HeroLogic.getInstance().getPokemonSkills(UserManager.getUser(uid));
|
||||
}
|
||||
CommonProto.FightTeamInfo.Builder builder = CommonProto.FightTeamInfo.
|
||||
return CommonProto.FightTeamInfo.
|
||||
newBuilder()
|
||||
.addAllFightUnitList(heroDefendFightInfos)
|
||||
.setTeamPassiveList(passiveSkill);
|
||||
if(pokemonSkills != null){
|
||||
builder.addAllPokemonUnitList(pokemonSkills);
|
||||
}
|
||||
return builder.build();
|
||||
.addAllPokemonUnitList(pokemonSkills)
|
||||
.setTeamPassiveList(passiveSkill)
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue