From d80ef9f58ce914df10909c4fe196c4e7f5dc17d8 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 8 Sep 2023 19:03:45 +0800 Subject: [PATCH] 1 --- server/hallserver/proto/cs_proto.proto | 25 ++++++++++++++++++------- third_party/f5 | 2 +- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/server/hallserver/proto/cs_proto.proto b/server/hallserver/proto/cs_proto.proto index c4f28de8..47a5d9ef 100644 --- a/server/hallserver/proto/cs_proto.proto +++ b/server/hallserver/proto/cs_proto.proto @@ -81,6 +81,15 @@ message MFTupleString repeated string values = 1; //values } +//分页信息 +message MFPagination +{ + optional int32 total = 1; //总记录数 + optional int32 count = 2; //当前页查到的记录数 + optional int32 current_page = 3; //当前第几页 + optional int32 total_page = 4; //总页数 +} + //房间信息(房间列表) message MFRoom { @@ -93,15 +102,17 @@ message MFRoom optional int32 team_max_num = 7; //最大队伍数 optional int32 player_max_num = 8; //最大玩家数 - optional string owner_id = 20; //房主账号id - optional string owner_name = 11; //房主账号名字 + optional MFMember owner = 20; //房主 } //队伍成员信息 message MFMember { optional string account_id = 1; //账号id - optional string name = 2; //mignz + optional string name = 2; // + optional string avatar_url = 3; //头像 + optional int32 hero_id = 4; //英雄id + optional int32 state = 9; //0:准备 1:已准备 optional int32 ping = 20; //ping值(单位毫秒) } @@ -124,8 +135,7 @@ message MFCurrentRoom optional int32 team_max_num = 7; //最大队伍数 optional int32 player_max_num = 8; //最大玩家数 - optional string owner_id = 20; //房主账号id - optional string owner_name = 21; //房主账号名字 + optional MFMember owner = 20; //房主 repeated MFTeam team_list = 30; //队伍列表 } @@ -183,12 +193,13 @@ message SMCreateRoom //获取房间列表 message CMRoomList { - + optional int32 page = 1; // } message SMRoomList { - + optional MFPagination Pagination = 1; //分页信息 + repeated MFRoom rows = 2; // } //加入房间 diff --git a/third_party/f5 b/third_party/f5 index fe1acddc..851f2aee 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit fe1acddcc815ffb3359c460c1dff03ad20da42cd +Subproject commit 851f2aeead295c80560055426c5644c04a564597