1

server/hallserver/player.go

@@ -11,17 +11,17 @@ type Player struct {
 	socket f5.WspCliConn
 	accountId string
 	sessionId string
-	chatChannel            int
-	privateTargetAccountId string // 私聊对象 accountId
-	worldChannelLastId     uint64 // 世界聊天 last id
-	guildChannelLastId     uint64 // 公会聊天 last id
-	privateChatLastId      uint64 // 私聊 last id
+	room *Room
 }
 
-func (p *Player) GetAccountId() string {
-	return p.accountId
+func (this *Player) GetAccountId() string {
+	return this.accountId
 }
 
-func (p *Player) SendMsg(rspMsg proto.Message) {
-	wspListener.sendProxyMsg(p.socket.Conn, p.socket.SocketHandle, rspMsg)
+func (this *Player) SendMsg(rspMsg proto.Message) {
+	wspListener.sendProxyMsg(this.socket.Conn, this.socket.SocketHandle, rspMsg)
+}
+
+func (this *Player) GetRoom() *Room {
+	return this.room
 }

server/hallserver/roommgr.go

@@ -6,11 +6,13 @@ import (
 
 type RoomMgr struct {
 	cs.MsgHandlerImpl
+	currRoomId int32
 	idHash map[int32]*Room
 }
 
 func (this *RoomMgr) init() {
 	this.idHash = make(map[int32]*Room)
+	this.currRoomId = 10000
 }
 
 func (this *RoomMgr) unInit() {