上传捉虫子ai代码

modules/arena/modelarena.go

@@ -94,6 +94,7 @@ func (this *modelArena) queryUserHeros(uid string, heroids []string) (results []
 		this.module.Errorln(err)
 		return
 	}
+
 	results = make([]*pb.DBHero, 0)
 	if err = model.GetListObjs(uid, heroids, &results); err != nil {
 		this.module.Errorln(err)

modules/catchbugs/api_singlegame.go

@@ -0,0 +1,60 @@
+package catchbugs
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/lego/sys/log"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+//接受切磋
+func (this *apiComp) SingleGameCheck(session comm.IUserSession, req *pb.CatchbugsSingleGameReq) (errdata *pb.ErrorData) {
+
+	return
+}
+
+func (this *apiComp) SingleGame(session comm.IUserSession, req *pb.CatchbugsSingleGameReq) (errdata *pb.ErrorData) {
+	var (
+		err                   error
+		user                  *pb.DBUser
+		info                  *pb.DBCatchBugs
+		robots                []*cfg.GameRobotData
+		redplayer, blueplayer *pb.DBCatchBugsPlayer
+	)
+	if errdata = this.SingleGameCheck(session, req); errdata != nil {
+		return
+	}
+	if robots, err = this.module.ModuleTools.RandRobotConfig(1); err != nil {
+		return
+	}
+	//发起者 red
+	user, err = this.module.ModuleUser.GetUser(session.GetUserId())
+	if err != nil {
+		this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: session.GetUserId()})
+		return
+	}
+	if info, err = this.module.model.getModel(session.GetUserId()); err != nil {
+		this.module.Error("未找到红方信息", log.Field{Key: "uid", Value: session.GetUserId()})
+		return
+	}
+
+	redplayer = &pb.DBCatchBugsPlayer{
+		Info:     comm.GetUserBaseInfo(user),
+		Integral: info.Integral,
+	}
+	blueplayer = &pb.DBCatchBugsPlayer{
+		Info:     comm.GetRobotBaseInfo(robots[0]),
+		Integral: 0,
+		Isai:     true,
+		Ready:    true,
+	}
+	if _, err = this.module.createRoom(req.Rules, redplayer, blueplayer, []comm.IUserSession{session.Clone()}); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_SystemError,
+			Message: err.Error(),
+		}
+		return
+	}
+	session.SendMsg(string(this.module.GetType()), "singlegame", &pb.CatchbugsSingleGameResp{})
+	return
+}

modules/catchbugs/module.go

@@ -64,33 +64,58 @@ func (this *CatchBugs) OnInstallComp() {
 
 func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string) (roomid string, err error) {
 	var (
-		rules     *pb.DBCatchBugsRules = &pb.DBCatchBugsRules{}
+		rules                 *pb.DBCatchBugsRules = &pb.DBCatchBugsRules{}
-		confs     []*cfg.GameCatchbugLllustratedData
+		reduser, blueuser     *pb.DBUser
-		cardsTemp []*pb.DBCatchBugsCard
+		redinfo, blueinfo     *pb.DBCatchBugs
-		cards     []*pb.DBCatchBugsCard
+		redplayer, blueplayer *pb.DBCatchBugsPlayer
-		weights   []int32
-		red       *pb.DBUser
-		blue      *pb.DBUser
-		redinfo   *pb.DBCatchBugs
-		blueinfo  *pb.DBCatchBugs
-		room      *Room
 	)
 	if err = json.Unmarshal([]byte(rulesStr), rules); err != nil {
 		this.Error("解析规则json", log.Field{Key: "err", Value: err.Error()})
 		return
 	}
 	//发起者 red
-	red, err = this.ModuleUser.GetUser(sessions[0].GetUserId())
+	reduser, err = this.ModuleUser.GetUser(sessions[0].GetUserId())
 	if err != nil {
 		this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
 		return
 	}
-	blue, err = this.ModuleUser.GetUser(sessions[1].GetUserId())
+	blueuser, err = this.ModuleUser.GetUser(sessions[1].GetUserId())
 	if err != nil {
 		this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[1].GetUserId()})
 		return
 	}
 
+	if redinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+		this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+		return
+	}
+	if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
+		this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
+		return
+	}
+
+	redplayer = &pb.DBCatchBugsPlayer{
+		Info:     comm.GetUserBaseInfo(reduser),
+		Integral: redinfo.Integral,
+	}
+	blueplayer = &pb.DBCatchBugsPlayer{
+		Info:     comm.GetUserBaseInfo(blueuser),
+		Integral: blueinfo.Integral,
+	}
+
+	roomid, err = this.createRoom(rules, redplayer, blueplayer, sessions)
+	return
+}
+
+func (this *CatchBugs) createRoom(rules *pb.DBCatchBugsRules, red, blue *pb.DBCatchBugsPlayer, sessions []comm.IUserSession) (roomid string, err error) {
+	var (
+		confs     []*cfg.GameCatchbugLllustratedData
+		cardsTemp []*pb.DBCatchBugsCard
+		cards     []*pb.DBCatchBugsCard
+		weights   []int32
+		room      *Room
+	)
+
 	if confs, err = this.configure.getGameCatchbugLllustratedDatas(); err != nil {
 		this.Error("配置未找到", log.Field{Key: "err", Value: err.Error()})
 		return
@@ -117,27 +142,12 @@ func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string)
 		cards[i].Index = int32(i)
 	}
 
-	if redinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
-		this.Error("未找到红方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
-		return
-	}
-	if blueinfo, err = this.model.getModel(sessions[0].GetUserId()); err != nil {
-		this.Error("未找到蓝方信息", log.Field{Key: "uid", Value: sessions[0].GetUserId()})
-		return
-	}
-
 	roomid = primitive.NewObjectID().Hex()
 	if room, err = this.rooms.newRoom(&pb.DBCatchBugsRoom{
-		Rid:   roomid,
+		Rid:    roomid,
-		Rules: rules,
+		Rules:  rules,
-		Red: &pb.DBCatchBugsPlayer{
+		Red:    red,
-			Info:     comm.GetUserBaseInfo(red),
+		Blue:   blue,
-			Integral: redinfo.Integral,
-		},
-		Blue: &pb.DBCatchBugsPlayer{
-			Info:     comm.GetUserBaseInfo(blue),
-			Integral: blueinfo.Integral,
-		},
 		Backup: cardsTemp[24:],
 		Card:   cards,
 	}, sessions); err != nil {

modules/catchbugs/room.go

@@ -60,7 +60,6 @@ func (this *Room) PlayerReadyEnd(uid string) (err error) {
 		}); err != nil {
 			this.module.Errorln(err)
 		}
-
 	}
 	return
 }
@@ -190,9 +189,11 @@ func (this *Room) PlayerHandleEnd(uid string, handle *pb.CatchbugsHandleEndReq)
 		this.module.model.Change(this.data.Red.Info.Uid, map[string]interface{}{
 			"integral": this.data.Red.Integral,
 		})
-		this.module.model.Change(this.data.Blue.Info.Uid, map[string]interface{}{
+		if !this.data.Blue.Isai {
-			"integral": this.data.Blue.Integral,
+			this.module.model.Change(this.data.Blue.Info.Uid, map[string]interface{}{
-		})
+				"integral": this.data.Blue.Integral,
+			})
+		}
 		if err = this.Broadcast("gameover", &pb.CatchbugsGameOverPush{
 			Winuid:       winuid,
 			Redintegral:  this.data.Red.Integral,
@@ -246,10 +247,47 @@ func (this *Room) ReplenishCard() {
 	}
 }
 
+func (this *Room) AiHanle(stype string) {
+	switch stype {
+	case "gameready":
+		go this.PlayerReadyEnd(this.data.Blue.Info.Uid)
+		break
+	case "roundstart":
+		go func() {
+			randoms := []int32{2, 3, 4, 5, 6}
+			random := randoms[comm.GetRandW(randoms)]
+			cardsSlice := []int32{}
+			for _, v := range this.data.Card {
+				if !v.Isopen {
+					cardsSlice = append(cardsSlice, v.Index)
+				}
+			}
+			if random > int32(len(cardsSlice)) {
+				random = int32(len(cardsSlice))
+			}
+			indexs := comm.RandShuffle(len(cardsSlice))
+			for i, v := range indexs[0:random] {
+				this.PlayerHandle(this.data.Blue.Info.Uid, &pb.CatchbugsHandleReq{
+					Roomid: this.data.Rid,
+					Index:  cardsSlice[v],
+					Number: int32(i % 2),
+				})
+			}
+			this.PlayerHandleEnd(this.data.Blue.Info.Uid, &pb.CatchbugsHandleEndReq{
+				Roomid: this.data.Rid,
+			})
+		}()
+		break
+	}
+}
+
 func (this *Room) Broadcast(stype string, msg proto.Message) (err error) {
 	if err = this.module.SendMsgToSession(string(this.module.GetType()), stype, msg, this.sessions...); err != nil {
 		this.module.Errorln(err)
 	}
+	if this.data.Blue.Isai { //是ai
+		this.AiHanle(stype)
+	}
 	return
 }
 

pb/catchbugs_db.pb.go

@@ -172,10 +172,11 @@ type DBCatchBugsPlayer struct {
 
 	Info         *BaseUserInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //发起者信息
 	Ready        bool          `protobuf:"varint,2,opt,name=ready,proto3" json:"ready"`
-	Score        int32         `protobuf:"varint,3,opt,name=score,proto3" json:"score"`
+	Isai         bool          `protobuf:"varint,3,opt,name=isai,proto3" json:"isai"` //是否是ai
-	Integral     int32         `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //积分
+	Score        int32         `protobuf:"varint,4,opt,name=score,proto3" json:"score"`
-	Lastopencard int32         `protobuf:"varint,5,opt,name=lastopencard,proto3" json:"lastopencard"`
+	Integral     int32         `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分
-	Cards        []int32       `protobuf:"varint,6,rep,packed,name=cards,proto3" json:"cards"`
+	Lastopencard int32         `protobuf:"varint,6,opt,name=lastopencard,proto3" json:"lastopencard"`
+	Cards        []int32       `protobuf:"varint,7,rep,packed,name=cards,proto3" json:"cards"`
 }
 
 func (x *DBCatchBugsPlayer) Reset() {
@@ -224,6 +225,13 @@ func (x *DBCatchBugsPlayer) GetReady() bool {
 	return false
 }
 
+func (x *DBCatchBugsPlayer) GetIsai() bool {
+	if x != nil {
+		return x.Isai
+	}
+	return false
+}
+
 func (x *DBCatchBugsPlayer) GetScore() int32 {
 	if x != nil {
 		return x.Score
@@ -442,40 +450,42 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{
 	0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
 	0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61, 0x72,
 	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x68, 0x65, 0x61, 0x64, 0x73, 0x74, 0x61,
-	0x72, 0x74, 0x22, 0xb8, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
+	0x72, 0x74, 0x22, 0xcc, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
 	0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65,
 	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x72,
 	0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64,
-	0x79, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
+	0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04,
-	0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69,
-	0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63,
+	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69,
-	0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f,
+	0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f,
-	0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73,
+	0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c,
-	0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x22, 0x61, 0x0a,
+	0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63,
-	0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64,
+	0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64,
-	0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64,
+	0x73, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
-	0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63,
+	0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x6f, 0x70,
+	0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18,
-	0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e,
+	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06,
-	0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73,
+	0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
-	0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
-	0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18,
+	0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75,
-	0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12,
+	0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61,
-	0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44,
+	0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75,
-	0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20,
+	0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c,
-	0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
+	0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75,
-	0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a,
+	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
-	0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
+	0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75,
-	0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52,
+	0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18,
+	0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43,
-	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
+	0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63,
-	0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a,
+	0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61,
-	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72,
+	0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (

pb/catchbugs_msg.pb.go

@@ -200,6 +200,93 @@ func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
 	return nil
 }
 
+//游戏准备推送
+type CatchbugsSingleGameReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Rules *DBCatchBugsRules `protobuf:"bytes,1,opt,name=rules,proto3" json:"rules"`
+}
+
+func (x *CatchbugsSingleGameReq) Reset() {
+	*x = CatchbugsSingleGameReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsSingleGameReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsSingleGameReq) ProtoMessage() {}
+
+func (x *CatchbugsSingleGameReq) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsSingleGameReq.ProtoReflect.Descriptor instead.
+func (*CatchbugsSingleGameReq) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *CatchbugsSingleGameReq) GetRules() *DBCatchBugsRules {
+	if x != nil {
+		return x.Rules
+	}
+	return nil
+}
+
+//游戏准备推送
+type CatchbugsSingleGameResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsSingleGameResp) Reset() {
+	*x = CatchbugsSingleGameResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsSingleGameResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsSingleGameResp) ProtoMessage() {}
+
+func (x *CatchbugsSingleGameResp) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CatchbugsSingleGameResp.ProtoReflect.Descriptor instead.
+func (*CatchbugsSingleGameResp) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
+}
+
 //游戏准备推送
 type CatchbugsGameReadyPush struct {
 	state         protoimpl.MessageState
@@ -213,7 +300,7 @@ type CatchbugsGameReadyPush struct {
 func (x *CatchbugsGameReadyPush) Reset() {
 	*x = CatchbugsGameReadyPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -226,7 +313,7 @@ func (x *CatchbugsGameReadyPush) String() string {
 func (*CatchbugsGameReadyPush) ProtoMessage() {}
 
 func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -239,7 +326,7 @@ func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsGameReadyPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsGameReadyPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CatchbugsGameReadyPush) GetServicePath() string {
@@ -268,7 +355,7 @@ type CatchbugsReadyReq struct {
 func (x *CatchbugsReadyReq) Reset() {
 	*x = CatchbugsReadyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -281,7 +368,7 @@ func (x *CatchbugsReadyReq) String() string {
 func (*CatchbugsReadyReq) ProtoMessage() {}
 
 func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -294,7 +381,7 @@ func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsReadyReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsReadyReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *CatchbugsReadyReq) GetRoomid() string {
@@ -317,7 +404,7 @@ type CatchbugsReadyResp struct {
 func (x *CatchbugsReadyResp) Reset() {
 	*x = CatchbugsReadyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -330,7 +417,7 @@ func (x *CatchbugsReadyResp) String() string {
 func (*CatchbugsReadyResp) ProtoMessage() {}
 
 func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -343,7 +430,7 @@ func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsReadyResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsReadyResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *CatchbugsReadyResp) GetRoomid() string {
@@ -373,7 +460,7 @@ type CatchbugsRoundStartPush struct {
 func (x *CatchbugsRoundStartPush) Reset() {
 	*x = CatchbugsRoundStartPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -386,7 +473,7 @@ func (x *CatchbugsRoundStartPush) String() string {
 func (*CatchbugsRoundStartPush) ProtoMessage() {}
 
 func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -399,7 +486,7 @@ func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsRoundStartPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsRoundStartPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *CatchbugsRoundStartPush) GetRound() int32 {
@@ -430,7 +517,7 @@ type CatchbugsHandleReq struct {
 func (x *CatchbugsHandleReq) Reset() {
 	*x = CatchbugsHandleReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -443,7 +530,7 @@ func (x *CatchbugsHandleReq) String() string {
 func (*CatchbugsHandleReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -456,7 +543,7 @@ func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *CatchbugsHandleReq) GetRoomid() string {
@@ -489,7 +576,7 @@ type CatchbugsHandleResp struct {
 func (x *CatchbugsHandleResp) Reset() {
 	*x = CatchbugsHandleResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -502,7 +589,7 @@ func (x *CatchbugsHandleResp) String() string {
 func (*CatchbugsHandleResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -515,7 +602,7 @@ func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
 }
 
 //玩家操作推送
@@ -534,7 +621,7 @@ type CatchbugsOpenCardPush struct {
 func (x *CatchbugsOpenCardPush) Reset() {
 	*x = CatchbugsOpenCardPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -547,7 +634,7 @@ func (x *CatchbugsOpenCardPush) String() string {
 func (*CatchbugsOpenCardPush) ProtoMessage() {}
 
 func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -560,7 +647,7 @@ func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsOpenCardPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsOpenCardPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *CatchbugsOpenCardPush) GetRoomid() string {
@@ -610,7 +697,7 @@ type CatchbugsHandleEndReq struct {
 func (x *CatchbugsHandleEndReq) Reset() {
 	*x = CatchbugsHandleEndReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -623,7 +710,7 @@ func (x *CatchbugsHandleEndReq) String() string {
 func (*CatchbugsHandleEndReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -636,7 +723,7 @@ func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleEndReq.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleEndReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *CatchbugsHandleEndReq) GetRoomid() string {
@@ -656,7 +743,7 @@ type CatchbugsHandleEndResp struct {
 func (x *CatchbugsHandleEndResp) Reset() {
 	*x = CatchbugsHandleEndResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -669,7 +756,7 @@ func (x *CatchbugsHandleEndResp) String() string {
 func (*CatchbugsHandleEndResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -682,7 +769,7 @@ func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsHandleEndResp.ProtoReflect.Descriptor instead.
 func (*CatchbugsHandleEndResp) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
 }
 
 //桌面变化推送
@@ -698,7 +785,7 @@ type CatchbugsTablesChangePush struct {
 func (x *CatchbugsTablesChangePush) Reset() {
 	*x = CatchbugsTablesChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -711,7 +798,7 @@ func (x *CatchbugsTablesChangePush) String() string {
 func (*CatchbugsTablesChangePush) ProtoMessage() {}
 
 func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -724,7 +811,7 @@ func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsTablesChangePush.ProtoReflect.Descriptor instead.
 func (*CatchbugsTablesChangePush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *CatchbugsTablesChangePush) GetChangetype() int32 {
@@ -751,7 +838,7 @@ type CatchbugsRoundEndPush struct {
 func (x *CatchbugsRoundEndPush) Reset() {
 	*x = CatchbugsRoundEndPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -764,7 +851,7 @@ func (x *CatchbugsRoundEndPush) String() string {
 func (*CatchbugsRoundEndPush) ProtoMessage() {}
 
 func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -777,7 +864,7 @@ func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsRoundEndPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsRoundEndPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16}
 }
 
 //游戏结束推送
@@ -794,7 +881,7 @@ type CatchbugsGameOverPush struct {
 func (x *CatchbugsGameOverPush) Reset() {
 	*x = CatchbugsGameOverPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -807,7 +894,7 @@ func (x *CatchbugsGameOverPush) String() string {
 func (*CatchbugsGameOverPush) ProtoMessage() {}
 
 func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -820,7 +907,7 @@ func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CatchbugsGameOverPush.ProtoReflect.Descriptor instead.
 func (*CatchbugsGameOverPush) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *CatchbugsGameOverPush) GetWinuid() string {
@@ -868,64 +955,70 @@ var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{
 	0x1a, 0x3b, 0x0a, 0x0d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
 	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
 	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x60, 0x0a,
+	0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x41, 0x0a,
-	0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65,
+	0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-	0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
-	0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f,
+	0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
-	0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63,
+	0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e,
-	0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22,
+	0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43,
-	0x2b, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64,
+	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64,
-	0x79, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
+	0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x12,
+	0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76,
-	0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65,
+	0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18,
-	0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
-	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
+	0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a,
-	0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75,
+	0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
-	0x63, 0x63, 0x22, 0x53, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52,
+	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x6f, 0x75, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a,
+	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x12, 0x43, 0x61,
-	0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f,
+	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x75, 0x6e, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61,
+	0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c,
+	0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68,
+	0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
+	0x22, 0x53, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75,
+	0x6e, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e,
+	0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
+	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
+	0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65,
+	0x72, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61,
+	0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x43, 0x61, 0x74,
+	0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64, 0x50, 0x75,
+	0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61,
+	0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x14,
+	0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
+	0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06,
+	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73,
+	0x73, 0x75, 0x63, 0x63, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
+	0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a,
 	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
-	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e,
+	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22,
-	0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d,
+	0x61, 0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54, 0x61, 0x62, 0x6c,
-	0x62, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
+	0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a,
-	0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x99, 0x01, 0x0a, 0x15, 0x43,
+	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4f, 0x70, 0x65, 0x6e, 0x43, 0x61, 0x72, 0x64,
+	0x52, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24, 0x0a, 0x04,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
+	0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c,
+	0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61,
-	0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
+	0x72, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52,
-	0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72,
+	0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a, 0x15, 0x43,
-	0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72,
-	0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x16,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
-	0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x2f, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62,
+	0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22,
-	0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12,
+	0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03,
-	0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
-	0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68,
+	0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73,
+	0x6f, 0x33,
-	0x70, 0x22, 0x61, 0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e,
-	0x0a, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x0a, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x74, 0x79, 0x70, 0x65, 0x12, 0x24,
-	0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44,
-	0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04,
-	0x63, 0x61, 0x72, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67,
-	0x73, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x6e, 0x64, 0x50, 0x75, 0x73, 0x68, 0x22, 0x75, 0x0a,
-	0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76,
-	0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e, 0x75, 0x69, 0x64, 0x12, 0x20,
-	0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74, 0x65,
-	0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -940,41 +1033,45 @@ func file_catchbugs_catchbugs_msg_proto_rawDescGZIP() []byte {
 	return file_catchbugs_catchbugs_msg_proto_rawDescData
 }
 
-var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
+var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
 var file_catchbugs_catchbugs_msg_proto_goTypes = []interface{}{
 	(*CatchbugsInfoReq)(nil),          // 0: CatchbugsInfoReq
 	(*CatchbugsInfoResp)(nil),         // 1: CatchbugsInfoResp
 	(*CatchbugsAwardReq)(nil),         // 2: CatchbugsAwardReq
 	(*CatchbugsAwardResp)(nil),        // 3: CatchbugsAwardResp
-	(*CatchbugsGameReadyPush)(nil),    // 4: CatchbugsGameReadyPush
+	(*CatchbugsSingleGameReq)(nil),    // 4: CatchbugsSingleGameReq
-	(*CatchbugsReadyReq)(nil),         // 5: CatchbugsReadyReq
+	(*CatchbugsSingleGameResp)(nil),   // 5: CatchbugsSingleGameResp
-	(*CatchbugsReadyResp)(nil),        // 6: CatchbugsReadyResp
+	(*CatchbugsGameReadyPush)(nil),    // 6: CatchbugsGameReadyPush
-	(*CatchbugsRoundStartPush)(nil),   // 7: CatchbugsRoundStartPush
+	(*CatchbugsReadyReq)(nil),         // 7: CatchbugsReadyReq
-	(*CatchbugsHandleReq)(nil),        // 8: CatchbugsHandleReq
+	(*CatchbugsReadyResp)(nil),        // 8: CatchbugsReadyResp
-	(*CatchbugsHandleResp)(nil),       // 9: CatchbugsHandleResp
+	(*CatchbugsRoundStartPush)(nil),   // 9: CatchbugsRoundStartPush
-	(*CatchbugsOpenCardPush)(nil),     // 10: CatchbugsOpenCardPush
+	(*CatchbugsHandleReq)(nil),        // 10: CatchbugsHandleReq
-	(*CatchbugsHandleEndReq)(nil),     // 11: CatchbugsHandleEndReq
+	(*CatchbugsHandleResp)(nil),       // 11: CatchbugsHandleResp
-	(*CatchbugsHandleEndResp)(nil),    // 12: CatchbugsHandleEndResp
+	(*CatchbugsOpenCardPush)(nil),     // 12: CatchbugsOpenCardPush
-	(*CatchbugsTablesChangePush)(nil), // 13: CatchbugsTablesChangePush
+	(*CatchbugsHandleEndReq)(nil),     // 13: CatchbugsHandleEndReq
-	(*CatchbugsRoundEndPush)(nil),     // 14: CatchbugsRoundEndPush
+	(*CatchbugsHandleEndResp)(nil),    // 14: CatchbugsHandleEndResp
-	(*CatchbugsGameOverPush)(nil),     // 15: CatchbugsGameOverPush
+	(*CatchbugsTablesChangePush)(nil), // 15: CatchbugsTablesChangePush
-	nil,                               // 16: CatchbugsAwardResp.AwardmapEntry
+	(*CatchbugsRoundEndPush)(nil),     // 16: CatchbugsRoundEndPush
-	(*DBCatchBugs)(nil),               // 17: DBCatchBugs
+	(*CatchbugsGameOverPush)(nil),     // 17: CatchbugsGameOverPush
-	(*UserAtno)(nil),                  // 18: UserAtno
+	nil,                               // 18: CatchbugsAwardResp.AwardmapEntry
-	(*DBCatchBugsRoom)(nil),           // 19: DBCatchBugsRoom
+	(*DBCatchBugs)(nil),               // 19: DBCatchBugs
-	(*DBCatchBugsCard)(nil),           // 20: DBCatchBugsCard
+	(*UserAtno)(nil),                  // 20: UserAtno
+	(*DBCatchBugsRules)(nil),          // 21: DBCatchBugsRules
+	(*DBCatchBugsRoom)(nil),           // 22: DBCatchBugsRoom
+	(*DBCatchBugsCard)(nil),           // 23: DBCatchBugsCard
 }
 var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
-	17, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
+	19, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
-	16, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
+	18, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
-	18, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
+	20, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
-	19, // 3: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
+	21, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules
-	20, // 4: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
+	22, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
-	5,  // [5:5] is the sub-list for method output_type
+	23, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
-	5,  // [5:5] is the sub-list for method input_type
+	6,  // [6:6] is the sub-list for method output_type
-	5,  // [5:5] is the sub-list for extension type_name
+	6,  // [6:6] is the sub-list for method input_type
-	5,  // [5:5] is the sub-list for extension extendee
+	6,  // [6:6] is the sub-list for extension type_name
-	0,  // [0:5] is the sub-list for field type_name
+	6,  // [6:6] is the sub-list for extension extendee
+	0,  // [0:6] is the sub-list for field type_name
 }
 
 func init() { file_catchbugs_catchbugs_msg_proto_init() }
@@ -1034,7 +1131,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsGameReadyPush); i {
+			switch v := v.(*CatchbugsSingleGameReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1046,7 +1143,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsReadyReq); i {
+			switch v := v.(*CatchbugsSingleGameResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1058,7 +1155,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsReadyResp); i {
+			switch v := v.(*CatchbugsGameReadyPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1070,7 +1167,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsRoundStartPush); i {
+			switch v := v.(*CatchbugsReadyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1082,7 +1179,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleReq); i {
+			switch v := v.(*CatchbugsReadyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1094,7 +1191,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleResp); i {
+			switch v := v.(*CatchbugsRoundStartPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1106,7 +1203,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsOpenCardPush); i {
+			switch v := v.(*CatchbugsHandleReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1118,7 +1215,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleEndReq); i {
+			switch v := v.(*CatchbugsHandleResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1130,7 +1227,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsHandleEndResp); i {
+			switch v := v.(*CatchbugsOpenCardPush); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1142,7 +1239,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsTablesChangePush); i {
+			switch v := v.(*CatchbugsHandleEndReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1154,7 +1251,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsRoundEndPush); i {
+			switch v := v.(*CatchbugsHandleEndResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1166,6 +1263,30 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			}
 		}
 		file_catchbugs_catchbugs_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CatchbugsTablesChangePush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_catchbugs_catchbugs_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CatchbugsRoundEndPush); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_catchbugs_catchbugs_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsGameOverPush); i {
 			case 0:
 				return &v.state
@@ -1184,7 +1305,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_catchbugs_catchbugs_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   17,
+			NumMessages:   19,
 			NumExtensions: 0,
 			NumServices:   0,
 		},