From 66b4e6bb1bef1e8408090a5ce859a3c5689a3dcf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 11 Sep 2023 18:59:49 +0800
Subject: [PATCH] 1

---
 server/hallserver/common/types.go  |  3 ++-
 server/hallserver/player/player.go |  4 ++++
 server/hallserver/room/room.go     |  3 +++
 server/hallserver/room/team.go     | 20 ++++++++++++--------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/server/hallserver/common/types.go b/server/hallserver/common/types.go
index cc31eb58..a434c40e 100644
--- a/server/hallserver/common/types.go
+++ b/server/hallserver/common/types.go
@@ -26,7 +26,8 @@ type Player interface {
 	GetAvatarUrl() string
 	GetHeroId() int32
 	GetPing() int32
-	SendMsg(rspMsg proto.Message)
+	GetTeamUuid() string
+	SendMsg(proto.Message)
 }
 
 type PlayerMgr interface {
diff --git a/server/hallserver/player/player.go b/server/hallserver/player/player.go
index 803f172e..2817c887 100644
--- a/server/hallserver/player/player.go
+++ b/server/hallserver/player/player.go
@@ -62,3 +62,7 @@ func (this *player) GetHeroId() int32 {
 func (this *player) GetPing() int32 {
 	return this.ping
 }
+
+func (this *player) GetTeamUuid() string {
+	return ""
+}
diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go
index 41d68b1b..6b2bc986 100644
--- a/server/hallserver/room/room.go
+++ b/server/hallserver/room/room.go
@@ -35,6 +35,9 @@ func (this *room) init(roomId string, roomIdx int64, owner common.Player, passwd
 	this.members = map[string]*member{
 		owner.GetAccountId(): this.owner,
 	}
+	this.teams = map[string]*team {
+		"": newTeam(""),
+	}
 	this.owner.hum.SetRoom(this)
 }
 
diff --git a/server/hallserver/room/team.go b/server/hallserver/room/team.go
index 719e69a1..ef810306 100644
--- a/server/hallserver/room/team.go
+++ b/server/hallserver/room/team.go
@@ -3,20 +3,24 @@ package room
 import (
 	"q5"
 	//"f5"
-	"cs"
-	"main/common"
+	//"cs"
+	//"main/common"
 	//"github.com/golang/protobuf/proto"
 )
 
 type team struct {
-	joinTime int64
-	state int32
-	entry q5.ListHead
-	hum common.Player
+	teamUuid string
+	members q5.ListHead
 }
 
-func (this team) init(hum common.Player) {
+func (this *team) addMember(m *member) {
+	if this.teamUuid != m.hum.GetTeamUuid() {
+		panic("team.addMember team_uuid error")
+	}
 }
 
-func (this team) fillMFMember(pb *cs.MFMember) {
+func newTeam(teamUuid string) *team {
+	t := new(team)
+	t.teamUuid = teamUuid
+	return t
 }