From 547c632e81c86b59e80c5d4f119ed538a047b4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B0=B8=E8=8A=B3?= Date: Fri, 14 Jun 2019 18:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=8C=B9=E9=85=8D=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BA=E6=88=BF=E9=97=B4=E5=90=8E=E5=8F=91?= =?UTF-8?q?=E9=80=81=E5=9C=B0=E5=9B=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/room/Room.java | 17 ---------- .../ljsd/jieling/logic/room/RoomManager.java | 9 +++++- .../com/ljsd/jieling/util/MessageUtil.java | 31 +++++++++++++------ 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/room/Room.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/room/Room.java index 4c7d0bb97..21837b1a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/room/Room.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/room/Room.java @@ -136,26 +136,9 @@ public class Room { RoomFightProto.RoomGameStartResponse.Builder builder = RoomFightProto.RoomGameStartResponse.newBuilder(); builder.setClientTimestamp(request.getClientTimestamp()); builder.setServerTimestamp(System.currentTimeMillis()); - builder.setMapId(mapId); - CommonProto.Cell.Builder cellBuilder = CommonProto.Cell.newBuilder(); - builder.addMapList(cellBuilder.build()); - - RoomFightProto.AgentInfo.Builder selfBuilder = RoomFightProto.AgentInfo.newBuilder(); - builder.setAgentInfo(selfBuilder.build()); - - for(int i=0; i cells = new ArrayList<>(); + + List agentInfoList = new ArrayList<>(); + for(int i=0; i sessionMap = OnlineUserManager.sessionMap; // Msg msg = new Msg(); @@ -202,11 +208,18 @@ public class MessageUtil { sendMessage(session, 1, responseMsgId, builder.build(), true); } - public static void sendRoomMatchSuccessIndication(int uid, int type, int roomId) { + public static void sendRoomMatchSuccessIndication(int[] uids, int type, int roomId, int mapId, + List cellList, List agentInfoList) { RoomProto.RoomMatchSuccessIndication.Builder builder = RoomProto.RoomMatchSuccessIndication.newBuilder(); builder.setRoomId(roomId); builder.setType(type); - sendMessage(uid, 1, MessageTypeProto.MessageType.ROOM_MATCH_SUCCESS_INDICATION_VALUE, builder.build(), true); + builder.setMapId(mapId); + builder.addAllMapList(cellList); + builder.addAllAgentInfos(agentInfoList); + CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); + builder.setTemporaryItems(dropBuilder.build()); + + sendMessage(uids, 1, MessageTypeProto.MessageType.ROOM_MATCH_SUCCESS_INDICATION_VALUE, builder.build(), true); } public static void sendRoomCancelMatchResponse(ISession session, int responseMsgId, int type, boolean result) {