1

server/hallserver/room/member.go

@@ -12,11 +12,13 @@ type member struct {
 	joinTime int64
 	state int32
 	entry q5.ListHead
+	teamEntry q5.ListHead
 	hum common.Player
 }
 
 func (this *member) init(hum common.Player) {
 	this.entry.Init(this)
+	this.teamEntry.Init(this)
 	this.hum = hum
 	this.joinTime = f5.GetApp().GetNowSeconds()
 }

server/hallserver/room/room.go

@@ -36,7 +36,7 @@ func (this *room) init(roomId string, roomIdx int64, owner common.Player, passwd
 		owner.GetAccountId(): this.owner,
 	}
 	this.teams = map[string]*team {
-		"": newTeam(""),
+		owner.GetTeamUuid(): newTeam(this.owner),
 	}
 	this.owner.hum.SetRoom(this)
 }

server/hallserver/room/team.go

@@ -17,10 +17,13 @@ func (this *team) addMember(m *member) {
 	if this.teamUuid != m.hum.GetTeamUuid() {
 		panic("team.addMember team_uuid error")
 	}
+	this.members.AddTail(&m.teamEntry)
 }
 
-func newTeam(teamUuid string) *team {
+func newTeam(leader *member) *team {
 	t := new(team)
-	t.teamUuid = teamUuid
+	t.members.Init(nil)
+	t.teamUuid = leader.hum.GetTeamUuid()
+	t.addMember(leader)
 	return t
 }