From bf01f7443e0dc68b47e3ab481267bcce112de27e Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 7 Aug 2019 18:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/map/MapLogic.java | 7 ++++--- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index b51ab3d2a..16fb1419c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -101,10 +101,13 @@ public class MapLogic { initMap(mapManager, user); user.setMapManager(mapManager); }*/ + MapInfoProto.MapEnterResponse.Builder mapEnterResponse = MapInfoProto.MapEnterResponse.newBuilder(); + SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); // 进入新地图 SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapId); int type = sChallengeConfig.getType(); if (mapManager.getCurMapId() == 0) { + mapEnterResponse.setCurXY(CellUtil.xy2Pos(sChallengeMapConfig.getPosition()[0],sChallengeMapConfig.getPosition()[1])); Map scMap = SCMap.sCMap.get(mapId); if (scMap == null) { LOGGER.info("enterMap() uid=>{} scMap == null =>{} ", uid, mapId); @@ -188,9 +191,7 @@ public class MapLogic { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "地图错误,应进入" + mapManager.getCurMapId()); return; } - MapInfoProto.MapEnterResponse.Builder mapEnterResponse = MapInfoProto.MapEnterResponse.newBuilder(); - SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); - mapEnterResponse.setCurXY(CellUtil.xy2Pos(sChallengeMapConfig.getPosition()[0],sChallengeMapConfig.getPosition()[1])); + if(type ==4){ List teamPosForHero = user.getTeamPosManager().getTeamPosForHero().get(teamId); 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 571ef935a..0c17471a5 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 @@ -370,12 +370,15 @@ public class PlayerLogic { CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() .setHead(1) .setHeadFrame(playerManager.getHeadFrame()) - .setName(playerManager.getNickName()).setUid(session.getUid()).setTeam(team); + .setName(playerManager.getNickName()).setUid(session.getUid()); + CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder(); + teamInfo.setTeam(team); if(teamPosManager.getTeamPosForPoken().get(1)!=null&&teamPosManager.getTeamPosForPoken().get(1).size()>0){ for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(1)){ - oneInfo.addPokemonInfos(posForPokenInfo.getPokenId()); + teamInfo.addPokemonInfos(posForPokenInfo.getPokenId()); } } + oneInfo.setTeam(teamInfo); PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo); MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);