server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-09-15 23:12:55 +08:00
parent 80c258b4e1
commit e0a9a2b673
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/hallserver/proto/cs_proto.proto
View File

@ -201,7 +201,7 @@ message SMCreateRoom
message CMSearchRoom message CMSearchRoom
{ {
optional int64 since_id = 1; //为0时表示从第一条数据开始 optional int64 since_id = 1; //为0时表示从第一条数据开始
optional int32 room_id = 2; //房间id optional string room_id = 2; //房间id
} }
message SMSearchRoom message SMSearchRoom

4
server/hallserver/room/roommgr.go
View File

@ -105,10 +105,14 @@ func (this *roomMgr) CMSearchRoom(hdr *f5.MsgHdr, msg *cs.CMSearchRoom) {
rspMsg := cs.SMSearchRoom{} rspMsg := cs.SMSearchRoom{}
rspMsg.Rows = make([]*cs.MFRoom, 0, constant.SEARCH_ROOM_PAGE_SIZE) rspMsg.Rows = make([]*cs.MFRoom, 0, constant.SEARCH_ROOM_PAGE_SIZE)
sinceId := msg.GetSinceId() sinceId := msg.GetSinceId()
roomId := msg.GetRoomId()
this.roomList.ForEach( this.roomList.ForEach(
func (data interface{}) bool { func (data interface{}) bool {
r := data.(*room) r := data.(*room)
if r.roomIdx > sinceId && r.viewable() { if r.roomIdx > sinceId && r.viewable() {
if roomId != "" && roomId != r.roomId {
return true
}
pb := new(cs.MFRoom) pb := new(cs.MFRoom)
r.fillMFRoom(pb) r.fillMFRoom(pb)
rspMsg.Rows = append(rspMsg.Rows, pb) rspMsg.Rows = append(rspMsg.Rows, pb)