Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

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_ready.go

@@ -6,7 +6,7 @@ import (
 )
 
 //接受切磋
-func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.CanineRabbitLoadCompleteReq) (errdata *pb.ErrorData) {
+func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.CatchbugsReadyReq) (errdata *pb.ErrorData) {
 	if req.Roomid == "" {
 		errdata = &pb.ErrorData{
 			Code:  pb.ErrorCode_ReqParameterError,
@@ -16,13 +16,13 @@ func (this *apiComp) LoadCompleteCheck(session comm.IUserSession, req *pb.Canine
 	return
 }
 
-func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.CanineRabbitLoadCompleteReq) (errdata *pb.ErrorData) {
+func (this *apiComp) Ready(session comm.IUserSession, req *pb.CatchbugsReadyReq) (errdata *pb.ErrorData) {
 	var (
 		room *Room
 		err  error
 	)
 
-	if errdata = this.LoadCompleteCheck(session, req); errdata != nil {
+	if errdata = this.ReadyCheck(session, req); errdata != nil {
 		return
 	}
 
@@ -35,7 +35,7 @@ func (this *apiComp) LoadComplete(session comm.IUserSession, req *pb.CanineRabbi
 		return
 	}
 
-	if err = room.PlayerLoadEnd(session.GetUserId()); errdata != nil {
+	if err = room.PlayerReadyEnd(session.GetUserId()); errdata != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Title:   pb.ErrorCode_DBError.String(),

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/configure.go

@@ -1,6 +1,7 @@
 package catchbugs
 
 import (
+	"go_dreamfactory/comm"
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/modules"
 	cfg "go_dreamfactory/sys/configure/structs"
@@ -9,6 +10,7 @@ import (
 const (
 	game_catchbugreward      = "game_catchbugreward.json"
 	game_catchbuglllustrated = "game_catchbuglllustrated.json"
+	game_catchbugskill       = "game_catchbugskill.json"
 )
 
 type configureComp struct {
@@ -22,6 +24,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	err = this.LoadMultiConfigure(map[string]interface{}{
 		game_catchbugreward:      cfg.NewGameCatchbugReward,
 		game_catchbuglllustrated: cfg.NewGameCatchbugLllustrated,
+		game_catchbugskill:       cfg.NewGameCatchbugSkill,
 	})
 	return
 }
@@ -49,3 +52,20 @@ func (this *configureComp) getGameCatchbugLllustratedDatas() (confs []*cfg.GameC
 	confs = v.(*cfg.GameCatchbugLllustrated).GetDataList()
 	return
 }
+
+// 获取奖励列表
+func (this *configureComp) getGameCatchbugSkillData(id int32) (conf *cfg.GameCatchbugSkillData, err error) {
+	var (
+		v  interface{}
+		ok bool
+	)
+	if v, err = this.GetConfigure(game_catchbugskill); err != nil {
+		return
+	}
+	if conf, ok = v.(*cfg.GameCatchbugSkill).GetDataMap()[id]; !ok {
+		err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_catchbugskill, id)
+		this.module.Errorf("err:%v", err)
+		return
+	}
+	return
+}

modules/catchbugs/module.go

@@ -64,64 +64,27 @@ 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
-		cardsSlice []int32
+		redinfo, blueinfo     *pb.DBCatchBugs
-		cardsTemp  []*pb.DBCatchBugsCard
+		redplayer, blueplayer *pb.DBCatchBugsPlayer
-		cards      []*pb.DBCatchBugsCard
-		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 confs, err = this.configure.getGameCatchbugLllustratedDatas(); err != nil {
-		this.Error("配置未找到", log.Field{Key: "err", Value: err.Error()})
-		return
-	}
-
-	for _, v := range confs {
-		weights = append(weights, v.Weights)
-	}
-	results := comm.GetRandWs(weights, 24)
-	for _, v := range results {
-		cardsSlice = append(cardsSlice, confs[v].Id)
-	}
-
-	for i, v := range cardsSlice[:12] {
-		cardsTemp = append(cardsTemp, &pb.DBCatchBugsCard{
-			Id:  int32(1000 + i*2),
-			Cid: v,
-		}, &pb.DBCatchBugsCard{
-			Id:  int32(1001 + i*2),
-			Cid: v,
-		})
-	}
-
-	indexs := comm.RandShuffle(len(cardsTemp))
-	cards = make([]*pb.DBCatchBugsCard, len(cardsTemp))
-	for i, v := range indexs {
-		cards[i] = cardsTemp[v]
-		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
@@ -131,19 +94,61 @@ func (this *CatchBugs) CreateRoom(sessions []comm.IUserSession, rulesStr string)
 		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
+	}
+
+	for _, v := range confs {
+		weights = append(weights, v.Weights)
+	}
+	results := comm.GetRandWs(weights, 24)
+	for i, v := range results {
+		cardsTemp = append(cardsTemp, &pb.DBCatchBugsCard{
+			Id:  int32(1000 + i*2),
+			Cid: confs[v].Id,
+		}, &pb.DBCatchBugsCard{
+			Id:  int32(1001 + i*2),
+			Cid: confs[v].Id,
+		})
+	}
+
+	indexs := comm.RandShuffle(24)
+	cards = make([]*pb.DBCatchBugsCard, 24)
+	for i, v := range indexs {
+		cards[i] = cardsTemp[v]
+		cards[i].Index = int32(i)
+	}
+
 	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,
+		Backup: cardsTemp[24:],
-		},
-		Blue: &pb.DBCatchBugsPlayer{
-			Info:     comm.GetUserBaseInfo(blue),
-			Integral: blueinfo.Integral,
-		},
-		Backup: cardsSlice[12:],
 		Card:   cards,
 	}, sessions); err != nil {
 		this.Error("创建房间错误", log.Field{Key: "err", Value: err.Error()})

modules/catchbugs/room.go

@@ -5,6 +5,7 @@ import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
 	"go_dreamfactory/sys/configure"
+	cfg "go_dreamfactory/sys/configure/structs"
 	"time"
 
 	"google.golang.org/protobuf/proto"
@@ -13,19 +14,23 @@ import (
 type Room struct {
 	module       *CatchBugs
 	data         *pb.DBCatchBugsRoom
+	conf         *cfg.GameCatchbugSkillData
 	sessions     []comm.IUserSession
 	starttime    time.Time
 	round        int32
+	isReplenish  bool
 	handleplayer string
-	currindex    int32
 }
 
 func (this *Room) GameStart() (err error) {
 	this.starttime = configure.Now()
+	if this.conf, err = this.module.configure.getGameCatchbugSkillData(this.data.Rules.Skill); err != nil {
+		this.module.Errorln(err)
+		return
+	}
 	if err = this.Broadcast("gameready", &pb.CatchbugsGameReadyPush{
 		ServicePath: fmt.Sprintf("%s/%s", this.module.service.GetType(), this.module.service.GetId()),
 		Room:        this.data,
-		Countdown:   60,
 	}); err != nil {
 		this.module.Errorln(err)
 	}
@@ -33,7 +38,7 @@ func (this *Room) GameStart() (err error) {
 	return
 }
 
-func (this *Room) PlayerLoadEnd(uid string) (err error) {
+func (this *Room) PlayerReadyEnd(uid string) (err error) {
 	if uid == this.data.Red.Info.Uid {
 		this.data.Red.Ready = true
 	} else {
@@ -47,6 +52,8 @@ func (this *Room) PlayerLoadEnd(uid string) (err error) {
 	}
 
 	if this.data.Red.Ready && this.data.Blue.Ready { //两个人都准备了
+		this.data.Red.Ready = false
+		this.data.Blue.Ready = false
 		if err = this.Broadcast("roundstart", &pb.CatchbugsRoundStartPush{
 			Round:        this.round,
 			Handleplayer: this.handleplayer,
@@ -89,7 +96,7 @@ func (this *Room) PlayerHandle(uid string, handle *pb.CatchbugsHandleReq) (err e
 			}
 		}
 	}
-	if err = this.Broadcast("gameover", &pb.CatchbugsOpenCardPush{
+	if err = this.Broadcast("opencard", &pb.CatchbugsOpenCardPush{
 		Roomid: this.data.Rid,
 		Index:  handle.Index,
 		Issucc: issucc,
@@ -105,38 +112,194 @@ func (this *Room) PlayerHandleEnd(uid string, handle *pb.CatchbugsHandleEndReq)
 		err = fmt.Errorf("It's not your operation!")
 		return
 	}
-	this.round++
+
+	var (
+		card []*pb.DBCatchBugsCard
+	)
 
 	if this.data.Red.Info.Uid == uid {
 		this.handleplayer = this.data.Blue.Info.Uid
 	} else {
 		this.handleplayer = this.data.Red.Info.Uid
 	}
+	state := this.checkGameOver()
+	if state == 2 || this.round == 3 {
+		this.ReplenishCard()
+		card = this.data.Card
+		if err = this.Broadcast("tableschange", &pb.CatchbugsTablesChangePush{
+			Changetype: 1,
+			Card:       card,
+		}); err != nil {
+			this.module.Errorln(err)
+		}
+	} else {
+		this.round++
+	}
+	if this.round%this.conf.Round == 0 { //触发技能
+		switch this.data.Rules.Skill {
+		case 1:
+			this.data.Card = Skill1Effect(this.data.Card)
+			card = this.data.Card
+			if err = this.Broadcast("tableschange", &pb.CatchbugsTablesChangePush{
+				Changetype: 0,
+				Card:       card,
+			}); err != nil {
+				this.module.Errorln(err)
+			}
+			break
+		case 2:
+			this.data.Card = Skill2Effect(this.data.Card)
+			card = this.data.Card
+			if err = this.Broadcast("tableschange", &pb.CatchbugsTablesChangePush{
+				Changetype: 0,
+				Card:       card,
+			}); err != nil {
+				this.module.Errorln(err)
+			}
+			break
+		case 4:
+			this.data.Card = Skill4Effect(this.data.Card)
+			card = this.data.Card
+			if err = this.Broadcast("tableschange", &pb.CatchbugsTablesChangePush{
+				Changetype: 0,
+				Card:       card,
+			}); err != nil {
+				this.module.Errorln(err)
+			}
+			break
+		}
+	}
+	if state == 3 {
+		winuid := ""
+		if len(this.data.Red.Cards) > len(this.data.Blue.Cards) {
+			winuid = this.data.Red.Info.Uid
+			this.data.Red.Score = int32(len(this.data.Red.Cards) * 4)
+			this.data.Blue.Score = int32(len(this.data.Blue.Cards))
 
-	if err = this.Broadcast("roundstart", &pb.CatchbugsRoundStartPush{
+		} else if len(this.data.Red.Cards) < len(this.data.Blue.Cards) {
-		Round:        this.round,
+			winuid = this.data.Blue.Info.Uid
-		Handleplayer: this.handleplayer,
+			this.data.Blue.Score = int32(len(this.data.Blue.Cards) * 4)
-	}); err != nil {
+			this.data.Red.Score = int32(len(this.data.Red.Cards))
-		this.module.Errorln(err)
+		} else {
+			this.data.Red.Score = int32(len(this.data.Red.Cards) * 2)
+			this.data.Blue.Score = int32(len(this.data.Blue.Cards) * 2)
+		}
+		this.data.Red.Integral += this.data.Red.Score
+		this.data.Blue.Integral += this.data.Blue.Score
+		this.module.model.Change(this.data.Red.Info.Uid, map[string]interface{}{
+			"integral": this.data.Red.Integral,
+		})
+		if !this.data.Blue.Isai {
+			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,
+			Blueintegral: this.data.Blue.Integral,
+		}); err != nil {
+
+			this.module.Errorln(err)
+		}
+	} else {
+		if err = this.Broadcast("roundend", &pb.CatchbugsRoundEndPush{}); err != nil {
+			this.module.Errorln(err)
+		}
+	}
+
+	return
+}
+
+//检测游戏是否结束
+func (this *Room) checkGameOver() (state int32) {
+	for _, v := range this.data.Card {
+		if !v.Isopen {
+			state = 1
+			return
+		}
+	}
+	if this.round < 3 && !this.isReplenish { //需要补拍
+		state = 2
+	} else {
+		state = 3
+		return
 	}
 	return
 }
 
+//补牌操作
+func (this *Room) ReplenishCard() {
+	var index = 0
+	this.round = 4
+	for _, v := range this.data.Card {
+		if v.Isopen {
+			v.Cid = this.data.Backup[index].Cid
+			v.Id = this.data.Backup[index].Id
+			index++
+		}
+	}
+	this.isReplenish = true
+	if this.data.Rules.Headstart == 0 {
+		this.handleplayer = this.data.Blue.Info.Uid
+	} else {
+		this.handleplayer = this.data.Red.Info.Uid
+	}
+}
+
+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
 }
 
 //技能效果1 随机2x2的区域 旋转
-func Skill1Effect(cards []*pb.DBCatchBugsCard) (ramdonCard []*pb.DBCatchBugsCard) {
+func Skill1Effect(cards []*pb.DBCatchBugsCard) (cardsTemp []*pb.DBCatchBugsCard) {
 	var (
 		cardsSlice       []int32
 		ramdon           int32 //随机点
 		x                int32
 		y                int32
 		offsetX, offsetY int32
+		ramdonCard       []*pb.DBCatchBugsCard
 	)
 	for _, v := range cards {
 		if !v.Isopen {
@@ -144,8 +307,8 @@ func Skill1Effect(cards []*pb.DBCatchBugsCard) (ramdonCard []*pb.DBCatchBugsCard
 		}
 	}
 	ramdon = cardsSlice[comm.RandShuffle(len(cardsSlice))[0]]
-	x = ramdon % 4
+	x = ramdon % 6
-	y = ramdon / 4
+	y = ramdon / 6
 	offsetX = 1
 	if x == 3 {
 		offsetX = -1
@@ -154,17 +317,93 @@ func Skill1Effect(cards []*pb.DBCatchBugsCard) (ramdonCard []*pb.DBCatchBugsCard
 	if y == 6 {
 		offsetY = -1
 	}
-	ramdonCard = append(ramdonCard, cards[y*6+x])
+	ramdonCard = append(ramdonCard, cards[y*4+x])
-	ramdonCard = append(ramdonCard, cards[y*6+x+offsetX])
+	ramdonCard = append(ramdonCard, cards[y*4+x+offsetX])
-	ramdonCard = append(ramdonCard, cards[(y+offsetY)*6+x+offsetX])
+	ramdonCard = append(ramdonCard, cards[(y+offsetY)*4+x+offsetX])
-	ramdonCard = append(ramdonCard, cards[(y+offsetY)*6+x])
+	ramdonCard = append(ramdonCard, cards[(y+offsetY)*4+x])
 	index0 := ramdonCard[0].Index
 	for i, v := range ramdonCard {
-		if i < len(ramdonCard) {
+		if i < len(ramdonCard)-1 {
 			v.Index = ramdonCard[i+1].Index
 		} else {
 			v.Index = index0
 		}
 	}
+	cardsTemp = cards
+	return cardsTemp
+}
+
+//技能效果1 随机2x2的区域 旋转
+func Skill2Effect(cards []*pb.DBCatchBugsCard) (cardsTemp []*pb.DBCatchBugsCard) {
+
+	cardsTemp = make([]*pb.DBCatchBugsCard, len(cards))
+
+	cardsTemp[0] = cards[12]
+	cardsTemp[1] = cards[13]
+	cardsTemp[2] = cards[14]
+	cardsTemp[6] = cards[18]
+	cardsTemp[7] = cards[19]
+	cardsTemp[8] = cards[20]
+
+	cardsTemp[3] = cards[0]
+	cardsTemp[4] = cards[1]
+	cardsTemp[5] = cards[2]
+	cardsTemp[9] = cards[6]
+	cardsTemp[10] = cards[7]
+	cardsTemp[11] = cards[8]
+
+	cardsTemp[15] = cards[3]
+	cardsTemp[16] = cards[4]
+	cardsTemp[17] = cards[5]
+	cardsTemp[21] = cards[9]
+	cardsTemp[22] = cards[10]
+	cardsTemp[23] = cards[11]
+
+	cardsTemp[12] = cards[15]
+	cardsTemp[13] = cards[16]
+	cardsTemp[14] = cards[17]
+	cardsTemp[18] = cards[21]
+	cardsTemp[19] = cards[22]
+	cardsTemp[20] = cards[23]
+
+	for i, v := range cardsTemp {
+		v.Index = int32(i)
+	}
+	return
+}
+
+//技能效果1 随机2x2的区域 旋转
+func Skill4Effect(cards []*pb.DBCatchBugsCard) (cardsTemp []*pb.DBCatchBugsCard) {
+	var (
+		ramdonSclie []int32 = make([]int32, 0)
+		number      int32
+		cardsSlice  []int32
+		ramdoncards []*pb.DBCatchBugsCard
+	)
+	ramdonSclie = append(ramdonSclie, 2)
+	if len(cards) > 6 {
+		ramdonSclie = append(ramdonSclie, 4, 6)
+	} else if len(cards) > 4 {
+		ramdonSclie = append(ramdonSclie, 4)
+	}
+
+	number = ramdonSclie[comm.RandShuffle(len(ramdonSclie))[0]]
+	for _, v := range cards {
+		if !v.Isopen {
+			cardsSlice = append(cardsSlice, v.Index)
+		}
+	}
+	for _, v := range comm.RandShuffle(len(cardsSlice))[0:number] {
+		ramdoncards = append(ramdoncards, cards[cardsSlice[v]])
+	}
+	index0 := ramdoncards[0].Index
+	for i, v := range ramdoncards {
+		if i < len(ramdoncards)-1 {
+			v.Index = ramdoncards[i+1].Index
+		} else {
+			v.Index = index0
+		}
+	}
+	cardsTemp = cards
 	return
 }

modules/catchbugs/rooms.go

@@ -42,6 +42,7 @@ func (this *roomsComp) newRoom(data *pb.DBCatchBugsRoom, session []comm.IUserSes
 		module:   this.module,
 		data:     data,
 		sessions: session,
+		round:    1,
 	}
 	this.lock.Lock()
 	this.rooms[data.Rid] = room

modules/dcolor/api_award.go

@@ -14,12 +14,13 @@ func (this *apiComp) AwardCheck(session comm.IUserSession, req *pb.DColorAwardRe
 
 func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (errdata *pb.ErrorData) {
 	var (
-		info  *pb.DBDColor
+		info   *pb.DBDColor
-		confs []*cfg.GameGColorRewardData
+		confs  []*cfg.GameGColorRewardData
-		res   []*cfg.Gameatn
+		res    []*cfg.Gameatn
-		atno  []*pb.UserAtno
+		atno   []*pb.UserAtno
-		ok    bool
+		awards map[int32]bool
-		err   error
+		ok     bool
+		err    error
 	)
 	if errdata = this.AwardCheck(session, req); errdata != nil {
 		return
@@ -47,7 +48,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (e
 
 	for _, conf := range confs {
 		if req.Atype == conf.Type {
-			if req.Atype == 1 {
+			if req.Atype == 0 {
 				if _, ok = info.Weekaward[conf.Key]; !ok && info.Integral >= conf.Condition {
 					res = append(res, conf.Reward...)
 					info.Weekaward[conf.Key] = true
@@ -67,6 +68,9 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (e
 	}
 	if req.Atype == 0 {
 		info.Weektime = configure.Now().Unix()
+		awards = info.Weekaward
+	} else {
+		awards = info.Allaward
 	}
 
 	this.module.model.Change(session.GetUserId(), map[string]interface{}{
@@ -74,6 +78,6 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.DColorAwardReq) (e
 		"allaward":  info.Allaward,
 		"weektime":  info.Weektime,
 	})
-	session.SendMsg(string(this.module.GetType()), "award", &pb.DColorAwardResp{Atype: req.Atype, Award: atno})
+	session.SendMsg(string(this.module.GetType()), "award", &pb.DColorAwardResp{Atype: req.Atype, Award: atno, Awardmap: awards})
 	return
 }

modules/dcolor/model.go

@@ -35,9 +35,11 @@ func (this *modelComp) getModel(uid string) (info *pb.DBDColor, err error) {
 	}
 	if err == mgo.MongodbNil {
 		info = &pb.DBDColor{
-			Id:       primitive.NewObjectID().Hex(),
+			Id:        primitive.NewObjectID().Hex(),
-			Uid:      uid,
+			Uid:       uid,
-			Integral: 0,
+			Integral:  0,
+			Weekaward: make(map[int32]bool),
+			Allaward:  make(map[int32]bool),
 		}
 		err = this.Add(uid, info)
 	}

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
@@ -258,9 +266,9 @@ type DBCatchBugsCard struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id     int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`   //唯一id
+	Id     int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`         //唯一id
-	Cid    int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` //卡牌配置id
+	Cid    int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"`       //卡牌配置id
-	Index  int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"`
+	Index  int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"`   //坐标转换 x=index%6 y=index/6
 	Isopen bool  `protobuf:"varint,4,opt,name=isopen,proto3" json:"isopen"` //是否开启
 }
 
@@ -334,8 +342,8 @@ type DBCatchBugsRoom struct {
 	Rules  *DBCatchBugsRules  `protobuf:"bytes,2,opt,name=rules,proto3" json:"rules"`
 	Red    *DBCatchBugsPlayer `protobuf:"bytes,3,opt,name=red,proto3" json:"red"`
 	Blue   *DBCatchBugsPlayer `protobuf:"bytes,4,opt,name=blue,proto3" json:"blue"`
-	Backup []int32            `protobuf:"varint,5,rep,packed,name=backup,proto3" json:"backup"` //预备卡牌
+	Backup []*DBCatchBugsCard `protobuf:"bytes,5,rep,name=backup,proto3" json:"backup"` //预备卡牌
-	Card   []*DBCatchBugsCard `protobuf:"bytes,6,rep,name=card,proto3" json:"card"`             //桌面卡牌
+	Card   []*DBCatchBugsCard `protobuf:"bytes,6,rep,name=card,proto3" json:"card"`     //桌面卡牌
 }
 
 func (x *DBCatchBugsRoom) Reset() {
@@ -398,7 +406,7 @@ func (x *DBCatchBugsRoom) GetBlue() *DBCatchBugsPlayer {
 	return nil
 }
 
-func (x *DBCatchBugsRoom) GetBackup() []int32 {
+func (x *DBCatchBugsRoom) GetBackup() []*DBCatchBugsCard {
 	if x != nil {
 		return x.Backup
 	}
@@ -442,39 +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, 0xd8, 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, 0x16, 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, 0x05, 0x52, 0x06, 0x62,
+	0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75,
-	0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20,
+	0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67,
+	0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43,
-	0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+	0x61, 0x72, 0x64, 0x52, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63,
-	0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x61, 0x72, 0x64, 0x18, 0x06, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
@@ -507,12 +518,13 @@ var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{
 	1, // 3: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules
 	2, // 4: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer
 	2, // 5: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer
-	3, // 6: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
+	3, // 6: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard
-	7, // [7:7] is the sub-list for method output_type
+	3, // 7: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard
-	7, // [7:7] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for method output_type
-	7, // [7:7] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for method input_type
-	7, // [7:7] is the sub-list for extension extendee
+	8, // [8:8] is the sub-list for extension type_name
-	0, // [0:7] is the sub-list for field type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
 }
 
 func init() { file_catchbugs_catchbugs_db_proto_init() }

pb/catchbugs_msg.pb.go

@@ -200,17 +200,17 @@ func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
 	return nil
 }
 
-//单机游戏请求
+//游戏准备推送
-type CatchbugsSingleOverReq struct {
+type CatchbugsSingleGameReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Books []int32 `protobuf:"varint,1,rep,packed,name=books,proto3" json:"books"` //图鉴
+	Rules *DBCatchBugsRules `protobuf:"bytes,1,opt,name=rules,proto3" json:"rules"`
 }
 
-func (x *CatchbugsSingleOverReq) Reset() {
+func (x *CatchbugsSingleGameReq) Reset() {
-	*x = CatchbugsSingleOverReq{}
+	*x = CatchbugsSingleGameReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -218,13 +218,13 @@ func (x *CatchbugsSingleOverReq) Reset() {
 	}
 }
 
-func (x *CatchbugsSingleOverReq) String() string {
+func (x *CatchbugsSingleGameReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CatchbugsSingleOverReq) ProtoMessage() {}
+func (*CatchbugsSingleGameReq) ProtoMessage() {}
 
-func (x *CatchbugsSingleOverReq) ProtoReflect() protoreflect.Message {
+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))
@@ -236,29 +236,27 @@ func (x *CatchbugsSingleOverReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CatchbugsSingleOverReq.ProtoReflect.Descriptor instead.
+// Deprecated: Use CatchbugsSingleGameReq.ProtoReflect.Descriptor instead.
-func (*CatchbugsSingleOverReq) Descriptor() ([]byte, []int) {
+func (*CatchbugsSingleGameReq) Descriptor() ([]byte, []int) {
 	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
 }
 
-func (x *CatchbugsSingleOverReq) GetBooks() []int32 {
+func (x *CatchbugsSingleGameReq) GetRules() *DBCatchBugsRules {
 	if x != nil {
-		return x.Books
+		return x.Rules
 	}
 	return nil
 }
 
-type CatchbugsSingleOverResp struct {
+//游戏准备推送
+type CatchbugsSingleGameResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
-
-	Integral int32           `protobuf:"varint,1,opt,name=integral,proto3" json:"integral"`
-	Books    map[int32]int32 `protobuf:"bytes,2,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴
 }
 
-func (x *CatchbugsSingleOverResp) Reset() {
+func (x *CatchbugsSingleGameResp) Reset() {
-	*x = CatchbugsSingleOverResp{}
+	*x = CatchbugsSingleGameResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -266,13 +264,13 @@ func (x *CatchbugsSingleOverResp) Reset() {
 	}
 }
 
-func (x *CatchbugsSingleOverResp) String() string {
+func (x *CatchbugsSingleGameResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CatchbugsSingleOverResp) ProtoMessage() {}
+func (*CatchbugsSingleGameResp) ProtoMessage() {}
 
-func (x *CatchbugsSingleOverResp) ProtoReflect() protoreflect.Message {
+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))
@@ -284,25 +282,11 @@ func (x *CatchbugsSingleOverResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CatchbugsSingleOverResp.ProtoReflect.Descriptor instead.
+// Deprecated: Use CatchbugsSingleGameResp.ProtoReflect.Descriptor instead.
-func (*CatchbugsSingleOverResp) Descriptor() ([]byte, []int) {
+func (*CatchbugsSingleGameResp) Descriptor() ([]byte, []int) {
 	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
 }
 
-func (x *CatchbugsSingleOverResp) GetIntegral() int32 {
-	if x != nil {
-		return x.Integral
-	}
-	return 0
-}
-
-func (x *CatchbugsSingleOverResp) GetBooks() map[int32]int32 {
-	if x != nil {
-		return x.Books
-	}
-	return nil
-}
-
 //游戏准备推送
 type CatchbugsGameReadyPush struct {
 	state         protoimpl.MessageState
@@ -311,7 +295,6 @@ type CatchbugsGameReadyPush struct {
 
 	ServicePath string           `protobuf:"bytes,1,opt,name=servicePath,proto3" json:"servicePath"` //游戏区服地址
 	Room        *DBCatchBugsRoom `protobuf:"bytes,2,opt,name=room,proto3" json:"room"`               //房间
-	Countdown   int32            `protobuf:"varint,3,opt,name=countdown,proto3" json:"countdown"`    //布阵倒计时
 }
 
 func (x *CatchbugsGameReadyPush) Reset() {
@@ -360,15 +343,8 @@ func (x *CatchbugsGameReadyPush) GetRoom() *DBCatchBugsRoom {
 	return nil
 }
 
-func (x *CatchbugsGameReadyPush) GetCountdown() int32 {
-	if x != nil {
-		return x.Countdown
-	}
-	return 0
-}
-
 //加载完毕请求
-type CatchbugsLoadCompleteReq struct {
+type CatchbugsReadyReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -376,8 +352,8 @@ type CatchbugsLoadCompleteReq struct {
 	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
 }
 
-func (x *CatchbugsLoadCompleteReq) Reset() {
+func (x *CatchbugsReadyReq) Reset() {
-	*x = CatchbugsLoadCompleteReq{}
+	*x = CatchbugsReadyReq{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -385,13 +361,13 @@ func (x *CatchbugsLoadCompleteReq) Reset() {
 	}
 }
 
-func (x *CatchbugsLoadCompleteReq) String() string {
+func (x *CatchbugsReadyReq) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CatchbugsLoadCompleteReq) ProtoMessage() {}
+func (*CatchbugsReadyReq) ProtoMessage() {}
 
-func (x *CatchbugsLoadCompleteReq) ProtoReflect() protoreflect.Message {
+func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
 	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -403,12 +379,12 @@ func (x *CatchbugsLoadCompleteReq) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CatchbugsLoadCompleteReq.ProtoReflect.Descriptor instead.
+// Deprecated: Use CatchbugsReadyReq.ProtoReflect.Descriptor instead.
-func (*CatchbugsLoadCompleteReq) Descriptor() ([]byte, []int) {
+func (*CatchbugsReadyReq) Descriptor() ([]byte, []int) {
 	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
 }
 
-func (x *CatchbugsLoadCompleteReq) GetRoomid() string {
+func (x *CatchbugsReadyReq) GetRoomid() string {
 	if x != nil {
 		return x.Roomid
 	}
@@ -416,7 +392,7 @@ func (x *CatchbugsLoadCompleteReq) GetRoomid() string {
 }
 
 //加载完毕请求
-type CatchbugsLoadCompleteResp struct {
+type CatchbugsReadyResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
@@ -425,8 +401,8 @@ type CatchbugsLoadCompleteResp struct {
 	Issucc bool   `protobuf:"varint,2,opt,name=issucc,proto3" json:"issucc"`
 }
 
-func (x *CatchbugsLoadCompleteResp) Reset() {
+func (x *CatchbugsReadyResp) Reset() {
-	*x = CatchbugsLoadCompleteResp{}
+	*x = CatchbugsReadyResp{}
 	if protoimpl.UnsafeEnabled {
 		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -434,13 +410,13 @@ func (x *CatchbugsLoadCompleteResp) Reset() {
 	}
 }
 
-func (x *CatchbugsLoadCompleteResp) String() string {
+func (x *CatchbugsReadyResp) String() string {
 	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*CatchbugsLoadCompleteResp) ProtoMessage() {}
+func (*CatchbugsReadyResp) ProtoMessage() {}
 
-func (x *CatchbugsLoadCompleteResp) ProtoReflect() protoreflect.Message {
+func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
 	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
@@ -452,19 +428,19 @@ func (x *CatchbugsLoadCompleteResp) ProtoReflect() protoreflect.Message {
 	return mi.MessageOf(x)
 }
 
-// Deprecated: Use CatchbugsLoadCompleteResp.ProtoReflect.Descriptor instead.
+// Deprecated: Use CatchbugsReadyResp.ProtoReflect.Descriptor instead.
-func (*CatchbugsLoadCompleteResp) Descriptor() ([]byte, []int) {
+func (*CatchbugsReadyResp) Descriptor() ([]byte, []int) {
 	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
 }
 
-func (x *CatchbugsLoadCompleteResp) GetRoomid() string {
+func (x *CatchbugsReadyResp) GetRoomid() string {
 	if x != nil {
 		return x.Roomid
 	}
 	return ""
 }
 
-func (x *CatchbugsLoadCompleteResp) GetIssucc() bool {
+func (x *CatchbugsReadyResp) GetIssucc() bool {
 	if x != nil {
 		return x.Issucc
 	}
@@ -477,9 +453,8 @@ type CatchbugsRoundStartPush struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Round        int32              `protobuf:"varint,1,opt,name=round,proto3" json:"round"`              //回合数
+	Round        int32  `protobuf:"varint,1,opt,name=round,proto3" json:"round"`              //回合数
-	Cards        []*DBCatchBugsCard `protobuf:"bytes,5,rep,name=cards,proto3" json:"cards"`               //桌子上的卡牌  技能生效才会有值
+	Handleplayer string `protobuf:"bytes,2,opt,name=handleplayer,proto3" json:"handleplayer"` //操作玩家
-	Handleplayer string             `protobuf:"bytes,2,opt,name=handleplayer,proto3" json:"handleplayer"` //操作玩家
 }
 
 func (x *CatchbugsRoundStartPush) Reset() {
@@ -521,13 +496,6 @@ func (x *CatchbugsRoundStartPush) GetRound() int32 {
 	return 0
 }
 
-func (x *CatchbugsRoundStartPush) GetCards() []*DBCatchBugsCard {
-	if x != nil {
-		return x.Cards
-	}
-	return nil
-}
-
 func (x *CatchbugsRoundStartPush) GetHandleplayer() string {
 	if x != nil {
 		return x.Handleplayer
@@ -541,8 +509,9 @@ type CatchbugsHandleReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
+	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`  //房间id
-	Index  int32  `protobuf:"varint,2,opt,name=index,proto3" json:"index"`  //卡牌下表
+	Index  int32  `protobuf:"varint,2,opt,name=index,proto3" json:"index"`   //卡牌下表
+	Number int32  `protobuf:"varint,3,opt,name=number,proto3" json:"number"` //0 表示第一张 1 表示第二张
 }
 
 func (x *CatchbugsHandleReq) Reset() {
@@ -591,6 +560,13 @@ func (x *CatchbugsHandleReq) GetIndex() int32 {
 	return 0
 }
 
+func (x *CatchbugsHandleReq) GetNumber() int32 {
+	if x != nil {
+		return x.Number
+	}
+	return 0
+}
+
 type CatchbugsHandleResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -638,7 +614,8 @@ type CatchbugsOpenCardPush struct {
 	Roomid       string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`             //房间id
 	Handleplayer string `protobuf:"bytes,2,opt,name=handleplayer,proto3" json:"handleplayer"` //操作玩家
 	Index        int32  `protobuf:"varint,3,opt,name=index,proto3" json:"index"`              //卡牌id
-	Issucc       bool   `protobuf:"varint,4,opt,name=issucc,proto3" json:"issucc"`            //是否得分
+	Number       int32  `protobuf:"varint,4,opt,name=number,proto3" json:"number"`            //0表示第一张 1表示第二张
+	Issucc       bool   `protobuf:"varint,5,opt,name=issucc,proto3" json:"issucc"`            //是否得分
 }
 
 func (x *CatchbugsOpenCardPush) Reset() {
@@ -694,6 +671,13 @@ func (x *CatchbugsOpenCardPush) GetIndex() int32 {
 	return 0
 }
 
+func (x *CatchbugsOpenCardPush) GetNumber() int32 {
+	if x != nil {
+		return x.Number
+	}
+	return 0
+}
+
 func (x *CatchbugsOpenCardPush) GetIssucc() bool {
 	if x != nil {
 		return x.Issucc
@@ -788,6 +772,101 @@ func (*CatchbugsHandleEndResp) Descriptor() ([]byte, []int) {
 	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{14}
 }
 
+//桌面变化推送
+type CatchbugsTablesChangePush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Changetype int32              `protobuf:"varint,1,opt,name=changetype,proto3" json:"changetype"` //0 技能变化  1补卡
+	Card       []*DBCatchBugsCard `protobuf:"bytes,2,rep,name=card,proto3" json:"card"`              //桌面卡牌
+}
+
+func (x *CatchbugsTablesChangePush) Reset() {
+	*x = CatchbugsTablesChangePush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsTablesChangePush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsTablesChangePush) ProtoMessage() {}
+
+func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+	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 CatchbugsTablesChangePush.ProtoReflect.Descriptor instead.
+func (*CatchbugsTablesChangePush) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *CatchbugsTablesChangePush) GetChangetype() int32 {
+	if x != nil {
+		return x.Changetype
+	}
+	return 0
+}
+
+func (x *CatchbugsTablesChangePush) GetCard() []*DBCatchBugsCard {
+	if x != nil {
+		return x.Card
+	}
+	return nil
+}
+
+//回个结束通知
+type CatchbugsRoundEndPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *CatchbugsRoundEndPush) Reset() {
+	*x = CatchbugsRoundEndPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CatchbugsRoundEndPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CatchbugsRoundEndPush) ProtoMessage() {}
+
+func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message {
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+	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 CatchbugsRoundEndPush.ProtoReflect.Descriptor instead.
+func (*CatchbugsRoundEndPush) Descriptor() ([]byte, []int) {
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16}
+}
+
 //游戏结束推送
 type CatchbugsGameOverPush struct {
 	state         protoimpl.MessageState
@@ -802,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)
 	}
@@ -815,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 {
@@ -828,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 {
@@ -876,72 +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, 0x2e, 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, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-	0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73,
+	0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x22, 0xaa, 0x01,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68,
-	0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c,
+	0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73,
-	0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
+	0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74,
+	0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x60, 0x0a, 0x16, 0x43,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x39, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x02,
+	0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
+	0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42,
+	0x50, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76,
-	0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73,
+	0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18,
-	0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42,
-	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x22, 0x2b, 0x0a,
-	0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7e, 0x0a, 0x16, 0x43, 0x61,
+	0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79,
+	0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x12, 0x43, 0x61,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
+	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70,
-	0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75,
-	0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09,
-	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x32, 0x0a, 0x18, 0x43, 0x61,
-	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4c, 0x6f, 0x61, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
-	0x65, 0x74, 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, 0x22, 0x4b,
-	0x0a, 0x19, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x4c, 0x6f, 0x61, 0x64, 0x43,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x7b, 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, 0x26, 0x0a, 0x05,
-	0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42,
-	0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x52, 0x05, 0x63,
-	0x61, 0x72, 0x64, 0x73, 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, 0x42, 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, 0x22, 0x15, 0x0a, 0x13,
-	0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52,
-	0x65, 0x73, 0x70, 0x22, 0x81, 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, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x04, 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, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63,
+	0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75,
-	0x68, 0x62, 0x75, 0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65,
+	0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
-	0x73, 0x70, 0x22, 0x75, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47,
+	0x22, 0x53, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x75,
-	0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x77,
+	0x6e, 0x64, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72,
-	0x69, 0x6e, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x77, 0x69, 0x6e,
+	0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e,
-	0x75, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72,
+	0x64, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70, 0x6c, 0x61, 0x79, 0x65,
-	0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x64, 0x69, 0x6e, 0x74,
+	0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x70,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x6c, 0x75, 0x65, 0x69, 0x6e, 0x74,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75,
+	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
-	0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	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, 0x22, 0x18, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75,
+	0x67, 0x73, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x65, 0x73, 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 (
@@ -956,38 +1033,40 @@ 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, 18)
+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
-	(*CatchbugsSingleOverReq)(nil),    // 4: CatchbugsSingleOverReq
+	(*CatchbugsSingleGameReq)(nil),    // 4: CatchbugsSingleGameReq
-	(*CatchbugsSingleOverResp)(nil),   // 5: CatchbugsSingleOverResp
+	(*CatchbugsSingleGameResp)(nil),   // 5: CatchbugsSingleGameResp
 	(*CatchbugsGameReadyPush)(nil),    // 6: CatchbugsGameReadyPush
-	(*CatchbugsLoadCompleteReq)(nil),  // 7: CatchbugsLoadCompleteReq
+	(*CatchbugsReadyReq)(nil),         // 7: CatchbugsReadyReq
-	(*CatchbugsLoadCompleteResp)(nil), // 8: CatchbugsLoadCompleteResp
+	(*CatchbugsReadyResp)(nil),        // 8: CatchbugsReadyResp
 	(*CatchbugsRoundStartPush)(nil),   // 9: CatchbugsRoundStartPush
 	(*CatchbugsHandleReq)(nil),        // 10: CatchbugsHandleReq
 	(*CatchbugsHandleResp)(nil),       // 11: CatchbugsHandleResp
 	(*CatchbugsOpenCardPush)(nil),     // 12: CatchbugsOpenCardPush
 	(*CatchbugsHandleEndReq)(nil),     // 13: CatchbugsHandleEndReq
 	(*CatchbugsHandleEndResp)(nil),    // 14: CatchbugsHandleEndResp
-	(*CatchbugsGameOverPush)(nil),     // 15: CatchbugsGameOverPush
+	(*CatchbugsTablesChangePush)(nil), // 15: CatchbugsTablesChangePush
-	nil,                               // 16: CatchbugsAwardResp.AwardmapEntry
+	(*CatchbugsRoundEndPush)(nil),     // 16: CatchbugsRoundEndPush
-	nil,                               // 17: CatchbugsSingleOverResp.BooksEntry
+	(*CatchbugsGameOverPush)(nil),     // 17: CatchbugsGameOverPush
-	(*DBCatchBugs)(nil),               // 18: DBCatchBugs
+	nil,                               // 18: CatchbugsAwardResp.AwardmapEntry
-	(*UserAtno)(nil),                  // 19: UserAtno
+	(*DBCatchBugs)(nil),               // 19: DBCatchBugs
-	(*DBCatchBugsRoom)(nil),           // 20: DBCatchBugsRoom
+	(*UserAtno)(nil),                  // 20: UserAtno
-	(*DBCatchBugsCard)(nil),           // 21: DBCatchBugsCard
+	(*DBCatchBugsRules)(nil),          // 21: DBCatchBugsRules
+	(*DBCatchBugsRoom)(nil),           // 22: DBCatchBugsRoom
+	(*DBCatchBugsCard)(nil),           // 23: DBCatchBugsCard
 }
 var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
-	18, // 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
-	19, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
+	20, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
-	17, // 3: CatchbugsSingleOverResp.books:type_name -> CatchbugsSingleOverResp.BooksEntry
+	21, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules
-	20, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
+	22, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
-	21, // 5: CatchbugsRoundStartPush.cards:type_name -> DBCatchBugsCard
+	23, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
 	6,  // [6:6] is the sub-list for method output_type
 	6,  // [6:6] is the sub-list for method input_type
 	6,  // [6:6] is the sub-list for extension type_name
@@ -1052,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.(*CatchbugsSingleOverReq); i {
+			switch v := v.(*CatchbugsSingleGameReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1064,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.(*CatchbugsSingleOverResp); i {
+			switch v := v.(*CatchbugsSingleGameResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1088,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.(*CatchbugsLoadCompleteReq); i {
+			switch v := v.(*CatchbugsReadyReq); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1100,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.(*CatchbugsLoadCompleteResp); i {
+			switch v := v.(*CatchbugsReadyResp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -1184,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
@@ -1202,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:   18,
+			NumMessages:   19,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

pb/dcolor_msg.pb.go

@@ -1178,7 +1178,7 @@ type DColorAwardReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Atype int32 `protobuf:"varint,2,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
+	Atype int32 `protobuf:"varint,1,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
 }
 
 func (x *DColorAwardReq) Reset() {
@@ -1225,8 +1225,9 @@ type DColorAwardResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Atype int32       `protobuf:"varint,2,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
+	Atype    int32          `protobuf:"varint,1,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
-	Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"`  //获取资源
+	Award    []*UserAtno    `protobuf:"bytes,2,rep,name=award,proto3" json:"award"`  //获取资源
+	Awardmap map[int32]bool `protobuf:"bytes,3,rep,name=awardmap,proto3" json:"awardmap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
 }
 
 func (x *DColorAwardResp) Reset() {
@@ -1275,6 +1276,13 @@ func (x *DColorAwardResp) GetAward() []*UserAtno {
 	return nil
 }
 
+func (x *DColorAwardResp) GetAwardmap() map[int32]bool {
+	if x != nil {
+		return x.Awardmap
+	}
+	return nil
+}
+
 var File_dcolor_dcolor_msg_proto protoreflect.FileDescriptor
 
 var file_dcolor_dcolor_msg_proto_rawDesc = []byte{
@@ -1384,13 +1392,21 @@ var file_dcolor_dcolor_msg_proto_rawDesc = []byte{
 	0x67, 0x72, 0x61, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x6c, 0x75, 0x65,
 	0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x26, 0x0a, 0x0e, 0x44, 0x43, 0x6f, 0x6c,
 	0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65,
-	0x22, 0x48, 0x0a, 0x0f, 0x44, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52,
+	0x22, 0xc1, 0x01, 0x0a, 0x0f, 0x44, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64,
-	0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
-	0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77,
-	0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
+	0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
-	0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
+	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x08, 0x61,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x44, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e,
+	0x41, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x61,
+	0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1405,7 +1421,7 @@ func file_dcolor_dcolor_msg_proto_rawDescGZIP() []byte {
 	return file_dcolor_dcolor_msg_proto_rawDescData
 }
 
-var file_dcolor_dcolor_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
+var file_dcolor_dcolor_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_dcolor_dcolor_msg_proto_goTypes = []interface{}{
 	(*DColorInfoReq)(nil),          // 0: DColorInfoReq
 	(*DColorInfoResp)(nil),         // 1: DColorInfoResp
@@ -1430,29 +1446,31 @@ var file_dcolor_dcolor_msg_proto_goTypes = []interface{}{
 	(*DColorGameOverPush)(nil),     // 20: DColorGameOverPush
 	(*DColorAwardReq)(nil),         // 21: DColorAwardReq
 	(*DColorAwardResp)(nil),        // 22: DColorAwardResp
-	(*DBDColor)(nil),               // 23: DBDColor
+	nil,                            // 23: DColorAwardResp.AwardmapEntry
-	(DBDColorDifficulty)(0),        // 24: DBDColorDifficulty
+	(*DBDColor)(nil),               // 24: DBDColor
-	(*DBDColorResult)(nil),         // 25: DBDColorResult
+	(DBDColorDifficulty)(0),        // 25: DBDColorDifficulty
-	(*BaseUserInfo)(nil),           // 26: BaseUserInfo
+	(*DBDColorResult)(nil),         // 26: DBDColorResult
-	(*DBDColorRoom)(nil),           // 27: DBDColorRoom
+	(*BaseUserInfo)(nil),           // 27: BaseUserInfo
-	(*UserAtno)(nil),               // 28: UserAtno
+	(*DBDColorRoom)(nil),           // 28: DBDColorRoom
+	(*UserAtno)(nil),               // 29: UserAtno
 }
 var file_dcolor_dcolor_msg_proto_depIdxs = []int32{
-	23, // 0: DColorInfoResp.info:type_name -> DBDColor
+	24, // 0: DColorInfoResp.info:type_name -> DBDColor
-	24, // 1: DColorSingleReq.difficulty:type_name -> DBDColorDifficulty
+	25, // 1: DColorSingleReq.difficulty:type_name -> DBDColorDifficulty
-	24, // 2: DColorSingleOverReq.difficulty:type_name -> DBDColorDifficulty
+	25, // 2: DColorSingleOverReq.difficulty:type_name -> DBDColorDifficulty
-	25, // 3: DColorSingleOverReq.handles:type_name -> DBDColorResult
+	26, // 3: DColorSingleOverReq.handles:type_name -> DBDColorResult
-	24, // 4: DColorQiecuoReq.difficulty:type_name -> DBDColorDifficulty
+	25, // 4: DColorQiecuoReq.difficulty:type_name -> DBDColorDifficulty
-	26, // 5: DColorQiecuonotifyPush.user:type_name -> BaseUserInfo
+	27, // 5: DColorQiecuonotifyPush.user:type_name -> BaseUserInfo
-	24, // 6: DColorQiecuonotifyPush.difficulty:type_name -> DBDColorDifficulty
+	25, // 6: DColorQiecuonotifyPush.difficulty:type_name -> DBDColorDifficulty
-	27, // 7: DColorGameReadyPush.room:type_name -> DBDColorRoom
+	28, // 7: DColorGameReadyPush.room:type_name -> DBDColorRoom
-	25, // 8: DColorGameHandlePush.handle:type_name -> DBDColorResult
+	26, // 8: DColorGameHandlePush.handle:type_name -> DBDColorResult
-	28, // 9: DColorAwardResp.award:type_name -> UserAtno
+	29, // 9: DColorAwardResp.award:type_name -> UserAtno
-	10, // [10:10] is the sub-list for method output_type
+	23, // 10: DColorAwardResp.awardmap:type_name -> DColorAwardResp.AwardmapEntry
-	10, // [10:10] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for extension type_name
+	11, // [11:11] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension extendee
+	11, // [11:11] is the sub-list for extension type_name
-	0,  // [0:10] is the sub-list for field type_name
+	11, // [11:11] is the sub-list for extension extendee
+	0,  // [0:11] is the sub-list for field type_name
 }
 
 func init() { file_dcolor_dcolor_msg_proto_init() }
@@ -1746,7 +1764,7 @@ func file_dcolor_dcolor_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_dcolor_dcolor_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   23,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   0,
 		},