diff --git a/modules/catchbugs/api_passlevel.go b/modules/catchbugs/api_passlevel.go new file mode 100644 index 000000000..3c71c7a1f --- /dev/null +++ b/modules/catchbugs/api_passlevel.go @@ -0,0 +1,45 @@ +package catchbugs + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +func (this *apiComp) PassLevelCheck(session comm.IUserSession, req *pb.CatchbugsPassLevelReq) (errdata *pb.ErrorData) { + return +} + +func (this *apiComp) PassLevel(session comm.IUserSession, req *pb.CatchbugsPassLevelReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameCatchbugStageData + info *pb.DBCatchBugs + err error + ) + if errdata = this.PassLevelCheck(session, req); errdata != nil { + return + } + if conf, err = this.module.configure.getGameCatchbugStage(req.Level); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + + if info, err = this.module.model.getModel(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + info.Integral += conf.Points + info.Level[req.Level] = true + this.module.model.Change(session.GetUserId(), map[string]interface{}{ + "integral": info.Integral, + "level": info.Level, + }) + session.SendMsg(string(this.module.GetType()), "award", &pb.CatchbugsPassLevelResp{Level: req.Level, Integral: info.Integral}) + return +} diff --git a/modules/catchbugs/configure.go b/modules/catchbugs/configure.go index 9880bcd53..45b64f74f 100644 --- a/modules/catchbugs/configure.go +++ b/modules/catchbugs/configure.go @@ -8,6 +8,7 @@ import ( ) const ( + game_catchbugstage = "game_catchbugstage.json" game_catchbugreward = "game_catchbugreward.json" game_catchbuglllustrated = "game_catchbuglllustrated.json" game_catchbugskill = "game_catchbugskill.json" @@ -22,6 +23,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*CatchBugs) err = this.LoadMultiConfigure(map[string]interface{}{ + game_catchbugstage: cfg.NewGameCatchbugStage, game_catchbugreward: cfg.NewGameCatchbugReward, game_catchbuglllustrated: cfg.NewGameCatchbugLllustrated, game_catchbugskill: cfg.NewGameCatchbugSkill, @@ -69,3 +71,20 @@ func (this *configureComp) getGameCatchbugSkillData(id int32) (conf *cfg.GameCat } return } + +// 获取奖励列表 +func (this *configureComp) getGameCatchbugStage(id int32) (conf *cfg.GameCatchbugStageData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_catchbugstage); err != nil { + return + } + if conf, ok = v.(*cfg.GameCatchbugStage).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_catchbugstage, id) + this.module.Errorf("err:%v", err) + return + } + return +} diff --git a/modules/pay/api_createorder.go b/modules/pay/api_createorder.go index 0f9ff0402..3460c7387 100644 --- a/modules/pay/api_createorder.go +++ b/modules/pay/api_createorder.go @@ -3,6 +3,7 @@ package pay import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "time" "go.mongodb.org/mongo-driver/bson/primitive" @@ -17,13 +18,20 @@ func (this *apiComp) CreateOrderCheck(session comm.IUserSession, req *pb.PayCrea // /获取系统公告 func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.PayCreateOrderReq) (errdata *pb.ErrorData) { var ( + conf *cfg.GameRechargeData order *pb.DBPayOrder err error ) if errdata = this.CreateOrderCheck(session, req); errdata != nil { return } - + if conf, err = this.module.configure.getGameRecharge(order.Bpoints); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } order = &pb.DBPayOrder{ Orderid: primitive.NewObjectID().Hex(), Uid: session.GetUserId(), @@ -32,6 +40,8 @@ func (this *apiComp) CreateOrder(session comm.IUserSession, req *pb.PayCreateOrd State: pb.DBPayOrderState_PayOrder_Unpaid, Ptype: req.Ptype, Pid: req.Pid, + Price: conf.Amount, + Amount: 1, } if err = this.module.model.create(order); err != nil { errdata = &pb.ErrorData{ diff --git a/modules/pay/api_delivery.go b/modules/pay/api_delivery.go index 2092c7a92..57704de8b 100644 --- a/modules/pay/api_delivery.go +++ b/modules/pay/api_delivery.go @@ -2,11 +2,12 @@ package pay import ( "context" - "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" - "math" + "time" + + "go.mongodb.org/mongo-driver/bson/primitive" ) //参数校验 @@ -18,45 +19,44 @@ func (this *apiComp) DeliveryCheck(session comm.IUserSession, req *pb.PayDeliver //模拟充值 func (this *apiComp) Delivery(session comm.IUserSession, req *pb.PayDeliveryReq) (errdata *pb.ErrorData) { var ( - conf *cfg.GameRechargeData - voucher *cfg.Gameatn - amount uint32 - neet uint32 - err error + conf *cfg.GameRechargeData + order *pb.DBPayOrder + err error ) if errdata = this.DeliveryCheck(session, req); errdata != nil { return } - if conf, err = this.module.configure.getGameRecharge(req.Productid); err != nil { + if conf, err = this.module.configure.getGameRecharge(order.Bpoints); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ConfigNoFound, - Title: pb.ErrorCode_ConfigNoFound.ToString(), Message: err.Error(), } return } - - voucher = this.module.ModuleTools.GetGlobalConf().Voucher - amount = this.module.ModuleItems.QueryItemAmount(session.GetUserId(), voucher.T) - neet = uint32(math.Floor(float64(conf.Amount) / 100)) - if amount < neet { + order = &pb.DBPayOrder{ + Orderid: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + Bpoints: req.BillingPoints, + Ctime: time.Now().Unix(), + State: pb.DBPayOrderState_PayOrder_Unpaid, + Ptype: req.Ptype, + Pid: req.Pid, + Price: conf.Amount, + Amount: 1, + } + if err = this.module.model.create(order); err != nil { errdata = &pb.ErrorData{ - Code: pb.ErrorCode_ResNoEnough, - Title: pb.ErrorCode_ResNoEnough.ToString(), - Message: fmt.Sprintf("需要代金卷:%d 只有:%d", neet, amount), + Code: pb.ErrorCode_DBError, + Message: err.Error(), } - return } - needatn := []*cfg.Gameatn{{ - A: voucher.A, - T: voucher.T, - N: int32(neet), - }} - - if errdata = this.module.ConsumeRes(session, needatn, true); errdata != nil { - return - } - if err = this.module.Rpc_ModulePayDelivery(context.Background(), req, &pb.PayDeliveryResp{}); err != nil { + if err = this.module.Rpc_ModulePayDelivery(context.Background(), &pb.HttpPayDeliveryReq{ + Uid: session.GetUserId(), + Orderid: order.Orderid, + Productid: order.Bpoints, + Price: order.Price, + Amount: order.Amount, + }, &pb.HttpPayDeliveryResp{}); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/pay/module.go b/modules/pay/module.go index b5ae01eb3..6d78a136d 100644 --- a/modules/pay/module.go +++ b/modules/pay/module.go @@ -92,7 +92,7 @@ func (this *Pay) OnInstallComp() { } // RPC----------------------------------------------------------------------------------------------------------------------- -func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDeliveryReq, reply *pb.PayDeliveryResp) (err error) { +func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeliveryReq, reply *pb.HttpPayDeliveryResp) (err error) { this.Debug("Rpc_ModulePayDelivery", log.Field{Key: "args", Value: args.String()}) var ( order *pb.DBPayOrder diff --git a/modules/robot/modulerobot_shop.go b/modules/robot/modulerobot_shop.go index 6c0377608..57df0c2e1 100644 --- a/modules/robot/modulerobot_shop.go +++ b/modules/robot/modulerobot_shop.go @@ -12,11 +12,11 @@ import ( //用户模块 机器人 type ModuleRobot_Shop struct { - goods map[pb.ShopType][]*pb.ShopItem + goods map[int32][]*pb.ShopItem } func (this *ModuleRobot_Shop) Init() (err error) { - this.goods = make(map[pb.ShopType][]*pb.ShopItem) + this.goods = make(map[int32][]*pb.ShopItem) return } @@ -35,7 +35,7 @@ func (this *ModuleRobot_Shop) OncePipeline(robot IRobot) (err error) { errdata *pb.ErrorData ) if _, errdata = robot.SendMessage("shop", "getlist", &pb.ShopGetListReq{ - SType: pb.ShopType_DiamondShop, + SType: 1, }); errdata != nil { err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message)) return @@ -50,10 +50,10 @@ func (this *ModuleRobot_Shop) DoPipeline(robot IRobot) (err error) { usermodule *ModuleRobot_User ) usermodule = robot.GetModule(comm.ModuleUser).(*ModuleRobot_User) - for _, v := range this.goods[pb.ShopType_GoldShop] { + for _, v := range this.goods[1] { if v.LeftBuyNum > 0 && usermodule.user.Gold >= int64(v.Consume[0].N) { if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{ - ShopType: pb.ShopType_GoldShop, + ShopType: 1, Gid: v.Gid, BuyNum: 1, }); errdata != nil { @@ -63,10 +63,10 @@ func (this *ModuleRobot_Shop) DoPipeline(robot IRobot) (err error) { break } } - for _, v := range this.goods[pb.ShopType_DiamondShop] { + for _, v := range this.goods[2] { if v.LeftBuyNum > 0 && usermodule.user.Diamond >= int64(v.Consume[0].N) { if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{ - ShopType: pb.ShopType_DiamondShop, + ShopType: 2, Gid: v.Gid, BuyNum: 1, }); errdata != nil { @@ -91,16 +91,16 @@ func (this *ModuleRobot_Shop) DoTask(robot IRobot, taskconf *cfg.GameWorldTaskDa ) usermodule = robot.GetModule(comm.ModuleUser).(*ModuleRobot_User) if _, errdata = robot.SendMessage("shop", "getlist", &pb.ShopGetListReq{ - SType: pb.ShopType_DiamondShop, + SType: 2, }); errdata != nil { err = errors.New(fmt.Sprintf("code:%d message:%s", errdata.Code, errdata.Message)) return } - for _, v := range this.goods[pb.ShopType_DiamondShop] { + for _, v := range this.goods[2] { if v.LeftBuyNum > 0 && usermodule.user.Diamond >= int64(v.Consume[0].N) { if _, errdata = robot.SendMessage("shop", "buy", &pb.ShopBuyReq{ - ShopType: pb.ShopType_DiamondShop, + ShopType: 2, Gid: v.Gid, BuyNum: 1, }); errdata != nil { diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 367564583..dfd3a2e4c 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -66,7 +66,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) return } sdata = shopData.Shops[int32(req.SType)] - if req.SType == pb.ShopType_GoldShop { + if req.SType == 1 { refresh = this.module.privilege.GetCountByPrivilegeId(session.GetUserId(), comm.PrivilegeType2) } if sdata == nil { diff --git a/modules/shop/module_test.go b/modules/shop/module_test.go index edc3b037b..79e412a18 100644 --- a/modules/shop/module_test.go +++ b/modules/shop/module_test.go @@ -78,7 +78,7 @@ func TestMain(m *testing.M) { // 测试api_getlist func Test_Module_APIGetList(t *testing.T) { - data, _ := ptypes.MarshalAny(&pb.ShopGetListReq{SType: pb.ShopType_GoldShop, IsManualRefresh: false}) + data, _ := ptypes.MarshalAny(&pb.ShopGetListReq{SType: 1, IsManualRefresh: false}) reply := &pb.RPCMessageReply{} s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62b16dda909b2f8faeff788d", MainType: "shop", SubType: "getlist", Message: data}, reply) log.Debugf("reply:%v", reply) diff --git a/modules/web/api_paydelivery.go b/modules/web/api_paydelivery.go index d860b50ae..16077ba9d 100644 --- a/modules/web/api_paydelivery.go +++ b/modules/web/api_paydelivery.go @@ -27,14 +27,14 @@ func (this *Api_Comp) PayDelivery(c *engine.Context) { // req := make([]interface{}, 0) // err := c.BindJSON(&req) var ( - payreq *pb.PayDeliveryReq = &pb.PayDeliveryReq{ + payreq *pb.HttpPayDeliveryReq = &pb.HttpPayDeliveryReq{ Uid: uid, Productid: pid, Orderid: oid, Price: price, Amount: 1, } - payresp *pb.PayDeliveryResp = &pb.PayDeliveryResp{ + payresp *pb.HttpPayDeliveryResp = &pb.HttpPayDeliveryResp{ Code: 0, Msg: "成功", Data: "", diff --git a/pb/catchbugs_db.pb.go b/pb/catchbugs_db.pb.go index 6ae5bb851..2c1459b38 100644 --- a/pb/catchbugs_db.pb.go +++ b/pb/catchbugs_db.pb.go @@ -31,7 +31,8 @@ type DBCatchBugs struct { Integral int32 `protobuf:"varint,3,opt,name=integral,proto3" json:"integral"` Books map[int32]int32 `protobuf:"bytes,4,rep,name=books,proto3" json:"books" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 Awards map[int32]bool `protobuf:"bytes,5,rep,name=awards,proto3" json:"awards" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //奖励 - Weektime int64 `protobuf:"varint,6,opt,name=weektime,proto3" json:"weektime"` //周时长 + Level map[int32]bool `protobuf:"bytes,6,rep,name=level,proto3" json:"level" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //通关信息 + Weektime int64 `protobuf:"varint,7,opt,name=weektime,proto3" json:"weektime"` //周时长 } func (x *DBCatchBugs) Reset() { @@ -101,6 +102,13 @@ func (x *DBCatchBugs) GetAwards() map[int32]bool { return nil } +func (x *DBCatchBugs) GetLevel() map[int32]bool { + if x != nil { + return x.Level + } + return nil +} + func (x *DBCatchBugs) GetWeektime() int64 { if x != nil { return x.Weektime @@ -425,7 +433,7 @@ var File_catchbugs_catchbugs_db_proto protoreflect.FileDescriptor var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x2f, 0x63, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, - 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xbd, 0x02, 0x0a, 0x0b, 0x44, + 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, @@ -436,56 +444,62 @@ var file_catchbugs_catchbugs_db_proto_rawDesc = []byte{ 0x52, 0x05, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x12, 0x30, 0x0a, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, - 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, - 0x6b, 0x74, 0x69, 0x6d, 0x65, 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, 0x1a, - 0x39, 0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x08, 0x52, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x46, 0x0a, 0x10, 0x44, 0x42, - 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14, - 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, 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, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, - 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, - 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, - 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, - 0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, - 0x73, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, - 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 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, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, - 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, - 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, - 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, - 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, - 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, + 0x79, 0x52, 0x06, 0x61, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x2d, 0x0a, 0x05, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, + 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x77, 0x65, 0x65, 0x6b, + 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x77, 0x65, 0x65, 0x6b, + 0x74, 0x69, 0x6d, 0x65, 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, 0x1a, 0x39, + 0x0a, 0x0b, 0x41, 0x77, 0x61, 0x72, 0x64, 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, 0x08, 0x52, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, + 0x65, 0x6c, 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, 0x46, 0x0a, 0x10, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, + 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x14, 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, 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, 0x12, 0x0a, 0x04, 0x69, 0x73, + 0x61, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, + 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, + 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, + 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x61, 0x72, 0x64, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x65, 0x6e, + 0x63, 0x61, 0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x18, 0x07, 0x20, + 0x03, 0x28, 0x05, 0x52, 0x05, 0x63, 0x61, 0x72, 0x64, 0x73, 0x22, 0x61, 0x0a, 0x0f, 0x44, 0x42, + 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x43, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 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, 0x6f, 0x70, 0x65, 0x6e, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70, 0x65, 0x6e, 0x22, 0xea, 0x01, + 0x0a, 0x0f, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x6f, 0x6f, + 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x72, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x24, 0x0a, 0x03, + 0x72, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, + 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, + 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, - 0x61, 0x79, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x62, 0x6c, 0x75, - 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, - 0x68, 0x42, 0x75, 0x67, 0x73, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, - 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 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, 0x06, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, - 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, + 0x61, 0x79, 0x65, 0x72, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, + 0x63, 0x6b, 0x75, 0x70, 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, 0x06, 0x62, 0x61, + 0x63, 0x6b, 0x75, 0x70, 0x12, 0x24, 0x0a, 0x04, 0x63, 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 ( @@ -500,7 +514,7 @@ func file_catchbugs_catchbugs_db_proto_rawDescGZIP() []byte { return file_catchbugs_catchbugs_db_proto_rawDescData } -var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_catchbugs_catchbugs_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ (*DBCatchBugs)(nil), // 0: DBCatchBugs (*DBCatchBugsRules)(nil), // 1: DBCatchBugsRules @@ -509,22 +523,24 @@ var file_catchbugs_catchbugs_db_proto_goTypes = []interface{}{ (*DBCatchBugsRoom)(nil), // 4: DBCatchBugsRoom nil, // 5: DBCatchBugs.BooksEntry nil, // 6: DBCatchBugs.AwardsEntry - (*BaseUserInfo)(nil), // 7: BaseUserInfo + nil, // 7: DBCatchBugs.LevelEntry + (*BaseUserInfo)(nil), // 8: BaseUserInfo } var file_catchbugs_catchbugs_db_proto_depIdxs = []int32{ 5, // 0: DBCatchBugs.books:type_name -> DBCatchBugs.BooksEntry 6, // 1: DBCatchBugs.awards:type_name -> DBCatchBugs.AwardsEntry - 7, // 2: DBCatchBugsPlayer.info:type_name -> BaseUserInfo - 1, // 3: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules - 2, // 4: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer - 2, // 5: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer - 3, // 6: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard - 3, // 7: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 7, // 2: DBCatchBugs.level:type_name -> DBCatchBugs.LevelEntry + 8, // 3: DBCatchBugsPlayer.info:type_name -> BaseUserInfo + 1, // 4: DBCatchBugsRoom.rules:type_name -> DBCatchBugsRules + 2, // 5: DBCatchBugsRoom.red:type_name -> DBCatchBugsPlayer + 2, // 6: DBCatchBugsRoom.blue:type_name -> DBCatchBugsPlayer + 3, // 7: DBCatchBugsRoom.backup:type_name -> DBCatchBugsCard + 3, // 8: DBCatchBugsRoom.card:type_name -> DBCatchBugsCard + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_catchbugs_catchbugs_db_proto_init() } @@ -601,7 +617,7 @@ func file_catchbugs_catchbugs_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_catchbugs_catchbugs_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/catchbugs_msg.pb.go b/pb/catchbugs_msg.pb.go index 1576eb42f..fb6584e06 100644 --- a/pb/catchbugs_msg.pb.go +++ b/pb/catchbugs_msg.pb.go @@ -106,6 +106,108 @@ func (x *CatchbugsInfoResp) GetInfo() *DBCatchBugs { return nil } +type CatchbugsPassLevelReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` +} + +func (x *CatchbugsPassLevelReq) Reset() { + *x = CatchbugsPassLevelReq{} + if protoimpl.UnsafeEnabled { + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CatchbugsPassLevelReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CatchbugsPassLevelReq) ProtoMessage() {} + +func (x *CatchbugsPassLevelReq) ProtoReflect() protoreflect.Message { + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2] + 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 CatchbugsPassLevelReq.ProtoReflect.Descriptor instead. +func (*CatchbugsPassLevelReq) Descriptor() ([]byte, []int) { + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *CatchbugsPassLevelReq) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +type CatchbugsPassLevelResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Level int32 `protobuf:"varint,1,opt,name=level,proto3" json:"level"` + Integral int32 `protobuf:"varint,2,opt,name=integral,proto3" json:"integral"` //红方积分 +} + +func (x *CatchbugsPassLevelResp) Reset() { + *x = CatchbugsPassLevelResp{} + if protoimpl.UnsafeEnabled { + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CatchbugsPassLevelResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CatchbugsPassLevelResp) ProtoMessage() {} + +func (x *CatchbugsPassLevelResp) ProtoReflect() protoreflect.Message { + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3] + 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 CatchbugsPassLevelResp.ProtoReflect.Descriptor instead. +func (*CatchbugsPassLevelResp) Descriptor() ([]byte, []int) { + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{3} +} + +func (x *CatchbugsPassLevelResp) GetLevel() int32 { + if x != nil { + return x.Level + } + return 0 +} + +func (x *CatchbugsPassLevelResp) GetIntegral() int32 { + if x != nil { + return x.Integral + } + return 0 +} + //领奖 type CatchbugsAwardReq struct { state protoimpl.MessageState @@ -116,7 +218,7 @@ type CatchbugsAwardReq struct { func (x *CatchbugsAwardReq) Reset() { *x = CatchbugsAwardReq{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -129,7 +231,7 @@ func (x *CatchbugsAwardReq) String() string { func (*CatchbugsAwardReq) ProtoMessage() {} func (x *CatchbugsAwardReq) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[2] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -142,7 +244,7 @@ func (x *CatchbugsAwardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CatchbugsAwardReq.ProtoReflect.Descriptor instead. func (*CatchbugsAwardReq) Descriptor() ([]byte, []int) { - return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{2} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4} } type CatchbugsAwardResp struct { @@ -157,7 +259,7 @@ type CatchbugsAwardResp struct { func (x *CatchbugsAwardResp) Reset() { *x = CatchbugsAwardResp{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -170,7 +272,7 @@ func (x *CatchbugsAwardResp) String() string { func (*CatchbugsAwardResp) ProtoMessage() {} func (x *CatchbugsAwardResp) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[3] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -183,7 +285,7 @@ func (x *CatchbugsAwardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CatchbugsAwardResp.ProtoReflect.Descriptor instead. func (*CatchbugsAwardResp) Descriptor() ([]byte, []int) { - return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{3} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5} } func (x *CatchbugsAwardResp) GetAwardmap() map[int32]bool { @@ -212,7 +314,7 @@ type CatchbugsSingleGameReq struct { func (x *CatchbugsSingleGameReq) Reset() { *x = CatchbugsSingleGameReq{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -225,7 +327,7 @@ func (x *CatchbugsSingleGameReq) String() string { func (*CatchbugsSingleGameReq) ProtoMessage() {} func (x *CatchbugsSingleGameReq) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[4] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -238,7 +340,7 @@ func (x *CatchbugsSingleGameReq) ProtoReflect() protoreflect.Message { // Deprecated: Use CatchbugsSingleGameReq.ProtoReflect.Descriptor instead. func (*CatchbugsSingleGameReq) Descriptor() ([]byte, []int) { - return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{4} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{6} } func (x *CatchbugsSingleGameReq) GetRules() *DBCatchBugsRules { @@ -258,7 +360,7 @@ type CatchbugsSingleGameResp struct { func (x *CatchbugsSingleGameResp) Reset() { *x = CatchbugsSingleGameResp{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -271,7 +373,7 @@ func (x *CatchbugsSingleGameResp) String() string { func (*CatchbugsSingleGameResp) ProtoMessage() {} func (x *CatchbugsSingleGameResp) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[5] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -284,7 +386,7 @@ func (x *CatchbugsSingleGameResp) ProtoReflect() protoreflect.Message { // Deprecated: Use CatchbugsSingleGameResp.ProtoReflect.Descriptor instead. func (*CatchbugsSingleGameResp) Descriptor() ([]byte, []int) { - return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{5} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{7} } //游戏准备推送 @@ -300,7 +402,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[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -313,7 +415,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[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -326,7 +428,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{8} } func (x *CatchbugsGameReadyPush) GetServicePath() string { @@ -355,7 +457,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[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -368,7 +470,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[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -381,7 +483,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{9} } func (x *CatchbugsReadyReq) GetRoomid() string { @@ -404,7 +506,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[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -417,7 +519,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[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -430,7 +532,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{10} } func (x *CatchbugsReadyResp) GetRoomid() string { @@ -460,7 +562,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[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -473,7 +575,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[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -486,7 +588,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{11} } func (x *CatchbugsRoundStartPush) GetRound() int32 { @@ -517,7 +619,7 @@ type CatchbugsHandleReq struct { func (x *CatchbugsHandleReq) Reset() { *x = CatchbugsHandleReq{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[10] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -530,7 +632,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[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -543,7 +645,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{12} } func (x *CatchbugsHandleReq) GetRoomid() string { @@ -576,7 +678,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[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -589,7 +691,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[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -602,7 +704,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{13} } //玩家操作推送8 @@ -621,7 +723,7 @@ type CatchbugsOpenCardPush struct { func (x *CatchbugsOpenCardPush) Reset() { *x = CatchbugsOpenCardPush{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[12] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -634,7 +736,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[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -647,7 +749,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{14} } func (x *CatchbugsOpenCardPush) GetRoomid() string { @@ -697,7 +799,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[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -710,7 +812,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[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -723,7 +825,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{15} } func (x *CatchbugsHandleEndReq) GetRoomid() string { @@ -743,7 +845,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[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -756,7 +858,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[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -769,7 +871,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{16} } //桌面变化推送10 a @@ -785,7 +887,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[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -798,7 +900,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[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -811,7 +913,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{17} } func (x *CatchbugsTablesChangePush) GetChangetype() int32 { @@ -838,7 +940,7 @@ type CatchbugsRoundEndPush struct { func (x *CatchbugsRoundEndPush) Reset() { *x = CatchbugsRoundEndPush{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -851,7 +953,7 @@ func (x *CatchbugsRoundEndPush) String() string { func (*CatchbugsRoundEndPush) ProtoMessage() {} func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[16] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -864,7 +966,7 @@ func (x *CatchbugsRoundEndPush) ProtoReflect() protoreflect.Message { // Deprecated: Use CatchbugsRoundEndPush.ProtoReflect.Descriptor instead. func (*CatchbugsRoundEndPush) Descriptor() ([]byte, []int) { - return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{16} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{18} } //游戏结束推送12 @@ -881,7 +983,7 @@ type CatchbugsGameOverPush struct { func (x *CatchbugsGameOverPush) Reset() { *x = CatchbugsGameOverPush{} if protoimpl.UnsafeEnabled { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -894,7 +996,7 @@ func (x *CatchbugsGameOverPush) String() string { func (*CatchbugsGameOverPush) ProtoMessage() {} func (x *CatchbugsGameOverPush) ProtoReflect() protoreflect.Message { - mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[17] + mi := &file_catchbugs_catchbugs_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -907,7 +1009,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{17} + return file_catchbugs_catchbugs_msg_proto_rawDescGZIP(), []int{19} } func (x *CatchbugsGameOverPush) GetWinuid() string { @@ -943,82 +1045,89 @@ var file_catchbugs_catchbugs_msg_proto_rawDesc = []byte{ 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, - 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61, - 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x3d, 0x0a, 0x08, 0x61, 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 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, 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, - 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, 0x41, 0x0a, - 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, - 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, - 0x42, 0x75, 0x67, 0x73, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, - 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, - 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 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, + 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x2d, 0x0a, 0x15, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, + 0x73, 0x50, 0x61, 0x73, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x22, 0x4a, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, + 0x50, 0x61, 0x73, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, + 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, + 0x76, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, + 0x13, 0x0a, 0x11, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x71, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, + 0x67, 0x73, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3d, 0x0a, 0x08, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x6d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, + 0x43, 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 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, 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, 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, 0x41, 0x0a, 0x16, 0x43, 0x61, 0x74, 0x63, + 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, 0x6d, 0x65, 0x52, + 0x65, 0x71, 0x12, 0x27, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x74, 0x63, 0x68, 0x42, 0x75, 0x67, 0x73, 0x52, + 0x75, 0x6c, 0x65, 0x73, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x43, + 0x61, 0x74, 0x63, 0x68, 0x62, 0x75, 0x67, 0x73, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x47, 0x61, + 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 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, 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, + 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, 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, + 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 ( @@ -1033,40 +1142,42 @@ 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, 21) var file_catchbugs_catchbugs_msg_proto_goTypes = []interface{}{ (*CatchbugsInfoReq)(nil), // 0: CatchbugsInfoReq (*CatchbugsInfoResp)(nil), // 1: CatchbugsInfoResp - (*CatchbugsAwardReq)(nil), // 2: CatchbugsAwardReq - (*CatchbugsAwardResp)(nil), // 3: CatchbugsAwardResp - (*CatchbugsSingleGameReq)(nil), // 4: CatchbugsSingleGameReq - (*CatchbugsSingleGameResp)(nil), // 5: CatchbugsSingleGameResp - (*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 - (*CatchbugsRoundEndPush)(nil), // 16: CatchbugsRoundEndPush - (*CatchbugsGameOverPush)(nil), // 17: CatchbugsGameOverPush - nil, // 18: CatchbugsAwardResp.AwardmapEntry - (*DBCatchBugs)(nil), // 19: DBCatchBugs - (*UserAtno)(nil), // 20: UserAtno - (*DBCatchBugsRules)(nil), // 21: DBCatchBugsRules - (*DBCatchBugsRoom)(nil), // 22: DBCatchBugsRoom - (*DBCatchBugsCard)(nil), // 23: DBCatchBugsCard + (*CatchbugsPassLevelReq)(nil), // 2: CatchbugsPassLevelReq + (*CatchbugsPassLevelResp)(nil), // 3: CatchbugsPassLevelResp + (*CatchbugsAwardReq)(nil), // 4: CatchbugsAwardReq + (*CatchbugsAwardResp)(nil), // 5: CatchbugsAwardResp + (*CatchbugsSingleGameReq)(nil), // 6: CatchbugsSingleGameReq + (*CatchbugsSingleGameResp)(nil), // 7: CatchbugsSingleGameResp + (*CatchbugsGameReadyPush)(nil), // 8: CatchbugsGameReadyPush + (*CatchbugsReadyReq)(nil), // 9: CatchbugsReadyReq + (*CatchbugsReadyResp)(nil), // 10: CatchbugsReadyResp + (*CatchbugsRoundStartPush)(nil), // 11: CatchbugsRoundStartPush + (*CatchbugsHandleReq)(nil), // 12: CatchbugsHandleReq + (*CatchbugsHandleResp)(nil), // 13: CatchbugsHandleResp + (*CatchbugsOpenCardPush)(nil), // 14: CatchbugsOpenCardPush + (*CatchbugsHandleEndReq)(nil), // 15: CatchbugsHandleEndReq + (*CatchbugsHandleEndResp)(nil), // 16: CatchbugsHandleEndResp + (*CatchbugsTablesChangePush)(nil), // 17: CatchbugsTablesChangePush + (*CatchbugsRoundEndPush)(nil), // 18: CatchbugsRoundEndPush + (*CatchbugsGameOverPush)(nil), // 19: CatchbugsGameOverPush + nil, // 20: CatchbugsAwardResp.AwardmapEntry + (*DBCatchBugs)(nil), // 21: DBCatchBugs + (*UserAtno)(nil), // 22: UserAtno + (*DBCatchBugsRules)(nil), // 23: DBCatchBugsRules + (*DBCatchBugsRoom)(nil), // 24: DBCatchBugsRoom + (*DBCatchBugsCard)(nil), // 25: DBCatchBugsCard } var file_catchbugs_catchbugs_msg_proto_depIdxs = []int32{ - 19, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs - 18, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry - 20, // 2: CatchbugsAwardResp.award:type_name -> UserAtno - 21, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules - 22, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom - 23, // 5: CatchbugsTablesChangePush.card:type_name -> DBCatchBugsCard + 21, // 0: CatchbugsInfoResp.info:type_name -> DBCatchBugs + 20, // 1: CatchbugsAwardResp.awardmap:type_name -> CatchbugsAwardResp.AwardmapEntry + 22, // 2: CatchbugsAwardResp.award:type_name -> UserAtno + 23, // 3: CatchbugsSingleGameReq.rules:type_name -> DBCatchBugsRules + 24, // 4: CatchbugsGameReadyPush.room:type_name -> DBCatchBugsRoom + 25, // 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 @@ -1107,7 +1218,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsAwardReq); i { + switch v := v.(*CatchbugsPassLevelReq); i { case 0: return &v.state case 1: @@ -1119,7 +1230,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsAwardResp); i { + switch v := v.(*CatchbugsPassLevelResp); i { case 0: return &v.state case 1: @@ -1131,7 +1242,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.(*CatchbugsSingleGameReq); i { + switch v := v.(*CatchbugsAwardReq); i { case 0: return &v.state case 1: @@ -1143,7 +1254,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.(*CatchbugsSingleGameResp); i { + switch v := v.(*CatchbugsAwardResp); i { case 0: return &v.state case 1: @@ -1155,7 +1266,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsGameReadyPush); i { + switch v := v.(*CatchbugsSingleGameReq); i { case 0: return &v.state case 1: @@ -1167,7 +1278,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.(*CatchbugsReadyReq); i { + switch v := v.(*CatchbugsSingleGameResp); i { case 0: return &v.state case 1: @@ -1179,7 +1290,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.(*CatchbugsReadyResp); i { + switch v := v.(*CatchbugsGameReadyPush); i { case 0: return &v.state case 1: @@ -1191,7 +1302,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsRoundStartPush); i { + switch v := v.(*CatchbugsReadyReq); i { case 0: return &v.state case 1: @@ -1203,7 +1314,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsHandleReq); i { + switch v := v.(*CatchbugsReadyResp); i { case 0: return &v.state case 1: @@ -1215,7 +1326,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsHandleResp); i { + switch v := v.(*CatchbugsRoundStartPush); i { case 0: return &v.state case 1: @@ -1227,7 +1338,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsOpenCardPush); i { + switch v := v.(*CatchbugsHandleReq); i { case 0: return &v.state case 1: @@ -1239,7 +1350,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsHandleEndReq); i { + switch v := v.(*CatchbugsHandleResp); i { case 0: return &v.state case 1: @@ -1251,7 +1362,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsHandleEndResp); i { + switch v := v.(*CatchbugsOpenCardPush); i { case 0: return &v.state case 1: @@ -1263,7 +1374,7 @@ 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 { + switch v := v.(*CatchbugsHandleEndReq); i { case 0: return &v.state case 1: @@ -1275,7 +1386,7 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CatchbugsRoundEndPush); i { + switch v := v.(*CatchbugsHandleEndResp); i { case 0: return &v.state case 1: @@ -1287,6 +1398,30 @@ func file_catchbugs_catchbugs_msg_proto_init() { } } file_catchbugs_catchbugs_msg_proto_msgTypes[17].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[18].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[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CatchbugsGameOverPush); i { case 0: return &v.state @@ -1305,7 +1440,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: 21, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/pay_db.pb.go b/pb/pay_db.pb.go index d8949ef23..b414b3bdb 100644 --- a/pb/pay_db.pb.go +++ b/pb/pay_db.pb.go @@ -154,6 +154,8 @@ type DBPayOrder struct { State DBPayOrderState `protobuf:"varint,6,opt,name=state,proto3,enum=DBPayOrderState" json:"state"` //订单状态 Ptype DBPayType `protobuf:"varint,7,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"` //订单类型 Pid int32 `protobuf:"varint,8,opt,name=pid,proto3" json:"pid"` //商品id + Price int32 `protobuf:"varint,9,opt,name=price,proto3" json:"price"` //价格 + Amount int32 `protobuf:"varint,10,opt,name=amount,proto3" json:"amount"` //数量 } func (x *DBPayOrder) Reset() { @@ -237,6 +239,20 @@ func (x *DBPayOrder) GetPid() int32 { return 0 } +func (x *DBPayOrder) GetPrice() int32 { + if x != nil { + return x.Price + } + return 0 +} + +func (x *DBPayOrder) GetAmount() int32 { + if x != nil { + return x.Amount + } + return 0 +} + //用户购买记录 type DBUserPay struct { state protoimpl.MessageState @@ -617,7 +633,7 @@ var File_pay_pay_db_proto protoreflect.FileDescriptor var file_pay_pay_db_proto_rawDesc = []byte{ 0x0a, 0x10, 0x70, 0x61, 0x79, 0x2f, 0x70, 0x61, 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, + 0x74, 0x6f, 0x22, 0xf2, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a, @@ -629,84 +645,86 @@ var file_pay_pay_db_proto_rawDesc = []byte{ 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x08, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42, - 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73, - 0x65, 0x72, 0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, - 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, - 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, - 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x2c, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, - 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, - 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, - 0x0a, 0x49, 0x74, 0x65, 0x6d, 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, 0x23, 0x0a, - 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, - 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f, - 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, - 0x66, 0x74, 0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, - 0x52, 0x0a, 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, + 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x88, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x55, 0x73, + 0x65, 0x72, 0x50, 0x61, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, + 0x50, 0x61, 0x79, 0x2e, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 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, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, + 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, + 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, 0x01, 0x0a, + 0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, + 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49, + 0x74, 0x65, 0x6d, 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, 0x23, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x61, 0x79, + 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x3f, 0x0a, 0x09, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, + 0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, 0x52, 0x0a, + 0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 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, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, + 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, + 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, + 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x49, + 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, + 0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 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, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, - 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, - 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, - 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, - 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 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, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, - 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, - 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, - 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, - 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, - 0x09, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, - 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, - 0x61, 0x63, 0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, - 0x79, 0x50, 0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, - 0x50, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, - 0x11, 0x0a, 0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, - 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, - 0x67, 0x10, 0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, - 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, - 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, - 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, - 0x69, 0x64, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x5f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, - 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, - 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62, + 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, + 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, + 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, + 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, 0x09, 0x44, + 0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, + 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x63, + 0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, + 0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x65, + 0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, + 0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, 0x10, 0x05, + 0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, 0x67, 0x10, + 0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, + 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12, + 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64, + 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, + 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/pay_msg.pb.go b/pb/pay_msg.pb.go index 421293a9e..2246279c6 100644 --- a/pb/pay_msg.pb.go +++ b/pb/pay_msg.pb.go @@ -582,11 +582,9 @@ type PayDeliveryReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` - Orderid string `protobuf:"bytes,2,opt,name=orderid,proto3" json:"orderid"` - Productid string `protobuf:"bytes,3,opt,name=productid,proto3" json:"productid"` - Price int32 `protobuf:"varint,4,opt,name=price,proto3" json:"price"` - Amount int32 `protobuf:"varint,5,opt,name=amount,proto3" json:"amount"` + Ptype DBPayType `protobuf:"varint,1,opt,name=ptype,proto3,enum=DBPayType" json:"ptype"` + Pid int32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid"` + BillingPoints string `protobuf:"bytes,3,opt,name=BillingPoints,proto3" json:"BillingPoints"` } func (x *PayDeliveryReq) Reset() { @@ -621,39 +619,25 @@ func (*PayDeliveryReq) Descriptor() ([]byte, []int) { return file_pay_pay_msg_proto_rawDescGZIP(), []int{11} } -func (x *PayDeliveryReq) GetUid() string { +func (x *PayDeliveryReq) GetPtype() DBPayType { if x != nil { - return x.Uid + return x.Ptype } - return "" + return DBPayType_DiamondShop } -func (x *PayDeliveryReq) GetOrderid() string { +func (x *PayDeliveryReq) GetPid() int32 { if x != nil { - return x.Orderid - } - return "" -} - -func (x *PayDeliveryReq) GetProductid() string { - if x != nil { - return x.Productid - } - return "" -} - -func (x *PayDeliveryReq) GetPrice() int32 { - if x != nil { - return x.Price + return x.Pid } return 0 } -func (x *PayDeliveryReq) GetAmount() int32 { +func (x *PayDeliveryReq) GetBillingPoints() string { if x != nil { - return x.Amount + return x.BillingPoints } - return 0 + return "" } ///支付系统发货请求 回应 @@ -662,9 +646,7 @@ type PayDeliveryResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"s"` //头像 - Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"` - Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data"` + Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"` } func (x *PayDeliveryResp) Reset() { @@ -699,25 +681,11 @@ func (*PayDeliveryResp) Descriptor() ([]byte, []int) { return file_pay_pay_msg_proto_rawDescGZIP(), []int{12} } -func (x *PayDeliveryResp) GetCode() ErrorCode { +func (x *PayDeliveryResp) GetOrder() *DBPayOrder { if x != nil { - return x.Code + return x.Order } - return ErrorCode_Success -} - -func (x *PayDeliveryResp) GetMsg() string { - if x != nil { - return x.Msg - } - return "" -} - -func (x *PayDeliveryResp) GetData() string { - if x != nil { - return x.Data - } - return "" + return nil } // 获取礼包信息 @@ -918,6 +886,150 @@ func (x *PayActivityResp) GetItems() []*UserAssets { return nil } +///支付系统发货请求 +type HttpPayDeliveryReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` + Orderid string `protobuf:"bytes,2,opt,name=orderid,proto3" json:"orderid"` + Productid string `protobuf:"bytes,3,opt,name=productid,proto3" json:"productid"` + Price int32 `protobuf:"varint,4,opt,name=price,proto3" json:"price"` + Amount int32 `protobuf:"varint,5,opt,name=amount,proto3" json:"amount"` +} + +func (x *HttpPayDeliveryReq) Reset() { + *x = HttpPayDeliveryReq{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HttpPayDeliveryReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HttpPayDeliveryReq) ProtoMessage() {} + +func (x *HttpPayDeliveryReq) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[17] + 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 HttpPayDeliveryReq.ProtoReflect.Descriptor instead. +func (*HttpPayDeliveryReq) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{17} +} + +func (x *HttpPayDeliveryReq) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *HttpPayDeliveryReq) GetOrderid() string { + if x != nil { + return x.Orderid + } + return "" +} + +func (x *HttpPayDeliveryReq) GetProductid() string { + if x != nil { + return x.Productid + } + return "" +} + +func (x *HttpPayDeliveryReq) GetPrice() int32 { + if x != nil { + return x.Price + } + return 0 +} + +func (x *HttpPayDeliveryReq) GetAmount() int32 { + if x != nil { + return x.Amount + } + return 0 +} + +///支付系统发货请求 回应 +type HttpPayDeliveryResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"s"` //头像 + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data"` +} + +func (x *HttpPayDeliveryResp) Reset() { + *x = HttpPayDeliveryResp{} + if protoimpl.UnsafeEnabled { + mi := &file_pay_pay_msg_proto_msgTypes[18] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HttpPayDeliveryResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HttpPayDeliveryResp) ProtoMessage() {} + +func (x *HttpPayDeliveryResp) ProtoReflect() protoreflect.Message { + mi := &file_pay_pay_msg_proto_msgTypes[18] + 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 HttpPayDeliveryResp.ProtoReflect.Descriptor instead. +func (*HttpPayDeliveryResp) Descriptor() ([]byte, []int) { + return file_pay_pay_msg_proto_rawDescGZIP(), []int{18} +} + +func (x *HttpPayDeliveryResp) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_Success +} + +func (x *HttpPayDeliveryResp) GetMsg() string { + if x != nil { + return x.Msg + } + return "" +} + +func (x *HttpPayDeliveryResp) GetData() string { + if x != nil { + return x.Data + } + return "" +} + var File_pay_pay_msg_proto protoreflect.FileDescriptor var file_pay_pay_msg_proto_rawDesc = []byte{ @@ -965,36 +1077,47 @@ var file_pay_pay_msg_proto_rawDesc = []byte{ 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, - 0x72, 0x50, 0x61, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x88, 0x01, 0x0a, 0x0e, 0x50, - 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, - 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, - 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x57, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, - 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, - 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x29, - 0x0a, 0x11, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, - 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, - 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x28, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, - 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, - 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x50, 0x61, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61, + 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, + 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, + 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, + 0x12, 0x24, 0x0a, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74, + 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, + 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, + 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11, + 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, + 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65, + 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, + 0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f, + 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, + 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74, + 0x70, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, + 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, + 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50, + 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, + 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, + 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, + 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, + 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1009,7 +1132,7 @@ func file_pay_pay_msg_proto_rawDescGZIP() []byte { return file_pay_pay_msg_proto_rawDescData } -var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_pay_pay_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19) var file_pay_pay_msg_proto_goTypes = []interface{}{ (*PayCreateOrderReq)(nil), // 0: PayCreateOrderReq (*PayCreateOrderResp)(nil), // 1: PayCreateOrderResp @@ -1028,33 +1151,37 @@ var file_pay_pay_msg_proto_goTypes = []interface{}{ (*PayGetActivityResp)(nil), // 14: PayGetActivityResp (*PayActivityBuyReq)(nil), // 15: PayActivityBuyReq (*PayActivityResp)(nil), // 16: PayActivityResp - (DBPayType)(0), // 17: DBPayType - (*DBPayOrder)(nil), // 18: DBPayOrder - (DBPayOrderState)(0), // 19: DBPayOrderState - (*DBUserPay)(nil), // 20: DBUserPay - (*DBPayDaily)(nil), // 21: DBPayDaily - (*UserAssets)(nil), // 22: UserAssets - (ErrorCode)(0), // 23: ErrorCode - (*ActivityGiftbagItem)(nil), // 24: ActivityGiftbagItem + (*HttpPayDeliveryReq)(nil), // 17: HttpPayDeliveryReq + (*HttpPayDeliveryResp)(nil), // 18: HttpPayDeliveryResp + (DBPayType)(0), // 19: DBPayType + (*DBPayOrder)(nil), // 20: DBPayOrder + (DBPayOrderState)(0), // 21: DBPayOrderState + (*DBUserPay)(nil), // 22: DBUserPay + (*DBPayDaily)(nil), // 23: DBPayDaily + (*UserAssets)(nil), // 24: UserAssets + (*ActivityGiftbagItem)(nil), // 25: ActivityGiftbagItem + (ErrorCode)(0), // 26: ErrorCode } var file_pay_pay_msg_proto_depIdxs = []int32{ - 17, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType - 18, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder - 19, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState - 20, // 3: PayRecordResp.info:type_name -> DBUserPay - 21, // 4: PayInfoResp.info:type_name -> DBPayDaily - 22, // 5: PayDailyBuyResp.items:type_name -> UserAssets - 18, // 6: PayShippedPush.order:type_name -> DBPayOrder - 22, // 7: PayShippedPush.items:type_name -> UserAssets - 20, // 8: PayShippedPush.info:type_name -> DBUserPay - 23, // 9: PayDeliveryResp.code:type_name -> ErrorCode - 24, // 10: PayGetActivityResp.info:type_name -> ActivityGiftbagItem - 22, // 11: PayActivityResp.items:type_name -> UserAssets - 12, // [12:12] is the sub-list for method output_type - 12, // [12:12] is the sub-list for method input_type - 12, // [12:12] is the sub-list for extension type_name - 12, // [12:12] is the sub-list for extension extendee - 0, // [0:12] is the sub-list for field type_name + 19, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType + 20, // 1: PayCreateOrderResp.order:type_name -> DBPayOrder + 21, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState + 22, // 3: PayRecordResp.info:type_name -> DBUserPay + 23, // 4: PayInfoResp.info:type_name -> DBPayDaily + 24, // 5: PayDailyBuyResp.items:type_name -> UserAssets + 20, // 6: PayShippedPush.order:type_name -> DBPayOrder + 24, // 7: PayShippedPush.items:type_name -> UserAssets + 22, // 8: PayShippedPush.info:type_name -> DBUserPay + 19, // 9: PayDeliveryReq.ptype:type_name -> DBPayType + 20, // 10: PayDeliveryResp.order:type_name -> DBPayOrder + 25, // 11: PayGetActivityResp.info:type_name -> ActivityGiftbagItem + 24, // 12: PayActivityResp.items:type_name -> UserAssets + 26, // 13: HttpPayDeliveryResp.code:type_name -> ErrorCode + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_pay_pay_msg_proto_init() } @@ -1270,6 +1397,30 @@ func file_pay_pay_msg_proto_init() { return nil } } + file_pay_pay_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HttpPayDeliveryReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_pay_pay_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HttpPayDeliveryResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1277,7 +1428,7 @@ func file_pay_pay_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_pay_pay_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 17, + NumMessages: 19, NumExtensions: 0, NumServices: 0, },