玉虚论道调整为半公平

dengdan 2022-09-12 11:56:57 +08:00
parent 8e93d63e25
commit 1a7f39304c
1 changed files with 83 additions and 79 deletions

View File

@ -835,32 +835,32 @@ public class PlayerLogic {
}
}
// 灵兽
Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
// clone 深度复制
Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
pokemon.setTmpId(pokemon.getTmpId());
pokemon.setId(pokemon.getId());
pokemon.setLevel(pokemon.getLevel());
pokemon.setStar(pokemon.getStar());
teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
}
// Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
// Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
// for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
// // clone 深度复制
// Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
// pokemon.setTmpId(pokemon.getTmpId());
// pokemon.setId(pokemon.getId());
// pokemon.setLevel(pokemon.getLevel());
// pokemon.setStar(pokemon.getStar());
// teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
// }
//LOGGER.info("=====================跨服获取阵容:{}",teamId);
Integer integer = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
teamOneTeamInfo.setTotalForce(integer);
for(Map.Entry<Integer, PurpleMansionSeal> entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){
PurpleMansionSeal value = entry.getValue();
Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
Hero hero = heroMap.get(value.getSubId());
if(value.getState()==0){
continue;
}
teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).
setId(value.getSealId()).setHeroTId(hero==null?0:hero.getTemplateId()));
}
//builder.setTeam(teamOneTeamInfo.build());
// for(Map.Entry<Integer, PurpleMansionSeal> entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){
// PurpleMansionSeal value = entry.getValue();
// Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
// Hero hero = heroMap.get(value.getSubId());
// if(value.getState()==0){
// continue;
// }
// teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).
// setId(value.getSealId()).setHeroTId(hero==null?0:hero.getTemplateId()));
// }
// builder.setTeam(teamOneTeamInfo.build());
builder.addCrossTeam(teamOneTeamInfo.build());
}
return builder.build();
@ -894,52 +894,56 @@ public class PlayerLogic {
if(hero == null){
continue;
}
Hero yuxuHero = HeroLogic.getInstance().getYuHero(hero.getTemplateId());
if(yuxuHero == null){
continue;
}
teamOneTeamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder()
.setHeroid(hero.getId())
.setHeroTid(hero.getTemplateId())
.setLevel(hero.getLevel(user.getHeroManager()))
.setStar(hero.getStar())
.setLevel(yuxuHero.getYuXuLevel())
.setStar(yuxuHero.getStar())
.setPosition(heroInfo.getPosition())
.setSkinId(hero.getSkin())
.setGodSoulLv(hero.getGodSoulLv())
.setPropertyId(hero.getPropertyId())
.setGodSoulLv(yuxuHero.getGodSoulLv())
.setPropertyId(yuxuHero.getPropertyId())
.build());
}
}
// 灵兽
Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
// clone 深度复制
Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
pokemon.setTmpId(pokemon.getTmpId());
pokemon.setId(pokemon.getId());
pokemon.setLevel(pokemon.getLevel());
pokemon.setStar(pokemon.getStar());
teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
}
// Map<String, Pokemon> pokemonMap = user.getPokemonManager().getPokemonMap();
// Map<Integer, String> teamMap = user.getPokemonManager().getPokemonTeamMap();
// for (Map.Entry<Integer, String> entry : teamMap.entrySet()) {
// // clone 深度复制
// Pokemon pokemon = (Pokemon)pokemonMap.get(entry.getValue()).clone();
// pokemon.setTmpId(pokemon.getTmpId());
// pokemon.setId(pokemon.getId());
// pokemon.setLevel(pokemon.getLevel());
// pokemon.setStar(pokemon.getStar());
// teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
// }
//LOGGER.info("=====================跨服获取阵容:{}",teamId);
Integer integer = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false);
teamOneTeamInfo.setTotalForce(integer);
for(Map.Entry<Integer, PurpleMansionSeal> entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){
PurpleMansionSeal value = entry.getValue();
Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
Hero hero = heroMap.get(value.getSubId());
if(value.getState()==0){
continue;
}
teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).
setId(value.getSealId()).setHeroTId(hero==null?0:hero.getTemplateId()));
}
//身外化身变身卡
teamOneTeamInfo.addAllTransformationCardInfo(CBean2Proto.getTransformationInfoList2(user));
//四象心法
teamOneTeamInfo.addAllSixiangxinfaInfo(GetPlayerInfoHandler.getSixiangxinfaInfos(user.getHeroManager()));
//命格
teamOneTeamInfo.addAllLifeGridInfo(GetPlayerInfoHandler.getLifeGridInfos(user.getHeroManager()));
//坐骑
teamOneTeamInfo.addAllUserMountInfo(CBean2Proto.getUserMountList(user));
// for(Map.Entry<Integer, PurpleMansionSeal> entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){
// PurpleMansionSeal value = entry.getValue();
// Map<String, Hero> heroMap = user.getHeroManager().getHeroMap();
// Hero hero = heroMap.get(value.getSubId());
// if(value.getState()==0){
// continue;
// }
// teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).
// setId(value.getSealId()).setHeroTId(hero==null?0:hero.getTemplateId()));
// }
// //身外化身变身卡
// teamOneTeamInfo.addAllTransformationCardInfo(CBean2Proto.getTransformationInfoList2(user));
// //四象心法
// teamOneTeamInfo.addAllSixiangxinfaInfo(GetPlayerInfoHandler.getSixiangxinfaInfos(user.getHeroManager()));
// //命格
// teamOneTeamInfo.addAllLifeGridInfo(GetPlayerInfoHandler.getLifeGridInfos(user.getHeroManager()));
// //坐骑
// teamOneTeamInfo.addAllUserMountInfo(CBean2Proto.getUserMountList(user));
builder.setTeam(teamOneTeamInfo.build());
//builder.addCrossTeam(teamOneTeamInfo.build());
}
@ -1070,36 +1074,36 @@ public class PlayerLogic {
.build());
}
}
if(crossArenaManager.getPokemons()!=null){
Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemonMap = crossArenaManager.getPokemons();
Map<Integer, String> teamMap = crossArenaManager.getPokemonTeamMap();
for(Map.Entry<Integer, String> entry :teamMap.entrySet()){
// clone 深度复制
com.ljsd.jieling.thrift.idl.Pokemon pokemon = pokemonMap.get(entry.getValue());
pokemon.setTmpId(pokemon.getTmpId());
pokemon.setId(pokemon.getId());
pokemon.setLevel(pokemon.getLevel());
pokemon.setStar(pokemon.getStar());
teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
}
}
// if(crossArenaManager.getPokemons()!=null){
// Map<String, com.ljsd.jieling.thrift.idl.Pokemon> pokemonMap = crossArenaManager.getPokemons();
// Map<Integer, String> teamMap = crossArenaManager.getPokemonTeamMap();
// for(Map.Entry<Integer, String> entry :teamMap.entrySet()){
// // clone 深度复制
// com.ljsd.jieling.thrift.idl.Pokemon pokemon = pokemonMap.get(entry.getValue());
// pokemon.setTmpId(pokemon.getTmpId());
// pokemon.setId(pokemon.getId());
// pokemon.setLevel(pokemon.getLevel());
// pokemon.setStar(pokemon.getStar());
// teamOneTeamInfo.addPokemonInfos(CBean2Proto.getSimpleTeamInfoByPokeMon(pokemon, entry.getKey()));
// }
// }
LOGGER.info("=====================跨服获取阵容:{}",teamId);
Integer integer = crossArenaManager.getTotalForceByTeam().getOrDefault(teamId,0);
teamOneTeamInfo.setTotalForce(integer);
if(crossArenaManager.getSeals()!= null){
for(Map.Entry<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> entry:crossArenaManager.getSeals().entrySet()){
com.ljsd.jieling.thrift.idl.PurpleMansionSeal value = entry.getValue();
com.ljsd.jieling.thrift.idl.ArenaOfHero arenaOfHero = crossArenaManager.getHeros().get(value.getSubId());
if(value.getState()==0){
continue;
}
teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).setId(value.getSealId()).setHeroTId(arenaOfHero==null?0:arenaOfHero.getTemplateId()));
}
}
// if(crossArenaManager.getSeals()!= null){
// for(Map.Entry<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> entry:crossArenaManager.getSeals().entrySet()){
// com.ljsd.jieling.thrift.idl.PurpleMansionSeal value = entry.getValue();
// com.ljsd.jieling.thrift.idl.ArenaOfHero arenaOfHero = crossArenaManager.getHeros().get(value.getSubId());
// if(value.getState()==0){
// continue;
// }
// teamOneTeamInfo.addSealShow(CommonProto.PurpleSealShowInfo.newBuilder().setType(value.getType()).setId(value.getSealId()).setHeroTId(arenaOfHero==null?0:arenaOfHero.getTemplateId()));
// }
// }
//builder.setTeam(teamOneTeamInfo.build());
builder.addCrossTeam(teamOneTeamInfo.build());
}
//PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build());
PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.newBuilder().setTeamInfo(builder.build());
return builder.build();
}