diff --git a/modules/catchbugs/room.go b/modules/catchbugs/room.go
index c073c1479..28a6ce09a 100644
--- a/modules/catchbugs/room.go
+++ b/modules/catchbugs/room.go
@@ -199,6 +199,10 @@ func (this *Room) PlayerHandleEnd(uid string, handle *pb.CatchbugsHandleEndReq)
 			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)
 		}
 	}
diff --git a/modules/dcolor/api_award.go b/modules/dcolor/api_award.go
index 1f2a71b4c..a7f9a9fa8 100644
--- a/modules/dcolor/api_award.go
+++ b/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
-		confs []*cfg.GameGColorRewardData
-		res   []*cfg.Gameatn
-		atno  []*pb.UserAtno
-		ok    bool
-		err   error
+		info   *pb.DBDColor
+		confs  []*cfg.GameGColorRewardData
+		res    []*cfg.Gameatn
+		atno   []*pb.UserAtno
+		awards map[int32]bool
+		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
 }
diff --git a/pb/catchbugs_db.pb.go b/pb/catchbugs_db.pb.go
index 59beff761..4b8c3081c 100644
--- a/pb/catchbugs_db.pb.go
+++ b/pb/catchbugs_db.pb.go
@@ -258,9 +258,9 @@ type DBCatchBugsCard struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id     int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`   //唯一id
-	Cid    int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"` //卡牌配置id
-	Index  int32 `protobuf:"varint,3,opt,name=index,proto3" json:"index"`
+	Id     int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`         //唯一id
+	Cid    int32 `protobuf:"varint,2,opt,name=cid,proto3" json:"cid"`       //卡牌配置id
+	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"` //是否开启
 }
 
diff --git a/pb/catchbugs_msg.pb.go b/pb/catchbugs_msg.pb.go
index c6bdecba8..0ab7582d2 100644
--- a/pb/catchbugs_msg.pb.go
+++ b/pb/catchbugs_msg.pb.go
@@ -200,109 +200,6 @@ func (x *CatchbugsAwardResp) GetAward() []*UserAtno {
 	return nil
 }
 
-//单机游戏请求
-type CatchbugsSingleOverReq struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Books []int32 `protobuf:"varint,1,rep,packed,name=books,proto3" json:"books"` //图鉴
-}
-
-func (x *CatchbugsSingleOverReq) Reset() {
-	*x = CatchbugsSingleOverReq{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CatchbugsSingleOverReq) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CatchbugsSingleOverReq) ProtoMessage() {}
-
-func (x *CatchbugsSingleOverReq) 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 CatchbugsSingleOverReq.ProtoReflect.Descriptor instead.
-func (*CatchbugsSingleOverReq) Descriptor() ([]byte, []int) {
-	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *CatchbugsSingleOverReq) GetBooks() []int32 {
-	if x != nil {
-		return x.Books
-	}
-	return nil
-}
-
-type CatchbugsSingleOverResp 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() {
-	*x = CatchbugsSingleOverResp{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CatchbugsSingleOverResp) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CatchbugsSingleOverResp) ProtoMessage() {}
-
-func (x *CatchbugsSingleOverResp) 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 CatchbugsSingleOverResp.ProtoReflect.Descriptor instead.
-func (*CatchbugsSingleOverResp) 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
@@ -316,7 +213,7 @@ type CatchbugsGameReadyPush struct {
 func (x *CatchbugsGameReadyPush) Reset() {
 	*x = CatchbugsGameReadyPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -329,7 +226,7 @@ func (x *CatchbugsGameReadyPush) String() string {
 func (*CatchbugsGameReadyPush) ProtoMessage() {}
 
 func (x *CatchbugsGameReadyPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -342,7 +239,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{6}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *CatchbugsGameReadyPush) GetServicePath() string {
@@ -371,7 +268,7 @@ type CatchbugsReadyReq struct {
 func (x *CatchbugsReadyReq) Reset() {
 	*x = CatchbugsReadyReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -384,7 +281,7 @@ func (x *CatchbugsReadyReq) String() string {
 func (*CatchbugsReadyReq) ProtoMessage() {}
 
 func (x *CatchbugsReadyReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -397,7 +294,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{7}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *CatchbugsReadyReq) GetRoomid() string {
@@ -420,7 +317,7 @@ type CatchbugsReadyResp struct {
 func (x *CatchbugsReadyResp) Reset() {
 	*x = CatchbugsReadyResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -433,7 +330,7 @@ func (x *CatchbugsReadyResp) String() string {
 func (*CatchbugsReadyResp) ProtoMessage() {}
 
 func (x *CatchbugsReadyResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -446,7 +343,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{8}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *CatchbugsReadyResp) GetRoomid() string {
@@ -476,7 +373,7 @@ type CatchbugsRoundStartPush struct {
 func (x *CatchbugsRoundStartPush) Reset() {
 	*x = CatchbugsRoundStartPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -489,7 +386,7 @@ func (x *CatchbugsRoundStartPush) String() string {
 func (*CatchbugsRoundStartPush) ProtoMessage() {}
 
 func (x *CatchbugsRoundStartPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -502,7 +399,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{9}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *CatchbugsRoundStartPush) GetRound() int32 {
@@ -525,14 +422,15 @@ type CatchbugsHandleReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` //房间id
-	Index  int32  `protobuf:"varint,2,opt,name=index,proto3" json:"index"`  //卡牌下表
+	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`  //房间id
+	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() {
 	*x = CatchbugsHandleReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -545,7 +443,7 @@ func (x *CatchbugsHandleReq) String() string {
 func (*CatchbugsHandleReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -558,7 +456,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{10}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *CatchbugsHandleReq) GetRoomid() string {
@@ -575,6 +473,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
@@ -584,7 +489,7 @@ type CatchbugsHandleResp struct {
 func (x *CatchbugsHandleResp) Reset() {
 	*x = CatchbugsHandleResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -597,7 +502,7 @@ func (x *CatchbugsHandleResp) String() string {
 func (*CatchbugsHandleResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -610,7 +515,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{11}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{9}
 }
 
 //玩家操作推送
@@ -622,13 +527,14 @@ 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() {
 	*x = CatchbugsOpenCardPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -641,7 +547,7 @@ func (x *CatchbugsOpenCardPush) String() string {
 func (*CatchbugsOpenCardPush) ProtoMessage() {}
 
 func (x *CatchbugsOpenCardPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -654,7 +560,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{12}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *CatchbugsOpenCardPush) GetRoomid() string {
@@ -678,6 +584,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
@@ -697,7 +610,7 @@ type CatchbugsHandleEndReq struct {
 func (x *CatchbugsHandleEndReq) Reset() {
 	*x = CatchbugsHandleEndReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -710,7 +623,7 @@ func (x *CatchbugsHandleEndReq) String() string {
 func (*CatchbugsHandleEndReq) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndReq) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -723,7 +636,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{13}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *CatchbugsHandleEndReq) GetRoomid() string {
@@ -743,7 +656,7 @@ type CatchbugsHandleEndResp struct {
 func (x *CatchbugsHandleEndResp) Reset() {
 	*x = CatchbugsHandleEndResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -756,7 +669,7 @@ func (x *CatchbugsHandleEndResp) String() string {
 func (*CatchbugsHandleEndResp) ProtoMessage() {}
 
 func (x *CatchbugsHandleEndResp) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -769,7 +682,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{14}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{12}
 }
 
 //桌面变化推送
@@ -785,7 +698,7 @@ type CatchbugsTablesChangePush struct {
 func (x *CatchbugsTablesChangePush) Reset() {
 	*x = CatchbugsTablesChangePush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -798,7 +711,7 @@ func (x *CatchbugsTablesChangePush) String() string {
 func (*CatchbugsTablesChangePush) ProtoMessage() {}
 
 func (x *CatchbugsTablesChangePush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -811,7 +724,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{15}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *CatchbugsTablesChangePush) GetChangetype() int32 {
@@ -828,6 +741,45 @@ func (x *CatchbugsTablesChangePush) GetCard() []*DBCatchBugsCard {
 	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[14]
+		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[14]
+	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{14}
+}
+
 //游戏结束推送
 type CatchbugsGameOverPush struct {
 	state         protoimpl.MessageState
@@ -842,7 +794,7 @@ type CatchbugsGameOverPush struct {
 func (x *CatchbugsGameOverPush) Reset() {
 	*x = CatchbugsGameOverPush{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+		mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -855,7 +807,7 @@ func (x *CatchbugsGameOverPush) String() string {
 func (*CatchbugsGameOverPush) ProtoMessage() {}
 
 func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message {
-	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16]
+	mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -868,7 +820,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{16}
+	return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *CatchbugsGameOverPush) GetWinuid() string {
@@ -916,73 +868,64 @@ 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,
-	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,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x22, 0xaa, 0x01,
-	0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c,
-	0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x39, 0x0a, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73,
-	0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42,
-	0x6f, 0x6f, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73,
-	0x1a, 0x38, 0x0a, 0x0a, 0x42, 0x6f, 0x6f, 0x6b, 0x73, 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, 0x05, 0x52,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x60, 0x0a, 0x16, 0x43, 0x61,
-	0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79,
-	0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50,
-	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, 0x22, 0x2b, 0x0a, 0x11,
+	0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x60, 0x0a,
+	0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65,
+	0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x50, 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, 0x22,
+	0x2b, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64,
+	0x79, 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, 0x44, 0x0a, 0x12,
 	0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 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, 0x44, 0x0a, 0x12, 0x43, 0x61, 0x74,
-	0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
+	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, 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, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
-	0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 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, 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, 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, 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,
+	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 (
@@ -997,44 +940,41 @@ 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, 19)
+var file_catchbugs_catchbugs_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 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
-	(*CatchbugsSingleOverResp)(nil),   // 5: CatchbugsSingleOverResp
-	(*CatchbugsGameReadyPush)(nil),    // 6: CatchbugsGameReadyPush
-	(*CatchbugsReadyReq)(nil),         // 7: CatchbugsReadyReq
-	(*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
-	(*CatchbugsTablesChangePush)(nil), // 15: CatchbugsTablesChangePush
-	(*CatchbugsGameOverPush)(nil),     // 16: CatchbugsGameOverPush
-	nil,                               // 17: CatchbugsAwardResp.AwardmapEntry
-	nil,                               // 18: CatchbugsSingleOverResp.BooksEntry
-	(*DBCatchBugs)(nil),               // 19: DBCatchBugs
-	(*UserAtno)(nil),                  // 20: UserAtno
-	(*DBCatchBugsRoom)(nil),           // 21: DBCatchBugsRoom
-	(*DBCatchBugsCard)(nil),           // 22: DBCatchBugsCard
+	(*CatchbugsGameReadyPush)(nil),    // 4: CatchbugsGameReadyPush
+	(*CatchbugsReadyReq)(nil),         // 5: CatchbugsReadyReq
+	(*CatchbugsReadyResp)(nil),        // 6: CatchbugsReadyResp
+	(*CatchbugsRoundStartPush)(nil),   // 7: CatchbugsRoundStartPush
+	(*CatchbugsHandleReq)(nil),        // 8: CatchbugsHandleReq
+	(*CatchbugsHandleResp)(nil),       // 9: CatchbugsHandleResp
+	(*CatchbugsOpenCardPush)(nil),     // 10: CatchbugsOpenCardPush
+	(*CatchbugsHandleEndReq)(nil),     // 11: CatchbugsHandleEndReq
+	(*CatchbugsHandleEndResp)(nil),    // 12: CatchbugsHandleEndResp
+	(*CatchbugsTablesChangePush)(nil), // 13: CatchbugsTablesChangePush
+	(*CatchbugsRoundEndPush)(nil),     // 14: CatchbugsRoundEndPush
+	(*CatchbugsGameOverPush)(nil),     // 15: CatchbugsGameOverPush
+	nil,                               // 16: CatchbugsAwardResp.AwardmapEntry
+	(*DBCatchBugs)(nil),               // 17: DBCatchBugs
+	(*UserAtno)(nil),                  // 18: UserAtno
+	(*DBCatchBugsRoom)(nil),           // 19: DBCatchBugsRoom
+	(*DBCatchBugsCard)(nil),           // 20: DBCatchBugsCard
 }
 var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{
-	19, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
-	17, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
-	20, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
-	18, // 3: CatchbugsSingleOverResp.books:type_name -> CatchbugsSingleOverResp.BooksEntry
-	21, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
-	22, // 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
-	6,  // [6:6] is the sub-list for extension extendee
-	0,  // [0:6] is the sub-list for field type_name
+	17, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs
+	16, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry
+	18, // 2: CatchbugsAwardResp.award:type_name -> UserAtno
+	19, // 3: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom
+	20, // 4: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard
+	5,  // [5:5] is the sub-list for method output_type
+	5,  // [5:5] is the sub-list for method input_type
+	5,  // [5:5] is the sub-list for extension type_name
+	5,  // [5:5] is the sub-list for extension extendee
+	0,  // [0:5] is the sub-list for field type_name
 }
 
 func init() { file_catchbugs_catchbugs_msg_proto_init() }
@@ -1094,30 +1034,6 @@ 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 {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CatchbugsSingleOverResp); 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[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsGameReadyPush); i {
 			case 0:
 				return &v.state
@@ -1129,7 +1045,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsReadyReq); i {
 			case 0:
 				return &v.state
@@ -1141,7 +1057,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsReadyResp); i {
 			case 0:
 				return &v.state
@@ -1153,7 +1069,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsRoundStartPush); i {
 			case 0:
 				return &v.state
@@ -1165,7 +1081,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsHandleReq); i {
 			case 0:
 				return &v.state
@@ -1177,7 +1093,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsHandleResp); i {
 			case 0:
 				return &v.state
@@ -1189,7 +1105,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsOpenCardPush); i {
 			case 0:
 				return &v.state
@@ -1201,7 +1117,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsHandleEndReq); i {
 			case 0:
 				return &v.state
@@ -1213,7 +1129,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsHandleEndResp); i {
 			case 0:
 				return &v.state
@@ -1225,7 +1141,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsTablesChangePush); i {
 			case 0:
 				return &v.state
@@ -1237,7 +1153,19 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 				return nil
 			}
 		}
-		file_catchbugs_catchbugs_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_catchbugs_catchbugs_msg_proto_msgTypes[14].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[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CatchbugsGameOverPush); i {
 			case 0:
 				return &v.state
@@ -1256,7 +1184,7 @@ func file_catchbugs_catchbugs_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_catchbugs_catchbugs_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   19,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/pb/dcolor_msg.pb.go b/pb/dcolor_msg.pb.go
index 259a39f22..0c2258da2 100644
--- a/pb/dcolor_msg.pb.go
+++ b/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 累计奖励
-	Award []*UserAtno `protobuf:"bytes,3,rep,name=award,proto3" json:"award"`  //获取资源
+	Atype    int32          `protobuf:"varint,1,opt,name=atype,proto3" json:"atype"` //0 周奖励 1 累计奖励
+	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,
-	0x22, 0x48, 0x0a, 0x0f, 0x44, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52,
-	0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61,
-	0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
-	0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
-	0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65,
+	0x22, 0xc1, 0x01, 0x0a, 0x0f, 0x44, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x41, 0x77, 0x61, 0x72, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77,
+	0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
+	0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x3a, 0x0a, 0x08, 0x61,
+	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
-	(DBDColorDifficulty)(0),        // 24: DBDColorDifficulty
-	(*DBDColorResult)(nil),         // 25: DBDColorResult
-	(*BaseUserInfo)(nil),           // 26: BaseUserInfo
-	(*DBDColorRoom)(nil),           // 27: DBDColorRoom
-	(*UserAtno)(nil),               // 28: UserAtno
+	nil,                            // 23: DColorAwardResp.AwardmapEntry
+	(*DBDColor)(nil),               // 24: DBDColor
+	(DBDColorDifficulty)(0),        // 25: DBDColorDifficulty
+	(*DBDColorResult)(nil),         // 26: DBDColorResult
+	(*BaseUserInfo)(nil),           // 27: BaseUserInfo
+	(*DBDColorRoom)(nil),           // 28: DBDColorRoom
+	(*UserAtno)(nil),               // 29: UserAtno
 }
 var file_dcolor_dcolor_msg_proto_depIdxs = []int32{
-	23, // 0: DColorInfoResp.info:type_name -> DBDColor
-	24, // 1: DColorSingleReq.difficulty:type_name -> DBDColorDifficulty
-	24, // 2: DColorSingleOverReq.difficulty:type_name -> DBDColorDifficulty
-	25, // 3: DColorSingleOverReq.handles:type_name -> DBDColorResult
-	24, // 4: DColorQiecuoReq.difficulty:type_name -> DBDColorDifficulty
-	26, // 5: DColorQiecuonotifyPush.user:type_name -> BaseUserInfo
-	24, // 6: DColorQiecuonotifyPush.difficulty:type_name -> DBDColorDifficulty
-	27, // 7: DColorGameReadyPush.room:type_name -> DBDColorRoom
-	25, // 8: DColorGameHandlePush.handle:type_name -> DBDColorResult
-	28, // 9: DColorAwardResp.award:type_name -> UserAtno
-	10, // [10:10] is the sub-list for method output_type
-	10, // [10:10] is the sub-list for method input_type
-	10, // [10:10] is the sub-list for extension type_name
-	10, // [10:10] is the sub-list for extension extendee
-	0,  // [0:10] is the sub-list for field type_name
+	24, // 0: DColorInfoResp.info:type_name -> DBDColor
+	25, // 1: DColorSingleReq.difficulty:type_name -> DBDColorDifficulty
+	25, // 2: DColorSingleOverReq.difficulty:type_name -> DBDColorDifficulty
+	26, // 3: DColorSingleOverReq.handles:type_name -> DBDColorResult
+	25, // 4: DColorQiecuoReq.difficulty:type_name -> DBDColorDifficulty
+	27, // 5: DColorQiecuonotifyPush.user:type_name -> BaseUserInfo
+	25, // 6: DColorQiecuonotifyPush.difficulty:type_name -> DBDColorDifficulty
+	28, // 7: DColorGameReadyPush.room:type_name -> DBDColorRoom
+	26, // 8: DColorGameHandlePush.handle:type_name -> DBDColorResult
+	29, // 9: DColorAwardResp.award:type_name -> UserAtno
+	23, // 10: DColorAwardResp.awardmap:type_name -> DColorAwardResp.AwardmapEntry
+	11, // [11:11] is the sub-list for method output_type
+	11, // [11:11] is the sub-list for method input_type
+	11, // [11:11] is the sub-list for extension 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,
 		},