1

server/matchserver/player/player.go

@@ -271,7 +271,11 @@ func (this *player) CMSetReady(hdr *f5.MsgHdr, msg *cs.CMSetReady) {
 		rspMsg.Errcode = proto.Int32(1)
 		rspMsg.Errmsg = proto.String("team already started")
 	} else {
-		this.isReady = 1
+		if msg.GetIsReady() != 0 {
+			this.isReady = 1
+		} else {
+			this.isReady = 0
+		}
 	}
 	this.SendMsg(rspMsg)
 	this.GetTeam().SendUpdateNotify()

server/matchserver/proto/cs_proto.proto

@@ -258,6 +258,7 @@ message SMCancel
 //设置状态为已准备
 message CMSetReady
 {
+    optional int32 is_ready = 1; //是否已准备
 }
 
 message SMSetReady

server/matchserver/team/team.go

@@ -240,7 +240,7 @@ func (this *team) genStartGameInfo() {
 	startInfo := struct {
 		ZoneId    int32  `json:"zone_id"`
 		NodeId    int32  `json:"node_id"`
-		MapId     int32  `json:"map"`
+		MapId     int32  `json:"map_id"`
 		RoomUuid  string `json:"room_uuid"`
 		StartTime int32  `json:"start_time"`
 		TeamList  []struct {