From 1a7f39304c564bd52ad1c83b1e2ca47ef5284a7a Mon Sep 17 00:00:00 2001 From: dengdan Date: Mon, 12 Sep 2022 11:56:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=E5=8D=8A=E5=85=AC=E5=B9=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/player/PlayerLogic.java | 162 +++++++++--------- 1 file changed, 83 insertions(+), 79 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 3acaa8860..a9695812f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -835,32 +835,32 @@ public class PlayerLogic { } } // 灵兽 - Map pokemonMap = user.getPokemonManager().getPokemonMap(); - Map teamMap = user.getPokemonManager().getPokemonTeamMap(); - for (Map.Entry 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 pokemonMap = user.getPokemonManager().getPokemonMap(); +// Map teamMap = user.getPokemonManager().getPokemonTeamMap(); +// for (Map.Entry 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 entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){ - PurpleMansionSeal value = entry.getValue(); - Map 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 entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){ +// PurpleMansionSeal value = entry.getValue(); +// Map 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 pokemonMap = user.getPokemonManager().getPokemonMap(); - Map teamMap = user.getPokemonManager().getPokemonTeamMap(); - for (Map.Entry 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 pokemonMap = user.getPokemonManager().getPokemonMap(); +// Map teamMap = user.getPokemonManager().getPokemonTeamMap(); +// for (Map.Entry 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 entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){ - PurpleMansionSeal value = entry.getValue(); - Map 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 entry:user.getHeroManager().getPurpleMansionSeal().entrySet()){ +// PurpleMansionSeal value = entry.getValue(); +// Map 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 pokemonMap = crossArenaManager.getPokemons(); - Map teamMap = crossArenaManager.getPokemonTeamMap(); - for(Map.Entry 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 pokemonMap = crossArenaManager.getPokemons(); +// Map teamMap = crossArenaManager.getPokemonTeamMap(); +// for(Map.Entry 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 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 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(); }