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

---
 server/hallserver/room/member.go |  6 +++---
 server/hallserver/room/room.go   |  2 +-
 server/hallserver/room/team.go   | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 server/hallserver/room/team.go

diff --git a/server/hallserver/room/member.go b/server/hallserver/room/member.go
index c0bc72e7..4730e7b6 100644
--- a/server/hallserver/room/member.go
+++ b/server/hallserver/room/member.go
@@ -16,9 +16,9 @@ type member struct {
 }
 
 func (this *member) init(hum common.Player) {
-	m := new(member)
-	m.hum = hum
-	m.joinTime = f5.GetApp().GetNowSeconds()
+	this.entry.Init(this)
+	this.hum = hum
+	this.joinTime = f5.GetApp().GetNowSeconds()
 }
 
 func (this *member) fillMFMember(pb *cs.MFMember) {
diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go
index e83ae986..41d68b1b 100644
--- a/server/hallserver/room/room.go
+++ b/server/hallserver/room/room.go
@@ -22,7 +22,7 @@ type room struct {
 	entry q5.ListHead
 	config roomConfg
 	owner *member
-	teams map[string][]q5.ListHead
+	teams map[string]*team
 	members map[string]*member
 }
 
diff --git a/server/hallserver/room/team.go b/server/hallserver/room/team.go
new file mode 100644
index 00000000..719e69a1
--- /dev/null
+++ b/server/hallserver/room/team.go
@@ -0,0 +1,22 @@
+package room
+
+import (
+	"q5"
+	//"f5"
+	"cs"
+	"main/common"
+	//"github.com/golang/protobuf/proto"
+)
+
+type team struct {
+	joinTime int64
+	state int32
+	entry q5.ListHead
+	hum common.Player
+}
+
+func (this team) init(hum common.Player) {
+}
+
+func (this team) fillMFMember(pb *cs.MFMember) {
+}