diff --git a/modules/battle/fight/attribute/attributenumeric.go b/modules/battle/fight/attribute/attributenumeric.go index ade00947a..d4393f6d3 100644 --- a/modules/battle/fight/attribute/attributenumeric.go +++ b/modules/battle/fight/attribute/attributenumeric.go @@ -14,29 +14,32 @@ func NewAttributeNumeric(pData float32) *AttributeNumeric { } type AttributeNumeric struct { - fixedValue *FixedPoint + fixedValue FixedPoint /// /// 基础数值 /// - BaseValue *FixedNumeric + BaseValue FixedNumeric /// /// 附加数值 /// - AppendValue *FixedNumeric + AppendValue FixedNumeric /// /// 附加百分比数值 /// - ProValue *FixedNumeric + ProValue FixedNumeric /// /// Buff附加数值 /// - BuffValue *FixedNumeric + BuffValue FixedNumeric /// /// Buff附加百分比数值 /// - BuffProValue *FixedNumeric + BuffProValue FixedNumeric } +func (this *AttributeNumeric) Fixed() FixedPoint { + return this.fixedValue +} func (this *AttributeNumeric) Value() float32 { return this.fixedValue.Scalar() } diff --git a/modules/battle/fight/attribute/fixednumeric.go b/modules/battle/fight/attribute/fixednumeric.go index a28b4deaa..496f2c7c0 100644 --- a/modules/battle/fight/attribute/fixednumeric.go +++ b/modules/battle/fight/attribute/fixednumeric.go @@ -1,33 +1,33 @@ package attribute -func NewFixedNumeric(pData float32) *FixedNumeric { - fixed := &FixedNumeric{} +func NewFixedNumeric(pData float32) FixedNumeric { + fixed := FixedNumeric{} fixed.Set(pData) return fixed } type FixedNumeric struct { - baseValue *FixedPoint + baseValue FixedPoint } -func (this *FixedNumeric) Set(value float32) float32 { +func (this FixedNumeric) Set(value float32) float32 { this.baseValue = NewFixedPoint(value) return this.baseValue.Scalar() } -func (this *FixedNumeric) Fixed() *FixedPoint { +func (this FixedNumeric) Fixed() FixedPoint { return this.baseValue } -func (this *FixedNumeric) Value() float32 { +func (this FixedNumeric) Value() float32 { return this.baseValue.Scalar() } /// /// 减少基本值 /// -func (this *FixedNumeric) Minus(value float32) float32 { - // this.baseValue -= value - // if this.baseValue.Scalar < 0 { - // this.baseValue = 0 - // } +func (this FixedNumeric) Minus(value float32) float32 { + this.baseValue.Reduce(value) + if this.baseValue.Scalar() < 0 { + this.baseValue.SetInt(0) + } return this.baseValue.Scalar() } diff --git a/modules/battle/fight/attribute/fixedpoint.go b/modules/battle/fight/attribute/fixedpoint.go index 6154b7ebc..d1340d857 100644 --- a/modules/battle/fight/attribute/fixedpoint.go +++ b/modules/battle/fight/attribute/fixedpoint.go @@ -8,8 +8,8 @@ import ( //基准倍数 const CARDINAL_NUMBER int = 10000 -func NewFixedPoint(value float32) *FixedPoint { - return &FixedPoint{ +func NewFixedPoint(value float32) FixedPoint { + return FixedPoint{ rawValue: int(math.Round(float64(value * float32(CARDINAL_NUMBER)))), } } @@ -18,40 +18,54 @@ type FixedPoint struct { rawValue int } -func (this *FixedPoint) Scalar() float32 { +func (this FixedPoint) SetInt(v int) { + this.rawValue = v +} + +func (this FixedPoint) Scalar() float32 { return float32(this.rawValue) * 0.0001 } -func (this *FixedPoint) ToInt() int { +func (this FixedPoint) ToInt() int { return this.rawValue / CARDINAL_NUMBER } -func (this *FixedPoint) ToFloat() float32 { +func (this FixedPoint) ToFloat() float32 { return this.Scalar() } -func (this *FixedPoint) ToString() string { +func (this FixedPoint) ToString() string { return fmt.Sprintf("%f", this.Scalar()) } -///+ -func (this *FixedPoint) Add(y *FixedPoint) *FixedPoint { - this.rawValue += y.rawValue - return this +/// - +func (this FixedPoint) Reduce(v float32) { + y := NewFixedPoint(v) + this.rawValue = this.rawValue - y.rawValue } -///- -func (this *FixedPoint) Reduce(y *FixedPoint) *FixedPoint { - this.rawValue -= y.rawValue - return this +/// + +func FixedPoint_Add(x, y FixedPoint) FixedPoint { + result := FixedPoint{} + result.rawValue = x.rawValue + y.rawValue + return result } -///* -func (this *FixedPoint) Multiply(y *FixedPoint) *FixedPoint { - this.rawValue = (this.rawValue * y.rawValue) / CARDINAL_NUMBER - return this +/// - +func FixedPoint_Reduce(x, y FixedPoint) FixedPoint { + result := FixedPoint{} + result.rawValue = x.rawValue - y.rawValue + return result +} + +/// * +func FixedPoint_Multiply(x, y FixedPoint) FixedPoint { + result := FixedPoint{} + result.rawValue = (x.rawValue * y.rawValue) / CARDINAL_NUMBER + return result } /// / -func (this *FixedPoint) Divide(y *FixedPoint) *FixedPoint { - this.rawValue = (this.rawValue * CARDINAL_NUMBER) / y.rawValue - return this +func FixedPoint_Divide(x, y FixedPoint) FixedPoint { + result := FixedPoint{} + result.rawValue = (x.rawValue * CARDINAL_NUMBER) / (y.rawValue) + return result } diff --git a/modules/battle/fight/attribute/healthpoint.go b/modules/battle/fight/attribute/healthpoint.go index 9bb65131b..baf3c39d2 100644 --- a/modules/battle/fight/attribute/healthpoint.go +++ b/modules/battle/fight/attribute/healthpoint.go @@ -46,3 +46,10 @@ func (this *HealthPoint) MaxValue() int32 { func (this *HealthPoint) Minus(value float32) { this.Hp.Minus(value) } + +/// +/// 剩余血量百分比 +/// +func (this *HealthPoint) Percent() float32 { + return FixedPoint_Divide(this.Hp.Fixed(), this.CurrMaxHp.Fixed()).Scalar() +} diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index a21f8f9c7..49b975912 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -6,9 +6,7 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "math" - "time" - "go.mongodb.org/mongo-driver/bson/primitive" "google.golang.org/protobuf/proto" ) @@ -24,9 +22,10 @@ func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.ShopBuyReq) (co func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb.ErrorCode, data proto.Message) { var ( err error - ok bool conf *cfg.GameShopitemData - shopitem *pb.DBShopItem + shopData *pb.DBShop + filed string + record *pb.UserShopData need []*cfg.Gameatn give []*cfg.Gameatn ) @@ -38,14 +37,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb code = pb.ErrorCode_SystemError return } - if shopitem, ok = this.module.modelShopItems.QueryUserShopDataByGoodId(session.GetUserId(), req.GoodsId); !ok { //没有购买记录 - shopitem = &pb.DBShopItem{ - Id: primitive.NewObjectID().Hex(), - Uid: session.GetUserId(), - GoodsId: conf.Key, - BuyNum: map[int32]int32{1: 0, 2: 0, 3: 0, 4: 0, 5: 0}, - LastBuyTime: map[int32]int64{1: 0, 2: 0, 3: 0, 4: 0, 5: 0}, - } + if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil { //没有购买记录 + code = pb.ErrorCode_DBError + return } need = make([]*cfg.Gameatn, len(conf.Need)) for i, v := range conf.Need { @@ -71,21 +65,40 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb if code = this.module.DispenseRes(session, give, true); code != pb.ErrorCode_Success { return } - if conf.Buyminnum-shopitem.BuyNum[int32(req.ShopType)] < req.BuyNum { + switch req.ShopType { + case pb.ShopType_GoldShop: + filed = "goldShop" + record = shopData.GoldShop + break + case pb.ShopType_DiamondShop: + filed = "diamondShop" + record = shopData.DiamondShop + break + case pb.ShopType_PVEShop: + filed = "pveShop" + record = shopData.PveShop + break + case pb.ShopType_PVPShop: + filed = "pvpShop" + record = shopData.PvpShop + break + case pb.ShopType_AllianceShop: + filed = "allianceShop" + record = shopData.AllianceShop + break + } + if record == nil { + record = &pb.UserShopData{ + Buy: map[int32]int32{}, + } + } + if conf.Buyminnum-record.Buy[req.GoodsId] < req.BuyNum { code = pb.ErrorCode_ShopGoodsIsSoldOut return } + record.Buy[req.GoodsId] += req.BuyNum + this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: record}) - shopitem.BuyNum[int32(req.ShopType)] += req.BuyNum - shopitem.LastBuyTime[int32(req.ShopType)] = time.Now().Unix() - if !ok { - this.module.modelShopItems.AddList(session.GetUserId(), shopitem.Id, shopitem) - } else { - this.module.modelShopItems.ChangeList(session.GetUserId(), shopitem.Id, map[string]interface{}{ - "buyNum": shopitem.BuyNum, - "lastBuyTime": shopitem.LastBuyTime, - }) - } //随机任务 this.module.ModuleRtask.SendToRtask(session, comm.Rtype64, 1) for _, v := range give { diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 3bb70a39c..2140279c3 100644 --- a/modules/shop/api_getlist.go +++ b/modules/shop/api_getlist.go @@ -2,7 +2,6 @@ package shop import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" "time" @@ -28,7 +27,6 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) udata *pb.DBUser sdata *pb.UserShopData items []*cfg.GameShopitemData - ushoputem map[int32]*pb.DBShopItem goods []*pb.ShopItem tdata time.Duration ltime time.Duration @@ -37,22 +35,19 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) if code = this.GetlistCheck(session, req); code != pb.ErrorCode_Success { return } - if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_SystemError + if shopconf, err = this.module.configure.GetShopConfigure(int32(req.SType)); err != nil { + code = pb.ErrorCode_ConfigNoFound return } - if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil && err != mgo.MongodbNil { - code = pb.ErrorCode_SystemError + if shopData, err = this.module.modelShop.QueryUserShopData(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError return } if udata = this.module.ModuleUser.GetUser(session.GetUserId()); udata == nil { code = pb.ErrorCode_SystemError return } - if ushoputem, err = this.module.modelShopItems.QueryUserShopData(session.GetUserId()); err != nil { - code = pb.ErrorCode_SystemError - return - } + switch req.SType { case pb.ShopType_GoldShop: sdata = shopData.GoldShop @@ -76,7 +71,9 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) break } if sdata == nil { - sdata = &pb.UserShopData{} + sdata = &pb.UserShopData{ + Buy: map[int32]int32{}, + } } if shopconf.Rnum > 0 { leftrefnum = shopconf.Rnum - sdata.ManualRefreshNum @@ -120,7 +117,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) } items = append(items, randomGoods(_items)) } - goods = transGoods(req.SType, items, ushoputem) + sdata.Buy = make(map[int32]int32) + goods = transGoods(items, sdata.Buy) sdata.LastRefreshTime = time.Now().Unix() sdata.ManualRefreshNum++ sdata.Items = make([]int32, len(items)) @@ -138,7 +136,8 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) } items = append(items, randomGoods(_items)) } - goods = transGoods(req.SType, items, ushoputem) + sdata.Buy = make(map[int32]int32) + goods = transGoods(items, sdata.Buy) sdata.LastRefreshTime = time.Now().Unix() sdata.Items = make([]int32, len(items)) for i, v := range items { @@ -150,7 +149,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq) code = pb.ErrorCode_SystemError return } - goods = transGoods(req.SType, items, ushoputem) + goods = transGoods(items, sdata.Buy) } } else { code = pb.ErrorCode_ReqParameterError diff --git a/modules/shop/core.go b/modules/shop/core.go index 87c1a5755..2a8ce3e2e 100644 --- a/modules/shop/core.go +++ b/modules/shop/core.go @@ -31,19 +31,19 @@ func randomGoods(goods []*cfg.GameShopitemData) (result *cfg.GameShopitemData) { } //转换商品对象 -func transGoods(stype pb.ShopType, goods []*cfg.GameShopitemData, ushoputem map[int32]*pb.DBShopItem) (result []*pb.ShopItem) { +func transGoods(goods []*cfg.GameShopitemData, buy map[int32]int32) (result []*pb.ShopItem) { result = make([]*pb.ShopItem, len(goods)) - ok := false - uitem := &pb.DBShopItem{} + // ok := false + // uitem := &pb.DBShopItem{} for i, v := range goods { - if uitem, ok = ushoputem[v.Key]; !ok { - uitem = &pb.DBShopItem{} - } + // if uitem, ok = ushoputem[v.Key]; !ok { + // uitem = &pb.DBShopItem{} + // } result[i] = &pb.ShopItem{ GoodsId: v.Key, Sale: int32(v.Sale), } - result[i].LeftBuyNum = v.Buyminnum - uitem.BuyNum[int32(stype)] + result[i].LeftBuyNum = v.Buyminnum - buy[v.Key] result[i].Items = make([]*pb.UserAssets, len(v.Iteminfo)) for i1, v1 := range v.Iteminfo { result[i].Items[i1] = &pb.UserAssets{ diff --git a/modules/shop/model_shop.go b/modules/shop/model_shop.go index 13e396ec7..61a21a6c0 100644 --- a/modules/shop/model_shop.go +++ b/modules/shop/model_shop.go @@ -3,6 +3,7 @@ package shop import ( "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" @@ -31,8 +32,9 @@ func (this *modelShopComp) Init(service core.IService, module core.IModule, comp //查询用户装备数据 func (this *modelShopComp) QueryUserShopData(uId string) (data *pb.DBShop, err error) { data = &pb.DBShop{} - if err = this.Get(uId, data); err != nil { + if err = this.Get(uId, data); err != nil && err != mgo.MongodbNil { this.module.Errorf("err:%v", err) } + err = nil return } diff --git a/modules/shop/model_shopitems.go b/modules/shop/model_shopitems.go deleted file mode 100644 index 148e5f63f..000000000 --- a/modules/shop/model_shopitems.go +++ /dev/null @@ -1,72 +0,0 @@ -package shop - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/lego/core" - "go_dreamfactory/lego/sys/mgo" - "go_dreamfactory/modules" - "go_dreamfactory/pb" - - "go.mongodb.org/mongo-driver/mongo" - "go.mongodb.org/mongo-driver/x/bsonx" -) - -///商店物品记录 数据组件 -type modelShopItemsComp struct { - modules.MCompModel - module *Shop -} - -//组件初始化接口 -func (this *modelShopItemsComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { - this.MCompModel.Init(service, module, comp, opt) - this.module = module.(*Shop) - this.TableName = comm.TableShopitems - //创建uid索引 - this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}, {Key: "goodsid", Value: bsonx.Int32(1)}}, - }) - return -} - -//查询用户装备数据 -func (this *modelShopItemsComp) QueryUserShopData(uId string) (result map[int32]*pb.DBShopItem, err error) { - result = make(map[int32]*pb.DBShopItem) - data := make([]*pb.DBShopItem, 0) - if err = this.GetList(uId, &data); err != nil && err != mgo.MongodbNil { - this.module.Errorf("err:%v", err) - return - } - err = nil - for _, v := range data { - result[v.GoodsId] = v - } - return -} - -//查询用户装备数据 -func (this *modelShopItemsComp) QueryUserShopDataByGoodId(uId string, goodId int32) (result *pb.DBShopItem, ok bool) { - var ( - err error - data []*pb.DBShopItem - ) - data = make([]*pb.DBShopItem, 0) - if err = this.GetList(uId, &data); err != nil { - this.module.Errorf("err%v", err) - return - } - for _, v := range data { - if v.GoodsId == goodId { - result = v - ok = true - return - } - } - return -} - -//添加用户的商品购买记录 -func (this *modelShopItemsComp) AddUserShopItemData(data *pb.DBShopItem) (err error) { - err = this.AddList(data.Uid, data.Id, data) - return -} diff --git a/modules/shop/module.go b/modules/shop/module.go index d33d49f64..c8c23b5e4 100644 --- a/modules/shop/module.go +++ b/modules/shop/module.go @@ -19,10 +19,9 @@ func NewModule() core.IModule { type Shop struct { modules.ModuleBase - api_comp *apiComp - configure *configureComp - modelShop *modelShopComp - modelShopItems *modelShopItemsComp + api_comp *apiComp + configure *configureComp + modelShop *modelShopComp } //模块名 @@ -41,12 +40,10 @@ func (this *Shop) OnInstallComp() { this.ModuleBase.OnInstallComp() this.api_comp = this.RegisterComp(new(apiComp)).(*apiComp) this.modelShop = this.RegisterComp(new(modelShopComp)).(*modelShopComp) - this.modelShopItems = this.RegisterComp(new(modelShopItemsComp)).(*modelShopItemsComp) this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } //Event------------------------------------------------------------------------------------------------------------ func (this *Shop) EventUserOffline(session comm.IUserSession) { this.modelShop.Del(session.GetUserId(), db.SetDBMgoLog(false)) - this.modelShopItems.BatchDelLists(session.GetUserId()) } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 115d9c365..8002cb667 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1162,6 +1162,101 @@ func (x *HeroAwakenResp) GetHero() *DBHero { return nil } +//抽卡 +type HeroChoukaReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + HeroIds []string `protobuf:"bytes,1,rep,name=heroIds,proto3" json:"heroIds"` +} + +func (x *HeroChoukaReq) Reset() { + *x = HeroChoukaReq{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroChoukaReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroChoukaReq) ProtoMessage() {} + +func (x *HeroChoukaReq) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[22] + 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 HeroChoukaReq.ProtoReflect.Descriptor instead. +func (*HeroChoukaReq) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} +} + +func (x *HeroChoukaReq) GetHeroIds() []string { + if x != nil { + return x.HeroIds + } + return nil +} + +type HeroChoukaResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Heroes []*DBHero `protobuf:"bytes,1,rep,name=heroes,proto3" json:"heroes"` +} + +func (x *HeroChoukaResp) Reset() { + *x = HeroChoukaResp{} + if protoimpl.UnsafeEnabled { + mi := &file_hero_hero_msg_proto_msgTypes[23] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *HeroChoukaResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*HeroChoukaResp) ProtoMessage() {} + +func (x *HeroChoukaResp) ProtoReflect() protoreflect.Message { + mi := &file_hero_hero_msg_proto_msgTypes[23] + 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 HeroChoukaResp.ProtoReflect.Descriptor instead. +func (*HeroChoukaResp) Descriptor() ([]byte, []int) { + return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} +} + +func (x *HeroChoukaResp) GetHeroes() []*DBHero { + if x != nil { + return x.Heroes + } + return nil +} + //英雄属性推送 type HeroPropertyPush struct { state protoimpl.MessageState @@ -1176,7 +1271,7 @@ type HeroPropertyPush struct { func (x *HeroPropertyPush) Reset() { *x = HeroPropertyPush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1189,7 +1284,7 @@ func (x *HeroPropertyPush) String() string { func (*HeroPropertyPush) ProtoMessage() {} func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1202,7 +1297,7 @@ func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroPropertyPush.ProtoReflect.Descriptor instead. func (*HeroPropertyPush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} } func (x *HeroPropertyPush) GetHeroId() string { @@ -1238,7 +1333,7 @@ type HeroLockReq struct { func (x *HeroLockReq) Reset() { *x = HeroLockReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1251,7 +1346,7 @@ func (x *HeroLockReq) String() string { func (*HeroLockReq) ProtoMessage() {} func (x *HeroLockReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1264,7 +1359,7 @@ func (x *HeroLockReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockReq.ProtoReflect.Descriptor instead. func (*HeroLockReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} } func (x *HeroLockReq) GetHeroid() string { @@ -1286,7 +1381,7 @@ type HeroLockResp struct { func (x *HeroLockResp) Reset() { *x = HeroLockResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1299,7 +1394,7 @@ func (x *HeroLockResp) String() string { func (*HeroLockResp) ProtoMessage() {} func (x *HeroLockResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1312,7 +1407,7 @@ func (x *HeroLockResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockResp.ProtoReflect.Descriptor instead. func (*HeroLockResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} } func (x *HeroLockResp) GetHero() *DBHero { @@ -1337,7 +1432,7 @@ type HeroGetSpecifiedReq struct { func (x *HeroGetSpecifiedReq) Reset() { *x = HeroGetSpecifiedReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1350,7 +1445,7 @@ func (x *HeroGetSpecifiedReq) String() string { func (*HeroGetSpecifiedReq) ProtoMessage() {} func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1363,7 +1458,7 @@ func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedReq.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} } func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() string { @@ -1405,7 +1500,7 @@ type HeroGetSpecifiedResp struct { func (x *HeroGetSpecifiedResp) Reset() { *x = HeroGetSpecifiedResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1418,7 +1513,7 @@ func (x *HeroGetSpecifiedResp) String() string { func (*HeroGetSpecifiedResp) ProtoMessage() {} func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1431,7 +1526,7 @@ func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedResp.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} } func (x *HeroGetSpecifiedResp) GetHero() *DBHero { @@ -1454,7 +1549,7 @@ type HeroDrawCardReq struct { func (x *HeroDrawCardReq) Reset() { *x = HeroDrawCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1467,7 +1562,7 @@ func (x *HeroDrawCardReq) String() string { func (*HeroDrawCardReq) ProtoMessage() {} func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1480,7 +1575,7 @@ func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardReq.ProtoReflect.Descriptor instead. func (*HeroDrawCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} } func (x *HeroDrawCardReq) GetDrawType() int32 { @@ -1508,7 +1603,7 @@ type HeroDrawCardResp struct { func (x *HeroDrawCardResp) Reset() { *x = HeroDrawCardResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1521,7 +1616,7 @@ func (x *HeroDrawCardResp) String() string { func (*HeroDrawCardResp) ProtoMessage() {} func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1534,7 +1629,7 @@ func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardResp.ProtoReflect.Descriptor instead. func (*HeroDrawCardResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{30} } func (x *HeroDrawCardResp) GetHeroes() []string { @@ -1556,7 +1651,7 @@ type HeroChangePush struct { func (x *HeroChangePush) Reset() { *x = HeroChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1569,7 +1664,7 @@ func (x *HeroChangePush) String() string { func (*HeroChangePush) ProtoMessage() {} func (x *HeroChangePush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1582,7 +1677,7 @@ func (x *HeroChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroChangePush.ProtoReflect.Descriptor instead. func (*HeroChangePush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{31} } func (x *HeroChangePush) GetList() []*DBHero { @@ -1690,53 +1785,59 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, - 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x44, 0x0a, - 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, - 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, - 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, - 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, - 0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, - 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, - 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, - 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, - 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, - 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, - 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, - 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, + 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, + 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x31, + 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, + 0x73, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, + 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, + 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x44, 0x0a, 0x0b, 0x61, + 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, + 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x1a, 0x3e, + 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x25, + 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, + 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, + 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, - 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, - 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, + 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, + 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, + 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, + 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, + 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, + 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, + 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, + 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, + 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1751,7 +1852,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 32) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -1775,43 +1876,46 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroResonanceUseEnergyResp)(nil), // 19: HeroResonanceUseEnergyResp (*HeroAwakenReq)(nil), // 20: HeroAwakenReq (*HeroAwakenResp)(nil), // 21: HeroAwakenResp - (*HeroPropertyPush)(nil), // 22: HeroPropertyPush - (*HeroLockReq)(nil), // 23: HeroLockReq - (*HeroLockResp)(nil), // 24: HeroLockResp - (*HeroGetSpecifiedReq)(nil), // 25: HeroGetSpecifiedReq - (*HeroGetSpecifiedResp)(nil), // 26: HeroGetSpecifiedResp - (*HeroDrawCardReq)(nil), // 27: HeroDrawCardReq - (*HeroDrawCardResp)(nil), // 28: HeroDrawCardResp - (*HeroChangePush)(nil), // 29: HeroChangePush - nil, // 30: HeroPropertyPush.PropertyEntry - nil, // 31: HeroPropertyPush.AddPropertyEntry - (*DBHero)(nil), // 32: DBHero + (*HeroChoukaReq)(nil), // 22: HeroChoukaReq + (*HeroChoukaResp)(nil), // 23: HeroChoukaResp + (*HeroPropertyPush)(nil), // 24: HeroPropertyPush + (*HeroLockReq)(nil), // 25: HeroLockReq + (*HeroLockResp)(nil), // 26: HeroLockResp + (*HeroGetSpecifiedReq)(nil), // 27: HeroGetSpecifiedReq + (*HeroGetSpecifiedResp)(nil), // 28: HeroGetSpecifiedResp + (*HeroDrawCardReq)(nil), // 29: HeroDrawCardReq + (*HeroDrawCardResp)(nil), // 30: HeroDrawCardResp + (*HeroChangePush)(nil), // 31: HeroChangePush + nil, // 32: HeroPropertyPush.PropertyEntry + nil, // 33: HeroPropertyPush.AddPropertyEntry + (*DBHero)(nil), // 34: DBHero } var file_hero_hero_msg_proto_depIdxs = []int32{ - 32, // 0: HeroInfoResp.base:type_name -> DBHero - 32, // 1: HeroListResp.list:type_name -> DBHero + 34, // 0: HeroInfoResp.base:type_name -> DBHero + 34, // 1: HeroListResp.list:type_name -> DBHero 5, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32 - 32, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 34, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero 8, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData 8, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 32, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 32, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 32, // 8: HeroResonanceResp.hero:type_name -> DBHero - 32, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero - 32, // 10: HeroResonanceResetResp.hero:type_name -> DBHero + 34, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 34, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 34, // 8: HeroResonanceResp.hero:type_name -> DBHero + 34, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero + 34, // 10: HeroResonanceResetResp.hero:type_name -> DBHero 17, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData - 32, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 32, // 13: HeroAwakenResp.hero:type_name -> DBHero - 30, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 31, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 32, // 16: HeroLockResp.hero:type_name -> DBHero - 32, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero - 32, // 18: HeroChangePush.list:type_name -> DBHero - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 34, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 34, // 13: HeroAwakenResp.hero:type_name -> DBHero + 34, // 14: HeroChoukaResp.heroes:type_name -> DBHero + 32, // 15: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 33, // 16: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 34, // 17: HeroLockResp.hero:type_name -> DBHero + 34, // 18: HeroGetSpecifiedResp.hero:type_name -> DBHero + 34, // 19: HeroChangePush.list:type_name -> DBHero + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -2086,7 +2190,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroPropertyPush); i { + switch v := v.(*HeroChoukaReq); i { case 0: return &v.state case 1: @@ -2098,7 +2202,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroLockReq); i { + switch v := v.(*HeroChoukaResp); i { case 0: return &v.state case 1: @@ -2110,7 +2214,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroLockResp); i { + switch v := v.(*HeroPropertyPush); i { case 0: return &v.state case 1: @@ -2122,7 +2226,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroGetSpecifiedReq); i { + switch v := v.(*HeroLockReq); i { case 0: return &v.state case 1: @@ -2134,7 +2238,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroGetSpecifiedResp); i { + switch v := v.(*HeroLockResp); i { case 0: return &v.state case 1: @@ -2146,7 +2250,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroDrawCardReq); i { + switch v := v.(*HeroGetSpecifiedReq); i { case 0: return &v.state case 1: @@ -2158,7 +2262,7 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroDrawCardResp); i { + switch v := v.(*HeroGetSpecifiedResp); i { case 0: return &v.state case 1: @@ -2170,6 +2274,30 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroDrawCardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*HeroDrawCardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroChangePush); i { case 0: return &v.state @@ -2188,7 +2316,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 32, + NumMessages: 34, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/shop_db.pb.go b/pb/shop_db.pb.go index c3d928840..7b6f7859e 100644 --- a/pb/shop_db.pb.go +++ b/pb/shop_db.pb.go @@ -83,9 +83,10 @@ type UserShopData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - LastRefreshTime int64 `protobuf:"varint,1,opt,name=LastRefreshTime,proto3" json:"LastRefreshTime"` //最后一次刷新时间 - ManualRefreshNum int32 `protobuf:"varint,2,opt,name=ManualRefreshNum,proto3" json:"ManualRefreshNum"` //手动刷新次数 - Items []int32 `protobuf:"varint,3,rep,packed,name=Items,proto3" json:"Items"` //商品列表 + LastRefreshTime int64 `protobuf:"varint,1,opt,name=LastRefreshTime,proto3" json:"LastRefreshTime"` //最后一次刷新时间 + ManualRefreshNum int32 `protobuf:"varint,2,opt,name=ManualRefreshNum,proto3" json:"ManualRefreshNum"` //手动刷新次数 + Items []int32 `protobuf:"varint,3,rep,packed,name=Items,proto3" json:"Items"` //商品列表 + Buy map[int32]int32 `protobuf:"bytes,4,rep,name=buy,proto3" json:"buy" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //购买记录 } func (x *UserShopData) Reset() { @@ -141,6 +142,13 @@ func (x *UserShopData) GetItems() []int32 { return nil } +func (x *UserShopData) GetBuy() map[int32]int32 { + if x != nil { + return x.Buy + } + return nil +} + type DBShop struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -236,141 +244,49 @@ func (x *DBShop) GetAllianceShop() *UserShopData { return nil } -type DBShopItem struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //装备id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //装备id - GoodsId int32 `protobuf:"varint,3,opt,name=goodsId,proto3" json:"goodsId" bson:"goodsId"` //商品Id - BuyNum map[int32]int32 `protobuf:"bytes,4,rep,name=buyNum,proto3" json:"buyNum" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"buyNum"` //购买数量 - LastBuyTime map[int32]int64 `protobuf:"bytes,5,rep,name=lastBuyTime,proto3" json:"lastBuyTime" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"lastBuyTime"` //最后一次购买的时间 -} - -func (x *DBShopItem) Reset() { - *x = DBShopItem{} - if protoimpl.UnsafeEnabled { - mi := &file_shop_shop_db_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DBShopItem) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DBShopItem) ProtoMessage() {} - -func (x *DBShopItem) ProtoReflect() protoreflect.Message { - mi := &file_shop_shop_db_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 DBShopItem.ProtoReflect.Descriptor instead. -func (*DBShopItem) Descriptor() ([]byte, []int) { - return file_shop_shop_db_proto_rawDescGZIP(), []int{2} -} - -func (x *DBShopItem) GetId() string { - if x != nil { - return x.Id - } - return "" -} - -func (x *DBShopItem) GetUid() string { - if x != nil { - return x.Uid - } - return "" -} - -func (x *DBShopItem) GetGoodsId() int32 { - if x != nil { - return x.GoodsId - } - return 0 -} - -func (x *DBShopItem) GetBuyNum() map[int32]int32 { - if x != nil { - return x.BuyNum - } - return nil -} - -func (x *DBShopItem) GetLastBuyTime() map[int32]int64 { - if x != nil { - return x.LastBuyTime - } - return nil -} - var File_shop_shop_db_proto protoreflect.FileDescriptor var file_shop_shop_db_proto_rawDesc = []byte{ 0x0a, 0x12, 0x73, 0x68, 0x6f, 0x70, 0x2f, 0x73, 0x68, 0x6f, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, - 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x4c, - 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a, - 0x0a, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, - 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, - 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x74, - 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x22, 0x8b, 0x02, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 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, 0x29, 0x0a, - 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, - 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64, 0x69, 0x61, 0x6d, - 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x64, 0x69, - 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x70, - 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x70, 0x53, 0x68, - 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31, 0x0a, 0x0c, 0x61, - 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x22, 0xb4, - 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 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, - 0x18, 0x0a, 0x07, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x07, 0x67, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x06, 0x62, 0x75, 0x79, - 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x53, 0x68, - 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x06, 0x62, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x3e, 0x0a, 0x0b, 0x6c, 0x61, - 0x73, 0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x1c, 0x2e, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x61, 0x73, - 0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x6c, - 0x61, 0x73, 0x74, 0x42, 0x75, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x75, - 0x79, 0x4e, 0x75, 0x6d, 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, 0x3e, 0x0a, 0x10, 0x4c, 0x61, 0x73, 0x74, 0x42, 0x75, 0x79, - 0x54, 0x69, 0x6d, 0x65, 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, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x5f, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x08, 0x0a, 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, - 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, - 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, - 0x50, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, - 0x6f, 0x70, 0x10, 0x04, 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, - 0x53, 0x68, 0x6f, 0x70, 0x10, 0x05, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdc, 0x01, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, + 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x28, 0x0a, 0x0f, 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, + 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, + 0x4c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, + 0x2a, 0x0a, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, + 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4d, 0x61, 0x6e, 0x75, 0x61, + 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x49, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x12, 0x28, 0x0a, 0x03, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x42, 0x75, + 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x03, 0x62, 0x75, 0x79, 0x1a, 0x36, 0x0a, 0x08, 0x42, + 0x75, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x8b, 0x02, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x68, 0x6f, 0x70, 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, 0x29, 0x0a, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x08, 0x67, 0x6f, 0x6c, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x2f, 0x0a, 0x0b, 0x64, + 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x0b, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, + 0x70, 0x76, 0x70, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, + 0x70, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, + 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x70, 0x76, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x12, 0x31, + 0x0a, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x70, 0x44, + 0x61, 0x74, 0x61, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, + 0x70, 0x2a, 0x5f, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, + 0x04, 0x4e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x47, 0x6f, 0x6c, 0x64, 0x53, + 0x68, 0x6f, 0x70, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, + 0x53, 0x68, 0x6f, 0x70, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x50, 0x53, 0x68, 0x6f, + 0x70, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x56, 0x45, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x04, + 0x12, 0x10, 0x0a, 0x0c, 0x41, 0x6c, 0x6c, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x53, 0x68, 0x6f, 0x70, + 0x10, 0x05, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -386,28 +302,25 @@ func file_shop_shop_db_proto_rawDescGZIP() []byte { } var file_shop_shop_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_shop_shop_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_shop_shop_db_proto_goTypes = []interface{}{ (ShopType)(0), // 0: ShopType (*UserShopData)(nil), // 1: UserShopData (*DBShop)(nil), // 2: DBShop - (*DBShopItem)(nil), // 3: DBShopItem - nil, // 4: DBShopItem.BuyNumEntry - nil, // 5: DBShopItem.LastBuyTimeEntry + nil, // 3: UserShopData.BuyEntry } var file_shop_shop_db_proto_depIdxs = []int32{ - 1, // 0: DBShop.goldShop:type_name -> UserShopData - 1, // 1: DBShop.diamondShop:type_name -> UserShopData - 1, // 2: DBShop.pvpShop:type_name -> UserShopData - 1, // 3: DBShop.pveShop:type_name -> UserShopData - 1, // 4: DBShop.allianceShop:type_name -> UserShopData - 4, // 5: DBShopItem.buyNum:type_name -> DBShopItem.BuyNumEntry - 5, // 6: DBShopItem.lastBuyTime:type_name -> DBShopItem.LastBuyTimeEntry - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 3, // 0: UserShopData.buy:type_name -> UserShopData.BuyEntry + 1, // 1: DBShop.goldShop:type_name -> UserShopData + 1, // 2: DBShop.diamondShop:type_name -> UserShopData + 1, // 3: DBShop.pvpShop:type_name -> UserShopData + 1, // 4: DBShop.pveShop:type_name -> UserShopData + 1, // 5: DBShop.allianceShop:type_name -> UserShopData + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_shop_shop_db_proto_init() } @@ -440,18 +353,6 @@ func file_shop_shop_db_proto_init() { return nil } } - file_shop_shop_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBShopItem); 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{ @@ -459,7 +360,7 @@ func file_shop_shop_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_shop_shop_db_proto_rawDesc, NumEnums: 1, - NumMessages: 5, + NumMessages: 3, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 46e4cc7a9..f8cf3d360 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -563,6 +563,101 @@ func (x *UserCreateResp) GetIsSucc() bool { return false } +//添加用户资源 +type UserAddResReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Res *UserAssets `protobuf:"bytes,1,opt,name=res,proto3" json:"res"` //资源类型 +} + +func (x *UserAddResReq) Reset() { + *x = UserAddResReq{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserAddResReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserAddResReq) ProtoMessage() {} + +func (x *UserAddResReq) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[11] + 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 UserAddResReq.ProtoReflect.Descriptor instead. +func (*UserAddResReq) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{11} +} + +func (x *UserAddResReq) GetRes() *UserAssets { + if x != nil { + return x.Res + } + return nil +} + +type UserAddResResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Res *UserAssets `protobuf:"bytes,1,opt,name=res,proto3" json:"res"` //资源类型 +} + +func (x *UserAddResResp) Reset() { + *x = UserAddResResp{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserAddResResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserAddResResp) ProtoMessage() {} + +func (x *UserAddResResp) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[12] + 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 UserAddResResp.ProtoReflect.Descriptor instead. +func (*UserAddResResp) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{12} +} + +func (x *UserAddResResp) GetRes() *UserAssets { + if x != nil { + return x.Res + } + return nil +} + // 玩家资源变更推送 type UserResChangePush struct { state protoimpl.MessageState @@ -579,7 +674,7 @@ type UserResChangePush struct { func (x *UserResChangePush) Reset() { *x = UserResChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[11] + mi := &file_user_user_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -592,7 +687,7 @@ func (x *UserResChangePush) String() string { func (*UserResChangePush) ProtoMessage() {} func (x *UserResChangePush) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[11] + mi := &file_user_user_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -605,7 +700,7 @@ func (x *UserResChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use UserResChangePush.ProtoReflect.Descriptor instead. func (*UserResChangePush) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{11} + return file_user_user_msg_proto_rawDescGZIP(), []int{13} } func (x *UserResChangePush) GetGold() int32 { @@ -653,7 +748,7 @@ type UserGetSettingReq struct { func (x *UserGetSettingReq) Reset() { *x = UserGetSettingReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[12] + mi := &file_user_user_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -666,7 +761,7 @@ func (x *UserGetSettingReq) String() string { func (*UserGetSettingReq) ProtoMessage() {} func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[12] + mi := &file_user_user_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -679,7 +774,7 @@ func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetSettingReq.ProtoReflect.Descriptor instead. func (*UserGetSettingReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{12} + return file_user_user_msg_proto_rawDescGZIP(), []int{14} } type UserGetSettingResp struct { @@ -693,7 +788,7 @@ type UserGetSettingResp struct { func (x *UserGetSettingResp) Reset() { *x = UserGetSettingResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[13] + mi := &file_user_user_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -706,7 +801,7 @@ func (x *UserGetSettingResp) String() string { func (*UserGetSettingResp) ProtoMessage() {} func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[13] + mi := &file_user_user_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -719,7 +814,7 @@ func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetSettingResp.ProtoReflect.Descriptor instead. func (*UserGetSettingResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{13} + return file_user_user_msg_proto_rawDescGZIP(), []int{15} } func (x *UserGetSettingResp) GetSetting() *DBUserSetting { @@ -741,7 +836,7 @@ type UserUpdateSettingReq struct { func (x *UserUpdateSettingReq) Reset() { *x = UserUpdateSettingReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[14] + mi := &file_user_user_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -754,7 +849,7 @@ func (x *UserUpdateSettingReq) String() string { func (*UserUpdateSettingReq) ProtoMessage() {} func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[14] + mi := &file_user_user_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -767,7 +862,7 @@ func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserUpdateSettingReq.ProtoReflect.Descriptor instead. func (*UserUpdateSettingReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{14} + return file_user_user_msg_proto_rawDescGZIP(), []int{16} } func (x *UserUpdateSettingReq) GetSetting() *DBUserSetting { @@ -788,7 +883,7 @@ type UserUpdateSettingResp struct { func (x *UserUpdateSettingResp) Reset() { *x = UserUpdateSettingResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[15] + mi := &file_user_user_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -801,7 +896,7 @@ func (x *UserUpdateSettingResp) String() string { func (*UserUpdateSettingResp) ProtoMessage() {} func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[15] + mi := &file_user_user_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -814,7 +909,7 @@ func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserUpdateSettingResp.ProtoReflect.Descriptor instead. func (*UserUpdateSettingResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{15} + return file_user_user_msg_proto_rawDescGZIP(), []int{17} } func (x *UserUpdateSettingResp) GetUid() string { @@ -834,7 +929,7 @@ type UserVeriCodeReq struct { func (x *UserVeriCodeReq) Reset() { *x = UserVeriCodeReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[16] + mi := &file_user_user_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -847,7 +942,7 @@ func (x *UserVeriCodeReq) String() string { func (*UserVeriCodeReq) ProtoMessage() {} func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[16] + mi := &file_user_user_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -860,7 +955,7 @@ func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserVeriCodeReq.ProtoReflect.Descriptor instead. func (*UserVeriCodeReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{16} + return file_user_user_msg_proto_rawDescGZIP(), []int{18} } type UserVeriCodeResp struct { @@ -874,7 +969,7 @@ type UserVeriCodeResp struct { func (x *UserVeriCodeResp) Reset() { *x = UserVeriCodeResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[17] + mi := &file_user_user_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -887,7 +982,7 @@ func (x *UserVeriCodeResp) String() string { func (*UserVeriCodeResp) ProtoMessage() {} func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[17] + mi := &file_user_user_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -900,7 +995,7 @@ func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserVeriCodeResp.ProtoReflect.Descriptor instead. func (*UserVeriCodeResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{17} + return file_user_user_msg_proto_rawDescGZIP(), []int{19} } func (x *UserVeriCodeResp) GetCode() int32 { @@ -922,7 +1017,7 @@ type UserInitdataReq struct { func (x *UserInitdataReq) Reset() { *x = UserInitdataReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[18] + mi := &file_user_user_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -935,7 +1030,7 @@ func (x *UserInitdataReq) String() string { func (*UserInitdataReq) ProtoMessage() {} func (x *UserInitdataReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[18] + mi := &file_user_user_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -948,7 +1043,7 @@ func (x *UserInitdataReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserInitdataReq.ProtoReflect.Descriptor instead. func (*UserInitdataReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{18} + return file_user_user_msg_proto_rawDescGZIP(), []int{20} } func (x *UserInitdataReq) GetCode() int32 { @@ -969,7 +1064,7 @@ type UserInitdataResp struct { func (x *UserInitdataResp) Reset() { *x = UserInitdataResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[19] + mi := &file_user_user_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -982,7 +1077,7 @@ func (x *UserInitdataResp) String() string { func (*UserInitdataResp) ProtoMessage() {} func (x *UserInitdataResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[19] + mi := &file_user_user_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -995,7 +1090,7 @@ func (x *UserInitdataResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserInitdataResp.ProtoReflect.Descriptor instead. func (*UserInitdataResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{19} + return file_user_user_msg_proto_rawDescGZIP(), []int{21} } func (x *UserInitdataResp) GetUid() string { @@ -1017,7 +1112,7 @@ type UserModifynameReq struct { func (x *UserModifynameReq) Reset() { *x = UserModifynameReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[20] + mi := &file_user_user_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1030,7 +1125,7 @@ func (x *UserModifynameReq) String() string { func (*UserModifynameReq) ProtoMessage() {} func (x *UserModifynameReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[20] + mi := &file_user_user_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1043,7 +1138,7 @@ func (x *UserModifynameReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifynameReq.ProtoReflect.Descriptor instead. func (*UserModifynameReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{20} + return file_user_user_msg_proto_rawDescGZIP(), []int{22} } func (x *UserModifynameReq) GetName() string { @@ -1066,7 +1161,7 @@ type UserModifynameResp struct { func (x *UserModifynameResp) Reset() { *x = UserModifynameResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[21] + mi := &file_user_user_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1079,7 +1174,7 @@ func (x *UserModifynameResp) String() string { func (*UserModifynameResp) ProtoMessage() {} func (x *UserModifynameResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[21] + mi := &file_user_user_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1092,7 +1187,7 @@ func (x *UserModifynameResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifynameResp.ProtoReflect.Descriptor instead. func (*UserModifynameResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{21} + return file_user_user_msg_proto_rawDescGZIP(), []int{23} } func (x *UserModifynameResp) GetUid() string { @@ -1126,7 +1221,7 @@ type UserGetTujianReq struct { func (x *UserGetTujianReq) Reset() { *x = UserGetTujianReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[22] + mi := &file_user_user_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1139,7 +1234,7 @@ func (x *UserGetTujianReq) String() string { func (*UserGetTujianReq) ProtoMessage() {} func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[22] + mi := &file_user_user_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1152,7 +1247,7 @@ func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetTujianReq.ProtoReflect.Descriptor instead. func (*UserGetTujianReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{22} + return file_user_user_msg_proto_rawDescGZIP(), []int{24} } type UserGetTujianResp struct { @@ -1166,7 +1261,7 @@ type UserGetTujianResp struct { func (x *UserGetTujianResp) Reset() { *x = UserGetTujianResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[23] + mi := &file_user_user_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1179,7 +1274,7 @@ func (x *UserGetTujianResp) String() string { func (*UserGetTujianResp) ProtoMessage() {} func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[23] + mi := &file_user_user_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1192,7 +1287,7 @@ func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetTujianResp.ProtoReflect.Descriptor instead. func (*UserGetTujianResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{23} + return file_user_user_msg_proto_rawDescGZIP(), []int{25} } func (x *UserGetTujianResp) GetHeroids() []string { @@ -1216,7 +1311,7 @@ type UserChangedPush struct { func (x *UserChangedPush) Reset() { *x = UserChangedPush{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[24] + mi := &file_user_user_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1229,7 +1324,7 @@ func (x *UserChangedPush) String() string { func (*UserChangedPush) ProtoMessage() {} func (x *UserChangedPush) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[24] + mi := &file_user_user_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1242,7 +1337,7 @@ func (x *UserChangedPush) ProtoReflect() protoreflect.Message { // Deprecated: Use UserChangedPush.ProtoReflect.Descriptor instead. func (*UserChangedPush) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{24} + return file_user_user_msg_proto_rawDescGZIP(), []int{26} } func (x *UserChangedPush) GetUid() string { @@ -1284,7 +1379,7 @@ type UserFigureReq struct { func (x *UserFigureReq) Reset() { *x = UserFigureReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[25] + mi := &file_user_user_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1297,7 +1392,7 @@ func (x *UserFigureReq) String() string { func (*UserFigureReq) ProtoMessage() {} func (x *UserFigureReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[25] + mi := &file_user_user_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1310,7 +1405,7 @@ func (x *UserFigureReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserFigureReq.ProtoReflect.Descriptor instead. func (*UserFigureReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{25} + return file_user_user_msg_proto_rawDescGZIP(), []int{27} } func (x *UserFigureReq) GetPreinstall() int32 { @@ -1375,7 +1470,7 @@ type UserFigureResp struct { func (x *UserFigureResp) Reset() { *x = UserFigureResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[26] + mi := &file_user_user_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1388,7 +1483,7 @@ func (x *UserFigureResp) String() string { func (*UserFigureResp) ProtoMessage() {} func (x *UserFigureResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[26] + mi := &file_user_user_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1401,7 +1496,7 @@ func (x *UserFigureResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserFigureResp.ProtoReflect.Descriptor instead. func (*UserFigureResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{26} + return file_user_user_msg_proto_rawDescGZIP(), []int{28} } func (x *UserFigureResp) GetUid() string { @@ -1437,7 +1532,7 @@ type UserModifysignReq struct { func (x *UserModifysignReq) Reset() { *x = UserModifysignReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[27] + mi := &file_user_user_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1450,7 +1545,7 @@ func (x *UserModifysignReq) String() string { func (*UserModifysignReq) ProtoMessage() {} func (x *UserModifysignReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[27] + mi := &file_user_user_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1463,7 +1558,7 @@ func (x *UserModifysignReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifysignReq.ProtoReflect.Descriptor instead. func (*UserModifysignReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{27} + return file_user_user_msg_proto_rawDescGZIP(), []int{29} } func (x *UserModifysignReq) GetSign() string { @@ -1484,7 +1579,7 @@ type UserModifysignResp struct { func (x *UserModifysignResp) Reset() { *x = UserModifysignResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[28] + mi := &file_user_user_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1497,7 +1592,7 @@ func (x *UserModifysignResp) String() string { func (*UserModifysignResp) ProtoMessage() {} func (x *UserModifysignResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[28] + mi := &file_user_user_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1510,7 +1605,7 @@ func (x *UserModifysignResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifysignResp.ProtoReflect.Descriptor instead. func (*UserModifysignResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{28} + return file_user_user_msg_proto_rawDescGZIP(), []int{30} } func (x *UserModifysignResp) GetUid() string { @@ -1526,114 +1621,121 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x0a, 0x13, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, - 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x75, 0x73, 0x65, 0x72, - 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, + 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, + 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, + 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, + 0x78, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, 0x0d, 0x0a, 0x0b, 0x55, + 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4a, 0x0a, 0x0c, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, + 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4c, + 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, - 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, - 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4a, - 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, - 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, - 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, - 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, - 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, - 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, - 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, - 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, - 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, - 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, - 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, - 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, - 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, - 0x63, 0x22, 0x75, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, - 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, - 0x76, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, - 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, - 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, - 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, - 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, - 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, - 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, - 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, - 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, - 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, + 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, + 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, + 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x2e, 0x0a, + 0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, + 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x2f, 0x0a, + 0x0e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1d, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x75, + 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, + 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, + 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x64, 0x69, + 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, + 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, + 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, + 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, + 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, + 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, + 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, + 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, + 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, + 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, + 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, + 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, + 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, + 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, + 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x45, 0x0a, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, - 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x12, 0x0a, - 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, - 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, - 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, - 0x22, 0x45, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, - 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x65, - 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, - 0x72, 0x65, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x12, 0x19, 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x05, 0x2e, 0x48, 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, - 0x65, 0x79, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, - 0x73, 0x52, 0x04, 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, - 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, - 0x12, 0x2b, 0x0a, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, - 0x6e, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a, - 0x0e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x69, 0x67, - 0x75, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, - 0x72, 0x65, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, - 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, - 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, - 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x6c, 0x76, 0x22, 0xe3, 0x01, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x46, 0x69, 0x67, + 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x65, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6c, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x72, 0x65, 0x69, + 0x6e, 0x73, 0x74, 0x61, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, + 0x0a, 0x04, 0x68, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x48, + 0x61, 0x69, 0x72, 0x52, 0x04, 0x68, 0x61, 0x69, 0x72, 0x12, 0x19, 0x0a, 0x04, 0x65, 0x79, 0x65, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x05, 0x2e, 0x45, 0x79, 0x65, 0x73, 0x52, 0x04, + 0x65, 0x79, 0x65, 0x73, 0x12, 0x1c, 0x0a, 0x05, 0x6d, 0x6f, 0x75, 0x74, 0x68, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x4d, 0x6f, 0x75, 0x74, 0x68, 0x52, 0x05, 0x6d, 0x6f, 0x75, + 0x74, 0x68, 0x12, 0x19, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x05, 0x2e, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x12, 0x2b, 0x0a, + 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x52, 0x0a, + 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x69, 0x6f, 0x6e, 0x22, 0x5b, 0x0a, 0x0e, 0x55, 0x73, + 0x65, 0x72, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, + 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, + 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, + 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, + 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1648,7 +1750,7 @@ func file_user_user_msg_proto_rawDescGZIP() []byte { return file_user_user_msg_proto_rawDescData } -var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) +var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 31) var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginResp)(nil), // 1: UserLoginResp @@ -1661,56 +1763,61 @@ var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoadResp)(nil), // 8: UserLoadResp (*UserCreateReq)(nil), // 9: UserCreateReq (*UserCreateResp)(nil), // 10: UserCreateResp - (*UserResChangePush)(nil), // 11: UserResChangePush - (*UserGetSettingReq)(nil), // 12: UserGetSettingReq - (*UserGetSettingResp)(nil), // 13: UserGetSettingResp - (*UserUpdateSettingReq)(nil), // 14: UserUpdateSettingReq - (*UserUpdateSettingResp)(nil), // 15: UserUpdateSettingResp - (*UserVeriCodeReq)(nil), // 16: UserVeriCodeReq - (*UserVeriCodeResp)(nil), // 17: UserVeriCodeResp - (*UserInitdataReq)(nil), // 18: UserInitdataReq - (*UserInitdataResp)(nil), // 19: UserInitdataResp - (*UserModifynameReq)(nil), // 20: UserModifynameReq - (*UserModifynameResp)(nil), // 21: UserModifynameResp - (*UserGetTujianReq)(nil), // 22: UserGetTujianReq - (*UserGetTujianResp)(nil), // 23: UserGetTujianResp - (*UserChangedPush)(nil), // 24: UserChangedPush - (*UserFigureReq)(nil), // 25: UserFigureReq - (*UserFigureResp)(nil), // 26: UserFigureResp - (*UserModifysignReq)(nil), // 27: UserModifysignReq - (*UserModifysignResp)(nil), // 28: UserModifysignResp - (*DBUser)(nil), // 29: DBUser - (*DBUserExpand)(nil), // 30: DBUserExpand - (ErrorCode)(0), // 31: ErrorCode - (*CacheUser)(nil), // 32: CacheUser - (*DBUserSetting)(nil), // 33: DBUserSetting - (*Hair)(nil), // 34: Hair - (*Eyes)(nil), // 35: Eyes - (*Mouth)(nil), // 36: Mouth - (*Body)(nil), // 37: Body - (*Complexion)(nil), // 38: Complexion - (*Figure)(nil), // 39: Figure + (*UserAddResReq)(nil), // 11: UserAddResReq + (*UserAddResResp)(nil), // 12: UserAddResResp + (*UserResChangePush)(nil), // 13: UserResChangePush + (*UserGetSettingReq)(nil), // 14: UserGetSettingReq + (*UserGetSettingResp)(nil), // 15: UserGetSettingResp + (*UserUpdateSettingReq)(nil), // 16: UserUpdateSettingReq + (*UserUpdateSettingResp)(nil), // 17: UserUpdateSettingResp + (*UserVeriCodeReq)(nil), // 18: UserVeriCodeReq + (*UserVeriCodeResp)(nil), // 19: UserVeriCodeResp + (*UserInitdataReq)(nil), // 20: UserInitdataReq + (*UserInitdataResp)(nil), // 21: UserInitdataResp + (*UserModifynameReq)(nil), // 22: UserModifynameReq + (*UserModifynameResp)(nil), // 23: UserModifynameResp + (*UserGetTujianReq)(nil), // 24: UserGetTujianReq + (*UserGetTujianResp)(nil), // 25: UserGetTujianResp + (*UserChangedPush)(nil), // 26: UserChangedPush + (*UserFigureReq)(nil), // 27: UserFigureReq + (*UserFigureResp)(nil), // 28: UserFigureResp + (*UserModifysignReq)(nil), // 29: UserModifysignReq + (*UserModifysignResp)(nil), // 30: UserModifysignResp + (*DBUser)(nil), // 31: DBUser + (*DBUserExpand)(nil), // 32: DBUserExpand + (ErrorCode)(0), // 33: ErrorCode + (*CacheUser)(nil), // 34: CacheUser + (*UserAssets)(nil), // 35: UserAssets + (*DBUserSetting)(nil), // 36: DBUserSetting + (*Hair)(nil), // 37: Hair + (*Eyes)(nil), // 38: Eyes + (*Mouth)(nil), // 39: Mouth + (*Body)(nil), // 40: Body + (*Complexion)(nil), // 41: Complexion + (*Figure)(nil), // 42: Figure } var file_user_user_msg_proto_depIdxs = []int32{ - 29, // 0: UserLoginResp.data:type_name -> DBUser - 30, // 1: UserLoginResp.ex:type_name -> DBUserExpand - 29, // 2: UserInfoResp.data:type_name -> DBUser - 30, // 3: UserInfoResp.ex:type_name -> DBUserExpand - 31, // 4: UserRegisterResp.Code:type_name -> ErrorCode - 32, // 5: UserLoadResp.data:type_name -> CacheUser - 33, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting - 33, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting - 34, // 8: UserFigureReq.hair:type_name -> Hair - 35, // 9: UserFigureReq.eyes:type_name -> Eyes - 36, // 10: UserFigureReq.mouth:type_name -> Mouth - 37, // 11: UserFigureReq.body:type_name -> Body - 38, // 12: UserFigureReq.complexion:type_name -> Complexion - 39, // 13: UserFigureResp.figure:type_name -> Figure - 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 + 31, // 0: UserLoginResp.data:type_name -> DBUser + 32, // 1: UserLoginResp.ex:type_name -> DBUserExpand + 31, // 2: UserInfoResp.data:type_name -> DBUser + 32, // 3: UserInfoResp.ex:type_name -> DBUserExpand + 33, // 4: UserRegisterResp.Code:type_name -> ErrorCode + 34, // 5: UserLoadResp.data:type_name -> CacheUser + 35, // 6: UserAddResReq.res:type_name -> UserAssets + 35, // 7: UserAddResResp.res:type_name -> UserAssets + 36, // 8: UserGetSettingResp.setting:type_name -> DBUserSetting + 36, // 9: UserUpdateSettingReq.setting:type_name -> DBUserSetting + 37, // 10: UserFigureReq.hair:type_name -> Hair + 38, // 11: UserFigureReq.eyes:type_name -> Eyes + 39, // 12: UserFigureReq.mouth:type_name -> Mouth + 40, // 13: UserFigureReq.body:type_name -> Body + 41, // 14: UserFigureReq.complexion:type_name -> Complexion + 42, // 15: UserFigureResp.figure:type_name -> Figure + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name } func init() { file_user_user_msg_proto_init() } @@ -1720,6 +1827,7 @@ func file_user_user_msg_proto_init() { } file_errorcode_proto_init() file_user_user_db_proto_init() + file_comm_proto_init() file_userexpand_proto_init() if !protoimpl.UnsafeEnabled { file_user_user_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { @@ -1855,7 +1963,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserResChangePush); i { + switch v := v.(*UserAddResReq); i { case 0: return &v.state case 1: @@ -1867,7 +1975,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetSettingReq); i { + switch v := v.(*UserAddResResp); i { case 0: return &v.state case 1: @@ -1879,7 +1987,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetSettingResp); i { + switch v := v.(*UserResChangePush); i { case 0: return &v.state case 1: @@ -1891,7 +1999,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserUpdateSettingReq); i { + switch v := v.(*UserGetSettingReq); i { case 0: return &v.state case 1: @@ -1903,7 +2011,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserUpdateSettingResp); i { + switch v := v.(*UserGetSettingResp); i { case 0: return &v.state case 1: @@ -1915,7 +2023,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserVeriCodeReq); i { + switch v := v.(*UserUpdateSettingReq); i { case 0: return &v.state case 1: @@ -1927,7 +2035,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserVeriCodeResp); i { + switch v := v.(*UserUpdateSettingResp); i { case 0: return &v.state case 1: @@ -1939,7 +2047,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserInitdataReq); i { + switch v := v.(*UserVeriCodeReq); i { case 0: return &v.state case 1: @@ -1951,7 +2059,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserInitdataResp); i { + switch v := v.(*UserVeriCodeResp); i { case 0: return &v.state case 1: @@ -1963,7 +2071,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifynameReq); i { + switch v := v.(*UserInitdataReq); i { case 0: return &v.state case 1: @@ -1975,7 +2083,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifynameResp); i { + switch v := v.(*UserInitdataResp); i { case 0: return &v.state case 1: @@ -1987,7 +2095,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetTujianReq); i { + switch v := v.(*UserModifynameReq); i { case 0: return &v.state case 1: @@ -1999,7 +2107,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetTujianResp); i { + switch v := v.(*UserModifynameResp); i { case 0: return &v.state case 1: @@ -2011,7 +2119,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserChangedPush); i { + switch v := v.(*UserGetTujianReq); i { case 0: return &v.state case 1: @@ -2023,7 +2131,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserFigureReq); i { + switch v := v.(*UserGetTujianResp); i { case 0: return &v.state case 1: @@ -2035,7 +2143,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserFigureResp); i { + switch v := v.(*UserChangedPush); i { case 0: return &v.state case 1: @@ -2047,7 +2155,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifysignReq); i { + switch v := v.(*UserFigureReq); i { case 0: return &v.state case 1: @@ -2059,6 +2167,30 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserFigureResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_user_user_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserModifysignReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_user_user_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserModifysignResp); i { case 0: return &v.state @@ -2077,7 +2209,7 @@ func file_user_user_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_user_user_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 29, + NumMessages: 31, NumExtensions: 0, NumServices: 0, },