1

server/hallserver/listener/handlermgr.go

@@ -24,6 +24,7 @@ func (this *HandlerMgr) Init() {
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMGetCurrentRoom), constant.ROOM_MGR_HANDLER_ID)
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMEnterObserver), constant.ROOM_MGR_HANDLER_ID)
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMLeaveObserver), constant.ROOM_MGR_HANDLER_ID)
+	cs.RegHandlerId(int(cs.CMMessageIdE__CMSwitchTeam), constant.ROOM_MGR_HANDLER_ID)
 
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMDisbandRoom), constant.ROOM_HANDLER_ID)
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMLeaveRoom), constant.ROOM_HANDLER_ID)

server/hallserver/room/room.go

@@ -14,6 +14,7 @@ type room struct {
 	cs.MsgHandlerImpl
 	roomId  string
 	roomIdx int64
+	curSortIdx int32
 	entry   q5.ListHead
 	config  struct {
 		mapId      int32
@@ -30,6 +31,8 @@ type room struct {
 	disbandReason      int32
 	teamUuidHash       map[string]*team
 	teamIdHash         map[int32]*team
+	obTeamUuidHash     map[string]*team
+	obTeamIdHash       map[int32]*team
 	members            map[string]*member
 	startTimer         *f5.TimerWp
 	delayDeleteTimer   *f5.TimerWp
@@ -68,6 +71,8 @@ func (this *room) addMember(m *member) {
 }
 
 func (this *room) addTeam(t *team) {
+	this.curSortIdx += 1
+	t.sortIdx = this.curSortIdx
 	this.teamUuidHash[t.teamUuid] = t
 	this.teamIdHash[t.teamId] = t
 }
@@ -572,8 +577,11 @@ func (this *room) delayDeleteRoom() {
 
 func newRoom() *room {
 	r := new(room)
+	r.curSortIdx = 1
 	r.teamUuidHash = map[string]*team{}
 	r.teamIdHash = map[int32]*team{}
+	r.obTeamUuidHash = map[string]*team{}
+	r.obTeamIdHash = map[int32]*team{}
 	r.members = map[string]*member{}
 	r.entry.Init(r)
 	r.attacher = f5.GetTimer().NewTimerAttacher()

server/hallserver/room/roommgr.go

@@ -259,3 +259,6 @@ func (this *roomMgr) CMLeaveObserver(hdr *f5.MsgHdr, msg *cs.CMLeaveObserver) {
 	hum.SendMsg(&rspMsg)
 	roomPtr.notifyRoomInfo(hum)
 }
+
+func (this *roomMgr) CMSwitchTeam(hdr *f5.MsgHdr, msg *cs.CMSwitchTeam) {
+}

server/hallserver/room/team.go

@@ -27,6 +27,8 @@ type team struct {
 	teamId        int32
 	teamUuid      string
 	members       q5.ListHead
+	obSortIdx     int32
+	sortIdx       int32
 	tmpTeamLeader *memberInfo
 }