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 54b7c2732..ea614cea7 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 @@ -440,28 +440,25 @@ public class PlayerLogic { public void getOneTeamInfo(ISession session, int id,int teamId,MessageTypeProto.MessageType messageType) throws Exception { User user = UserManager.getUser(id); PlayerManager playerManager = user.getPlayerInfoManager(); - CommonProto.Team.Builder team = CommonProto.Team.newBuilder(); - TeamPosManager teamPosManager = user.getTeamPosManager(); - if(teamPosManager.getTeamPosForHero().containsKey(teamId)){ - for (TeamPosHeroInfo heroInfo:teamPosManager.getTeamPosForHero().get(teamId)) { - int templateId = user.getHeroManager().getHero(heroInfo.getHeroId()).getTemplateId(); - team.addHeroTid(templateId); - } - } - CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() .setHead(1) .setHeadFrame(playerManager.getHeadFrame()) .setLevel(playerManager.getLevel()) .setName(playerManager.getNickName()).setUid(session.getUid()); + TeamPosManager teamPosManager = user.getTeamPosManager(); CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); - teamInfo.setTeam(team); teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false)); if(teamPosManager.getTeamPosForPoken().get(teamId)!=null&&teamPosManager.getTeamPosForPoken().get(teamId).size()>0){ for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(teamId)){ teamInfo.addPokemonInfos(posForPokenInfo.getPokenId()); } } + if(teamPosManager.getTeamPosForHero().containsKey(teamId)){ + for (TeamPosHeroInfo heroInfo:teamPosManager.getTeamPosForHero().get(teamId)) { + Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId()); + teamInfo.addTeam(CommonProto.TeamInfoDeatail.newBuilder().setHeroTid(hero.getTemplateId()).setLevel(hero.getLevel()).setStar(hero.getStar()).build()); + } + } oneInfo.setTeam(teamInfo); PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);