From 5306b1eb979fdf777bf69838dbfeb12774cfeb8f Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 29 Dec 2022 11:43:28 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E5=87=BA=E5=94=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 ++ modules/equipment/module.go | 54 +++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/comm/imodule.go b/comm/imodule.go index 56f15b4f3..68f8e3c87 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -140,6 +140,8 @@ type ( NewEquipment(uid, cid string) (code pb.ErrorCode, equip *pb.DB_Equipment) //添加装备 AddEquipment(session IUserSession, equip *pb.DB_Equipment) (code pb.ErrorCode) + //出售装备 + SellEquipments(session IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno) } IMainline interface { ModifyMainlineDataByNanduID(uid string, nandu, id int32) (code pb.ErrorCode) diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 646265dec..09361e427 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -7,6 +7,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "math" "github.com/go-redis/redis/v8" ) @@ -175,6 +176,59 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi return } +///出售装备 +func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (code pb.ErrorCode, atno []*pb.UserAtno) { + var ( + err error + equipments []*pb.DB_Equipment + confs []*cfg.GameEquipData + sale [][]*cfg.Gameatn + ) + if equipments, err = this.modelEquipment.QueryUserEquipmentsByIds(session.GetUserId(), equs); err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + confs = make([]*cfg.GameEquipData, len(equipments)) + sale = make([][]*cfg.Gameatn, len(equipments)) + for i, v := range equipments { + if v.HeroId != "" || v.Islock { + code = pb.ErrorCode_EquipmentNoCanSell + this.Errorf("NoCanSell %v", v) + return + } + if confs[i], err = this.configure.GetEquipmentConfigureById(v.CId); err != nil { + this.Errorln(err) + code = pb.ErrorCode_EquipmentOnFoundEquipment + return + } + if confs[i].Sale == nil || len(confs[i].Sale) == 0 { + code = pb.ErrorCode_EquipmentNoCanSell + return + } + sale[i] = make([]*cfg.Gameatn, len(confs[i].Sale)) + for n, s := range confs[i].Sale { + _s := &cfg.Gameatn{ + A: s.A, + T: s.T, + N: s.N + int32(math.Floor(float64(s.N*(v.Lv-1))*float64(confs[i].Salecoef))), + } + sale[i][n] = _s + } + } + + sales := make([]*cfg.Gameatn, 0) + for _, v := range sale { + sales = append(sales, v...) + } + if code, atno = this.DispenseAtno(session, sales, true); code != pb.ErrorCode_Success { + return + } + if code = this.DelEquipments(session, equs, true); code != pb.ErrorCode_Success { + return + } + return +} + //Evens-------------------------------------------------------------------------------------------------------------------------------- //推送道具变化消息 func (this *Equipment) equipmentsChangePush(session comm.IUserSession, items []*pb.DB_Equipment) (err error) { From b6e490ee173d55ed0f25620b6516d0fad0b37ea6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 29 Dec 2022 11:54:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9F=90=E7=A7=8D?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=89=80=E6=9C=89=E9=81=93=E5=85=B7=EF=BC=88?= =?UTF-8?q?=E9=81=93=E5=85=B7=E7=B1=BB=E5=9E=8B,=E6=95=B0=E9=87=8F?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comp_configure.go | 11 +++++++++++ modules/gm/api_cmd.go | 1 + modules/gm/module.go | 26 ++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 05b4f8a3b..93bf1b3ca 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -332,3 +332,14 @@ func (this *MCompConfigure) GetVipConfigureData(lv int32) (item *cfg.GameVipData return } + +func (this *MCompConfigure) GetItemConfigureByType(useType int32) (item []*cfg.GameItemData) { + if v, err := this.GetConfigure(game_item); err == nil { + for _, v1 := range v.(*cfg.GameItem).GetDataMap() { + if v1.Usetype == useType { + item = append(item, v1) + } + } + } + return +} diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index 0e430f0ba..c3c739a74 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -37,6 +37,7 @@ import ( 20、bingo:cleanitem 21、bingo:allequip 21、bingo:chat,1 +22、bingo:itemtype,1,1 // 获取某种类型所有道具（道具类型,数量） */ //参数校验 func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode) { diff --git a/modules/gm/module.go b/modules/gm/module.go index 271dad286..9d611d356 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -425,6 +425,32 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "0", Value: datas[0]}, ) + } else if len(datas) == 3 && (datas[0] == "itemtype") { + num1, err := strconv.Atoi(datas[1]) + if err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + num2, err := strconv.Atoi(datas[2]) + if err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + _data := this.configure.GetItemConfigureByType(int32(num1)) + for _, v := range _data { + res := &cfg.Gameatn{ + A: "item", + T: v.Id, + N: int32(num2), + } + this.DispenseRes(session, []*cfg.Gameatn{res}, true) + } + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + log.Field{Key: "1", Value: datas[1]}, + log.Field{Key: "2", Value: datas[2]}, + ) } } } From 8812fc78c22fb27bcf3fc2fa5847a7f6dd704198 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 29 Dec 2022 12:01:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9vip=20=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 1 + modules/gm/api_cmd.go | 1 + modules/gm/module.go | 18 ++++++++++++++++++ modules/user/module.go | 21 +++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/comm/imodule.go b/comm/imodule.go index 68f8e3c87..002aacf23 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -125,6 +125,7 @@ type ( CheckTujianHero(session IUserSession, heros []string) []bool // bingo设置玩家等级 BingoSetUserLv(session IUserSession, lv int32) error + BingoSetUserVipLv(session IUserSession, lv int32) error } //武器模块 IEquipment interface { diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go index c3c739a74..fd2a59e20 100644 --- a/modules/gm/api_cmd.go +++ b/modules/gm/api_cmd.go @@ -38,6 +38,7 @@ import ( 21、bingo:allequip 21、bingo:chat,1 22、bingo:itemtype,1,1 // 获取某种类型所有道具（道具类型,数量） +18、bingo:viplv,50 */ //参数校验 func (this *apiComp) CmdCheck(session comm.IUserSession, req *pb.GMCmdReq) (code pb.ErrorCode) { diff --git a/modules/gm/module.go b/modules/gm/module.go index 9d611d356..e0e8ed45b 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -451,6 +451,24 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC log.Field{Key: "1", Value: datas[1]}, log.Field{Key: "2", Value: datas[2]}, ) + } else if len(datas) == 2 && (datas[0] == "viplv") { // 玩家等级 + module1, err := this.service.GetModule(comm.ModuleUser) + if err != nil { + return + } + num, err := strconv.Atoi(datas[1]) + if err != nil { + code = pb.ErrorCode_ReqParameterError + return + } + if err = module1.(comm.IUser).BingoSetUserVipLv(session, int32(num)); err == nil { + code = pb.ErrorCode_Success + } + this.Debug("使用bingo命令:uid = %s ", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "0", Value: datas[0]}, + log.Field{Key: "N", Value: int32(num)}, + ) } } } diff --git a/modules/user/module.go b/modules/user/module.go index 745977669..7a5589651 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -655,3 +655,24 @@ func (this *User) RecoverUserVit() { } } } + +func (this *User) BingoSetUserVipLv(session comm.IUserSession, lv int32) error { + if lv <= 0 { + return comm.NewCustomError(pb.ErrorCode_ReqParameterError) + } + update := map[string]interface{}{ + "vip": lv, + "vipexp": 0, + } + if err := this.modelUser.Change(session.GetUserId(), update); err == nil { + if err := session.SendMsg(string(this.GetType()), UserSubTypeLvChangedPush, + &pb.UserVipChangedPush{Uid: session.GetUserId(), VipExp: 0, VipLv: lv}); err != nil { + this.Error("Bingo玩家等级变化 UserVipChangedPush推送失败", + log.Field{Key: "uid", Value: session.GetUserId()}, + log.Field{Key: "vipexp", Value: 0}, + log.Field{Key: "viplv", Value: lv}, + ) + } + } + return nil +} From ebca3dd65d0c675362553b44d44eeda9abaed281 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 29 Dec 2022 14:35:54 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=8D=AF=E5=89=82=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/items/api_useItem.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index ac65ed1bb..db6356281 100644 --- a/modules/items/api_useItem.go +++ b/modules/items/api_useItem.go @@ -159,6 +159,23 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq) if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { return } + case 11: //药剂使用 + sale := make([]*cfg.Gameatn, 0, len(prop)) + for _, v := range itemcf.DecomposeDeplete { + sale = append(sale, &cfg.Gameatn{ + A: v.A, + T: v.T, + N: v.N * int32(req.Amount), + }) + + } + if code = this.module.AddItemforGrid(session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success { + return + } + if code = this.module.DispenseRes(session, sale, true); code != pb.ErrorCode_Success { + return + } + break default: code = pb.ErrorCode_ItemsUseNotSupported return From ef12d49cf8eb560b5da8832e19010d34b993d2ba Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 29 Dec 2022 15:24:09 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=87=BA=E5=94=AE?= =?UTF-8?q?=E6=BB=A1=E8=B6=B3=E6=9D=A1=E4=BB=B6=E7=9A=84=E8=A3=85=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comp_configure.go | 11 + modules/viking/api.go | 6 + modules/viking/api_challengeover.go | 38 +- pb/errorcode.pb.go | 583 ++++++++++++++-------------- pb/hero_db.pb.go | 232 ++++------- pb/library_db.pb.go | 132 +++++-- pb/library_msg.pb.go | 30 +- pb/user_db.pb.go | 72 ++-- pb/user_msg.pb.go | 243 ++++++------ pb/viking_msg.pb.go | 84 ++-- 10 files changed, 718 insertions(+), 713 deletions(-) diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 93bf1b3ca..ee5bf526a 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -26,6 +26,8 @@ const ( game_item = "game_item.json" game_vip = "game_vip.json" + + game_equip = "game_equip.json" //装备信息表 ) ///配置管理基础组件 @@ -46,6 +48,7 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com err = this.LoadConfigure(game_playerlv, cfg.NewGamePlayerlv) err = this.LoadConfigure(game_facemod, cfg.NewGameFacemod) err = this.LoadConfigure(game_signreset, cfg.NewGameSignReset) + err = this.LoadConfigure(game_equip, cfg.NewGameEquip) //err = this.LoadConfigure(game_sign, cfg.NewGameSign) err = this.LoadConfigure(game_item, cfg.NewGameItem) err = this.LoadConfigure(game_vip, cfg.NewGameVip) @@ -343,3 +346,11 @@ func (this *MCompConfigure) GetItemConfigureByType(useType int32) (item []*cfg.G } return } +func (this *MCompConfigure) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameEquipData) { + + if v, err := this.GetConfigure(game_equip); err == nil { + configure = v.(*cfg.GameEquip).Get(equipmentId) + return + } + return +} diff --git a/modules/viking/api.go b/modules/viking/api.go index 58c34b2f7..ab6c10711 100644 --- a/modules/viking/api.go +++ b/modules/viking/api.go @@ -23,6 +23,7 @@ type apiComp struct { module *Viking friend comm.IFriend chat comm.IChat + equip comm.IEquipment } //组件初始化接口 @@ -46,5 +47,10 @@ func (this *apiComp) Start() (err error) { return } this.chat = module.(comm.IChat) + + if module, err = this.service.GetModule(comm.ModuleEquipment); err != nil { + return + } + this.equip = module.(comm.IEquipment) return } diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 9827d8de2..d9661ae5f 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -24,12 +24,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal var ( mapData map[string]interface{} reward []*cfg.Gameatn - asset []*pb.UserAssets - bWin bool // 战斗是否胜利 + bWin bool // 战斗是否胜利 + atno []*pb.UserAtno // atno 类型 + del []string // 自动出售的装备 ) mapData = make(map[string]interface{}, 0) reward = make([]*cfg.Gameatn, 0) - asset = make([]*pb.UserAssets, 0) code = this.ChallengeOverCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 @@ -96,34 +96,34 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal if code = this.module.DispenseRes(session, vikingCfg.Firstprize, true); code != pb.ErrorCode_Success { return } - for _, v := range vikingCfg.Firstprize { - asset = append(asset, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } } this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, viking, req.Report) reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励 - if code = this.module.DispenseRes(session, reward, true); code != pb.ErrorCode_Success { + if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success { return } - for _, v := range reward { - asset = append(asset, &pb.UserAssets{ - A: v.A, - T: v.T, - N: v.N, - }) - } + for _, v := range req.Star { + for _, v1 := range atno { + if v1.A == "equp" { + cfg := this.configure.GetEquipmentConfigureById(v1.T) + if cfg.Star == v { + del = append(del, v1.O) + } + } + } + } + if len(del) > 0 { // 自动出售 + this.equip.SellEquipments(session, del) + } mapData["bossTime"] = viking.BossTime // 更新时间 code = this.module.ModifyVikingData(session.GetUserId(), mapData) session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{ Data: viking, - Asset: asset, + Asset: atno, + Sell: del, }) if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { this.chat.SendSysChatToWorld(comm.ChatSystem14, nil, req.BossId, req.Difficulty, user.Name) diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 1e0d65997..bc3bfc37e 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -67,7 +67,6 @@ const ( ErrorCode_UserFriendNoEnough ErrorCode = 1014 //友情点不足 ErrorCode_UserSociatyCoinNoEnough ErrorCode = 1015 //公会币不足 ErrorCode_UserArenaCoinNoEnough ErrorCode = 1016 //竞技场币不足 - ErrorCode_UserVitNoEnough ErrorCode = 1017 //体力不足 // friend ErrorCode_FriendNotSelf ErrorCode = 1100 //不能是自己 ErrorCode_FriendSelfMax ErrorCode = 1101 //超出好友最大数量 @@ -339,7 +338,6 @@ var ( 1014: "UserFriendNoEnough", 1015: "UserSociatyCoinNoEnough", 1016: "UserArenaCoinNoEnough", - 1017: "UserVitNoEnough", 1100: "FriendNotSelf", 1101: "FriendSelfMax", 1102: "FriendTargetMax", @@ -579,7 +577,6 @@ var ( "UserFriendNoEnough": 1014, "UserSociatyCoinNoEnough": 1015, "UserArenaCoinNoEnough": 1016, - "UserVitNoEnough": 1017, "FriendNotSelf": 1100, "FriendSelfMax": 1101, "FriendTargetMax": 1102, @@ -809,7 +806,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xcf, 0x2a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xb9, 0x2a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -862,296 +859,294 @@ var file_errorcode_proto_rawDesc = []byte{ 0x10, 0xf6, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf7, 0x07, 0x12, 0x1a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, - 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf8, 0x07, 0x12, 0x14, 0x0a, - 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, - 0x10, 0xf9, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, - 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, - 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, - 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, - 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, - 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, - 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, - 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, - 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, - 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, - 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, - 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, - 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, - 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, - 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, - 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, - 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, - 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, - 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, - 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, - 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, - 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, - 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, - 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, - 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, - 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, - 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, - 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, - 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, - 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, - 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, - 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, - 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, - 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, - 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, - 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, - 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, - 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, - 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, - 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, - 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, - 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, - 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, - 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, - 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, - 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, - 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, - 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, - 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, - 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, - 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, - 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, - 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, - 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, - 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, - 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, - 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, - 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, - 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, - 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, - 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, - 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, - 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, - 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, - 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, - 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, - 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, - 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, - 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, - 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, - 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, - 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, - 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, - 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, - 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, - 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, - 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, - 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, - 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, - 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, - 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, - 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, - 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, - 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, - 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, - 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, - 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, - 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, - 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, - 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, - 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, - 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, - 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, - 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, - 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, - 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, - 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, - 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, - 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, - 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, - 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, - 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, - 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, - 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, - 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, - 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, - 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, - 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, - 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, - 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, - 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, - 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, - 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, - 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, - 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, - 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, - 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, - 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, - 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, - 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, - 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, - 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, - 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, - 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, - 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, - 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, - 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, - 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, - 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, - 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, - 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, - 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, - 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, - 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, - 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, - 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, - 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, - 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, - 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, - 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, - 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, - 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, - 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, - 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, - 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, - 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, - 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, - 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, 0x0a, - 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, - 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, - 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, - 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, - 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, - 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, - 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, - 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, - 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, - 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, - 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, - 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, - 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, - 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, - 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, - 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, - 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, - 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, - 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, - 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, - 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, - 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, - 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, - 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, - 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, - 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x15, - 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, - 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, - 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, - 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, - 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, - 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, - 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, - 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, - 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, - 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, - 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, - 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, - 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, - 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, - 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, - 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, - 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, - 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, - 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, - 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, - 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, - 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, - 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, - 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, - 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, - 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, - 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, - 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, - 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, - 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, - 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, - 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, - 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, - 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, - 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, - 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, - 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, - 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, - 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf8, 0x07, 0x12, 0x12, 0x0a, + 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, + 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, + 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, + 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, + 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, + 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, + 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, + 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, + 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, + 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, + 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, + 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, + 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, + 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, + 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, + 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, + 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, + 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, + 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, + 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, + 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, + 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, + 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, + 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, + 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, + 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, + 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, + 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, + 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, + 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, + 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, + 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, + 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, + 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, + 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, + 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, + 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, + 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, + 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, + 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, + 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, + 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, + 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, + 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, + 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, + 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, + 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, + 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, + 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, + 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, + 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, + 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, + 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, + 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, + 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, + 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, + 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, + 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, + 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, + 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, + 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, + 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, + 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, + 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, + 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, + 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, + 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, + 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, + 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, + 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, + 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, + 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, + 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, + 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, + 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, + 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, + 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, + 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, + 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, + 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, + 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, + 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, + 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, + 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, + 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, + 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, + 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, + 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, + 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, + 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, + 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, + 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, + 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, + 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, + 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, + 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, + 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, + 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, + 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, + 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, + 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, + 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, + 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, + 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, + 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, + 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, + 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, + 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, + 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, + 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, + 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, + 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, + 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, + 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, + 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, + 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, + 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, + 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, + 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, + 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, + 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, + 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, + 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, + 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, + 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, + 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, + 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, + 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, + 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, + 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, + 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, + 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, + 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, + 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, + 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, + 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, + 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, + 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, + 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, + 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, + 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, + 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, + 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, + 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, + 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, + 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, + 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, + 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, + 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, + 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, + 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, + 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, + 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, + 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, + 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, + 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, + 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, + 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, + 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, + 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, + 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, + 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, + 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, + 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, + 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, + 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, + 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, + 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, + 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, + 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, + 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, + 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, + 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, + 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, + 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, + 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, + 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, + 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, + 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, + 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, + 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, + 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, + 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, + 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, + 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, + 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, + 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, + 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, + 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, + 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, + 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, + 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, + 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 2e0fb5712..d5de3524c 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -369,61 +369,6 @@ func (x *DBHero) GetHoroscopeProperty() map[string]int32 { return nil } -type Floor struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - H4 int32 `protobuf:"varint,1,opt,name=h4,proto3" json:"h4"` // 4星次数 - H5 int32 `protobuf:"varint,2,opt,name=h5,proto3" json:"h5"` // 5星次数 -} - -func (x *Floor) Reset() { - *x = Floor{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_db_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *Floor) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*Floor) ProtoMessage() {} - -func (x *Floor) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_db_proto_msgTypes[1] - 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 Floor.ProtoReflect.Descriptor instead. -func (*Floor) Descriptor() ([]byte, []int) { - return file_hero_hero_db_proto_rawDescGZIP(), []int{1} -} - -func (x *Floor) GetH4() int32 { - if x != nil { - return x.H4 - } - return 0 -} - -func (x *Floor) GetH5() int32 { - if x != nil { - return x.H5 - } - return 0 -} - //英雄扩展数据 type DBHeroRecord struct { state protoimpl.MessageState @@ -447,7 +392,7 @@ type DBHeroRecord struct { func (x *DBHeroRecord) Reset() { *x = DBHeroRecord{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_db_proto_msgTypes[2] + mi := &file_hero_hero_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -460,7 +405,7 @@ func (x *DBHeroRecord) String() string { func (*DBHeroRecord) ProtoMessage() {} func (x *DBHeroRecord) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_db_proto_msgTypes[2] + mi := &file_hero_hero_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -473,7 +418,7 @@ func (x *DBHeroRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBHeroRecord.ProtoReflect.Descriptor instead. func (*DBHeroRecord) Descriptor() ([]byte, []int) { - return file_hero_hero_db_proto_rawDescGZIP(), []int{2} + return file_hero_hero_db_proto_rawDescGZIP(), []int{1} } func (x *DBHeroRecord) GetId() string { @@ -575,7 +520,7 @@ type DBHeroTalent struct { func (x *DBHeroTalent) Reset() { *x = DBHeroTalent{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_db_proto_msgTypes[3] + mi := &file_hero_hero_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -588,7 +533,7 @@ func (x *DBHeroTalent) String() string { func (*DBHeroTalent) ProtoMessage() {} func (x *DBHeroTalent) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_db_proto_msgTypes[3] + mi := &file_hero_hero_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -601,7 +546,7 @@ func (x *DBHeroTalent) ProtoReflect() protoreflect.Message { // Deprecated: Use DBHeroTalent.ProtoReflect.Descriptor instead. func (*DBHeroTalent) Descriptor() ([]byte, []int) { - return file_hero_hero_db_proto_rawDescGZIP(), []int{3} + return file_hero_hero_db_proto_rawDescGZIP(), []int{2} } func (x *DBHeroTalent) GetId() string { @@ -740,56 +685,54 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 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, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, - 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, - 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, - 0xf0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 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, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, - 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, - 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, - 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, - 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, - 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, - 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, - 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, - 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, - 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 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, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, - 0x6f, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, - 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf0, 0x03, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, + 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, + 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, + 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, + 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, + 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, + 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, + 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, + 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, + 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x1a, 0x3c, 0x0a, + 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, - 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, - 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, - 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, + 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, + 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 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, 0x16, 0x0a, 0x06, + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, + 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, + 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, + 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, + 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -805,39 +748,38 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte { } var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 14) +var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13) var file_hero_hero_db_proto_goTypes = []interface{}{ (HeroType)(0), // 0: HeroType (*DBHero)(nil), // 1: DBHero - (*Floor)(nil), // 2: Floor - (*DBHeroRecord)(nil), // 3: DBHeroRecord - (*DBHeroTalent)(nil), // 4: DBHeroTalent - nil, // 5: DBHero.PropertyEntry - nil, // 6: DBHero.AddPropertyEntry - nil, // 7: DBHero.EnergyEntry - nil, // 8: DBHero.EnergyPropertyEntry - nil, // 9: DBHero.JuexPropertyEntry - nil, // 10: DBHero.TalentPropertyEntry - nil, // 11: DBHero.HoroscopePropertyEntry - nil, // 12: DBHeroRecord.ConditionEntry - nil, // 13: DBHeroRecord.Star5HeroEntry - nil, // 14: DBHeroTalent.TalentEntry - (*SkillData)(nil), // 15: SkillData + (*DBHeroRecord)(nil), // 2: DBHeroRecord + (*DBHeroTalent)(nil), // 3: DBHeroTalent + nil, // 4: DBHero.PropertyEntry + nil, // 5: DBHero.AddPropertyEntry + nil, // 6: DBHero.EnergyEntry + nil, // 7: DBHero.EnergyPropertyEntry + nil, // 8: DBHero.JuexPropertyEntry + nil, // 9: DBHero.TalentPropertyEntry + nil, // 10: DBHero.HoroscopePropertyEntry + nil, // 11: DBHeroRecord.ConditionEntry + nil, // 12: DBHeroRecord.Star5HeroEntry + nil, // 13: DBHeroTalent.TalentEntry + (*SkillData)(nil), // 14: SkillData } var file_hero_hero_db_proto_depIdxs = []int32{ - 15, // 0: DBHero.normalSkill:type_name -> SkillData - 5, // 1: DBHero.property:type_name -> DBHero.PropertyEntry - 6, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry - 7, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry - 8, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry - 9, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry + 14, // 0: DBHero.normalSkill:type_name -> SkillData + 4, // 1: DBHero.property:type_name -> DBHero.PropertyEntry + 5, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry + 6, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry + 7, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry + 8, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry 0, // 6: DBHero.status:type_name -> HeroType - 10, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry - 15, // 8: DBHero.equipSkill:type_name -> SkillData - 11, // 9: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry - 12, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry - 13, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry - 14, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry + 9, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry + 14, // 8: DBHero.equipSkill:type_name -> SkillData + 10, // 9: DBHero.horoscopeProperty:type_name -> DBHero.HoroscopePropertyEntry + 11, // 10: DBHeroRecord.condition:type_name -> DBHeroRecord.ConditionEntry + 12, // 11: DBHeroRecord.star5Hero:type_name -> DBHeroRecord.Star5HeroEntry + 13, // 12: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry 13, // [13:13] is the sub-list for method output_type 13, // [13:13] is the sub-list for method input_type 13, // [13:13] is the sub-list for extension type_name @@ -865,18 +807,6 @@ func file_hero_hero_db_proto_init() { } } file_hero_hero_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Floor); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBHeroRecord); i { case 0: return &v.state @@ -888,7 +818,7 @@ func file_hero_hero_db_proto_init() { return nil } } - file_hero_hero_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBHeroTalent); i { case 0: return &v.state @@ -907,7 +837,7 @@ func file_hero_hero_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_db_proto_rawDesc, NumEnums: 1, - NumMessages: 14, + NumMessages: 13, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index 38b8b4040..4f526bd36 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -233,9 +233,9 @@ type DBFetterstory struct { 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 - FeeterTask map[int32]*FetterTask `protobuf:"bytes,3,rep,name=feeterTask,proto3" json:"feeterTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"feeterTask"` //已开启的羁绊任务 key:羁绊ID + 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 + FeeterTask map[int32]*FetterTasks `protobuf:"bytes,3,rep,name=feeterTask,proto3" json:"feeterTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"feeterTask"` //已开启的羁绊任务 key:羁绊ID } func (x *DBFetterstory) Reset() { @@ -284,26 +284,74 @@ func (x *DBFetterstory) GetUid() string { return "" } -func (x *DBFetterstory) GetFeeterTask() map[int32]*FetterTask { +func (x *DBFetterstory) GetFeeterTask() map[int32]*FetterTasks { if x != nil { return x.FeeterTask } return nil } +type FetterTasks struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Tasks []int32 `protobuf:"varint,1,rep,packed,name=tasks,proto3" json:"tasks"` +} + +func (x *FetterTasks) Reset() { + *x = FetterTasks{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_db_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FetterTasks) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FetterTasks) ProtoMessage() {} + +func (x *FetterTasks) ProtoReflect() protoreflect.Message { + mi := &file_library_library_db_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FetterTasks.ProtoReflect.Descriptor instead. +func (*FetterTasks) Descriptor() ([]byte, []int) { + return file_library_library_db_proto_rawDescGZIP(), []int{3} +} + +func (x *FetterTasks) GetTasks() []int32 { + if x != nil { + return x.Tasks + } + return nil +} + // 羁绊任务 type FetterTask struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TaskIds []int32 `protobuf:"varint,1,rep,packed,name=taskIds,proto3" json:"taskIds" bson:"taskIds"` //完成的任务 + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskId"` //任务Id + Status int32 `protobuf:"varint,2,opt,name=status,proto3" json:"status" bson:"status"` //状态 0锁定 1已完成 } func (x *FetterTask) Reset() { *x = FetterTask{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_db_proto_msgTypes[3] + mi := &file_library_library_db_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -316,7 +364,7 @@ func (x *FetterTask) String() string { func (*FetterTask) ProtoMessage() {} func (x *FetterTask) ProtoReflect() protoreflect.Message { - mi := &file_library_library_db_proto_msgTypes[3] + mi := &file_library_library_db_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -329,14 +377,21 @@ func (x *FetterTask) ProtoReflect() protoreflect.Message { // Deprecated: Use FetterTask.ProtoReflect.Descriptor instead. func (*FetterTask) Descriptor() ([]byte, []int) { - return file_library_library_db_proto_rawDescGZIP(), []int{3} + return file_library_library_db_proto_rawDescGZIP(), []int{4} } -func (x *FetterTask) GetTaskIds() []int32 { +func (x *FetterTask) GetTaskId() int32 { if x != nil { - return x.TaskIds + return x.TaskId } - return nil + return 0 +} + +func (x *FetterTask) GetStatus() int32 { + if x != nil { + return x.Status + } + return 0 } var File_library_library_db_proto protoreflect.FileDescriptor @@ -379,22 +434,26 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x6f, 0x79, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, - 0x65, 0x22, 0xbd, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, + 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 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, 0x3e, 0x0a, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x66, 0x65, 0x65, 0x74, 0x65, - 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4a, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, + 0x72, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4b, 0x0a, 0x0f, 0x46, 0x65, 0x65, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x26, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, - 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x46, 0x65, 0x74, 0x74, + 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x22, 0x23, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, + 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x3c, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -409,21 +468,22 @@ func file_library_library_db_proto_rawDescGZIP() []byte { return file_library_library_db_proto_rawDescData } -var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_library_library_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_library_library_db_proto_goTypes = []interface{}{ (*DBLibrary)(nil), // 0: DBLibrary (*DBHeroFetter)(nil), // 1: DBHeroFetter (*DBFetterstory)(nil), // 2: DBFetterstory - (*FetterTask)(nil), // 3: FetterTask - nil, // 4: DBLibrary.HeroEntry - nil, // 5: DBLibrary.PrizeEntry - nil, // 6: DBFetterstory.FeeterTaskEntry + (*FetterTasks)(nil), // 3: FetterTasks + (*FetterTask)(nil), // 4: FetterTask + nil, // 5: DBLibrary.HeroEntry + nil, // 6: DBLibrary.PrizeEntry + nil, // 7: DBFetterstory.FeeterTaskEntry } var file_library_library_db_proto_depIdxs = []int32{ - 4, // 0: DBLibrary.hero:type_name -> DBLibrary.HeroEntry - 5, // 1: DBLibrary.prize:type_name -> DBLibrary.PrizeEntry - 6, // 2: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry - 3, // 3: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTask + 5, // 0: DBLibrary.hero:type_name -> DBLibrary.HeroEntry + 6, // 1: DBLibrary.prize:type_name -> DBLibrary.PrizeEntry + 7, // 2: DBFetterstory.feeterTask:type_name -> DBFetterstory.FeeterTaskEntry + 3, // 3: DBFetterstory.FeeterTaskEntry.value:type_name -> FetterTasks 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -474,6 +534,18 @@ func file_library_library_db_proto_init() { } } file_library_library_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FetterTasks); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FetterTask); i { case 0: return &v.state @@ -492,7 +564,7 @@ func file_library_library_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_library_library_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index 0607d1909..d636c5fa8 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -769,7 +769,7 @@ type LibraryFetterstoryTaskReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FetterId int32 `protobuf:"varint,1,opt,name=fetterId,proto3" json:"fetterId"` //章节ID + FetterId int32 `protobuf:"varint,1,opt,name=fetterId,proto3" json:"fetterId"` //羁绊ID } func (x *LibraryFetterstoryTaskReq) Reset() { @@ -816,7 +816,7 @@ type LibraryFetterstoryTaskResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TaskIds []int32 `protobuf:"varint,1,rep,packed,name=taskIds,proto3" json:"taskIds"` + List []*FetterTask `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } func (x *LibraryFetterstoryTaskResp) Reset() { @@ -851,9 +851,9 @@ func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) { return file_library_library_msg_proto_rawDescGZIP(), []int{16} } -func (x *LibraryFetterstoryTaskResp) GetTaskIds() []int32 { +func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { if x != nil { - return x.TaskIds + return x.List } return nil } @@ -929,12 +929,12 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x74, 0x61, 0x22, 0x37, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x1a, 0x4c, + 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x49, 0x64, 0x22, 0x3d, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x74, 0x6f, 0x72, - 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, + 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x54, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -971,6 +971,7 @@ var file_library_library_msg_proto_goTypes = []interface{}{ nil, // 17: LibraryUseGiftReq.ItemsEntry (*DBLibrary)(nil), // 18: DBLibrary (*DBHeroFetter)(nil), // 19: DBHeroFetter + (*FetterTask)(nil), // 20: FetterTask } var file_library_library_msg_proto_depIdxs = []int32{ 18, // 0: LibraryGetListResp.data:type_name -> DBLibrary @@ -983,11 +984,12 @@ var file_library_library_msg_proto_depIdxs = []int32{ 18, // 7: LibraryChangePush.data:type_name -> DBLibrary 19, // 8: LibraryChangePush.fetter:type_name -> DBHeroFetter 19, // 9: LibraryLvRewardResp.data:type_name -> DBHeroFetter - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 20, // 10: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_library_library_msg_proto_init() } diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 4167730fe..ec2207d43 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -104,32 +104,30 @@ type DBUser struct { 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 - Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid - Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 - Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id - Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip - Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 - Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 - Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 - Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 - Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 - Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 - Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 - Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 - Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 - Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 - Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 - Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 - Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 - Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 - Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 - Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 - Vit int32 `protobuf:"varint,25,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力 - LastRecoverVitSec int64 `protobuf:"varint,26,opt,name=lastRecoverVitSec,proto3" json:"lastRecoverVitSec" bson:"lastRecoverVit"` // 上次体会恢复时间 + 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 + Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid + Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 + Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id + Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip + Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 + Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 + Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 + Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 + Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 + Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 + Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 + Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 + Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 + Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 + Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 + Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 + Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 + Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 + Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 + Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 } func (x *DBUser) Reset() { @@ -332,20 +330,6 @@ func (x *DBUser) GetBgp() string { return "" } -func (x *DBUser) GetVit() int32 { - if x != nil { - return x.Vit - } - return 0 -} - -func (x *DBUser) GetLastRecoverVitSec() int64 { - if x != nil { - return x.LastRecoverVitSec - } - return 0 -} - type DBUserSetting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -598,7 +582,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xf2, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xb2, 0x04, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x75, @@ -634,11 +618,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x67, 0x70, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x62, 0x67, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x76, 0x69, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, - 0x6f, 0x76, 0x65, 0x72, 0x56, 0x69, 0x74, 0x53, 0x65, 0x63, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x03, - 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x56, 0x69, 0x74, - 0x53, 0x65, 0x63, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x62, 0x67, 0x70, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index a44eee262..fa480d152 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -593,7 +593,6 @@ type UserResChangedPush struct { Starcoin int64 `protobuf:"varint,6,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座币 Guildcoin int32 `protobuf:"varint,7,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 ArenaCoin int32 `protobuf:"varint,8,opt,name=arenaCoin,proto3" json:"arenaCoin" bson:"arenaCoin"` //竞技场币 - Vit int32 `protobuf:"varint,9,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力 } func (x *UserResChangedPush) Reset() { @@ -684,13 +683,6 @@ func (x *UserResChangedPush) GetArenaCoin() int32 { return 0 } -func (x *UserResChangedPush) GetVit() int32 { - if x != nil { - return x.Vit - } - return 0 -} - // 玩家在其它终端登录的通知 type UserOtherTermLoginPush struct { state protoimpl.MessageState @@ -2464,7 +2456,7 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 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, 0xee, 0x01, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0xdc, 0x01, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, @@ -2478,126 +2470,125 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, - 0x76, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x74, 0x22, 0x2a, - 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, - 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 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, + 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x2a, 0x0a, 0x16, + 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, + 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 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, - 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, - 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, - 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, - 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, - 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, - 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x62, 0x67, 0x70, 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, 0x62, 0x67, 0x70, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, - 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, - 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, - 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x66, 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, 0x1a, 0x0a, 0x08, - 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 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, 0x47, 0x0a, 0x11, 0x55, - 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, + 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, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 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, 0x16, 0x0a, 0x06, - 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, - 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 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, 0x22, 0x27, 0x0a, 0x13, 0x55, - 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, - 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, - 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, - 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, - 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, - 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, - 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, - 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, - 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, - 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, - 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, 0x53, 0x68, - 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, - 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, - 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, - 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, - 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, - 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, - 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, - 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x31, 0x0a, + 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, + 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, + 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, + 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, + 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, + 0x70, 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, 0x62, 0x67, 0x70, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, + 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, + 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 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, 0x1a, 0x0a, 0x08, 0x66, 0x69, + 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, + 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 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, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, + 0x72, 0x4c, 0x76, 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, 0x03, 0x52, 0x03, 0x65, + 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 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, 0x16, 0x0a, 0x06, 0x76, 0x69, + 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, + 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 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, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, + 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, + 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, + 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, + 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, + 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, + 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, + 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, + 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 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, 0x53, 0x68, 0x6f, 0x77, + 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, + 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, + 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, + 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, + 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, + 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, + 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, + 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go index 94f67aa7f..f6882c466 100644 --- a/pb/viking_msg.pb.go +++ b/pb/viking_msg.pb.go @@ -240,6 +240,7 @@ type VikingChallengeOverReq struct { BossId int32 `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"` // boos 类型 Difficulty int32 `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度 Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报 + Star []int32 `protobuf:"varint,4,rep,packed,name=star,proto3" json:"star"` // 自动出售装备的星级 } func (x *VikingChallengeOverReq) Reset() { @@ -295,14 +296,22 @@ func (x *VikingChallengeOverReq) GetReport() *BattleReport { return nil } +func (x *VikingChallengeOverReq) GetStar() []int32 { + if x != nil { + return x.Star + } + return nil +} + // 客户端通知服务器打赢了 type VikingChallengeOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *DBViking `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` - Asset []*UserAssets `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` // GameRe // 推送atn + Data *DBViking `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Asset []*UserAtno `protobuf:"bytes,2,rep,name=asset,proto3" json:"asset"` // 推送atno + Sell []string `protobuf:"bytes,3,rep,name=sell,proto3" json:"sell"` // 自动出售的装备 } func (x *VikingChallengeOverResp) Reset() { @@ -344,13 +353,20 @@ func (x *VikingChallengeOverResp) GetData() *DBViking { return nil } -func (x *VikingChallengeOverResp) GetAsset() []*UserAssets { +func (x *VikingChallengeOverResp) GetAsset() []*UserAtno { if x != nil { return x.Asset } return nil } +func (x *VikingChallengeOverResp) GetSell() []string { + if x != nil { + return x.Sell + } + return nil +} + // 购买 type VikingBuyReq struct { state protoimpl.MessageState @@ -576,35 +592,37 @@ var file_viking_viking_msg_proto_rawDesc = []byte{ 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, - 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x77, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, - 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, - 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, - 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, - 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, - 0x5b, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, - 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x8b, 0x01, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, + 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, + 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, + 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, + 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, + 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, + 0x73, 0x74, 0x61, 0x72, 0x22, 0x6d, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, + 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f, + 0x0a, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x73, 0x65, 0x6c, 0x6c, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x73, + 0x65, 0x6c, 0x6c, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, + 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, + 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, - 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x73, 0x73, - 0x65, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, - 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x73, 0x73, 0x65, 0x74, 0x22, 0x24, 0x0a, 0x0c, - 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, - 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, - 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, - 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69, 0x6b, + 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1a, + 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, + 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -635,7 +653,7 @@ var file_viking_viking_msg_proto_goTypes = []interface{}{ (*BattleFormation)(nil), // 11: BattleFormation (*BattleInfo)(nil), // 12: BattleInfo (*BattleReport)(nil), // 13: BattleReport - (*UserAssets)(nil), // 14: UserAssets + (*UserAtno)(nil), // 14: UserAtno (*DBVikingRank)(nil), // 15: DBVikingRank } var file_viking_viking_msg_proto_depIdxs = []int32{ @@ -644,7 +662,7 @@ var file_viking_viking_msg_proto_depIdxs = []int32{ 12, // 2: VikingChallengeResp.info:type_name -> BattleInfo 13, // 3: VikingChallengeOverReq.report:type_name -> BattleReport 10, // 4: VikingChallengeOverResp.data:type_name -> DBViking - 14, // 5: VikingChallengeOverResp.asset:type_name -> UserAssets + 14, // 5: VikingChallengeOverResp.asset:type_name -> UserAtno 10, // 6: VikingBuyResp.data:type_name -> DBViking 15, // 7: VikingRankListResp.ranks:type_name -> DBVikingRank 8, // [8:8] is the sub-list for method output_type From e3e895b1b04d4f74218a3a958d57b82553d5a9ff Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 29 Dec 2022 15:30:38 +0800 Subject: [PATCH 6/7] =?UTF-8?q?pb=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pb/errorcode.pb.go | 583 ++++++++++++++++++------------------- pb/user_db.pb.go | 82 ++++-- pb/user_msg.pb.go | 706 +++++++++++++++++++++++++-------------------- 3 files changed, 734 insertions(+), 637 deletions(-) diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index bc3bfc37e..1e0d65997 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -67,6 +67,7 @@ const ( ErrorCode_UserFriendNoEnough ErrorCode = 1014 //友情点不足 ErrorCode_UserSociatyCoinNoEnough ErrorCode = 1015 //公会币不足 ErrorCode_UserArenaCoinNoEnough ErrorCode = 1016 //竞技场币不足 + ErrorCode_UserVitNoEnough ErrorCode = 1017 //体力不足 // friend ErrorCode_FriendNotSelf ErrorCode = 1100 //不能是自己 ErrorCode_FriendSelfMax ErrorCode = 1101 //超出好友最大数量 @@ -338,6 +339,7 @@ var ( 1014: "UserFriendNoEnough", 1015: "UserSociatyCoinNoEnough", 1016: "UserArenaCoinNoEnough", + 1017: "UserVitNoEnough", 1100: "FriendNotSelf", 1101: "FriendSelfMax", 1102: "FriendTargetMax", @@ -577,6 +579,7 @@ var ( "UserFriendNoEnough": 1014, "UserSociatyCoinNoEnough": 1015, "UserArenaCoinNoEnough": 1016, + "UserVitNoEnough": 1017, "FriendNotSelf": 1100, "FriendSelfMax": 1101, "FriendTargetMax": 1102, @@ -806,7 +809,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xb9, 0x2a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xcf, 0x2a, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -859,294 +862,296 @@ var file_errorcode_proto_rawDesc = []byte{ 0x10, 0xf6, 0x07, 0x12, 0x1c, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf7, 0x07, 0x12, 0x1a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, - 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf8, 0x07, 0x12, 0x12, 0x0a, - 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, - 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, - 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, - 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, - 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, - 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, - 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, - 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, - 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, - 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, - 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, - 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, - 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, - 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, - 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, - 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, - 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, - 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, - 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, - 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, - 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, - 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, - 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, - 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, - 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, - 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, - 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, - 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, - 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, - 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, - 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, - 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, - 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, - 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, - 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, - 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, - 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, - 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, - 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, - 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, - 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, - 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, - 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, - 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, - 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, - 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, - 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, - 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, - 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, - 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, - 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, - 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, - 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, - 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, - 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, - 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, - 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, - 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, - 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, - 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, - 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, - 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, - 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, - 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, - 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, - 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, - 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, - 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, - 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, - 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, - 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, - 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, - 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, - 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, - 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, - 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, - 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, - 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, - 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, - 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, - 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, - 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, - 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, - 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, - 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, - 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, - 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, - 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, - 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, - 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, - 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, - 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, - 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, - 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, - 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, - 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, - 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, - 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, - 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, - 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, - 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, - 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, - 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, - 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, - 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, - 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, - 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, - 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, - 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, - 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, - 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, - 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, - 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, - 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, - 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, - 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, - 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, - 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, - 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, - 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, - 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, - 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, - 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, - 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, - 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, - 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, - 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, - 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, - 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, - 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, - 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, - 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, - 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, - 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, - 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, - 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, - 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, - 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, - 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, - 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, - 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, - 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, - 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, - 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, - 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, - 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, - 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, - 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, - 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, - 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, - 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, - 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, - 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, - 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, - 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, - 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, - 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, - 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, - 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, - 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, - 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, - 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, - 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, - 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, - 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, - 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, - 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, - 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, - 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, - 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, - 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, - 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, - 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, - 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, - 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, - 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, - 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, - 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, - 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, - 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, - 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, - 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, - 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, - 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, - 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, - 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, - 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, - 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, - 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, - 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, - 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, - 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, - 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, - 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, - 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, - 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, - 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, - 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, - 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, - 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, - 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, - 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, - 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, - 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, - 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, - 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, - 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, - 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, - 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, - 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, - 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf8, 0x07, 0x12, 0x14, 0x0a, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, + 0x10, 0xf9, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, + 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, + 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, + 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, + 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, + 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, + 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, + 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, + 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, + 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, + 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, + 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, + 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, + 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, + 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, + 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, + 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, + 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, + 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, + 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, + 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, + 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, + 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, + 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, + 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, + 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, + 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, + 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, + 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, + 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, + 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, + 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, + 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, + 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, + 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, + 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, + 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, + 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, + 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, + 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, + 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, + 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, + 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, + 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, + 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, + 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, + 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, + 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, + 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, + 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, + 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, + 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, + 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, + 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, + 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, + 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, + 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, + 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, + 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, + 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, + 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, + 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, + 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, + 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, + 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, + 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, + 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, + 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, + 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, + 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, + 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, + 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, + 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, + 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, + 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, + 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, + 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, + 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, + 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, + 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, + 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, + 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, + 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, + 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, + 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, + 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, + 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, + 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, + 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, + 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, + 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, + 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, + 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, + 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, + 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, + 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, + 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, + 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, + 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, + 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, + 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, + 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, + 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, + 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, + 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, + 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, + 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, + 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, + 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, + 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, + 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, + 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, + 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, + 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, + 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, + 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, + 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, + 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, + 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, + 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, + 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, + 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, + 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, + 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, + 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, + 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, + 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, + 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x45, + 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x98, + 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x4d, + 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x45, 0x6e, + 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, + 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e, 0x63, + 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, 0x69, 0x62, 0x72, 0x61, + 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xf2, 0x15, 0x12, 0x16, + 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf5, 0x15, + 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xf6, 0x15, 0x12, + 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, 0x65, 0x54, 0x61, 0x73, + 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xf7, 0x15, 0x12, 0x1b, + 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, 0x10, 0x0a, 0x0b, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, 0x16, 0x12, 0x13, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, + 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, + 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, + 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, + 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, 0x17, 0x12, 0x13, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, + 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, + 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x10, 0xc1, 0x17, + 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, 0x67, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, 0x73, 0x10, + 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xbd, + 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, + 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, 0x13, 0x0a, 0x0d, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc0, 0xea, + 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, 0x01, 0x12, 0x18, + 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, + 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, + 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xc6, 0xea, 0x01, + 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, 0x01, 0x12, 0x14, + 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, + 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, + 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcb, 0xea, + 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, + 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, 0x01, 0x12, 0x1d, + 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, + 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, 0x12, 0x1c, 0x0a, + 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, + 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, + 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, + 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, 0x01, 0x12, 0x15, + 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, + 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, + 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, + 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, + 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, + 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, + 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, + 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, + 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, + 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, + 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, + 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, + 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, + 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, + 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, + 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, + 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, + 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, + 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, + 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, + 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, + 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, + 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, + 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, + 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, + 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, + 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, + 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, + 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, + 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, + 0xde, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, + 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, + 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, + 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, + 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index ec2207d43..2ffb896c6 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -25,11 +25,11 @@ type CacheUser struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id - SessionId string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"sessionId"` //会话id - ServiceTag string `protobuf:"bytes,3,opt,name=ServiceTag,proto3" json:"serviceTag"` //所在服务集群 区服id - GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"gatewayServiceId"` //所在网关服务id - Ip string `protobuf:"bytes,5,opt,name=ip,proto3" json:"ip"` //远程ip + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户id + SessionId string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"SessionId" bson:"sessionId"` //会话id + ServiceTag string `protobuf:"bytes,3,opt,name=ServiceTag,proto3" json:"ServiceTag" bson:"serviceTag"` //所在服务集群 区服id + GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId" bson:"gatewayServiceId"` //所在网关服务id + Ip string `protobuf:"bytes,5,opt,name=ip,proto3" json:"ip" bson:"ip"` //远程ip } func (x *CacheUser) Reset() { @@ -104,30 +104,32 @@ type DBUser struct { 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 - Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid - Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 - Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id - Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip - Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 - Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 - Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 - Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 - Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 - Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 - Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 - Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 - Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 - Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 - Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 - Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 - Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 - Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 - Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 - Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 + 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 + Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid" bson:"uuid"` //玩家唯一uuid + Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid" bson:"binduid"` //玩家账号 + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name" bson:"name"` //玩家名 + Sid string `protobuf:"bytes,6,opt,name=sid,proto3" json:"sid" bson:"sid"` //区服id + Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip" bson:"createip"` //创建账号时的ip + Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip" bson:"lastloginip"` //最后一次登录时的ip + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime" bson:"ctime"` //玩家创号时间戳 + Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime" bson:"logintime"` //最后一次登录时间 + Gender int32 `protobuf:"varint,11,opt,name=gender,proto3" json:"gender" bson:"gender"` //性别 0男1女 + Avatar string `protobuf:"bytes,12,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像 + Gold int64 `protobuf:"varint,13,opt,name=gold,proto3" json:"gold" bson:"gold"` //金币 + Exp int64 `protobuf:"varint,14,opt,name=exp,proto3" json:"exp" bson:"exp"` //经验 + Vipexp int64 `protobuf:"varint,15,opt,name=vipexp,proto3" json:"vipexp" bson:"vipexp"` //vip经验 + Starcoin int64 `protobuf:"varint,16,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座图币 + Created bool `protobuf:"varint,17,opt,name=created,proto3" json:"created" bson:"created"` //创角 + Lv int32 `protobuf:"varint,18,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级 + Vip int32 `protobuf:"varint,19,opt,name=vip,proto3" json:"vip" bson:"vip"` // vip等级 + Diamond int64 `protobuf:"varint,20,opt,name=diamond,proto3" json:"diamond" bson:"diamond"` // 钻石 + Title int32 `protobuf:"varint,21,opt,name=title,proto3" json:"title" bson:"title"` //头衔 + Offlinetime int64 `protobuf:"varint,22,opt,name=offlinetime,proto3" json:"offlinetime" bson:"offlinetime"` //离线时间 + Figure int32 `protobuf:"varint,23,opt,name=figure,proto3" json:"figure" bson:"figure"` //主角形象 + Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 + Vit int32 `protobuf:"varint,25,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力 + LastRecoverVitSec int64 `protobuf:"varint,26,opt,name=lastRecoverVitSec,proto3" json:"lastRecoverVitSec" bson:"lastRecoverVitSec"` // 上次体会恢复时间 } func (x *DBUser) Reset() { @@ -330,6 +332,20 @@ func (x *DBUser) GetBgp() string { return "" } +func (x *DBUser) GetVit() int32 { + if x != nil { + return x.Vit + } + return 0 +} + +func (x *DBUser) GetLastRecoverVitSec() int64 { + if x != nil { + return x.LastRecoverVitSec + } + return 0 +} + type DBUserSetting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -582,7 +598,7 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xb2, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xf2, 0x04, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x12, 0x0a, 0x04, 0x75, @@ -618,7 +634,11 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x17, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x67, 0x70, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x62, 0x67, 0x70, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x62, 0x67, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x74, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x76, 0x69, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, + 0x6f, 0x76, 0x65, 0x72, 0x56, 0x69, 0x74, 0x53, 0x65, 0x63, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x56, 0x69, 0x74, + 0x53, 0x65, 0x63, 0x22, 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index fa480d152..cd572ae60 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -593,6 +593,7 @@ type UserResChangedPush struct { Starcoin int64 `protobuf:"varint,6,opt,name=starcoin,proto3" json:"starcoin" bson:"starcoin"` //星座币 Guildcoin int32 `protobuf:"varint,7,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 ArenaCoin int32 `protobuf:"varint,8,opt,name=arenaCoin,proto3" json:"arenaCoin" bson:"arenaCoin"` //竞技场币 + Vit int32 `protobuf:"varint,9,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力 } func (x *UserResChangedPush) Reset() { @@ -683,6 +684,13 @@ func (x *UserResChangedPush) GetArenaCoin() int32 { return 0 } +func (x *UserResChangedPush) GetVit() int32 { + if x != nil { + return x.Vit + } + return 0 +} + // 玩家在其它终端登录的通知 type UserOtherTermLoginPush struct { state protoimpl.MessageState @@ -731,6 +739,53 @@ func (x *UserOtherTermLoginPush) GetUid() string { return "" } +type UserVitChangedPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Vit int32 `protobuf:"varint,1,opt,name=vit,proto3" json:"vit" bson:"vit"` //体力 +} + +func (x *UserVitChangedPush) Reset() { + *x = UserVitChangedPush{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserVitChangedPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserVitChangedPush) ProtoMessage() {} + +func (x *UserVitChangedPush) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[13] + 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 UserVitChangedPush.ProtoReflect.Descriptor instead. +func (*UserVitChangedPush) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{13} +} + +func (x *UserVitChangedPush) GetVit() int32 { + if x != nil { + return x.Vit + } + return 0 +} + //用户设置获取 type UserGetSettingReq struct { state protoimpl.MessageState @@ -741,7 +796,7 @@ type UserGetSettingReq struct { func (x *UserGetSettingReq) Reset() { *x = UserGetSettingReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[13] + mi := &file_user_user_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -754,7 +809,7 @@ func (x *UserGetSettingReq) String() string { func (*UserGetSettingReq) ProtoMessage() {} func (x *UserGetSettingReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[13] + mi := &file_user_user_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -767,7 +822,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{13} + return file_user_user_msg_proto_rawDescGZIP(), []int{14} } type UserGetSettingResp struct { @@ -781,7 +836,7 @@ type UserGetSettingResp struct { func (x *UserGetSettingResp) Reset() { *x = UserGetSettingResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[14] + mi := &file_user_user_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -794,7 +849,7 @@ func (x *UserGetSettingResp) String() string { func (*UserGetSettingResp) ProtoMessage() {} func (x *UserGetSettingResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[14] + mi := &file_user_user_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -807,7 +862,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{14} + return file_user_user_msg_proto_rawDescGZIP(), []int{15} } func (x *UserGetSettingResp) GetSetting() *DBUserSetting { @@ -829,7 +884,7 @@ type UserUpdateSettingReq struct { func (x *UserUpdateSettingReq) Reset() { *x = UserUpdateSettingReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[15] + mi := &file_user_user_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -842,7 +897,7 @@ func (x *UserUpdateSettingReq) String() string { func (*UserUpdateSettingReq) ProtoMessage() {} func (x *UserUpdateSettingReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[15] + mi := &file_user_user_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -855,7 +910,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{15} + return file_user_user_msg_proto_rawDescGZIP(), []int{16} } func (x *UserUpdateSettingReq) GetSetting() *DBUserSetting { @@ -876,7 +931,7 @@ type UserUpdateSettingResp struct { func (x *UserUpdateSettingResp) Reset() { *x = UserUpdateSettingResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[16] + mi := &file_user_user_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -889,7 +944,7 @@ func (x *UserUpdateSettingResp) String() string { func (*UserUpdateSettingResp) ProtoMessage() {} func (x *UserUpdateSettingResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[16] + mi := &file_user_user_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -902,7 +957,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{16} + return file_user_user_msg_proto_rawDescGZIP(), []int{17} } func (x *UserUpdateSettingResp) GetUid() string { @@ -922,7 +977,7 @@ type UserVeriCodeReq struct { func (x *UserVeriCodeReq) Reset() { *x = UserVeriCodeReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[17] + mi := &file_user_user_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -935,7 +990,7 @@ func (x *UserVeriCodeReq) String() string { func (*UserVeriCodeReq) ProtoMessage() {} func (x *UserVeriCodeReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[17] + mi := &file_user_user_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -948,7 +1003,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{17} + return file_user_user_msg_proto_rawDescGZIP(), []int{18} } type UserVeriCodeResp struct { @@ -962,7 +1017,7 @@ type UserVeriCodeResp struct { func (x *UserVeriCodeResp) Reset() { *x = UserVeriCodeResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[18] + mi := &file_user_user_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -975,7 +1030,7 @@ func (x *UserVeriCodeResp) String() string { func (*UserVeriCodeResp) ProtoMessage() {} func (x *UserVeriCodeResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[18] + mi := &file_user_user_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -988,7 +1043,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{18} + return file_user_user_msg_proto_rawDescGZIP(), []int{19} } func (x *UserVeriCodeResp) GetCode() int32 { @@ -1010,7 +1065,7 @@ type UserInitdataReq struct { func (x *UserInitdataReq) Reset() { *x = UserInitdataReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[19] + mi := &file_user_user_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1023,7 +1078,7 @@ func (x *UserInitdataReq) String() string { func (*UserInitdataReq) ProtoMessage() {} func (x *UserInitdataReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[19] + mi := &file_user_user_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1036,7 +1091,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{19} + return file_user_user_msg_proto_rawDescGZIP(), []int{20} } func (x *UserInitdataReq) GetCode() int32 { @@ -1057,7 +1112,7 @@ type UserInitdataResp struct { func (x *UserInitdataResp) Reset() { *x = UserInitdataResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[20] + mi := &file_user_user_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1070,7 +1125,7 @@ func (x *UserInitdataResp) String() string { func (*UserInitdataResp) ProtoMessage() {} func (x *UserInitdataResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[20] + mi := &file_user_user_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1083,7 +1138,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{20} + return file_user_user_msg_proto_rawDescGZIP(), []int{21} } func (x *UserInitdataResp) GetUid() string { @@ -1105,7 +1160,7 @@ type UserModifynameReq struct { func (x *UserModifynameReq) Reset() { *x = UserModifynameReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[21] + mi := &file_user_user_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1118,7 +1173,7 @@ func (x *UserModifynameReq) String() string { func (*UserModifynameReq) ProtoMessage() {} func (x *UserModifynameReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[21] + mi := &file_user_user_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1131,7 +1186,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{21} + return file_user_user_msg_proto_rawDescGZIP(), []int{22} } func (x *UserModifynameReq) GetName() string { @@ -1154,7 +1209,7 @@ type UserModifynameResp struct { func (x *UserModifynameResp) Reset() { *x = UserModifynameResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[22] + mi := &file_user_user_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1167,7 +1222,7 @@ func (x *UserModifynameResp) String() string { func (*UserModifynameResp) ProtoMessage() {} func (x *UserModifynameResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[22] + mi := &file_user_user_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1180,7 +1235,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{22} + return file_user_user_msg_proto_rawDescGZIP(), []int{23} } func (x *UserModifynameResp) GetUid() string { @@ -1216,7 +1271,7 @@ type UserModifyavatarReq struct { func (x *UserModifyavatarReq) Reset() { *x = UserModifyavatarReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[23] + mi := &file_user_user_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1229,7 +1284,7 @@ func (x *UserModifyavatarReq) String() string { func (*UserModifyavatarReq) ProtoMessage() {} func (x *UserModifyavatarReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[23] + mi := &file_user_user_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1242,7 +1297,7 @@ func (x *UserModifyavatarReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifyavatarReq.ProtoReflect.Descriptor instead. func (*UserModifyavatarReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{23} + return file_user_user_msg_proto_rawDescGZIP(), []int{24} } func (x *UserModifyavatarReq) GetAvatarId() string { @@ -1264,7 +1319,7 @@ type UserModifyavatarResp struct { func (x *UserModifyavatarResp) Reset() { *x = UserModifyavatarResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[24] + mi := &file_user_user_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1277,7 +1332,7 @@ func (x *UserModifyavatarResp) String() string { func (*UserModifyavatarResp) ProtoMessage() {} func (x *UserModifyavatarResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[24] + mi := &file_user_user_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1290,7 +1345,7 @@ func (x *UserModifyavatarResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifyavatarResp.ProtoReflect.Descriptor instead. func (*UserModifyavatarResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{24} + return file_user_user_msg_proto_rawDescGZIP(), []int{25} } func (x *UserModifyavatarResp) GetUid() string { @@ -1319,7 +1374,7 @@ type UserModifybgpReq struct { func (x *UserModifybgpReq) Reset() { *x = UserModifybgpReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[25] + mi := &file_user_user_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1332,7 +1387,7 @@ func (x *UserModifybgpReq) String() string { func (*UserModifybgpReq) ProtoMessage() {} func (x *UserModifybgpReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[25] + mi := &file_user_user_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1345,7 +1400,7 @@ func (x *UserModifybgpReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifybgpReq.ProtoReflect.Descriptor instead. func (*UserModifybgpReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{25} + return file_user_user_msg_proto_rawDescGZIP(), []int{26} } func (x *UserModifybgpReq) GetBgpId() string { @@ -1367,7 +1422,7 @@ type UserModifybgpResp struct { func (x *UserModifybgpResp) Reset() { *x = UserModifybgpResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[26] + mi := &file_user_user_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1380,7 +1435,7 @@ func (x *UserModifybgpResp) String() string { func (*UserModifybgpResp) ProtoMessage() {} func (x *UserModifybgpResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[26] + mi := &file_user_user_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1393,7 +1448,7 @@ func (x *UserModifybgpResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifybgpResp.ProtoReflect.Descriptor instead. func (*UserModifybgpResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{26} + return file_user_user_msg_proto_rawDescGZIP(), []int{27} } func (x *UserModifybgpResp) GetUid() string { @@ -1422,7 +1477,7 @@ type UserModifyfigureReq struct { func (x *UserModifyfigureReq) Reset() { *x = UserModifyfigureReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[27] + mi := &file_user_user_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1435,7 +1490,7 @@ func (x *UserModifyfigureReq) String() string { func (*UserModifyfigureReq) ProtoMessage() {} func (x *UserModifyfigureReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[27] + mi := &file_user_user_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1448,7 +1503,7 @@ func (x *UserModifyfigureReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifyfigureReq.ProtoReflect.Descriptor instead. func (*UserModifyfigureReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{27} + return file_user_user_msg_proto_rawDescGZIP(), []int{28} } func (x *UserModifyfigureReq) GetFigureId() int32 { @@ -1470,7 +1525,7 @@ type UserModifyfigureResp struct { func (x *UserModifyfigureResp) Reset() { *x = UserModifyfigureResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[28] + mi := &file_user_user_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1483,7 +1538,7 @@ func (x *UserModifyfigureResp) String() string { func (*UserModifyfigureResp) ProtoMessage() {} func (x *UserModifyfigureResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[28] + mi := &file_user_user_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1496,7 +1551,7 @@ func (x *UserModifyfigureResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserModifyfigureResp.ProtoReflect.Descriptor instead. func (*UserModifyfigureResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{28} + return file_user_user_msg_proto_rawDescGZIP(), []int{29} } func (x *UserModifyfigureResp) GetUid() string { @@ -1523,7 +1578,7 @@ type UserGetTujianReq struct { func (x *UserGetTujianReq) Reset() { *x = UserGetTujianReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[29] + mi := &file_user_user_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1536,7 +1591,7 @@ func (x *UserGetTujianReq) String() string { func (*UserGetTujianReq) ProtoMessage() {} func (x *UserGetTujianReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[29] + mi := &file_user_user_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1549,7 +1604,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{29} + return file_user_user_msg_proto_rawDescGZIP(), []int{30} } type UserGetTujianResp struct { @@ -1563,7 +1618,7 @@ type UserGetTujianResp struct { func (x *UserGetTujianResp) Reset() { *x = UserGetTujianResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[30] + mi := &file_user_user_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1576,7 +1631,7 @@ func (x *UserGetTujianResp) String() string { func (*UserGetTujianResp) ProtoMessage() {} func (x *UserGetTujianResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[30] + mi := &file_user_user_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1589,7 +1644,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{30} + return file_user_user_msg_proto_rawDescGZIP(), []int{31} } func (x *UserGetTujianResp) GetHeroids() []string { @@ -1613,7 +1668,7 @@ type UserLvChangedPush struct { func (x *UserLvChangedPush) Reset() { *x = UserLvChangedPush{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[31] + mi := &file_user_user_msg_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1626,7 +1681,7 @@ func (x *UserLvChangedPush) String() string { func (*UserLvChangedPush) ProtoMessage() {} func (x *UserLvChangedPush) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[31] + mi := &file_user_user_msg_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1639,7 +1694,7 @@ func (x *UserLvChangedPush) ProtoReflect() protoreflect.Message { // Deprecated: Use UserLvChangedPush.ProtoReflect.Descriptor instead. func (*UserLvChangedPush) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{31} + return file_user_user_msg_proto_rawDescGZIP(), []int{32} } func (x *UserLvChangedPush) GetUid() string { @@ -1677,7 +1732,7 @@ type UserVipChangedPush struct { func (x *UserVipChangedPush) Reset() { *x = UserVipChangedPush{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[32] + mi := &file_user_user_msg_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1690,7 +1745,7 @@ func (x *UserVipChangedPush) String() string { func (*UserVipChangedPush) ProtoMessage() {} func (x *UserVipChangedPush) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[32] + mi := &file_user_user_msg_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1703,7 +1758,7 @@ func (x *UserVipChangedPush) ProtoReflect() protoreflect.Message { // Deprecated: Use UserVipChangedPush.ProtoReflect.Descriptor instead. func (*UserVipChangedPush) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{32} + return file_user_user_msg_proto_rawDescGZIP(), []int{33} } func (x *UserVipChangedPush) GetUid() string { @@ -1739,7 +1794,7 @@ type UserModifysignReq struct { func (x *UserModifysignReq) Reset() { *x = UserModifysignReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[33] + mi := &file_user_user_msg_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1752,7 +1807,7 @@ func (x *UserModifysignReq) String() string { func (*UserModifysignReq) ProtoMessage() {} func (x *UserModifysignReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[33] + mi := &file_user_user_msg_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1765,7 +1820,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{33} + return file_user_user_msg_proto_rawDescGZIP(), []int{34} } func (x *UserModifysignReq) GetSign() string { @@ -1786,7 +1841,7 @@ type UserModifysignResp struct { func (x *UserModifysignResp) Reset() { *x = UserModifysignResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[34] + mi := &file_user_user_msg_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1799,7 +1854,7 @@ func (x *UserModifysignResp) String() string { func (*UserModifysignResp) ProtoMessage() {} func (x *UserModifysignResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[34] + mi := &file_user_user_msg_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1812,7 +1867,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{34} + return file_user_user_msg_proto_rawDescGZIP(), []int{35} } func (x *UserModifysignResp) GetUid() string { @@ -1834,7 +1889,7 @@ type UserBattlerecordReq struct { func (x *UserBattlerecordReq) Reset() { *x = UserBattlerecordReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[35] + mi := &file_user_user_msg_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1847,7 +1902,7 @@ func (x *UserBattlerecordReq) String() string { func (*UserBattlerecordReq) ProtoMessage() {} func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[35] + mi := &file_user_user_msg_proto_msgTypes[36] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1860,7 +1915,7 @@ func (x *UserBattlerecordReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserBattlerecordReq.ProtoReflect.Descriptor instead. func (*UserBattlerecordReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{35} + return file_user_user_msg_proto_rawDescGZIP(), []int{36} } func (x *UserBattlerecordReq) GetUid() string { @@ -1885,7 +1940,7 @@ type UserBattlerecordResp struct { func (x *UserBattlerecordResp) Reset() { *x = UserBattlerecordResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[36] + mi := &file_user_user_msg_proto_msgTypes[37] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1898,7 +1953,7 @@ func (x *UserBattlerecordResp) String() string { func (*UserBattlerecordResp) ProtoMessage() {} func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[36] + mi := &file_user_user_msg_proto_msgTypes[37] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1911,7 +1966,7 @@ func (x *UserBattlerecordResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserBattlerecordResp.ProtoReflect.Descriptor instead. func (*UserBattlerecordResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{36} + return file_user_user_msg_proto_rawDescGZIP(), []int{37} } func (x *UserBattlerecordResp) GetData() *DBUser { @@ -1961,7 +2016,7 @@ type UserSettingteamReq struct { func (x *UserSettingteamReq) Reset() { *x = UserSettingteamReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[37] + mi := &file_user_user_msg_proto_msgTypes[38] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1974,7 +2029,7 @@ func (x *UserSettingteamReq) String() string { func (*UserSettingteamReq) ProtoMessage() {} func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[37] + mi := &file_user_user_msg_proto_msgTypes[38] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1987,7 +2042,7 @@ func (x *UserSettingteamReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSettingteamReq.ProtoReflect.Descriptor instead. func (*UserSettingteamReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{37} + return file_user_user_msg_proto_rawDescGZIP(), []int{38} } func (x *UserSettingteamReq) GetHeroObjIds() []string { @@ -2008,7 +2063,7 @@ type UserSettingteamResp struct { func (x *UserSettingteamResp) Reset() { *x = UserSettingteamResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[38] + mi := &file_user_user_msg_proto_msgTypes[39] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2021,7 +2076,7 @@ func (x *UserSettingteamResp) String() string { func (*UserSettingteamResp) ProtoMessage() {} func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[38] + mi := &file_user_user_msg_proto_msgTypes[39] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2034,7 +2089,7 @@ func (x *UserSettingteamResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSettingteamResp.ProtoReflect.Descriptor instead. func (*UserSettingteamResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{38} + return file_user_user_msg_proto_rawDescGZIP(), []int{39} } func (x *UserSettingteamResp) GetUid() string { @@ -2054,7 +2109,7 @@ type UserShowteamReq struct { func (x *UserShowteamReq) Reset() { *x = UserShowteamReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[39] + mi := &file_user_user_msg_proto_msgTypes[40] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2067,7 +2122,7 @@ func (x *UserShowteamReq) String() string { func (*UserShowteamReq) ProtoMessage() {} func (x *UserShowteamReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[39] + mi := &file_user_user_msg_proto_msgTypes[40] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2080,7 +2135,7 @@ func (x *UserShowteamReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserShowteamReq.ProtoReflect.Descriptor instead. func (*UserShowteamReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{39} + return file_user_user_msg_proto_rawDescGZIP(), []int{40} } type UserShowteamResp struct { @@ -2094,7 +2149,7 @@ type UserShowteamResp struct { func (x *UserShowteamResp) Reset() { *x = UserShowteamResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[40] + mi := &file_user_user_msg_proto_msgTypes[41] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2107,7 +2162,7 @@ func (x *UserShowteamResp) String() string { func (*UserShowteamResp) ProtoMessage() {} func (x *UserShowteamResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[40] + mi := &file_user_user_msg_proto_msgTypes[41] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2120,7 +2175,7 @@ func (x *UserShowteamResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserShowteamResp.ProtoReflect.Descriptor instead. func (*UserShowteamResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{40} + return file_user_user_msg_proto_rawDescGZIP(), []int{41} } func (x *UserShowteamResp) GetHeroObjIds() []string { @@ -2142,7 +2197,7 @@ type UserOnlineResp struct { func (x *UserOnlineResp) Reset() { *x = UserOnlineResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[41] + mi := &file_user_user_msg_proto_msgTypes[42] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2155,7 +2210,7 @@ func (x *UserOnlineResp) String() string { func (*UserOnlineResp) ProtoMessage() {} func (x *UserOnlineResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[41] + mi := &file_user_user_msg_proto_msgTypes[42] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2168,7 +2223,7 @@ func (x *UserOnlineResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserOnlineResp.ProtoReflect.Descriptor instead. func (*UserOnlineResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{41} + return file_user_user_msg_proto_rawDescGZIP(), []int{42} } func (x *UserOnlineResp) GetUsers() []*CacheUser { @@ -2190,7 +2245,7 @@ type UserDataListResp struct { func (x *UserDataListResp) Reset() { *x = UserDataListResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[42] + mi := &file_user_user_msg_proto_msgTypes[43] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2203,7 +2258,7 @@ func (x *UserDataListResp) String() string { func (*UserDataListResp) ProtoMessage() {} func (x *UserDataListResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[42] + mi := &file_user_user_msg_proto_msgTypes[43] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2216,7 +2271,7 @@ func (x *UserDataListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserDataListResp.ProtoReflect.Descriptor instead. func (*UserDataListResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{42} + return file_user_user_msg_proto_rawDescGZIP(), []int{43} } func (x *UserDataListResp) GetUsers() []*DBUser { @@ -2235,7 +2290,7 @@ type UserGetServerDataReq struct { func (x *UserGetServerDataReq) Reset() { *x = UserGetServerDataReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[43] + mi := &file_user_user_msg_proto_msgTypes[44] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2248,7 +2303,7 @@ func (x *UserGetServerDataReq) String() string { func (*UserGetServerDataReq) ProtoMessage() {} func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[43] + mi := &file_user_user_msg_proto_msgTypes[44] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2261,7 +2316,7 @@ func (x *UserGetServerDataReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetServerDataReq.ProtoReflect.Descriptor instead. func (*UserGetServerDataReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{43} + return file_user_user_msg_proto_rawDescGZIP(), []int{44} } type UserGetServerDataResp struct { @@ -2275,7 +2330,7 @@ type UserGetServerDataResp struct { func (x *UserGetServerDataResp) Reset() { *x = UserGetServerDataResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[44] + mi := &file_user_user_msg_proto_msgTypes[45] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2288,7 +2343,7 @@ func (x *UserGetServerDataResp) String() string { func (*UserGetServerDataResp) ProtoMessage() {} func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[44] + mi := &file_user_user_msg_proto_msgTypes[45] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2301,7 +2356,7 @@ func (x *UserGetServerDataResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserGetServerDataResp.ProtoReflect.Descriptor instead. func (*UserGetServerDataResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{44} + return file_user_user_msg_proto_rawDescGZIP(), []int{45} } func (x *UserGetServerDataResp) GetData() *DBServerData { @@ -2320,7 +2375,7 @@ type UserSignReq struct { func (x *UserSignReq) Reset() { *x = UserSignReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[45] + mi := &file_user_user_msg_proto_msgTypes[46] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2333,7 +2388,7 @@ func (x *UserSignReq) String() string { func (*UserSignReq) ProtoMessage() {} func (x *UserSignReq) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[45] + mi := &file_user_user_msg_proto_msgTypes[46] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2346,7 +2401,7 @@ func (x *UserSignReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSignReq.ProtoReflect.Descriptor instead. func (*UserSignReq) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{45} + return file_user_user_msg_proto_rawDescGZIP(), []int{46} } // 推送签到信息 @@ -2362,7 +2417,7 @@ type UserSignResp struct { func (x *UserSignResp) Reset() { *x = UserSignResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_user_msg_proto_msgTypes[46] + mi := &file_user_user_msg_proto_msgTypes[47] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2375,7 +2430,7 @@ func (x *UserSignResp) String() string { func (*UserSignResp) ProtoMessage() {} func (x *UserSignResp) ProtoReflect() protoreflect.Message { - mi := &file_user_user_msg_proto_msgTypes[46] + mi := &file_user_user_msg_proto_msgTypes[47] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2388,7 +2443,7 @@ func (x *UserSignResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserSignResp.ProtoReflect.Descriptor instead. func (*UserSignResp) Descriptor() ([]byte, []int) { - return file_user_user_msg_proto_rawDescGZIP(), []int{46} + return file_user_user_msg_proto_rawDescGZIP(), []int{47} } func (x *UserSignResp) GetData() *DBSign { @@ -2456,7 +2511,7 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 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, 0xdc, 0x01, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0xee, 0x01, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, @@ -2470,125 +2525,129 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x2a, 0x0a, 0x16, - 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, - 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 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, 0x31, 0x0a, - 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, - 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, - 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, - 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, - 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, - 0x70, 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, 0x62, 0x67, 0x70, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, - 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, - 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 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, 0x1a, 0x0a, 0x08, 0x66, 0x69, - 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, - 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 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, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, - 0x72, 0x4c, 0x76, 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, 0x03, 0x52, 0x03, 0x65, - 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, - 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 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, 0x16, 0x0a, 0x06, 0x76, 0x69, - 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, - 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 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, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, - 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, - 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, - 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, - 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, - 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, - 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, - 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, - 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, + 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, + 0x76, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x69, 0x74, 0x22, 0x2a, + 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, + 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, + 0x65, 0x72, 0x56, 0x69, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, + 0x69, 0x74, 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, 0x53, 0x68, 0x6f, 0x77, - 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, - 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, - 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, - 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, - 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, - 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, - 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, - 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, - 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, - 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, - 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, + 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, + 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, + 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 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, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, + 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 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, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, + 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, 0x47, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 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, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, + 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, + 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 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, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, + 0x4c, 0x76, 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, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, + 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, + 0x64, 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, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, + 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, + 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, + 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, + 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, + 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, + 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, + 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, + 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, + 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 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, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, + 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, + 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, + 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, + 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, + 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, + 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, + 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, + 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, + 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, + 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, + 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, + 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, + 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, + 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2603,7 +2662,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, 47) +var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 48) var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginResp)(nil), // 1: UserLoginResp @@ -2618,69 +2677,70 @@ var file_user_user_msg_proto_goTypes = []interface{}{ (*UserCreateResp)(nil), // 10: UserCreateResp (*UserResChangedPush)(nil), // 11: UserResChangedPush (*UserOtherTermLoginPush)(nil), // 12: UserOtherTermLoginPush - (*UserGetSettingReq)(nil), // 13: UserGetSettingReq - (*UserGetSettingResp)(nil), // 14: UserGetSettingResp - (*UserUpdateSettingReq)(nil), // 15: UserUpdateSettingReq - (*UserUpdateSettingResp)(nil), // 16: UserUpdateSettingResp - (*UserVeriCodeReq)(nil), // 17: UserVeriCodeReq - (*UserVeriCodeResp)(nil), // 18: UserVeriCodeResp - (*UserInitdataReq)(nil), // 19: UserInitdataReq - (*UserInitdataResp)(nil), // 20: UserInitdataResp - (*UserModifynameReq)(nil), // 21: UserModifynameReq - (*UserModifynameResp)(nil), // 22: UserModifynameResp - (*UserModifyavatarReq)(nil), // 23: UserModifyavatarReq - (*UserModifyavatarResp)(nil), // 24: UserModifyavatarResp - (*UserModifybgpReq)(nil), // 25: UserModifybgpReq - (*UserModifybgpResp)(nil), // 26: UserModifybgpResp - (*UserModifyfigureReq)(nil), // 27: UserModifyfigureReq - (*UserModifyfigureResp)(nil), // 28: UserModifyfigureResp - (*UserGetTujianReq)(nil), // 29: UserGetTujianReq - (*UserGetTujianResp)(nil), // 30: UserGetTujianResp - (*UserLvChangedPush)(nil), // 31: UserLvChangedPush - (*UserVipChangedPush)(nil), // 32: UserVipChangedPush - (*UserModifysignReq)(nil), // 33: UserModifysignReq - (*UserModifysignResp)(nil), // 34: UserModifysignResp - (*UserBattlerecordReq)(nil), // 35: UserBattlerecordReq - (*UserBattlerecordResp)(nil), // 36: UserBattlerecordResp - (*UserSettingteamReq)(nil), // 37: UserSettingteamReq - (*UserSettingteamResp)(nil), // 38: UserSettingteamResp - (*UserShowteamReq)(nil), // 39: UserShowteamReq - (*UserShowteamResp)(nil), // 40: UserShowteamResp - (*UserOnlineResp)(nil), // 41: UserOnlineResp - (*UserDataListResp)(nil), // 42: UserDataListResp - (*UserGetServerDataReq)(nil), // 43: UserGetServerDataReq - (*UserGetServerDataResp)(nil), // 44: UserGetServerDataResp - (*UserSignReq)(nil), // 45: UserSignReq - (*UserSignResp)(nil), // 46: UserSignResp - (*DBUser)(nil), // 47: DBUser - (*DBUserExpand)(nil), // 48: DBUserExpand - (ErrorCode)(0), // 49: ErrorCode - (*CacheUser)(nil), // 50: CacheUser - (*DBUserSetting)(nil), // 51: DBUserSetting - (*DBPagodaRecord)(nil), // 52: DBPagodaRecord - (*DBHuntingRank)(nil), // 53: DBHuntingRank - (*DBVikingRank)(nil), // 54: DBVikingRank - (*DBServerData)(nil), // 55: DBServerData - (*DBSign)(nil), // 56: DBSign + (*UserVitChangedPush)(nil), // 13: UserVitChangedPush + (*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 + (*UserModifyavatarReq)(nil), // 24: UserModifyavatarReq + (*UserModifyavatarResp)(nil), // 25: UserModifyavatarResp + (*UserModifybgpReq)(nil), // 26: UserModifybgpReq + (*UserModifybgpResp)(nil), // 27: UserModifybgpResp + (*UserModifyfigureReq)(nil), // 28: UserModifyfigureReq + (*UserModifyfigureResp)(nil), // 29: UserModifyfigureResp + (*UserGetTujianReq)(nil), // 30: UserGetTujianReq + (*UserGetTujianResp)(nil), // 31: UserGetTujianResp + (*UserLvChangedPush)(nil), // 32: UserLvChangedPush + (*UserVipChangedPush)(nil), // 33: UserVipChangedPush + (*UserModifysignReq)(nil), // 34: UserModifysignReq + (*UserModifysignResp)(nil), // 35: UserModifysignResp + (*UserBattlerecordReq)(nil), // 36: UserBattlerecordReq + (*UserBattlerecordResp)(nil), // 37: UserBattlerecordResp + (*UserSettingteamReq)(nil), // 38: UserSettingteamReq + (*UserSettingteamResp)(nil), // 39: UserSettingteamResp + (*UserShowteamReq)(nil), // 40: UserShowteamReq + (*UserShowteamResp)(nil), // 41: UserShowteamResp + (*UserOnlineResp)(nil), // 42: UserOnlineResp + (*UserDataListResp)(nil), // 43: UserDataListResp + (*UserGetServerDataReq)(nil), // 44: UserGetServerDataReq + (*UserGetServerDataResp)(nil), // 45: UserGetServerDataResp + (*UserSignReq)(nil), // 46: UserSignReq + (*UserSignResp)(nil), // 47: UserSignResp + (*DBUser)(nil), // 48: DBUser + (*DBUserExpand)(nil), // 49: DBUserExpand + (ErrorCode)(0), // 50: ErrorCode + (*CacheUser)(nil), // 51: CacheUser + (*DBUserSetting)(nil), // 52: DBUserSetting + (*DBPagodaRecord)(nil), // 53: DBPagodaRecord + (*DBHuntingRank)(nil), // 54: DBHuntingRank + (*DBVikingRank)(nil), // 55: DBVikingRank + (*DBServerData)(nil), // 56: DBServerData + (*DBSign)(nil), // 57: DBSign } var file_user_user_msg_proto_depIdxs = []int32{ - 47, // 0: UserLoginResp.data:type_name -> DBUser - 48, // 1: UserLoginResp.ex:type_name -> DBUserExpand - 47, // 2: UserInfoResp.data:type_name -> DBUser - 48, // 3: UserInfoResp.ex:type_name -> DBUserExpand - 49, // 4: UserRegisterResp.Code:type_name -> ErrorCode - 50, // 5: UserLoadResp.data:type_name -> CacheUser - 51, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting - 51, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting - 47, // 8: UserBattlerecordResp.data:type_name -> DBUser - 48, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand - 52, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord - 53, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank - 54, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank - 50, // 13: UserOnlineResp.users:type_name -> CacheUser - 47, // 14: UserDataListResp.users:type_name -> DBUser - 55, // 15: UserGetServerDataResp.data:type_name -> DBServerData - 56, // 16: UserSignResp.data:type_name -> DBSign + 48, // 0: UserLoginResp.data:type_name -> DBUser + 49, // 1: UserLoginResp.ex:type_name -> DBUserExpand + 48, // 2: UserInfoResp.data:type_name -> DBUser + 49, // 3: UserInfoResp.ex:type_name -> DBUserExpand + 50, // 4: UserRegisterResp.Code:type_name -> ErrorCode + 51, // 5: UserLoadResp.data:type_name -> CacheUser + 52, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting + 52, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting + 48, // 8: UserBattlerecordResp.data:type_name -> DBUser + 49, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand + 53, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord + 54, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank + 55, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank + 51, // 13: UserOnlineResp.users:type_name -> CacheUser + 48, // 14: UserDataListResp.users:type_name -> DBUser + 56, // 15: UserGetServerDataResp.data:type_name -> DBServerData + 57, // 16: UserSignResp.data:type_name -> DBSign 17, // [17:17] is the sub-list for method output_type 17, // [17:17] is the sub-list for method input_type 17, // [17:17] is the sub-list for extension type_name @@ -2858,7 +2918,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.(*UserGetSettingReq); i { + switch v := v.(*UserVitChangedPush); i { case 0: return &v.state case 1: @@ -2870,7 +2930,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.(*UserGetSettingResp); i { + switch v := v.(*UserGetSettingReq); i { case 0: return &v.state case 1: @@ -2882,7 +2942,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.(*UserUpdateSettingReq); i { + switch v := v.(*UserGetSettingResp); i { case 0: return &v.state case 1: @@ -2894,7 +2954,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.(*UserUpdateSettingResp); i { + switch v := v.(*UserUpdateSettingReq); i { case 0: return &v.state case 1: @@ -2906,7 +2966,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.(*UserVeriCodeReq); i { + switch v := v.(*UserUpdateSettingResp); i { case 0: return &v.state case 1: @@ -2918,7 +2978,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.(*UserVeriCodeResp); i { + switch v := v.(*UserVeriCodeReq); i { case 0: return &v.state case 1: @@ -2930,7 +2990,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.(*UserInitdataReq); i { + switch v := v.(*UserVeriCodeResp); i { case 0: return &v.state case 1: @@ -2942,7 +3002,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.(*UserInitdataResp); i { + switch v := v.(*UserInitdataReq); i { case 0: return &v.state case 1: @@ -2954,7 +3014,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.(*UserModifynameReq); i { + switch v := v.(*UserInitdataResp); i { case 0: return &v.state case 1: @@ -2966,7 +3026,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.(*UserModifynameResp); i { + switch v := v.(*UserModifynameReq); i { case 0: return &v.state case 1: @@ -2978,7 +3038,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.(*UserModifyavatarReq); i { + switch v := v.(*UserModifynameResp); i { case 0: return &v.state case 1: @@ -2990,7 +3050,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.(*UserModifyavatarResp); i { + switch v := v.(*UserModifyavatarReq); i { case 0: return &v.state case 1: @@ -3002,7 +3062,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.(*UserModifybgpReq); i { + switch v := v.(*UserModifyavatarResp); i { case 0: return &v.state case 1: @@ -3014,7 +3074,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.(*UserModifybgpResp); i { + switch v := v.(*UserModifybgpReq); i { case 0: return &v.state case 1: @@ -3026,7 +3086,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.(*UserModifyfigureReq); i { + switch v := v.(*UserModifybgpResp); i { case 0: return &v.state case 1: @@ -3038,7 +3098,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifyfigureResp); i { + switch v := v.(*UserModifyfigureReq); i { case 0: return &v.state case 1: @@ -3050,7 +3110,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetTujianReq); i { + switch v := v.(*UserModifyfigureResp); i { case 0: return &v.state case 1: @@ -3062,7 +3122,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetTujianResp); i { + switch v := v.(*UserGetTujianReq); i { case 0: return &v.state case 1: @@ -3074,7 +3134,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserLvChangedPush); i { + switch v := v.(*UserGetTujianResp); i { case 0: return &v.state case 1: @@ -3086,7 +3146,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserVipChangedPush); i { + switch v := v.(*UserLvChangedPush); i { case 0: return &v.state case 1: @@ -3098,7 +3158,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifysignReq); i { + switch v := v.(*UserVipChangedPush); i { case 0: return &v.state case 1: @@ -3110,7 +3170,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserModifysignResp); i { + switch v := v.(*UserModifysignReq); i { case 0: return &v.state case 1: @@ -3122,7 +3182,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserBattlerecordReq); i { + switch v := v.(*UserModifysignResp); i { case 0: return &v.state case 1: @@ -3134,7 +3194,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserBattlerecordResp); i { + switch v := v.(*UserBattlerecordReq); i { case 0: return &v.state case 1: @@ -3146,7 +3206,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSettingteamReq); i { + switch v := v.(*UserBattlerecordResp); i { case 0: return &v.state case 1: @@ -3158,7 +3218,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSettingteamResp); i { + switch v := v.(*UserSettingteamReq); i { case 0: return &v.state case 1: @@ -3170,7 +3230,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserShowteamReq); i { + switch v := v.(*UserSettingteamResp); i { case 0: return &v.state case 1: @@ -3182,7 +3242,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserShowteamResp); i { + switch v := v.(*UserShowteamReq); i { case 0: return &v.state case 1: @@ -3194,7 +3254,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserOnlineResp); i { + switch v := v.(*UserShowteamResp); i { case 0: return &v.state case 1: @@ -3206,7 +3266,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserDataListResp); i { + switch v := v.(*UserOnlineResp); i { case 0: return &v.state case 1: @@ -3218,7 +3278,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetServerDataReq); i { + switch v := v.(*UserDataListResp); i { case 0: return &v.state case 1: @@ -3230,7 +3290,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserGetServerDataResp); i { + switch v := v.(*UserGetServerDataReq); i { case 0: return &v.state case 1: @@ -3242,7 +3302,7 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UserSignReq); i { + switch v := v.(*UserGetServerDataResp); i { case 0: return &v.state case 1: @@ -3254,6 +3314,18 @@ func file_user_user_msg_proto_init() { } } file_user_user_msg_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserSignReq); 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[47].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserSignResp); i { case 0: return &v.state @@ -3272,7 +3344,7 @@ func file_user_user_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_user_user_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 47, + NumMessages: 48, NumExtensions: 0, NumServices: 0, }, From 09efad7ccf49f35d51857c32edadb7dbc023f7fd Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 29 Dec 2022 15:46:26 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E4=B8=BB=E5=B1=9E=E6=80=A7=E8=AE=A1=E7=AE=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_equipattrlibrary.json | 696 ++++++++++++++++++ modules/equipment/api_wash.go | 2 +- modules/equipment/api_washconfirm.go | 2 +- modules/equipment/modelEquipment.go | 7 +- .../structs/game.equipAttrlibraryData.go | 2 + 5 files changed, 706 insertions(+), 3 deletions(-) diff --git a/bin/json/game_equipattrlibrary.json b/bin/json/game_equipattrlibrary.json index 3ca3ac6c4..6a6d9310e 100644 --- a/bin/json/game_equipattrlibrary.json +++ b/bin/json/game_equipattrlibrary.json @@ -4,6 +4,7 @@ "libraryid": 10001, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -18,6 +19,7 @@ "libraryid": 10002, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -32,6 +34,7 @@ "libraryid": 10002, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -46,6 +49,7 @@ "libraryid": 10002, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -60,6 +64,7 @@ "libraryid": 10002, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -74,6 +79,7 @@ "libraryid": 10002, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -88,6 +94,7 @@ "libraryid": 10002, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -102,6 +109,7 @@ "libraryid": 10003, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -116,6 +124,7 @@ "libraryid": 10004, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -130,6 +139,7 @@ "libraryid": 10004, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -144,6 +154,7 @@ "libraryid": 10004, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -158,6 +169,7 @@ "libraryid": 10004, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -172,6 +184,7 @@ "libraryid": 10004, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -186,6 +199,7 @@ "libraryid": 10004, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -200,6 +214,7 @@ "libraryid": 10005, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -214,6 +229,7 @@ "libraryid": 10006, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -228,6 +244,7 @@ "libraryid": 10006, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -242,6 +259,7 @@ "libraryid": 10006, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -256,6 +274,7 @@ "libraryid": 10006, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -270,6 +289,7 @@ "libraryid": 10006, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -284,6 +304,7 @@ "libraryid": 10006, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -298,6 +319,7 @@ "libraryid": 10011, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -312,6 +334,7 @@ "libraryid": 10012, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -326,6 +349,7 @@ "libraryid": 10012, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -340,6 +364,7 @@ "libraryid": 10012, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -354,6 +379,7 @@ "libraryid": 10012, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -368,6 +394,7 @@ "libraryid": 10012, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -382,6 +409,7 @@ "libraryid": 10012, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -396,6 +424,7 @@ "libraryid": 10013, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -410,6 +439,7 @@ "libraryid": 10014, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -424,6 +454,7 @@ "libraryid": 10014, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -438,6 +469,7 @@ "libraryid": 10014, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -452,6 +484,7 @@ "libraryid": 10014, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -466,6 +499,7 @@ "libraryid": 10014, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -480,6 +514,7 @@ "libraryid": 10014, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -494,6 +529,7 @@ "libraryid": 10015, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -508,6 +544,7 @@ "libraryid": 10016, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -522,6 +559,7 @@ "libraryid": 10016, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -536,6 +574,7 @@ "libraryid": 10016, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -550,6 +589,7 @@ "libraryid": 10016, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -564,6 +604,7 @@ "libraryid": 10016, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -578,6 +619,7 @@ "libraryid": 10016, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -592,6 +634,7 @@ "libraryid": 10021, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -606,6 +649,7 @@ "libraryid": 10022, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -620,6 +664,7 @@ "libraryid": 10022, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -634,6 +679,7 @@ "libraryid": 10022, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -648,6 +694,7 @@ "libraryid": 10022, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -662,6 +709,7 @@ "libraryid": 10022, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -676,6 +724,7 @@ "libraryid": 10022, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -690,6 +739,7 @@ "libraryid": 10023, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -704,6 +754,7 @@ "libraryid": 10024, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -718,6 +769,7 @@ "libraryid": 10024, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -732,6 +784,7 @@ "libraryid": 10024, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -746,6 +799,7 @@ "libraryid": 10024, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -760,6 +814,7 @@ "libraryid": 10024, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -774,6 +829,7 @@ "libraryid": 10024, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -788,6 +844,7 @@ "libraryid": 10025, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -802,6 +859,7 @@ "libraryid": 10026, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -816,6 +874,7 @@ "libraryid": 10026, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -830,6 +889,7 @@ "libraryid": 10026, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -844,6 +904,7 @@ "libraryid": 10026, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -858,6 +919,7 @@ "libraryid": 10026, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -872,6 +934,7 @@ "libraryid": 10026, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -886,6 +949,7 @@ "libraryid": 10031, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -900,6 +964,7 @@ "libraryid": 10032, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -914,6 +979,7 @@ "libraryid": 10032, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -928,6 +994,7 @@ "libraryid": 10032, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -942,6 +1009,7 @@ "libraryid": 10032, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -956,6 +1024,7 @@ "libraryid": 10032, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -970,6 +1039,7 @@ "libraryid": 10032, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -984,6 +1054,7 @@ "libraryid": 10033, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -998,6 +1069,7 @@ "libraryid": 10034, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1012,6 +1084,7 @@ "libraryid": 10034, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1026,6 +1099,7 @@ "libraryid": 10034, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1040,6 +1114,7 @@ "libraryid": 10034, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1054,6 +1129,7 @@ "libraryid": 10034, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1068,6 +1144,7 @@ "libraryid": 10034, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1082,6 +1159,7 @@ "libraryid": 10035, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1096,6 +1174,7 @@ "libraryid": 10036, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1110,6 +1189,7 @@ "libraryid": 10036, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1124,6 +1204,7 @@ "libraryid": 10036, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1138,6 +1219,7 @@ "libraryid": 10036, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1152,6 +1234,7 @@ "libraryid": 10036, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1166,6 +1249,7 @@ "libraryid": 10036, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1180,6 +1264,7 @@ "libraryid": 10041, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1194,6 +1279,7 @@ "libraryid": 10042, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1208,6 +1294,7 @@ "libraryid": 10042, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1222,6 +1309,7 @@ "libraryid": 10042, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1236,6 +1324,7 @@ "libraryid": 10042, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1250,6 +1339,7 @@ "libraryid": 10042, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1264,6 +1354,7 @@ "libraryid": 10042, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1278,6 +1369,7 @@ "libraryid": 10043, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1292,6 +1384,7 @@ "libraryid": 10044, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1306,6 +1399,7 @@ "libraryid": 10044, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1320,6 +1414,7 @@ "libraryid": 10044, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1334,6 +1429,7 @@ "libraryid": 10044, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1348,6 +1444,7 @@ "libraryid": 10044, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1362,6 +1459,7 @@ "libraryid": 10044, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1376,6 +1474,7 @@ "libraryid": 10045, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1390,6 +1489,7 @@ "libraryid": 10046, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1404,6 +1504,7 @@ "libraryid": 10046, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1418,6 +1519,7 @@ "libraryid": 10046, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1432,6 +1534,7 @@ "libraryid": 10046, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1446,6 +1549,7 @@ "libraryid": 10046, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1460,6 +1564,7 @@ "libraryid": 10046, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1474,6 +1579,7 @@ "libraryid": 10051, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1488,6 +1594,7 @@ "libraryid": 10052, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1502,6 +1609,7 @@ "libraryid": 10052, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1516,6 +1624,7 @@ "libraryid": 10052, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1530,6 +1639,7 @@ "libraryid": 10052, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1544,6 +1654,7 @@ "libraryid": 10052, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1558,6 +1669,7 @@ "libraryid": 10052, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1572,6 +1684,7 @@ "libraryid": 10053, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1586,6 +1699,7 @@ "libraryid": 10054, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1600,6 +1714,7 @@ "libraryid": 10054, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1614,6 +1729,7 @@ "libraryid": 10054, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1628,6 +1744,7 @@ "libraryid": 10054, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1642,6 +1759,7 @@ "libraryid": 10054, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1656,6 +1774,7 @@ "libraryid": 10054, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1670,6 +1789,7 @@ "libraryid": 10055, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1684,6 +1804,7 @@ "libraryid": 10056, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1698,6 +1819,7 @@ "libraryid": 10056, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1712,6 +1834,7 @@ "libraryid": 10056, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1726,6 +1849,7 @@ "libraryid": 10056, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1740,6 +1864,7 @@ "libraryid": 10056, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1754,6 +1879,7 @@ "libraryid": 10056, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1768,6 +1894,7 @@ "libraryid": 1001, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1782,6 +1909,7 @@ "libraryid": 1001, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1796,6 +1924,7 @@ "libraryid": 1001, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1810,6 +1939,7 @@ "libraryid": 1001, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1824,6 +1954,7 @@ "libraryid": 1001, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1838,6 +1969,7 @@ "libraryid": 1001, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1852,6 +1984,7 @@ "libraryid": 11001, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1866,6 +1999,7 @@ "libraryid": 11002, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1880,6 +2014,7 @@ "libraryid": 11002, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1894,6 +2029,7 @@ "libraryid": 11002, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -1908,6 +2044,7 @@ "libraryid": 11002, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1922,6 +2059,7 @@ "libraryid": 11002, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1936,6 +2074,7 @@ "libraryid": 11002, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -1950,6 +2089,7 @@ "libraryid": 11003, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -1964,6 +2104,7 @@ "libraryid": 11004, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1978,6 +2119,7 @@ "libraryid": 11004, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -1992,6 +2134,7 @@ "libraryid": 11004, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2006,6 +2149,7 @@ "libraryid": 11004, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2020,6 +2164,7 @@ "libraryid": 11004, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2034,6 +2179,7 @@ "libraryid": 11004, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2048,6 +2194,7 @@ "libraryid": 11005, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2062,6 +2209,7 @@ "libraryid": 11006, "attrkey": "atk", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2076,6 +2224,7 @@ "libraryid": 11006, "attrkey": "def", "attrvar": 20, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2090,6 +2239,7 @@ "libraryid": 11006, "attrkey": "hp", "attrvar": 100, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2104,6 +2254,7 @@ "libraryid": 11006, "attrkey": "atkpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2118,6 +2269,7 @@ "libraryid": 11006, "attrkey": "defpro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2132,6 +2284,7 @@ "libraryid": 11006, "attrkey": "hppro", "attrvar": 20, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2146,6 +2299,7 @@ "libraryid": 11011, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2160,6 +2314,7 @@ "libraryid": 11012, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2174,6 +2329,7 @@ "libraryid": 11012, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2188,6 +2344,7 @@ "libraryid": 11012, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2202,6 +2359,7 @@ "libraryid": 11012, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2216,6 +2374,7 @@ "libraryid": 11012, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2230,6 +2389,7 @@ "libraryid": 11012, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2244,6 +2404,7 @@ "libraryid": 11013, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2258,6 +2419,7 @@ "libraryid": 11014, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2272,6 +2434,7 @@ "libraryid": 11014, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2286,6 +2449,7 @@ "libraryid": 11014, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2300,6 +2464,7 @@ "libraryid": 11014, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2314,6 +2479,7 @@ "libraryid": 11014, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2328,6 +2494,7 @@ "libraryid": 11014, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2342,6 +2509,7 @@ "libraryid": 11015, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2356,6 +2524,7 @@ "libraryid": 11016, "attrkey": "atk", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2370,6 +2539,7 @@ "libraryid": 11016, "attrkey": "def", "attrvar": 26, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2384,6 +2554,7 @@ "libraryid": 11016, "attrkey": "hp", "attrvar": 130, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2398,6 +2569,7 @@ "libraryid": 11016, "attrkey": "atkpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2412,6 +2584,7 @@ "libraryid": 11016, "attrkey": "defpro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2426,6 +2599,7 @@ "libraryid": 11016, "attrkey": "hppro", "attrvar": 26, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2440,6 +2614,7 @@ "libraryid": 11021, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2454,6 +2629,7 @@ "libraryid": 11022, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2468,6 +2644,7 @@ "libraryid": 11022, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2482,6 +2659,7 @@ "libraryid": 11022, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2496,6 +2674,7 @@ "libraryid": 11022, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2510,6 +2689,7 @@ "libraryid": 11022, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2524,6 +2704,7 @@ "libraryid": 11022, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2538,6 +2719,7 @@ "libraryid": 11023, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2552,6 +2734,7 @@ "libraryid": 11024, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2566,6 +2749,7 @@ "libraryid": 11024, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2580,6 +2764,7 @@ "libraryid": 11024, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2594,6 +2779,7 @@ "libraryid": 11024, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2608,6 +2794,7 @@ "libraryid": 11024, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2622,6 +2809,7 @@ "libraryid": 11024, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2636,6 +2824,7 @@ "libraryid": 11025, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2650,6 +2839,7 @@ "libraryid": 11026, "attrkey": "atk", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2664,6 +2854,7 @@ "libraryid": 11026, "attrkey": "def", "attrvar": 33, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2678,6 +2869,7 @@ "libraryid": 11026, "attrkey": "hp", "attrvar": 169, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2692,6 +2884,7 @@ "libraryid": 11026, "attrkey": "atkpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2706,6 +2899,7 @@ "libraryid": 11026, "attrkey": "defpro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2720,6 +2914,7 @@ "libraryid": 11026, "attrkey": "hppro", "attrvar": 33, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2734,6 +2929,7 @@ "libraryid": 11031, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2748,6 +2944,7 @@ "libraryid": 11032, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2762,6 +2959,7 @@ "libraryid": 11032, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2776,6 +2974,7 @@ "libraryid": 11032, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2790,6 +2989,7 @@ "libraryid": 11032, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2804,6 +3004,7 @@ "libraryid": 11032, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2818,6 +3019,7 @@ "libraryid": 11032, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2832,6 +3034,7 @@ "libraryid": 11033, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2846,6 +3049,7 @@ "libraryid": 11034, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2860,6 +3064,7 @@ "libraryid": 11034, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2874,6 +3079,7 @@ "libraryid": 11034, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2888,6 +3094,7 @@ "libraryid": 11034, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2902,6 +3109,7 @@ "libraryid": 11034, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2916,6 +3124,7 @@ "libraryid": 11034, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -2930,6 +3139,7 @@ "libraryid": 11035, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -2944,6 +3154,7 @@ "libraryid": 11036, "attrkey": "atk", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2958,6 +3169,7 @@ "libraryid": 11036, "attrkey": "def", "attrvar": 42, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -2972,6 +3184,7 @@ "libraryid": 11036, "attrkey": "hp", "attrvar": 219, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -2986,6 +3199,7 @@ "libraryid": 11036, "attrkey": "atkpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3000,6 +3214,7 @@ "libraryid": 11036, "attrkey": "defpro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3014,6 +3229,7 @@ "libraryid": 11036, "attrkey": "hppro", "attrvar": 42, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3028,6 +3244,7 @@ "libraryid": 11041, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3042,6 +3259,7 @@ "libraryid": 11042, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3056,6 +3274,7 @@ "libraryid": 11042, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3070,6 +3289,7 @@ "libraryid": 11042, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3084,6 +3304,7 @@ "libraryid": 11042, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3098,6 +3319,7 @@ "libraryid": 11042, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3112,6 +3334,7 @@ "libraryid": 11042, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3126,6 +3349,7 @@ "libraryid": 11043, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3140,6 +3364,7 @@ "libraryid": 11044, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3154,6 +3379,7 @@ "libraryid": 11044, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3168,6 +3394,7 @@ "libraryid": 11044, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3182,6 +3409,7 @@ "libraryid": 11044, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3196,6 +3424,7 @@ "libraryid": 11044, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3210,6 +3439,7 @@ "libraryid": 11044, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3224,6 +3454,7 @@ "libraryid": 11045, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3238,6 +3469,7 @@ "libraryid": 11046, "attrkey": "atk", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3252,6 +3484,7 @@ "libraryid": 11046, "attrkey": "def", "attrvar": 54, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3266,6 +3499,7 @@ "libraryid": 11046, "attrkey": "hp", "attrvar": 284, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3280,6 +3514,7 @@ "libraryid": 11046, "attrkey": "atkpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3294,6 +3529,7 @@ "libraryid": 11046, "attrkey": "defpro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3308,6 +3544,7 @@ "libraryid": 11046, "attrkey": "hppro", "attrvar": 54, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3322,6 +3559,7 @@ "libraryid": 11051, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3336,6 +3574,7 @@ "libraryid": 11052, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3350,6 +3589,7 @@ "libraryid": 11052, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3364,6 +3604,7 @@ "libraryid": 11052, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3378,6 +3619,7 @@ "libraryid": 11052, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3392,6 +3634,7 @@ "libraryid": 11052, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3406,6 +3649,7 @@ "libraryid": 11052, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3420,6 +3664,7 @@ "libraryid": 11053, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3434,6 +3679,7 @@ "libraryid": 11054, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3448,6 +3694,7 @@ "libraryid": 11054, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3462,6 +3709,7 @@ "libraryid": 11054, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3476,6 +3724,7 @@ "libraryid": 11054, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3490,6 +3739,7 @@ "libraryid": 11054, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3504,6 +3754,7 @@ "libraryid": 11054, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3518,6 +3769,7 @@ "libraryid": 11055, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 1000, "Addition": [ 800, @@ -3532,6 +3784,7 @@ "libraryid": 11056, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3546,6 +3799,7 @@ "libraryid": 11056, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3560,6 +3814,7 @@ "libraryid": 11056, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3574,6 +3829,7 @@ "libraryid": 11056, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3588,6 +3844,7 @@ "libraryid": 11056, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3602,6 +3859,7 @@ "libraryid": 11056, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3616,6 +3874,7 @@ "libraryid": 1101, "attrkey": "atk", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3630,6 +3889,7 @@ "libraryid": 1101, "attrkey": "def", "attrvar": 70, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -3644,6 +3904,7 @@ "libraryid": 1101, "attrkey": "hp", "attrvar": 369, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -3658,6 +3919,7 @@ "libraryid": 1101, "attrkey": "atkpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3672,6 +3934,7 @@ "libraryid": 1101, "attrkey": "defpro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3686,6 +3949,7 @@ "libraryid": 1101, "attrkey": "hppro", "attrvar": 70, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -3700,6 +3964,7 @@ "libraryid": 20001, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3708,6 +3973,7 @@ "libraryid": 20001, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3716,6 +3982,7 @@ "libraryid": 20001, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3724,6 +3991,7 @@ "libraryid": 20001, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3732,6 +4000,7 @@ "libraryid": 20001, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3740,6 +4009,7 @@ "libraryid": 20001, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3748,6 +4018,7 @@ "libraryid": 20001, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3756,6 +4027,7 @@ "libraryid": 20001, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3764,6 +4036,7 @@ "libraryid": 20001, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3772,6 +4045,7 @@ "libraryid": 20001, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3780,6 +4054,7 @@ "libraryid": 20001, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3788,6 +4063,7 @@ "libraryid": 20001, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3796,6 +4072,7 @@ "libraryid": 20001, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3804,6 +4081,7 @@ "libraryid": 20001, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3812,6 +4090,7 @@ "libraryid": 20001, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3820,6 +4099,7 @@ "libraryid": 20001, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3828,6 +4108,7 @@ "libraryid": 20001, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3836,6 +4117,7 @@ "libraryid": 20001, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3844,6 +4126,7 @@ "libraryid": 20001, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3852,6 +4135,7 @@ "libraryid": 20001, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3860,6 +4144,7 @@ "libraryid": 20001, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3868,6 +4153,7 @@ "libraryid": 20001, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3876,6 +4162,7 @@ "libraryid": 20001, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3884,6 +4171,7 @@ "libraryid": 20001, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3892,6 +4180,7 @@ "libraryid": 20001, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3900,6 +4189,7 @@ "libraryid": 20001, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3908,6 +4198,7 @@ "libraryid": 20001, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3916,6 +4207,7 @@ "libraryid": 20001, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3924,6 +4216,7 @@ "libraryid": 20001, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3932,6 +4225,7 @@ "libraryid": 20002, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3940,6 +4234,7 @@ "libraryid": 20002, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3948,6 +4243,7 @@ "libraryid": 20002, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3956,6 +4252,7 @@ "libraryid": 20002, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3964,6 +4261,7 @@ "libraryid": 20002, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3972,6 +4270,7 @@ "libraryid": 20002, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3980,6 +4279,7 @@ "libraryid": 20002, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3988,6 +4288,7 @@ "libraryid": 20002, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -3996,6 +4297,7 @@ "libraryid": 20002, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4004,6 +4306,7 @@ "libraryid": 20002, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4012,6 +4315,7 @@ "libraryid": 20002, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4020,6 +4324,7 @@ "libraryid": 20002, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4028,6 +4333,7 @@ "libraryid": 20002, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4036,6 +4342,7 @@ "libraryid": 20002, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4044,6 +4351,7 @@ "libraryid": 20002, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4052,6 +4360,7 @@ "libraryid": 20002, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4060,6 +4369,7 @@ "libraryid": 20002, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4068,6 +4378,7 @@ "libraryid": 20002, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4076,6 +4387,7 @@ "libraryid": 20002, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4084,6 +4396,7 @@ "libraryid": 20002, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4092,6 +4405,7 @@ "libraryid": 20002, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4100,6 +4414,7 @@ "libraryid": 20002, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4108,6 +4423,7 @@ "libraryid": 20002, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4116,6 +4432,7 @@ "libraryid": 20002, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4124,6 +4441,7 @@ "libraryid": 20002, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4132,6 +4450,7 @@ "libraryid": 20002, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4140,6 +4459,7 @@ "libraryid": 20002, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4148,6 +4468,7 @@ "libraryid": 20002, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4156,6 +4477,7 @@ "libraryid": 20002, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4164,6 +4486,7 @@ "libraryid": 20003, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4172,6 +4495,7 @@ "libraryid": 20003, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4180,6 +4504,7 @@ "libraryid": 20003, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4188,6 +4513,7 @@ "libraryid": 20003, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4196,6 +4522,7 @@ "libraryid": 20003, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4204,6 +4531,7 @@ "libraryid": 20003, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4212,6 +4540,7 @@ "libraryid": 20003, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4220,6 +4549,7 @@ "libraryid": 20003, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4228,6 +4558,7 @@ "libraryid": 20003, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4236,6 +4567,7 @@ "libraryid": 20003, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4244,6 +4576,7 @@ "libraryid": 20003, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4252,6 +4585,7 @@ "libraryid": 20003, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4260,6 +4594,7 @@ "libraryid": 20003, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4268,6 +4603,7 @@ "libraryid": 20003, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4276,6 +4612,7 @@ "libraryid": 20003, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4284,6 +4621,7 @@ "libraryid": 20003, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4292,6 +4630,7 @@ "libraryid": 20003, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4300,6 +4639,7 @@ "libraryid": 20003, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4308,6 +4648,7 @@ "libraryid": 20003, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4316,6 +4657,7 @@ "libraryid": 20003, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4324,6 +4666,7 @@ "libraryid": 20003, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4332,6 +4675,7 @@ "libraryid": 20003, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4340,6 +4684,7 @@ "libraryid": 20003, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4348,6 +4693,7 @@ "libraryid": 20003, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4356,6 +4702,7 @@ "libraryid": 20003, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4364,6 +4711,7 @@ "libraryid": 20003, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4372,6 +4720,7 @@ "libraryid": 20003, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4380,6 +4729,7 @@ "libraryid": 20003, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4388,6 +4738,7 @@ "libraryid": 20003, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4396,6 +4747,7 @@ "libraryid": 20004, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4404,6 +4756,7 @@ "libraryid": 20004, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4412,6 +4765,7 @@ "libraryid": 20004, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4420,6 +4774,7 @@ "libraryid": 20004, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4428,6 +4783,7 @@ "libraryid": 20004, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4436,6 +4792,7 @@ "libraryid": 20004, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4444,6 +4801,7 @@ "libraryid": 20004, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4452,6 +4810,7 @@ "libraryid": 20004, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4460,6 +4819,7 @@ "libraryid": 20004, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4468,6 +4828,7 @@ "libraryid": 20004, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4476,6 +4837,7 @@ "libraryid": 20004, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4484,6 +4846,7 @@ "libraryid": 20004, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4492,6 +4855,7 @@ "libraryid": 20004, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4500,6 +4864,7 @@ "libraryid": 20004, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4508,6 +4873,7 @@ "libraryid": 20004, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4516,6 +4882,7 @@ "libraryid": 20004, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4524,6 +4891,7 @@ "libraryid": 20004, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4532,6 +4900,7 @@ "libraryid": 20004, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4540,6 +4909,7 @@ "libraryid": 20004, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4548,6 +4918,7 @@ "libraryid": 20004, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4556,6 +4927,7 @@ "libraryid": 20004, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4564,6 +4936,7 @@ "libraryid": 20004, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4572,6 +4945,7 @@ "libraryid": 20004, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4580,6 +4954,7 @@ "libraryid": 20004, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4588,6 +4963,7 @@ "libraryid": 20004, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4596,6 +4972,7 @@ "libraryid": 20004, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4604,6 +4981,7 @@ "libraryid": 20004, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4612,6 +4990,7 @@ "libraryid": 20004, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4620,6 +4999,7 @@ "libraryid": 20004, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4628,6 +5008,7 @@ "libraryid": 20005, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4636,6 +5017,7 @@ "libraryid": 20005, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4644,6 +5026,7 @@ "libraryid": 20005, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4652,6 +5035,7 @@ "libraryid": 20005, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4660,6 +5044,7 @@ "libraryid": 20005, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4668,6 +5053,7 @@ "libraryid": 20005, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4676,6 +5062,7 @@ "libraryid": 20005, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4684,6 +5071,7 @@ "libraryid": 20005, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4692,6 +5080,7 @@ "libraryid": 20005, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4700,6 +5089,7 @@ "libraryid": 20005, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4708,6 +5098,7 @@ "libraryid": 20005, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4716,6 +5107,7 @@ "libraryid": 20005, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4724,6 +5116,7 @@ "libraryid": 20005, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4732,6 +5125,7 @@ "libraryid": 20005, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4740,6 +5134,7 @@ "libraryid": 20005, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4748,6 +5143,7 @@ "libraryid": 20005, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4756,6 +5152,7 @@ "libraryid": 20005, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4764,6 +5161,7 @@ "libraryid": 20005, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4772,6 +5170,7 @@ "libraryid": 20005, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4780,6 +5179,7 @@ "libraryid": 20005, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4788,6 +5188,7 @@ "libraryid": 20005, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4796,6 +5197,7 @@ "libraryid": 20005, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4804,6 +5206,7 @@ "libraryid": 20005, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4812,6 +5215,7 @@ "libraryid": 20005, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4820,6 +5224,7 @@ "libraryid": 20005, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4828,6 +5233,7 @@ "libraryid": 20005, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4836,6 +5242,7 @@ "libraryid": 20005, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4844,6 +5251,7 @@ "libraryid": 20005, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4852,6 +5260,7 @@ "libraryid": 20005, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4860,6 +5269,7 @@ "libraryid": 20006, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4868,6 +5278,7 @@ "libraryid": 20006, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4876,6 +5287,7 @@ "libraryid": 20006, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4884,6 +5296,7 @@ "libraryid": 20006, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4892,6 +5305,7 @@ "libraryid": 20006, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4900,6 +5314,7 @@ "libraryid": 20006, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4908,6 +5323,7 @@ "libraryid": 20006, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4916,6 +5332,7 @@ "libraryid": 20006, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4924,6 +5341,7 @@ "libraryid": 20006, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4932,6 +5350,7 @@ "libraryid": 20006, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4940,6 +5359,7 @@ "libraryid": 20006, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4948,6 +5368,7 @@ "libraryid": 20006, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4956,6 +5377,7 @@ "libraryid": 20006, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4964,6 +5386,7 @@ "libraryid": 20006, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4972,6 +5395,7 @@ "libraryid": 20006, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4980,6 +5404,7 @@ "libraryid": 20006, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4988,6 +5413,7 @@ "libraryid": 20006, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -4996,6 +5422,7 @@ "libraryid": 20006, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5004,6 +5431,7 @@ "libraryid": 20006, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5012,6 +5440,7 @@ "libraryid": 20006, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5020,6 +5449,7 @@ "libraryid": 20006, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5028,6 +5458,7 @@ "libraryid": 20006, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5036,6 +5467,7 @@ "libraryid": 20006, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5044,6 +5476,7 @@ "libraryid": 20006, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5052,6 +5485,7 @@ "libraryid": 20006, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5060,6 +5494,7 @@ "libraryid": 20006, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5068,6 +5503,7 @@ "libraryid": 20006, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5076,6 +5512,7 @@ "libraryid": 20006, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5084,6 +5521,7 @@ "libraryid": 20006, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5092,6 +5530,7 @@ "libraryid": 20101, "attrkey": "atk", "attrvar": 1, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -5106,6 +5545,7 @@ "libraryid": 20101, "attrkey": "def", "attrvar": 1, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -5120,6 +5560,7 @@ "libraryid": 20101, "attrkey": "hp", "attrvar": 1, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -5134,6 +5575,7 @@ "libraryid": 20101, "attrkey": "atkpro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -5148,6 +5590,7 @@ "libraryid": 20101, "attrkey": "defpro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -5162,6 +5605,7 @@ "libraryid": 20101, "attrkey": "hppro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -5176,6 +5620,7 @@ "libraryid": 30001, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5184,6 +5629,7 @@ "libraryid": 30001, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5192,6 +5638,7 @@ "libraryid": 30001, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5200,6 +5647,7 @@ "libraryid": 30001, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5208,6 +5656,7 @@ "libraryid": 30001, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5216,6 +5665,7 @@ "libraryid": 30001, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5224,6 +5674,7 @@ "libraryid": 30001, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5232,6 +5683,7 @@ "libraryid": 30001, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5240,6 +5692,7 @@ "libraryid": 30001, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5248,6 +5701,7 @@ "libraryid": 30001, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5256,6 +5710,7 @@ "libraryid": 30001, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5264,6 +5719,7 @@ "libraryid": 30001, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5272,6 +5728,7 @@ "libraryid": 30001, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5280,6 +5737,7 @@ "libraryid": 30001, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5288,6 +5746,7 @@ "libraryid": 30001, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5296,6 +5755,7 @@ "libraryid": 30001, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5304,6 +5764,7 @@ "libraryid": 30001, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5312,6 +5773,7 @@ "libraryid": 30001, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5320,6 +5782,7 @@ "libraryid": 30001, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5328,6 +5791,7 @@ "libraryid": 30001, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5336,6 +5800,7 @@ "libraryid": 30001, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5344,6 +5809,7 @@ "libraryid": 30001, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5352,6 +5818,7 @@ "libraryid": 30001, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5360,6 +5827,7 @@ "libraryid": 30001, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5368,6 +5836,7 @@ "libraryid": 30001, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5376,6 +5845,7 @@ "libraryid": 30001, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5384,6 +5854,7 @@ "libraryid": 30001, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5392,6 +5863,7 @@ "libraryid": 30001, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5400,6 +5872,7 @@ "libraryid": 30001, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5408,6 +5881,7 @@ "libraryid": 30001, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5416,6 +5890,7 @@ "libraryid": 30001, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5424,6 +5899,7 @@ "libraryid": 30001, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5432,6 +5908,7 @@ "libraryid": 30001, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5440,6 +5917,7 @@ "libraryid": 30001, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5448,6 +5926,7 @@ "libraryid": 30001, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5456,6 +5935,7 @@ "libraryid": 30001, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5464,6 +5944,7 @@ "libraryid": 30001, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5472,6 +5953,7 @@ "libraryid": 30001, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5480,6 +5962,7 @@ "libraryid": 30001, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5488,6 +5971,7 @@ "libraryid": 30001, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5496,6 +5980,7 @@ "libraryid": 30001, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5504,6 +5989,7 @@ "libraryid": 30002, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5512,6 +5998,7 @@ "libraryid": 30002, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5520,6 +6007,7 @@ "libraryid": 30002, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5528,6 +6016,7 @@ "libraryid": 30002, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5536,6 +6025,7 @@ "libraryid": 30002, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5544,6 +6034,7 @@ "libraryid": 30002, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5552,6 +6043,7 @@ "libraryid": 30002, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5560,6 +6052,7 @@ "libraryid": 30002, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5568,6 +6061,7 @@ "libraryid": 30002, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5576,6 +6070,7 @@ "libraryid": 30002, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5584,6 +6079,7 @@ "libraryid": 30002, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5592,6 +6088,7 @@ "libraryid": 30002, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5600,6 +6097,7 @@ "libraryid": 30002, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5608,6 +6106,7 @@ "libraryid": 30002, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5616,6 +6115,7 @@ "libraryid": 30002, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5624,6 +6124,7 @@ "libraryid": 30002, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5632,6 +6133,7 @@ "libraryid": 30002, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5640,6 +6142,7 @@ "libraryid": 30002, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5648,6 +6151,7 @@ "libraryid": 30002, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5656,6 +6160,7 @@ "libraryid": 30002, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5664,6 +6169,7 @@ "libraryid": 30002, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5672,6 +6178,7 @@ "libraryid": 30002, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5680,6 +6187,7 @@ "libraryid": 30002, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5688,6 +6196,7 @@ "libraryid": 30002, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5696,6 +6205,7 @@ "libraryid": 30002, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5704,6 +6214,7 @@ "libraryid": 30002, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5712,6 +6223,7 @@ "libraryid": 30002, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5720,6 +6232,7 @@ "libraryid": 30002, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5728,6 +6241,7 @@ "libraryid": 30002, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5736,6 +6250,7 @@ "libraryid": 30002, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5744,6 +6259,7 @@ "libraryid": 30002, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5752,6 +6268,7 @@ "libraryid": 30002, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5760,6 +6277,7 @@ "libraryid": 30002, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5768,6 +6286,7 @@ "libraryid": 30002, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5776,6 +6295,7 @@ "libraryid": 30002, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5784,6 +6304,7 @@ "libraryid": 30002, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5792,6 +6313,7 @@ "libraryid": 30002, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5800,6 +6322,7 @@ "libraryid": 30002, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5808,6 +6331,7 @@ "libraryid": 30002, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5816,6 +6340,7 @@ "libraryid": 30002, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5824,6 +6349,7 @@ "libraryid": 30002, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5832,6 +6358,7 @@ "libraryid": 30003, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5840,6 +6367,7 @@ "libraryid": 30003, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5848,6 +6376,7 @@ "libraryid": 30003, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5856,6 +6385,7 @@ "libraryid": 30003, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5864,6 +6394,7 @@ "libraryid": 30003, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5872,6 +6403,7 @@ "libraryid": 30003, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5880,6 +6412,7 @@ "libraryid": 30003, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5888,6 +6421,7 @@ "libraryid": 30003, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5896,6 +6430,7 @@ "libraryid": 30003, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5904,6 +6439,7 @@ "libraryid": 30003, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5912,6 +6448,7 @@ "libraryid": 30003, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5920,6 +6457,7 @@ "libraryid": 30003, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5928,6 +6466,7 @@ "libraryid": 30003, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5936,6 +6475,7 @@ "libraryid": 30003, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5944,6 +6484,7 @@ "libraryid": 30003, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5952,6 +6493,7 @@ "libraryid": 30003, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5960,6 +6502,7 @@ "libraryid": 30003, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5968,6 +6511,7 @@ "libraryid": 30003, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5976,6 +6520,7 @@ "libraryid": 30003, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5984,6 +6529,7 @@ "libraryid": 30003, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -5992,6 +6538,7 @@ "libraryid": 30003, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6000,6 +6547,7 @@ "libraryid": 30003, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6008,6 +6556,7 @@ "libraryid": 30003, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6016,6 +6565,7 @@ "libraryid": 30003, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6024,6 +6574,7 @@ "libraryid": 30003, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6032,6 +6583,7 @@ "libraryid": 30003, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6040,6 +6592,7 @@ "libraryid": 30003, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6048,6 +6601,7 @@ "libraryid": 30003, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6056,6 +6610,7 @@ "libraryid": 30003, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6064,6 +6619,7 @@ "libraryid": 30003, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6072,6 +6628,7 @@ "libraryid": 30003, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6080,6 +6637,7 @@ "libraryid": 30003, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6088,6 +6646,7 @@ "libraryid": 30003, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6096,6 +6655,7 @@ "libraryid": 30003, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6104,6 +6664,7 @@ "libraryid": 30003, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6112,6 +6673,7 @@ "libraryid": 30003, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6120,6 +6682,7 @@ "libraryid": 30003, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6128,6 +6691,7 @@ "libraryid": 30003, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6136,6 +6700,7 @@ "libraryid": 30003, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6144,6 +6709,7 @@ "libraryid": 30003, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6152,6 +6718,7 @@ "libraryid": 30003, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6160,6 +6727,7 @@ "libraryid": 30004, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6168,6 +6736,7 @@ "libraryid": 30004, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6176,6 +6745,7 @@ "libraryid": 30004, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6184,6 +6754,7 @@ "libraryid": 30004, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6192,6 +6763,7 @@ "libraryid": 30004, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6200,6 +6772,7 @@ "libraryid": 30004, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6208,6 +6781,7 @@ "libraryid": 30004, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6216,6 +6790,7 @@ "libraryid": 30004, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6224,6 +6799,7 @@ "libraryid": 30004, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6232,6 +6808,7 @@ "libraryid": 30004, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6240,6 +6817,7 @@ "libraryid": 30004, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6248,6 +6826,7 @@ "libraryid": 30004, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6256,6 +6835,7 @@ "libraryid": 30004, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6264,6 +6844,7 @@ "libraryid": 30004, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6272,6 +6853,7 @@ "libraryid": 30004, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6280,6 +6862,7 @@ "libraryid": 30004, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6288,6 +6871,7 @@ "libraryid": 30004, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6296,6 +6880,7 @@ "libraryid": 30004, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6304,6 +6889,7 @@ "libraryid": 30004, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6312,6 +6898,7 @@ "libraryid": 30004, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6320,6 +6907,7 @@ "libraryid": 30004, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6328,6 +6916,7 @@ "libraryid": 30004, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6336,6 +6925,7 @@ "libraryid": 30004, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6344,6 +6934,7 @@ "libraryid": 30004, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6352,6 +6943,7 @@ "libraryid": 30004, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6360,6 +6952,7 @@ "libraryid": 30004, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6368,6 +6961,7 @@ "libraryid": 30004, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6376,6 +6970,7 @@ "libraryid": 30004, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6384,6 +6979,7 @@ "libraryid": 30004, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6392,6 +6988,7 @@ "libraryid": 30004, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6400,6 +6997,7 @@ "libraryid": 30004, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6408,6 +7006,7 @@ "libraryid": 30004, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6416,6 +7015,7 @@ "libraryid": 30004, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6424,6 +7024,7 @@ "libraryid": 30004, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6432,6 +7033,7 @@ "libraryid": 30004, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6440,6 +7042,7 @@ "libraryid": 30004, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6448,6 +7051,7 @@ "libraryid": 30004, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6456,6 +7060,7 @@ "libraryid": 30004, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6464,6 +7069,7 @@ "libraryid": 30004, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6472,6 +7078,7 @@ "libraryid": 30004, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6480,6 +7087,7 @@ "libraryid": 30004, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6488,6 +7096,7 @@ "libraryid": 30005, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6496,6 +7105,7 @@ "libraryid": 30005, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6504,6 +7114,7 @@ "libraryid": 30005, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6512,6 +7123,7 @@ "libraryid": 30005, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6520,6 +7132,7 @@ "libraryid": 30005, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6528,6 +7141,7 @@ "libraryid": 30005, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6536,6 +7150,7 @@ "libraryid": 30005, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6544,6 +7159,7 @@ "libraryid": 30005, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6552,6 +7168,7 @@ "libraryid": 30005, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6560,6 +7177,7 @@ "libraryid": 30005, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6568,6 +7186,7 @@ "libraryid": 30005, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6576,6 +7195,7 @@ "libraryid": 30005, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6584,6 +7204,7 @@ "libraryid": 30005, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6592,6 +7213,7 @@ "libraryid": 30005, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6600,6 +7222,7 @@ "libraryid": 30005, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6608,6 +7231,7 @@ "libraryid": 30005, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6616,6 +7240,7 @@ "libraryid": 30005, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6624,6 +7249,7 @@ "libraryid": 30005, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6632,6 +7258,7 @@ "libraryid": 30005, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6640,6 +7267,7 @@ "libraryid": 30005, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6648,6 +7276,7 @@ "libraryid": 30005, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6656,6 +7285,7 @@ "libraryid": 30005, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6664,6 +7294,7 @@ "libraryid": 30005, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6672,6 +7303,7 @@ "libraryid": 30005, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6680,6 +7312,7 @@ "libraryid": 30005, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6688,6 +7321,7 @@ "libraryid": 30005, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6696,6 +7330,7 @@ "libraryid": 30005, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6704,6 +7339,7 @@ "libraryid": 30005, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6712,6 +7348,7 @@ "libraryid": 30005, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6720,6 +7357,7 @@ "libraryid": 30005, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6728,6 +7366,7 @@ "libraryid": 30005, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6736,6 +7375,7 @@ "libraryid": 30005, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6744,6 +7384,7 @@ "libraryid": 30005, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6752,6 +7393,7 @@ "libraryid": 30005, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6760,6 +7402,7 @@ "libraryid": 30005, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6768,6 +7411,7 @@ "libraryid": 30005, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6776,6 +7420,7 @@ "libraryid": 30005, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6784,6 +7429,7 @@ "libraryid": 30005, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6792,6 +7438,7 @@ "libraryid": 30005, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6800,6 +7447,7 @@ "libraryid": 30005, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6808,6 +7456,7 @@ "libraryid": 30005, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6816,6 +7465,7 @@ "libraryid": 30006, "attrkey": "1", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6824,6 +7474,7 @@ "libraryid": 30006, "attrkey": "2", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6832,6 +7483,7 @@ "libraryid": 30006, "attrkey": "3", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6840,6 +7492,7 @@ "libraryid": 30006, "attrkey": "4", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6848,6 +7501,7 @@ "libraryid": 30006, "attrkey": "5", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6856,6 +7510,7 @@ "libraryid": 30006, "attrkey": "6", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6864,6 +7519,7 @@ "libraryid": 30006, "attrkey": "7", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6872,6 +7528,7 @@ "libraryid": 30006, "attrkey": "8", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6880,6 +7537,7 @@ "libraryid": 30006, "attrkey": "9", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6888,6 +7546,7 @@ "libraryid": 30006, "attrkey": "10", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6896,6 +7555,7 @@ "libraryid": 30006, "attrkey": "11", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6904,6 +7564,7 @@ "libraryid": 30006, "attrkey": "12", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6912,6 +7573,7 @@ "libraryid": 30006, "attrkey": "13", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6920,6 +7582,7 @@ "libraryid": 30006, "attrkey": "14", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6928,6 +7591,7 @@ "libraryid": 30006, "attrkey": "15", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6936,6 +7600,7 @@ "libraryid": 30006, "attrkey": "16", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6944,6 +7609,7 @@ "libraryid": 30006, "attrkey": "17", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6952,6 +7618,7 @@ "libraryid": 30006, "attrkey": "18", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6960,6 +7627,7 @@ "libraryid": 30006, "attrkey": "19", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6968,6 +7636,7 @@ "libraryid": 30006, "attrkey": "20", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6976,6 +7645,7 @@ "libraryid": 30006, "attrkey": "21", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6984,6 +7654,7 @@ "libraryid": 30006, "attrkey": "22", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -6992,6 +7663,7 @@ "libraryid": 30006, "attrkey": "23", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7000,6 +7672,7 @@ "libraryid": 30006, "attrkey": "24", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7008,6 +7681,7 @@ "libraryid": 30006, "attrkey": "25", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7016,6 +7690,7 @@ "libraryid": 30006, "attrkey": "26", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7024,6 +7699,7 @@ "libraryid": 30006, "attrkey": "27", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7032,6 +7708,7 @@ "libraryid": 30006, "attrkey": "28", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7040,6 +7717,7 @@ "libraryid": 30006, "attrkey": "29", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7048,6 +7726,7 @@ "libraryid": 30006, "attrkey": "30", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7056,6 +7735,7 @@ "libraryid": 30006, "attrkey": "31", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7064,6 +7744,7 @@ "libraryid": 30006, "attrkey": "32", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7072,6 +7753,7 @@ "libraryid": 30006, "attrkey": "33", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7080,6 +7762,7 @@ "libraryid": 30006, "attrkey": "34", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7088,6 +7771,7 @@ "libraryid": 30006, "attrkey": "35", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7096,6 +7780,7 @@ "libraryid": 30006, "attrkey": "36", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7104,6 +7789,7 @@ "libraryid": 30006, "attrkey": "37", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7112,6 +7798,7 @@ "libraryid": 30006, "attrkey": "38", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7120,6 +7807,7 @@ "libraryid": 30006, "attrkey": "39", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7128,6 +7816,7 @@ "libraryid": 30006, "attrkey": "40", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7136,6 +7825,7 @@ "libraryid": 30006, "attrkey": "41", "attrvar": 1, + "attrvar_correct": 1, "probability": 1000, "Addition": [] }, @@ -7144,6 +7834,7 @@ "libraryid": 30101, "attrkey": "atk", "attrvar": 1, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -7158,6 +7849,7 @@ "libraryid": 30101, "attrkey": "def", "attrvar": 1, + "attrvar_correct": 1, "probability": 150, "Addition": [ 800, @@ -7172,6 +7864,7 @@ "libraryid": 30101, "attrkey": "hp", "attrvar": 1, + "attrvar_correct": 1, "probability": 400, "Addition": [ 800, @@ -7186,6 +7879,7 @@ "libraryid": 30101, "attrkey": "atkpro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -7200,6 +7894,7 @@ "libraryid": 30101, "attrkey": "defpro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, @@ -7214,6 +7909,7 @@ "libraryid": 30101, "attrkey": "hppro", "attrvar": 1, + "attrvar_correct": 1, "probability": 100, "Addition": [ 800, diff --git a/modules/equipment/api_wash.go b/modules/equipment/api_wash.go index df02b2b9f..506068fa1 100644 --- a/modules/equipment/api_wash.go +++ b/modules/equipment/api_wash.go @@ -65,7 +65,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) ( Lv: equip.AdverbEntry[i].Lv, AttrName: attrlibrarys[v].Attrkey, BaseValue: attrlibrarys[v].Attrvar, - Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)), + Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].AttrvarCorrect)), } } this.module.ModuleRtask.SendToRtask(session, comm.Rtype95, 1) diff --git a/modules/equipment/api_washconfirm.go b/modules/equipment/api_washconfirm.go index 176cd1b08..de24be1c3 100644 --- a/modules/equipment/api_washconfirm.go +++ b/modules/equipment/api_washconfirm.go @@ -47,7 +47,7 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas Lv: v.Lv, AttrName: attrlibrary.Attrkey, BaseValue: attrlibrary.Attrvar, - Value: attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attrvar)), + Value: attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.AttrvarCorrect)), } } if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{ diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index d4900e46c..a90a0a903 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -326,7 +326,12 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.GameEquipData, intensify *cfg.GameEquipIntensifyData) (err error) { equipment.Lv++ equipment.MainEntry.Lv++ - equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(equipment.MainEntry.BaseValue)*float64(intensify.Bonus)/1000.0) + var mainconfigure *cfg.GameEquipAttrlibraryData + if mainconfigure, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.MainEntry.Id); err != nil { + this.module.Errorf("升级服务错误 读取主词条配置错误!") + return + } + equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(float64(mainconfigure.AttrvarCorrect)*float64(intensify.Bonus)/1000.0) if !intensify.Activation { //不触发副词条变化 return } diff --git a/sys/configure/structs/game.equipAttrlibraryData.go b/sys/configure/structs/game.equipAttrlibraryData.go index 65a6e4eb3..565c5c1f5 100644 --- a/sys/configure/structs/game.equipAttrlibraryData.go +++ b/sys/configure/structs/game.equipAttrlibraryData.go @@ -15,6 +15,7 @@ type GameEquipAttrlibraryData struct { Libraryid int32 Attrkey string Attrvar int32 + AttrvarCorrect int32 Probability int32 Addition []int32 } @@ -30,6 +31,7 @@ func (_v *GameEquipAttrlibraryData)Deserialize(_buf map[string]interface{}) (err { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["libraryid"].(float64); !_ok_ { err = errors.New("libraryid error"); return }; _v.Libraryid = int32(_tempNum_) } { var _ok_ bool; if _v.Attrkey, _ok_ = _buf["attrkey"].(string); !_ok_ { err = errors.New("attrkey error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar"].(float64); !_ok_ { err = errors.New("attrvar error"); return }; _v.Attrvar = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar_correct"].(float64); !_ok_ { err = errors.New("attrvar_correct error"); return }; _v.AttrvarCorrect = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } { var _arr_ []interface{}