1

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) {

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
 }
 

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) {
+}