1

server/matchserver/common/types.go

@@ -70,6 +70,7 @@ type Player interface {
 	IsOnline() bool
 	GetTeam() Team
 	SetTeam(Team)
+	IsReady() bool
 	FillMFTeamMember(*cs.MFTeamMember)
 	GetSortIdx() int32
 	SetSortIdx(int32)

server/matchserver/player/player.go

@@ -120,6 +120,10 @@ func (this *player) IsOnline() bool {
 	return this.socket.IsValid()
 }
 
+func (this *player) IsReady() bool {
+	return this.isReady != 0
+}
+
 func (this *player) GetTeam() common.Team {
 	return this.team
 }

server/matchserver/team/team.go

@@ -108,13 +108,22 @@ func (this *team) Started() bool {
 
 func (this *team) CanStartGame(hum common.Player) bool {
 	if !this.Started() {
-		this.state = constant.TEAM_STATE_STARTED
+		if this.GetMemberNum() > 0 {
+			allReady := true
+			for _, m := range this.accountIdHash {
+				if m != this.owner && !m.IsReady() {
+					allReady = false
+					break
+				}
+			}
+			return allReady
+		}
 	}
-	return true
+	return false
 }
 
 func (this *team) StartGame() {
-	if !this.Started() {
+	if !this.Started() && this.CanStartGame(this.owner) {
 		this.state = constant.TEAM_STATE_STARTED
 		this.startTime = f5.GetApp().GetNowSeconds()
 		this.genStartGameInfo()