1

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; //队伍信息
 }

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
 }