yx跨服打架灵兽,段位重置1000

back_recharge
xuexinpeng 2021-10-18 15:10:18 +08:00
parent b21cb8f45a
commit 375951b7d5
4 changed files with 18 additions and 9 deletions

View File

@ -126,8 +126,8 @@ public class CrossYuxulundaoGetInfoHandler extends BaseHandler<ArenaInfoProto.Cr
CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, serverRankConfig.getFirstReward(), BIReason.CROSS_YUXULUNDAO_DAILYREWARD);
builder.addDrop(drop);
}
csPlayer.setCrossYuxulundaoNewScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
csPlayer.setCrossYuxulundaoOldScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
csPlayer.setCrossYuxulundaoNewScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow() == 0? 1000:SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
csPlayer.setCrossYuxulundaoOldScore(SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow()== 0? 1000:SMServerRankConfig.serverRankConfig.get(resetId).getScoreLow());
isNeedUpdate = true;
}
arenaManager.setCrossMatchTimes(0);

View File

@ -739,7 +739,7 @@ public class FightUtil {
return CommonProto.FightTeamInfo.
newBuilder()
.addAllFightUnitList(heroFightInfos)
.addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemonSkills(crossArenaManager))
.addAllPokemonUnitList(HeroLogic.getInstance().getCrossPokemon(crossArenaManager))
.setTeamPassiveList("")
.build();
}

View File

@ -2409,11 +2409,20 @@ public class HeroLogic{
return pokemonInfos;
}
public List<CommonProto.FightUnitInfo> getCrossPokemonSkills(CrossArenaManager crossArenaManager){
public List<CommonProto.FightUnitInfo> getCrossPokemon(CrossArenaManager crossArenaManager){
//todo 灵兽
Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemons = crossArenaManager.getPokemons();
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<>();
for(Map.Entry<String, com.ljsd.jieling.thrift.idl.Pokemon> entry:pokemons.entrySet()){
for(Map.Entry<Integer, String> entry : teamMap.entrySet()){
com.ljsd.jieling.thrift.idl.Pokemon pokemon = pokemonMap.get(entry.getValue());
pokemons.put(entry.getKey(),pokemon);
}
for(Map.Entry<Integer, com.ljsd.jieling.thrift.idl.Pokemon> entry:pokemons.entrySet()){
com.ljsd.jieling.thrift.idl.Pokemon pokemon = entry.getValue();
if(pokemon==null){
continue;
@ -2422,7 +2431,7 @@ public class HeroLogic{
Map<Integer, Integer> map = calOnePokemonAttribute(pokemon.getTmpId(),pokemon.getStar(),pokemon.getLevel());
StringBuilder propertyBuilder = getOnePokemonProperty(map,pokemon.getLevel());
CommonProto.FightUnitInfo info = CommonProto.FightUnitInfo.newBuilder()
.setPosition(1)
.setPosition(entry.getKey())
.setStar(pokemon.getStar())
.setProperty(propertyBuilder.toString())
.setUnitId(String.valueOf(pokemon.getTmpId())).setUnitSkillIds(String.valueOf(sSpiritAnimalSkill.getId())).build();

View File

@ -81,10 +81,10 @@ struct CrossArenaManager{
4:optional map<i32,i32> totalForceByTeam ;
5:optional i32 totalForce;
6:optional i32 yxldForce;
7:optional map<string,Pokemon> pokemons;
7:optional map<string,Pokemon> pokemons;//
8:optional map<i32,PurpleMansionSeal> seals;
9:optional map<i32,i32> guildSkill;
10:optional map<i32,string> pokemonTeamMap;
10:optional map<i32,string> pokemonTeamMap;//
11:optional i32 treeLevel;
12:optional list<i32> skill;//id