From 27bd9607df4f76711dd28cb1db98d7ff9f3fca95 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 12 Mar 2024 10:45:59 +0800
Subject: [PATCH] 1

---
 server/matchserver/proto/cs_proto.proto | 10 +++++++++-
 server/matchserver/team/team.go         |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/server/matchserver/proto/cs_proto.proto b/server/matchserver/proto/cs_proto.proto
index 2592c3a6..27c35b1d 100644
--- a/server/matchserver/proto/cs_proto.proto
+++ b/server/matchserver/proto/cs_proto.proto
@@ -125,6 +125,14 @@ message MFTeamMember
     optional int32 is_ready = 9; //是否已准备
 }
 
+//队伍信息
+message MFTeam
+{
+    optional string team_uuid = 1; //队伍唯一id
+    repeated MFTeamMember members = 2; //成员信息
+    optional string next_team_uuid = 3; //下一次队伍唯一id
+}
+
 //登录
 message CMLogin
 {
@@ -262,5 +270,5 @@ message SMGrantInvitePermission
 //队伍信息更新通知
 message SMTeamUpdateNotify
 {
-    repeated MFTeamMember members = 1; //成员信息
+    optional MFTeam team_info = 1; //队伍信息
 }
diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go
index e0da1a45..2df4daec 100644
--- a/server/matchserver/team/team.go
+++ b/server/matchserver/team/team.go
@@ -36,6 +36,15 @@ func (this *team) GetTeamUuid() string {
 }
 
 func (this *team) CanJoin(accountId string) bool {
+	if this.IsCopy() {
+		if !this.isFull() {
+			return true
+		} else if this.GetMemberByAccountId(accountId) != nil {
+			return true
+		}
+	} else {
+		return !this.isFull()
+	}
 	return false
 }