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 22:54:38 +08:00
parent 90ecb4feee
commit 50d788aab7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,8 @@ func (this *room) init(roomId string, roomIdx int64,
this.roomIdx = roomIdx this.roomIdx = roomIdx
this.entry.Init(this) this.entry.Init(this)
this.config.mapId = msg.GetMapId() this.config.mapId = msg.GetMapId()
this.config.zoneId = owner.GetZoneId() this.config.zoneId = msg.GetZoneId()
this.config.nodeId = owner.GetNodeId() this.config.nodeId = msg.GetNodeId()
this.config.passwd = msg.GetPasswd() this.config.passwd = msg.GetPasswd()
this.config.maxTeamNum = constant.ROOM_MAX_TEAM_NUM this.config.maxTeamNum = constant.ROOM_MAX_TEAM_NUM
this.owner = newMember(this, owner) this.owner = newMember(this, owner)

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

@ -72,7 +72,7 @@ func (this *roomMgr) CMCreateRoom(hdr *f5.MsgHdr, msg *cs.CMCreateRoom) {
func (this *roomMgr) CMJoinRoom(hdr *f5.MsgHdr, msg *cs.CMJoinRoom) { func (this *roomMgr) CMJoinRoom(hdr *f5.MsgHdr, msg *cs.CMJoinRoom) {
hum := hdr.Context.(common.Player) hum := hdr.Context.(common.Player)
rspMsg := cs.SMJoinRoom{} rspMsg := cs.SMJoinRoom{}
if hum.GetRoom() != nil { if hum.GetRoom() != nil && hum.GetRoom().GetRoomState() == ROOM_INIT_STATE {
rspMsg.Errcode = proto.Int32(1) rspMsg.Errcode = proto.Int32(1)
rspMsg.Errmsg = proto.String("already room") rspMsg.Errmsg = proto.String("already room")
hum.SendMsg(&rspMsg) hum.SendMsg(&rspMsg)