diff --git a/cmd/v2/gen_test.go b/cmd/v2/gen_test.go index 483fbbbd6..6224efb2b 100644 --- a/cmd/v2/gen_test.go +++ b/cmd/v2/gen_test.go @@ -1,8 +1,8 @@ package main_test import ( - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/cmd/v2/lib/common" + cfg "go_dreamfactory/sys/configure/structs" "html/template" "os" "testing" @@ -13,7 +13,10 @@ type TaskCond struct { } func TestTask(t *testing.T) { - if tb, err := cfg.NewTables(common.Loader); err == nil { + commcfg := &common.Config{ + Path: "F:\\projects\\workspace\\go_dreamfactory\\bin\\json", + } + if tb, err := cfg.NewTables(commcfg.Loader); err == nil { data := tb.RdtaskCondi.GetDataMap() tmpl := template.New("task") diff --git a/cmd/v2/lib/assistant.go b/cmd/v2/lib/assistant.go index e19c1e3e6..f8b12e773 100644 --- a/cmd/v2/lib/assistant.go +++ b/cmd/v2/lib/assistant.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "go_dreamfactory/cmd/v2/lib/common" "go_dreamfactory/cmd/v2/service/observer" "go_dreamfactory/pb" diff --git a/cmd/v2/lib/common/utils.go b/cmd/v2/lib/common/utils.go index cbe4c50b0..d73492c4b 100644 --- a/cmd/v2/lib/common/utils.go +++ b/cmd/v2/lib/common/utils.go @@ -3,7 +3,9 @@ package common import ( "bytes" "encoding/json" + "errors" "fmt" + "go_dreamfactory/lego/core" "io" "io/ioutil" "math" @@ -18,6 +20,10 @@ import ( "google.golang.org/protobuf/proto" ) +func MF(s1 core.M_Modules, s2 string) string { + return fmt.Sprintf("%s.%s", s1, s2) +} + func FormatJson(data string) (string, error) { var out bytes.Buffer err := json.Indent(&out, []byte(data), "", " ") @@ -161,8 +167,20 @@ func ConvertFileSize(size int64) string { return "0" } -func Loader(file string) ([]map[string]interface{}, error) { - path := filepath.Join("E:\\projects\\workspace\\go_dreamfactory\\bin\\json", file+".json") +type Config struct { + Path string +} + +func (this *Config) SetPath(path string) { + this.Path = path +} + +// "F:\\projects\\workspace\\go_dreamfactory\\bin\\json" +func (this *Config) Loader(file string) ([]map[string]interface{}, error) { + if this.Path == "" { + return nil, errors.New("no setting config path") + } + path := filepath.Join(this.Path, file+".json") if bytes, err := ioutil.ReadFile(path); err != nil { return nil, err } else { @@ -237,7 +255,7 @@ func FormatFloatCeil(num float64, decimal int) (float64, error) { func LastChars(str string, count int) string { if len(str) <= count { - return str - } - return str[len(str)-count:] -} \ No newline at end of file + return str + } + return str[len(str)-count:] +} diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/lib/pb/protocol.go similarity index 59% rename from cmd/v2/ui/protocol.go rename to cmd/v2/lib/pb/protocol.go index f1e325f3c..86ff153ea 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/lib/pb/protocol.go @@ -1,14 +1,12 @@ -package ui +package pb import ( "errors" "fmt" + "go_dreamfactory/cmd/v2/lib/common" "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/cmd/v2/service/observer" - formview "go_dreamfactory/cmd/v2/ui/views" + "go_dreamfactory/comm" - "go_dreamfactory/lego/core" "go_dreamfactory/modules/friend" "go_dreamfactory/modules/growtask" "go_dreamfactory/modules/hero" @@ -23,114 +21,10 @@ import ( "go_dreamfactory/pb" "strings" - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" ) -type MyCaseView interface { - Init(service service.PttService, obs observer.Observer, w fyne.Window, res *widget.Entry) - CreateView(t *model.TestCase) fyne.CanvasObject - Load() -} - -// 1 注册接口测试的表单试图 -var ( - viewRegister = map[string]MyCaseView{ - // gm - ff(comm.ModuleGM, "cmd"): &formview.BingoView{}, - // reddot - ff(comm.ModuleReddot, "get"): &formview.ReddotView{}, - //sys - ff(comm.ModuleSys, "funclist"): &formview.SysFuncListView{}, - //user - ff(comm.ModuleUser, user.UserSubTypeModifyAvatar): &formview.UserModifyavatarView{}, - ff(comm.ModuleUser, user.UserSubTypeModifyName): &formview.UserModifynameView{}, - ff(comm.ModuleUser, user.UserSubTypeModifyFigure): &formview.UserModifyfigureView{}, - ff(comm.ModuleUser, user.UserSubTYpeModifyBgp): &formview.UserModifybgpView{}, - ff(comm.ModuleUser, user.UserSubTypeModifySign): &formview.UserSignView{}, - ff(comm.ModuleUser, user.UserSubTypeBattlerecord): &formview.UserBattlerecordView{}, - // items - ff(comm.ModuleItems, "getlist"): &formview.ItemListView{}, - ff(comm.ModuleItems, "sellitem"): &formview.ItemsSellView{}, - ff(comm.ModuleItems, "useitem"): &formview.ItemsUseView{}, - //mail - ff(comm.ModuleMail, "getlist"): &formview.MailListView{}, - ff(comm.ModuleMail, "readmail"): &formview.MailReadMailView{}, - ff(comm.ModuleMail, "delmail"): &formview.MailDelView{}, - ff(comm.ModuleMail, "getusermailattachment"): &formview.MailAttachmentView{}, - ff(comm.ModuleMail, "getallmailattachment"): &formview.MailAttachmentAllView{}, - //task - ff(comm.ModuleTask, task.TaskSubTypeList): &formview.TaskListView{}, - ff(comm.ModuleTask, task.TaskSubTypeActiveList): &formview.TaskActiveListView{}, - ff(comm.ModuleTask, task.TaskSubTypeActiveReceive): &formview.TaskActiveReceiveView{}, - ff(comm.ModuleTask, task.TaskSubTypeGetrecord): &formview.RtaskRecordView{}, - // hero - ff(comm.ModuleHero, hero.HeroSubTypeList): &formview.HeroListView{}, - ff(comm.ModuleHero, hero.StrengthenUplv): &formview.HeroStrengthenUplvView{}, - ff(comm.ModuleHero, hero.StrengthenUpStar): &formview.HeroStrengthenUpStarView{}, - ff(comm.ModuleHero, hero.DrawCard): &formview.HeroZhaomuView{}, - ff(comm.ModuleHero, "info"): &formview.HeroInfoView{}, - //equip - ff(comm.ModuleEquipment, "getlist"): &formview.EquipListView{}, - ff(comm.ModuleEquipment, "equip"): &formview.EquipUpDownView{}, - ff(comm.ModuleEquipment, "upgrade"): &formview.EquipUpgradeView{}, - //friend - ff(comm.ModuleFriend, friend.FriendSubTypeList): &formview.FriendListView{}, - // ff(comm.ModuleFriend, friend.FriendSubTypeApply): &formview.FriendApplyView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeAgree): &formview.FriendAgreeView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeBlacklist): &formview.FriendBlacklistView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack): &formview.FriendAddBlackView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack): &formview.FriendDelblackView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeSearch): &formview.FriendSearchView{}, - // ff(comm.ModuleFriend, friend.FriendSubTypeZanList): &formview.FriendZanView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeRandList): &formview.FriendRandListView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeGetreward): &formview.FriendGetrewardView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist): &formview.FriendAssistListView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero): &formview.FriendAssistHeroView{}, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList): &formview.FriendAssistHeroListView{}, - - // shop - ff(comm.ModuleShop, "getlist"): &formview.ShopListView{}, - ff(comm.ModuleShop, "buy"): &formview.ShopBuyView{}, - // mailine - ff(comm.ModuleMline, mline.MlineGetListResp): &formview.MainlineListView{}, - ff(comm.ModuleMline, mline.MlineChallengeResp): &formview.MainlineChallengeView{}, - ff(comm.ModuleMline, mline.MlineGetRewardResp): &formview.MainlineRewardView{}, - // pagoda - ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, - // rtask - ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, - // linestory - ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, - ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, - // gourmet - ff(comm.ModuleGourmet, "getranduser"): &formview.GourmentGetRandView{}, - // sociaty - ff(comm.ModuleSociaty, sociaty.SociatySubTypeList): &formview.SociatyListView{}, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeCreate): &formview.SociatyCreateView{}, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeMine): &formview.SociatyMineView{}, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist): &formview.SociatyTasklistView{}, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeRank): &formview.SociatyRankView{}, - ff(comm.ModuleSociaty, "boss"): &formview.SociatyBossView{}, - // troll - ff(comm.ModuleTroll, "getlist"): &formview.TrollGetlistView{}, - // growtask - ff(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): &formview.GrowtaskListView{}, - //worldtask - ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): &formview.WorldtaskMineView{}, - //smithy - ff(comm.ModuleSmithy, "customer"): &formview.SmithyView{}, - //武馆派遣 - ff(comm.ModuleDispatch, "dispatch"): &formview.DispatchView{}, - //声望 - ff(comm.ModuleReputation, "reputation"): &formview.ReputationView{}, - //旧时光 - ff(comm.ModuleOldtimes, "oldtimes"): &formview.OldtimesView{}, - } -) - // 2 添加导航菜单 var ( CaseIndex = map[string][]string{ @@ -160,114 +54,114 @@ var ( string(comm.ModuleReputation), string(comm.ModuleOldtimes), }, - "gm": {ff(comm.ModuleGM, "cmd")}, + "gm": {common.MF(comm.ModuleGM, "cmd")}, "sys": { - ff(comm.ModuleSys, "funclist"), + common.MF(comm.ModuleSys, "funclist"), }, - "reddot": {ff(comm.ModuleReddot, "get")}, + "reddot": {common.MF(comm.ModuleReddot, "get")}, "user": { - ff(comm.ModuleUser, user.UserSubTypeModifyAvatar), - ff(comm.ModuleUser, user.UserSubTypeModifyName), - ff(comm.ModuleUser, user.UserSubTypeModifyFigure), - ff(comm.ModuleUser, user.UserSubTYpeModifyBgp), - ff(comm.ModuleUser, user.UserSubTypeModifySign), - ff(comm.ModuleUser, user.UserSubTypeBattlerecord), + common.MF(comm.ModuleUser, user.UserSubTypeModifyAvatar), + common.MF(comm.ModuleUser, user.UserSubTypeModifyName), + common.MF(comm.ModuleUser, user.UserSubTypeModifyFigure), + common.MF(comm.ModuleUser, user.UserSubTYpeModifyBgp), + common.MF(comm.ModuleUser, user.UserSubTypeModifySign), + common.MF(comm.ModuleUser, user.UserSubTypeBattlerecord), }, "items": { - ff(comm.ModuleItems, "getlist"), - ff(comm.ModuleItems, "sellitem"), - ff(comm.ModuleItems, "useitem"), + common.MF(comm.ModuleItems, "getlist"), + common.MF(comm.ModuleItems, "sellitem"), + common.MF(comm.ModuleItems, "useitem"), }, "mail": { - ff(comm.ModuleMail, "getlist"), - ff(comm.ModuleMail, "readmail"), - ff(comm.ModuleMail, "delmail"), - ff(comm.ModuleMail, "getusermailattachment"), - ff(comm.ModuleMail, "getallmailattachment"), + common.MF(comm.ModuleMail, "getlist"), + common.MF(comm.ModuleMail, "readmail"), + common.MF(comm.ModuleMail, "delmail"), + common.MF(comm.ModuleMail, "getusermailattachment"), + common.MF(comm.ModuleMail, "getallmailattachment"), }, "hero": { - ff(comm.ModuleHero, hero.HeroSubTypeList), - ff(comm.ModuleHero, hero.StrengthenUplv), - ff(comm.ModuleHero, hero.StrengthenUpStar), - ff(comm.ModuleHero, hero.DrawCard), - ff(comm.ModuleHero, "info"), + common.MF(comm.ModuleHero, hero.HeroSubTypeList), + common.MF(comm.ModuleHero, hero.StrengthenUplv), + common.MF(comm.ModuleHero, hero.StrengthenUpStar), + common.MF(comm.ModuleHero, hero.DrawCard), + common.MF(comm.ModuleHero, "info"), }, "equipment": { - ff(comm.ModuleEquipment, "getlist"), - ff(comm.ModuleEquipment, "equip"), - ff(comm.ModuleEquipment, "upgrade"), + common.MF(comm.ModuleEquipment, "getlist"), + common.MF(comm.ModuleEquipment, "equip"), + common.MF(comm.ModuleEquipment, "upgrade"), }, "task": { - ff(comm.ModuleTask, task.TaskSubTypeList), - ff(comm.ModuleTask, task.TaskSubTypeActiveList), - ff(comm.ModuleTask, task.TaskSubTypeActiveReceive), - ff(comm.ModuleTask, task.TaskSubTypeGetrecord), + common.MF(comm.ModuleTask, task.TaskSubTypeList), + common.MF(comm.ModuleTask, task.TaskSubTypeActiveList), + common.MF(comm.ModuleTask, task.TaskSubTypeActiveReceive), + common.MF(comm.ModuleTask, task.TaskSubTypeGetrecord), }, "friend": { - ff(comm.ModuleFriend, friend.FriendSubTypeList), - // ff(comm.ModuleFriend, friend.FriendSubTypeApply), - ff(comm.ModuleFriend, friend.FriendSubTypeAgree), - ff(comm.ModuleFriend, friend.FriendSubTypeBlacklist), - ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack), - ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack), - // ff(comm.ModuleFriend, friend.FriendSubTypeSearch), - // ff(comm.ModuleFriend, friend.FriendSubTypeZanList), - ff(comm.ModuleFriend, friend.FriendSubTypeRandList), - ff(comm.ModuleFriend, friend.FriendSubTypeGetreward), - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero), - ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist), - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList), + common.MF(comm.ModuleFriend, friend.FriendSubTypeList), + // common.MF(comm.ModuleFriend, friend.FriendSubTypeApply), + common.MF(comm.ModuleFriend, friend.FriendSubTypeAgree), + common.MF(comm.ModuleFriend, friend.FriendSubTypeBlacklist), + common.MF(comm.ModuleFriend, friend.FriendSubTypeAddBlack), + common.MF(comm.ModuleFriend, friend.FriendSubTypeDelBlack), + // common.MF(comm.ModuleFriend, friend.FriendSubTypeSearch), + // common.MF(comm.ModuleFriend, friend.FriendSubTypeZanList), + common.MF(comm.ModuleFriend, friend.FriendSubTypeRandList), + common.MF(comm.ModuleFriend, friend.FriendSubTypeGetreward), + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHero), + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistlist), + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList), }, "shop": { - ff(comm.ModuleShop, "getlist"), - ff(comm.ModuleShop, "buy"), + common.MF(comm.ModuleShop, "getlist"), + common.MF(comm.ModuleShop, "buy"), }, "mainline": { - ff(comm.ModuleMline, mline.MlineGetListResp), - ff(comm.ModuleMline, mline.MlineChallengeResp), - ff(comm.ModuleMline, mline.MlineGetRewardResp), + common.MF(comm.ModuleMline, mline.MlineGetListResp), + common.MF(comm.ModuleMline, mline.MlineChallengeResp), + common.MF(comm.ModuleMline, mline.MlineGetRewardResp), }, "pagoda": { - ff(comm.ModulePagoda, "getlist"), + common.MF(comm.ModulePagoda, "getlist"), }, "rtask": { - ff(comm.ModuleRtask, "rtest"), + common.MF(comm.ModuleRtask, "rtest"), }, "linestory": { - ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter), - ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp), + common.MF(comm.ModuleLinestory, linestory.LinestorySubTypeChapter), + common.MF(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp), }, "gourmet": { - ff(comm.ModuleGourmet, "getranduser"), + common.MF(comm.ModuleGourmet, "getranduser"), }, "sociaty": { - ff(comm.ModuleSociaty, sociaty.SociatySubTypeList), - ff(comm.ModuleSociaty, sociaty.SociatySubTypeCreate), - ff(comm.ModuleSociaty, sociaty.SociatySubTypeMine), - ff(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist), - ff(comm.ModuleSociaty, sociaty.SociatySubTypeRank), - ff(comm.ModuleSociaty, "boss"), + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeList), + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeCreate), + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeMine), + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist), + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeRank), + common.MF(comm.ModuleSociaty, "boss"), }, "troll": { - ff(comm.ModuleTroll, "getlist"), + common.MF(comm.ModuleTroll, "getlist"), }, "growtask": { - ff(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList), + common.MF(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList), }, "worldtask": { - ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine), + common.MF(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine), }, "smithy": { - ff(comm.ModuleSmithy, "customer"), + common.MF(comm.ModuleSmithy, "customer"), }, "dispatch": { - ff(comm.ModuleDispatch, "dispatch"), + common.MF(comm.ModuleDispatch, "dispatch"), }, "reputation": { - ff(comm.ModuleReputation, "reputation"), + common.MF(comm.ModuleReputation, "reputation"), }, "oldtimes": { - ff(comm.ModuleOldtimes, "oldtimes"), + common.MF(comm.ModuleOldtimes, "oldtimes"), }, } ) @@ -281,7 +175,7 @@ var ( MainType: string(comm.ModuleGM), Enabled: true, }, - ff(comm.ModuleGM, "cmd"): { + common.MF(comm.ModuleGM, "cmd"): { Desc: "eg. bingo:item,10001,1 bingo:attr,gold,1000000", MainType: string(comm.ModuleGM), SubType: "cmd", @@ -294,7 +188,7 @@ var ( MainType: string(comm.ModuleReddot), Enabled: true, }, - ff(comm.ModuleReddot, "get"): { + common.MF(comm.ModuleReddot, "get"): { Desc: "红点", NavLabel: "红点", MainType: string(comm.ModuleReddot), @@ -306,7 +200,7 @@ var ( MainType: string(comm.ModuleSys), Enabled: true, }, - ff(comm.ModuleSys, "funclist"): { + common.MF(comm.ModuleSys, "funclist"): { NavLabel: "功能列表", Desc: "返回未开启的功能列表", MainType: string(comm.ModuleSys), @@ -319,7 +213,7 @@ var ( MainType: "user", Enabled: true, }, - ff(comm.ModuleUser, user.UserSubTypeModifyAvatar): { + common.MF(comm.ModuleUser, user.UserSubTypeModifyAvatar): { Desc: "用户头像修改", NavLabel: "修改头像", MainType: string(comm.ModuleUser), @@ -348,28 +242,28 @@ var ( }, Enabled: true, }, - ff(comm.ModuleUser, user.UserSubTypeModifyFigure): { + common.MF(comm.ModuleUser, user.UserSubTypeModifyFigure): { Desc: "用户形象修改", NavLabel: "修改形象", MainType: string(comm.ModuleUser), SubType: user.UserSubTypeModifyFigure, Enabled: true, }, - ff(comm.ModuleUser, user.UserSubTYpeModifyBgp): { + common.MF(comm.ModuleUser, user.UserSubTYpeModifyBgp): { Desc: "背景修改", NavLabel: "修改背景", MainType: string(comm.ModuleUser), SubType: user.UserSubTYpeModifyBgp, Enabled: true, }, - ff(comm.ModuleUser, user.UserSubTypeModifySign): { + common.MF(comm.ModuleUser, user.UserSubTypeModifySign): { NavLabel: "修改签名", Desc: "用户签名修改", MainType: string(comm.ModuleUser), SubType: user.UserSubTypeModifySign, Enabled: true, }, - ff(comm.ModuleUser, user.UserSubTypeBattlerecord): { + common.MF(comm.ModuleUser, user.UserSubTypeBattlerecord): { NavLabel: "战斗记录", Desc: "玩家在心魔塔、狩猎、维京远征的战斗记录", MainType: string(comm.ModuleUser), @@ -382,21 +276,21 @@ var ( MainType: string(comm.ModuleItems), Enabled: true, }, - ff(comm.ModuleItems, "getlist"): { + common.MF(comm.ModuleItems, "getlist"): { NavLabel: "道具列表", Desc: "道具列表", MainType: string(comm.ModuleItems), SubType: "getlist", Enabled: true, }, - ff(comm.ModuleItems, "sellitem"): { + common.MF(comm.ModuleItems, "sellitem"): { NavLabel: "道具售卖", Desc: "道具售卖", MainType: string(comm.ModuleItems), SubType: "sellitem", Enabled: true, }, - ff(comm.ModuleItems, "useitem"): { + common.MF(comm.ModuleItems, "useitem"): { NavLabel: "道具使用", Desc: "道具使用", MainType: string(comm.ModuleItems), @@ -410,35 +304,35 @@ var ( MainType: string(comm.ModuleMail), Enabled: true, }, - ff(comm.ModuleMail, "getlist"): { + common.MF(comm.ModuleMail, "getlist"): { NavLabel: "我的邮件", Desc: "我的邮件", MainType: string(comm.ModuleMail), SubType: "getlist", Enabled: true, }, - ff(comm.ModuleMail, "readmail"): { + common.MF(comm.ModuleMail, "readmail"): { NavLabel: "读邮件", Desc: "读取邮件", MainType: string(comm.ModuleMail), SubType: "readmail", Enabled: true, }, - ff(comm.ModuleMail, "delmail"): { + common.MF(comm.ModuleMail, "delmail"): { NavLabel: "删除邮件", Desc: "删除邮件", MainType: string(comm.ModuleMail), SubType: "delmail", Enabled: true, }, - ff(comm.ModuleMail, "getusermailattachment"): { + common.MF(comm.ModuleMail, "getusermailattachment"): { NavLabel: "领取附件", Desc: "领取附件", MainType: string(comm.ModuleMail), SubType: "getusermailattachment", Enabled: true, }, - ff(comm.ModuleMail, "getallmailattachment"): { + common.MF(comm.ModuleMail, "getallmailattachment"): { NavLabel: "一键领取", Desc: "领取所有附件", MainType: string(comm.ModuleMail), @@ -475,7 +369,7 @@ var ( return formatStr.String() }, }, - ff(comm.ModuleTask, task.TaskSubTypeGetrecord): { + common.MF(comm.ModuleTask, task.TaskSubTypeGetrecord): { NavLabel: "任务数据", Desc: "任务数据", MainType: string(comm.ModuleTask), @@ -483,7 +377,7 @@ var ( Enabled: true, }, - ff(comm.ModuleTask, task.TaskSubTypeActiveList): { + common.MF(comm.ModuleTask, task.TaskSubTypeActiveList): { NavLabel: "活跃度列表", Desc: "用户活跃度列表", MainType: string(comm.ModuleTask), @@ -492,7 +386,7 @@ var ( Rsp: &pb.TaskActiveListResp{}, Enabled: true, }, - ff(comm.ModuleTask, task.TaskSubTypeActiveReceive): { + common.MF(comm.ModuleTask, task.TaskSubTypeActiveReceive): { NavLabel: "活跃度领取", Desc: "用户活跃度领取", MainType: string(comm.ModuleTask), @@ -507,7 +401,7 @@ var ( MainType: string(comm.ModuleHero), Enabled: true, }, - ff(comm.ModuleHero, hero.HeroSubTypeList): { + common.MF(comm.ModuleHero, hero.HeroSubTypeList): { NavLabel: "英雄列表", Desc: "英雄列表", MainType: string(comm.ModuleHero), @@ -528,7 +422,7 @@ var ( }, Enabled: true, }, - ff(comm.ModuleHero, hero.StrengthenUplv): { + common.MF(comm.ModuleHero, hero.StrengthenUplv): { NavLabel: "英雄升级", Desc: "英雄等级升级", MainType: string(comm.ModuleHero), @@ -537,7 +431,7 @@ var ( Rsp: &pb.HeroStrengthenUplvResp{}, Enabled: true, }, - ff(comm.ModuleHero, hero.StrengthenUpStar): { + common.MF(comm.ModuleHero, hero.StrengthenUpStar): { NavLabel: "英雄升星", Desc: "英雄星级升级", MainType: string(comm.ModuleHero), @@ -546,14 +440,14 @@ var ( Rsp: &pb.HeroStrengthenUpStarResp{}, Enabled: true, }, - ff(comm.ModuleHero, hero.DrawCard): { + common.MF(comm.ModuleHero, hero.DrawCard): { NavLabel: "招募", Desc: "抽卡招募", MainType: string(comm.ModuleHero), SubType: hero.DrawCard, Enabled: true, }, - ff(comm.ModuleHero, "info"): { + common.MF(comm.ModuleHero, "info"): { NavLabel: "英雄信息", Desc: "英雄信息", MainType: string(comm.ModuleHero), @@ -566,21 +460,21 @@ var ( MainType: string(comm.ModuleEquipment), Enabled: true, }, - ff(comm.ModuleEquipment, "getlist"): { + common.MF(comm.ModuleEquipment, "getlist"): { NavLabel: "装备列表", Desc: "装备列表", MainType: string(comm.ModuleEquipment), SubType: "getlist", Enabled: true, }, - ff(comm.ModuleEquipment, "equip"): { + common.MF(comm.ModuleEquipment, "equip"): { NavLabel: "穿卸装备", Desc: "穿/卸装备", MainType: string(comm.ModuleEquipment), SubType: "equip", Enabled: true, }, - ff(comm.ModuleEquipment, "upgrade"): { + common.MF(comm.ModuleEquipment, "upgrade"): { NavLabel: "升级装备", Desc: "升级装备", MainType: string(comm.ModuleEquipment), @@ -593,7 +487,7 @@ var ( MainType: string(comm.ModuleFriend), Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeRandList): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeRandList): { NavLabel: "在线玩家", Desc: "在线玩家列表", MainType: string(comm.ModuleFriend), @@ -613,7 +507,7 @@ var ( return formatStr.String() }, }, - ff(comm.ModuleFriend, friend.FriendSubTypeList): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeList): { NavLabel: "我的好友", Desc: "我的好友列表", MainType: string(comm.ModuleFriend), @@ -622,7 +516,7 @@ var ( Rsp: &pb.FriendListResp{}, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeApply): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeApply): { NavLabel: "好友申请", Desc: "好友申请", MainType: string(comm.ModuleFriend), @@ -631,7 +525,7 @@ var ( Rsp: &pb.FriendApplyResp{}, Enabled: false, }, - ff(comm.ModuleFriend, friend.FriendSubTypeBlacklist): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeBlacklist): { NavLabel: "黑名单", Desc: "黑名单列表", MainType: string(comm.ModuleFriend), @@ -640,7 +534,7 @@ var ( Rsp: &pb.FriendBlackListResp{}, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeAddBlack): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeAddBlack): { NavLabel: "加黑名单", Desc: "添加黑名单", MainType: string(comm.ModuleFriend), @@ -649,7 +543,7 @@ var ( Rsp: &pb.FriendAddBlackResp{}, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeDelBlack): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeDelBlack): { NavLabel: "删黑名单", Desc: "删除黑名单", MainType: string(comm.ModuleFriend), @@ -658,7 +552,7 @@ var ( Rsp: &pb.FriendDelBlackResp{}, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeAgree): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeAgree): { NavLabel: "好友审批", Desc: "好友申请审批", MainType: string(comm.ModuleFriend), @@ -667,7 +561,7 @@ var ( Rsp: &pb.FriendAgreeResp{}, Enabled: true, }, - // ff(comm.ModuleFriend, friend.FriendSubTypeSearch): { + // common.MF(comm.ModuleFriend, friend.FriendSubTypeSearch): { // NavLabel: "好友搜索", // Desc: "搜索好友", // MainType: string(comm.ModuleFriend), @@ -676,28 +570,28 @@ var ( // Rsp: &pb.FriendSearchResp{}, // Enabled: true, // }, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHero): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHero): { NavLabel: "助战英雄", Desc: "助战英雄", MainType: string(comm.ModuleFriend), SubType: friend.FriendSubTypeAssistHero, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistlist): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistlist): { NavLabel: "助战列表", Desc: "助战英雄列表", MainType: string(comm.ModuleFriend), SubType: friend.FriendSubTypeAssistlist, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeGetreward): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeGetreward): { NavLabel: "助战奖励", Desc: "助战奖励", MainType: string(comm.ModuleFriend), SubType: friend.FriendSubTypeGetreward, Enabled: true, }, - ff(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList): { + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList): { NavLabel: "助战英雄列表", Desc: "我的好友助战英雄列表", MainType: string(comm.ModuleFriend), @@ -711,14 +605,14 @@ var ( MainType: string(comm.ModuleShop), Enabled: true, }, - ff(comm.ModuleShop, "getlist"): { + common.MF(comm.ModuleShop, "getlist"): { NavLabel: "商店列表", Desc: "商店列表", MainType: string(comm.ModuleShop), SubType: "getlist", Enabled: true, }, - ff(comm.ModuleShop, "buy"): { + common.MF(comm.ModuleShop, "buy"): { NavLabel: "购买商品", Desc: "购买商品", MainType: string(comm.ModuleShop), @@ -731,21 +625,21 @@ var ( MainType: string(comm.ModuleShop), Enabled: true, }, - ff(comm.ModuleMline, mline.MlineGetListResp): { + common.MF(comm.ModuleMline, mline.MlineGetListResp): { NavLabel: "主线关卡", Desc: "主线关卡", MainType: string(comm.ModuleMline), SubType: mline.MlineGetListResp, Enabled: true, }, - ff(comm.ModuleMline, mline.MlineChallengeResp): { + common.MF(comm.ModuleMline, mline.MlineChallengeResp): { NavLabel: "关卡挑战", Desc: "关卡挑战", MainType: string(comm.ModuleMline), SubType: mline.MlineChallengeResp, Enabled: true, }, - ff(comm.ModuleMline, mline.MlineGetRewardResp): { + common.MF(comm.ModuleMline, mline.MlineGetRewardResp): { NavLabel: "关卡奖励", Desc: "获取关卡奖励", MainType: string(comm.ModuleMline), @@ -758,7 +652,7 @@ var ( MainType: string(comm.ModulePagoda), Enabled: true, }, - ff(comm.ModulePagoda, "getlist"): { + common.MF(comm.ModulePagoda, "getlist"): { NavLabel: "魔塔列表", Desc: "魔塔列表", MainType: string(comm.ModulePagoda), @@ -771,7 +665,7 @@ var ( MainType: string(comm.ModuleRtask), Enabled: true, }, - ff(comm.ModuleRtask, "rtest"): { + common.MF(comm.ModuleRtask, "rtest"): { NavLabel: "测试条件", Desc: "测试任务触发", MainType: string(comm.ModuleRtask), @@ -784,14 +678,14 @@ var ( MainType: string(comm.ModuleLinestory), Enabled: true, }, - ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): { + common.MF(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): { NavLabel: "支线任务", Desc: "我的剧情任务", MainType: string(comm.ModuleLinestory), SubType: linestory.LinestorySubTypeChapter, Enabled: true, }, - ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): { + common.MF(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): { NavLabel: "羁绊任务", Desc: "我的剧情任务", MainType: string(comm.ModuleLibrary), @@ -804,7 +698,7 @@ var ( MainType: string(comm.ModuleGourmet), Enabled: true, }, - ff(comm.ModuleGourmet, "getranduser"): { + common.MF(comm.ModuleGourmet, "getranduser"): { NavLabel: "随机玩家", Desc: "随机玩家", MainType: string(comm.ModuleGourmet), @@ -817,14 +711,14 @@ var ( MainType: string(comm.ModuleSociaty), Enabled: true, }, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeCreate): { + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeCreate): { NavLabel: "公会创建", Desc: "公会创建", MainType: string(comm.ModuleSociaty), SubType: sociaty.SociatySubTypeCreate, Enabled: true, }, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeList): { + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeList): { NavLabel: "公会推荐", Desc: "公会列表", MainType: string(comm.ModuleSociaty), @@ -834,28 +728,28 @@ var ( return "不打印" }, }, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeMine): { + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeMine): { NavLabel: "我的公会", Desc: "我的公会", MainType: string(comm.ModuleSociaty), SubType: sociaty.SociatySubTypeMine, Enabled: true, }, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist): { + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist): { NavLabel: "任务列表", Desc: "任务列表", MainType: string(comm.ModuleSociaty), SubType: sociaty.SociatySubTypeTasklist, Enabled: true, }, - ff(comm.ModuleSociaty, sociaty.SociatySubTypeRank): { + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeRank): { NavLabel: "排行榜", Desc: "排行榜", MainType: string(comm.ModuleSociaty), SubType: sociaty.SociatySubTypeRank, Enabled: true, }, - ff(comm.ModuleSociaty, "boss"): { + common.MF(comm.ModuleSociaty, "boss"): { NavLabel: "BOSS", Desc: "BOSS", MainType: string(comm.ModuleSociaty), @@ -868,7 +762,7 @@ var ( MainType: string(comm.ModuleTroll), Enabled: true, }, - ff(comm.ModuleTroll, "getlist"): { + common.MF(comm.ModuleTroll, "getlist"): { NavLabel: "列表", Desc: "巨兽列表", MainType: string(comm.ModuleTroll), @@ -881,7 +775,7 @@ var ( MainType: string(comm.ModuleGrowtask), Enabled: true, }, - ff(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): { + common.MF(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): { NavLabel: "列表", Desc: "成长任务列表", MainType: string(comm.ModuleGrowtask), @@ -894,7 +788,7 @@ var ( MainType: string(comm.ModuleWorldtask), Enabled: true, }, - ff(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): { + common.MF(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): { NavLabel: "我的任务", Desc: "世界任务剧情", MainType: string(comm.ModuleWorldtask), @@ -907,7 +801,7 @@ var ( MainType: string(comm.ModuleSmithy), Enabled: true, }, - ff(comm.ModuleSmithy, "customer"): { + common.MF(comm.ModuleSmithy, "customer"): { NavLabel: "顾客", Desc: "当前铁匠铺中的顾客", MainType: string(comm.ModuleSmithy), @@ -920,7 +814,7 @@ var ( MainType: string(comm.ModuleDispatch), Enabled: true, }, - ff(comm.ModuleDispatch, "dispatch"): { + common.MF(comm.ModuleDispatch, "dispatch"): { NavLabel: "派遣", Desc: "派遣", MainType: string(comm.ModuleDispatch), @@ -933,7 +827,7 @@ var ( MainType: string(comm.ModuleReputation), Enabled: true, }, - ff(comm.ModuleReputation, "reputation"): { + common.MF(comm.ModuleReputation, "reputation"): { NavLabel: "声望管理", Desc: "声望管理", MainType: string(comm.ModuleReputation), @@ -946,7 +840,7 @@ var ( MainType: string(comm.ModuleOldtimes), Enabled: true, }, - ff(comm.ModuleOldtimes, "oldtimes"): { + common.MF(comm.ModuleOldtimes, "oldtimes"): { NavLabel: "关卡", Desc: "关卡编辑器", MainType: string(comm.ModuleOldtimes), @@ -955,7 +849,3 @@ var ( }, } ) - -func ff(s1 core.M_Modules, s2 string) string { - return fmt.Sprintf("%s.%s", s1, s2) -} diff --git a/cmd/v2/lib/pb/task_protocol.go b/cmd/v2/lib/pb/task_protocol.go new file mode 100644 index 000000000..e64bcc659 --- /dev/null +++ b/cmd/v2/lib/pb/task_protocol.go @@ -0,0 +1,22 @@ +package pb + +import ( + "go_dreamfactory/cmd/v2/lib/common" + "go_dreamfactory/cmd/v2/model" + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +var ( + TaskCase = map[string]*model.TestCase{ + common.MF(comm.ModuleAcademy, "receive"): { + NavLabel: "联盟学院 领取奖励", + Desc: "新手训练营", + MainType: string(comm.ModuleAcademy), + SubType: "receive", + Enabled: true, + Req: &pb.AcademyReceiveReq{}, + Rsp: &pb.AcademyReceiveResp{}, + }, + } +) diff --git a/cmd/v2/model/testcase.go b/cmd/v2/model/testcase.go index 194bc3b91..6ddd87527 100644 --- a/cmd/v2/model/testcase.go +++ b/cmd/v2/model/testcase.go @@ -13,4 +13,4 @@ type TestCase struct { Enabled bool //是否启用 // View MyCaseView //视图 Print func(rsp proto.Message) string //定义打印 -} +} \ No newline at end of file diff --git a/cmd/v2/ui/app_testcase.go b/cmd/v2/ui/app_testcase.go index 381dc73fd..66f365209 100644 --- a/cmd/v2/ui/app_testcase.go +++ b/cmd/v2/ui/app_testcase.go @@ -3,6 +3,7 @@ package ui import ( "fmt" "go_dreamfactory/cmd/v2/lib/common" + pb2 "go_dreamfactory/cmd/v2/lib/pb" "go_dreamfactory/cmd/v2/model" "go_dreamfactory/cmd/v2/service" "go_dreamfactory/cmd/v2/service/observer" @@ -51,7 +52,7 @@ func (a *appTester) LazyInit(service service.PttService, obs observer.Observer) intro.SetText(t.Desc) content.Objects = []fyne.CanvasObject{} - if view, ok := viewRegister[viewKey]; ok { + if view, ok := ViewRegister[viewKey]; ok { timeLbl := widget.NewLabel("time") resLog := widget.NewMultiLineEntry() view.Init(service, obs, globalWin.w, resLog) @@ -114,17 +115,17 @@ func (a *appTester) LazyInit(service service.PttService, obs observer.Observer) func (a *appTester) makeNav(setNav func(testCase *model.TestCase)) fyne.CanvasObject { tree := &widget.Tree{ ChildUIDs: func(uid string) (c []widget.TreeNodeID) { - return CaseIndex[uid] + return pb2.CaseIndex[uid] }, IsBranch: func(uid string) bool { - children, ok := CaseIndex[uid] + children, ok := pb2.CaseIndex[uid] return ok && len(children) > 0 }, CreateNode: func(branch bool) fyne.CanvasObject { return widget.NewLabel("(empty)") }, UpdateNode: func(uid string, branch bool, obj fyne.CanvasObject) { - t, ok := CaseNav[uid] + t, ok := pb2.CaseNav[uid] if !ok { logrus.WithField("id", uid).Warnf("Missing tutorial panel") return @@ -155,7 +156,7 @@ func (a *appTester) makeNav(setNav func(testCase *model.TestCase)) fyne.CanvasOb } }, OnSelected: func(uid string) { - if t, ok := CaseNav[uid]; ok { + if t, ok := pb2.CaseNav[uid]; ok { logrus.WithFields(logrus.Fields{"mainType": t.MainType, "subType": t.SubType}).Debug("select") if a.disEnabled(t) { return diff --git a/cmd/v2/ui/navview.go b/cmd/v2/ui/navview.go new file mode 100644 index 000000000..f010e2092 --- /dev/null +++ b/cmd/v2/ui/navview.go @@ -0,0 +1,125 @@ +package ui + +import ( + "go_dreamfactory/cmd/v2/lib/common" + "go_dreamfactory/cmd/v2/ui/views" + "go_dreamfactory/cmd/v2/model" + "go_dreamfactory/cmd/v2/service" + "go_dreamfactory/cmd/v2/service/observer" + "go_dreamfactory/comm" + "go_dreamfactory/modules/friend" + "go_dreamfactory/modules/growtask" + "go_dreamfactory/modules/hero" + "go_dreamfactory/modules/library" + "go_dreamfactory/modules/linestory" + "go_dreamfactory/modules/mline" + "go_dreamfactory/modules/sociaty" + "go_dreamfactory/modules/task" + "go_dreamfactory/modules/user" + "go_dreamfactory/modules/worldtask" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/widget" +) + +type MyCaseView interface { + Init(service service.PttService, obs observer.Observer, w fyne.Window, res *widget.Entry) + CreateView(t *model.TestCase) fyne.CanvasObject + Load() +} + +// 1 注册接口测试的表单试图 +var ( + ViewRegister = map[string]MyCaseView{ + // gm + common.MF(comm.ModuleGM, "cmd"): &formview.BingoView{}, + // reddot + common.MF(comm.ModuleReddot, "get"): &formview.ReddotView{}, + //sys + common.MF(comm.ModuleSys, "funclist"): &formview.SysFuncListView{}, + //user + common.MF(comm.ModuleUser, user.UserSubTypeModifyAvatar): &formview.UserModifyavatarView{}, + common.MF(comm.ModuleUser, user.UserSubTypeModifyName): &formview.UserModifynameView{}, + common.MF(comm.ModuleUser, user.UserSubTypeModifyFigure): &formview.UserModifyfigureView{}, + common.MF(comm.ModuleUser, user.UserSubTYpeModifyBgp): &formview.UserModifybgpView{}, + common.MF(comm.ModuleUser, user.UserSubTypeModifySign): &formview.UserSignView{}, + common.MF(comm.ModuleUser, user.UserSubTypeBattlerecord): &formview.UserBattlerecordView{}, + // items + common.MF(comm.ModuleItems, "getlist"): &formview.ItemListView{}, + common.MF(comm.ModuleItems, "sellitem"): &formview.ItemsSellView{}, + common.MF(comm.ModuleItems, "useitem"): &formview.ItemsUseView{}, + //mail + common.MF(comm.ModuleMail, "getlist"): &formview.MailListView{}, + common.MF(comm.ModuleMail, "readmail"): &formview.MailReadMailView{}, + common.MF(comm.ModuleMail, "delmail"): &formview.MailDelView{}, + common.MF(comm.ModuleMail, "getusermailattachment"): &formview.MailAttachmentView{}, + common.MF(comm.ModuleMail, "getallmailattachment"): &formview.MailAttachmentAllView{}, + //task + common.MF(comm.ModuleTask, task.TaskSubTypeList): &formview.TaskListView{}, + common.MF(comm.ModuleTask, task.TaskSubTypeActiveList): &formview.TaskActiveListView{}, + common.MF(comm.ModuleTask, task.TaskSubTypeActiveReceive): &formview.TaskActiveReceiveView{}, + common.MF(comm.ModuleTask, task.TaskSubTypeGetrecord): &formview.RtaskRecordView{}, + // hero + common.MF(comm.ModuleHero, hero.HeroSubTypeList): &formview.HeroListView{}, + common.MF(comm.ModuleHero, hero.StrengthenUplv): &formview.HeroStrengthenUplvView{}, + common.MF(comm.ModuleHero, hero.StrengthenUpStar): &formview.HeroStrengthenUpStarView{}, + common.MF(comm.ModuleHero, hero.DrawCard): &formview.HeroZhaomuView{}, + common.MF(comm.ModuleHero, "info"): &formview.HeroInfoView{}, + //equip + common.MF(comm.ModuleEquipment, "getlist"): &formview.EquipListView{}, + common.MF(comm.ModuleEquipment, "equip"): &formview.EquipUpDownView{}, + common.MF(comm.ModuleEquipment, "upgrade"): &formview.EquipUpgradeView{}, + //friend + common.MF(comm.ModuleFriend, friend.FriendSubTypeList): &formview.FriendListView{}, + // common.MF(comm.ModuleFriend, friend.FriendSubTypeApply): &formview.FriendApplyView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeAgree): &formview.FriendAgreeView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeBlacklist): &formview.FriendBlacklistView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeAddBlack): &formview.FriendAddBlackView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeDelBlack): &formview.FriendDelblackView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeSearch): &formview.FriendSearchView{}, + // common.MF(comm.ModuleFriend, friend.FriendSubTypeZanList): &formview.FriendZanView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeRandList): &formview.FriendRandListView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeGetreward): &formview.FriendGetrewardView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistlist): &formview.FriendAssistListView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHero): &formview.FriendAssistHeroView{}, + common.MF(comm.ModuleFriend, friend.FriendSubTypeAssistHeroList): &formview.FriendAssistHeroListView{}, + + // shop + common.MF(comm.ModuleShop, "getlist"): &formview.ShopListView{}, + common.MF(comm.ModuleShop, "buy"): &formview.ShopBuyView{}, + // mailine + common.MF(comm.ModuleMline, mline.MlineGetListResp): &formview.MainlineListView{}, + common.MF(comm.ModuleMline, mline.MlineChallengeResp): &formview.MainlineChallengeView{}, + common.MF(comm.ModuleMline, mline.MlineGetRewardResp): &formview.MainlineRewardView{}, + // pagoda + common.MF(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, + // rtask + common.MF(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, + // linestory + common.MF(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, + common.MF(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, + // gourmet + common.MF(comm.ModuleGourmet, "getranduser"): &formview.GourmentGetRandView{}, + // sociaty + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeList): &formview.SociatyListView{}, + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeCreate): &formview.SociatyCreateView{}, + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeMine): &formview.SociatyMineView{}, + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeTasklist): &formview.SociatyTasklistView{}, + common.MF(comm.ModuleSociaty, sociaty.SociatySubTypeRank): &formview.SociatyRankView{}, + common.MF(comm.ModuleSociaty, "boss"): &formview.SociatyBossView{}, + // troll + common.MF(comm.ModuleTroll, "getlist"): &formview.TrollGetlistView{}, + // growtask + common.MF(comm.ModuleGrowtask, growtask.GrowtaskSubTypeList): &formview.GrowtaskListView{}, + //worldtask + common.MF(comm.ModuleWorldtask, worldtask.WorldtaskSubtypeMine): &formview.WorldtaskMineView{}, + //smithy + common.MF(comm.ModuleSmithy, "customer"): &formview.SmithyView{}, + //武馆派遣 + common.MF(comm.ModuleDispatch, "dispatch"): &formview.DispatchView{}, + //声望 + common.MF(comm.ModuleReputation, "reputation"): &formview.ReputationView{}, + //旧时光 + common.MF(comm.ModuleOldtimes, "oldtimes"): &formview.OldtimesView{}, + } +) diff --git a/cmd/v2/ui/views/dispatch.go b/cmd/v2/ui/views/dispatch.go index 8e8545a5a..c725b7367 100644 --- a/cmd/v2/ui/views/dispatch.go +++ b/cmd/v2/ui/views/dispatch.go @@ -56,7 +56,7 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject { noticeFun() }) //刷新公告 - refreshBtn := widget.NewButton("刷新公告", func() { + refresh := func() { if err := service.GetPttService().SendToClient( t.MainType, "refresh", @@ -66,6 +66,16 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject { return } noticeFun() + } + refreshBtn := widget.NewButton("刷新公告", func() { + refresh() + }) + // 测试刷新 + testRefreshBtn := widget.NewButton("测试重复", func() { + for i := 0; i < 100; i++ { + refresh() + time.Sleep(time.Millisecond * 200) + } }) //领取奖励 @@ -136,7 +146,7 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject { paiWin.Resize(fyne.NewSize(600, 300)) paiWin.Show() }) - + //周奖励领取 weekReceiveBtn := widget.NewButton("周奖励", func() { if err := service.GetPttService().SendToClient( @@ -152,7 +162,7 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject { }) - top := container.NewHBox(noticeBtn, refreshBtn, receiveBtn, + top := container.NewHBox(noticeBtn, refreshBtn, testRefreshBtn, receiveBtn, autoReceiveBtn, paiqianBtn, weekReceiveBtn) bottom := container.NewHBox(d.noticeLabl) c := container.NewBorder(top, bottom, nil, nil, d.itemList.ItemList) @@ -182,27 +192,36 @@ func (a *DispatchView) noticeList() { return } - a.noticeLabl.SetText(fmt.Sprintf("公告等级:%v 免费次数:%v 刷新次数:%v 任务数:%v 周任务数:%v 周奖励领取:%v", - rsp.Dispatch.Lv, - rsp.Dispatch.FreeCount, - rsp.Dispatch.RefreshCount, - rsp.Dispatch.TaskCount, - rsp.Dispatch.WeekCount, - rsp.Dispatch.WeekReceived, - )) - a.noticeLabl.Refresh() + //验证结果是否有重复 + tidMap := make(map[int32]int32) + var r bool for _, v := range rsp.Dispatch.Tasks { + if _, ok := tidMap[v.TaskId]; ok { + r = true + } + tidMap[v.TaskId] = v.TaskId t1 := time.Unix(v.Duration, 0) lt1 := t1.Format("15:04:05") t2 := time.Unix(v.LeftTime, 0) lt2 := t2.Format("15:04:05") item := common.Item{ Id: cast.ToString(v.TaskId), - Text: fmt.Sprintf("ID:%v 状态:%v 任务截至:%v 派遣截至:%v", v.TaskId, v.Status, lt1, lt2), + Text: fmt.Sprintf("ID:%v 状态:%v 任务截至:%v 派遣截至:%v ", v.TaskId, v.Status, lt1, lt2), Data: v, } a.itemList.AddItem(item) } + + a.noticeLabl.SetText(fmt.Sprintf("公告等级:%v 免费次数:%v 刷新次数:%v 任务数:%v 周任务数:%v 周奖励领取:%v 重复:%v", + rsp.Dispatch.Lv, + rsp.Dispatch.FreeCount, + rsp.Dispatch.RefreshCount, + rsp.Dispatch.TaskCount, + rsp.Dispatch.WeekCount, + rsp.Dispatch.WeekReceived, + r, + )) + a.noticeLabl.Refresh() } }, }) diff --git a/cmd/v2/ui/views/rtask_testview.go b/cmd/v2/ui/views/rtask_testview.go index d209b7080..ef0cfe1e2 100644 --- a/cmd/v2/ui/views/rtask_testview.go +++ b/cmd/v2/ui/views/rtask_testview.go @@ -1,12 +1,21 @@ package formview import ( + "fmt" + "go_dreamfactory/cmd/v2/lib/common" + pb2 "go_dreamfactory/cmd/v2/lib/pb" "go_dreamfactory/cmd/v2/model" "go_dreamfactory/cmd/v2/service" "go_dreamfactory/pb" "go_dreamfactory/utils" + "strings" + "sync" + + cfg "go_dreamfactory/sys/configure/structs" "fyne.io/fyne/v2" + "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" "github.com/spf13/cast" @@ -14,9 +23,21 @@ import ( type RtaskTestView struct { BaseformView + itemList *common.ItemList + result chan int } func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { + defer this.loadProtocol() + this.itemList = common.NewItemList() + this.itemList.ItemList = this.itemList.CreateDefaultCheckList() + + this.result = make(chan int) + + go func() { + + }() + rtaskTypeInput := widget.NewEntry() paramsInput := widget.NewEntry() @@ -34,29 +55,111 @@ func (this *RtaskTestView) CreateView(t *model.TestCase) fyne.CanvasObject { this.form.AppendItem(widget.NewFormItem("分组编号", input)) - this.form.OnSubmit = func() { - // if rtaskTypeInput.Text == "" { - // dialog.ShowError(errors.New("请填写任务类型ID"), this.w) - // return - // } + testBtn := widget.NewButton("手动触发", func() { + this.form.OnSubmit = func() { + if err := service.GetPttService().SendToClient( + t.MainType, + t.SubType, + &pb.RtaskTestReq{ + RtaskType: cast.ToInt32(rtaskTypeInput.Text), + Params: utils.TrInt32(paramsInput.Text), + CondiId: cast.ToInt32(condiInput.Text), + }, + ); err != nil { + logrus.Error(err) + return + } + } - // if paramsInput.Text == "" { - // dialog.ShowError(errors.New("请填写任务条件参数"), this.w) - // return - // } + paiWin := dialog.NewCustom("手动触发", "关闭", this.form, this.w) + paiWin.Resize(fyne.NewSize(600, 300)) + paiWin.Show() + }) - if err := service.GetPttService().SendToClient( - t.MainType, - t.SubType, - &pb.RtaskTestReq{ - RtaskType: cast.ToInt32(rtaskTypeInput.Text), - Params: utils.TrInt32(paramsInput.Text), - CondiId: cast.ToInt32(condiInput.Text), - }, - ); err != nil { - logrus.Error(err) - return + //"F:\\projects\\workspace\\go_dreamfactory\\bin\\json" + jsonPathEntry := widget.NewEntry() + jsonPathEntry.SetText("F:\\projects\\workspace\\go_dreamfactory\\bin\\json") + reportEntry := widget.NewEntry() + reportEntry.SetText("F:\\result.txt") + + autoTestForm := widget.NewForm( + widget.NewFormItem("Json配置", jsonPathEntry), + widget.NewFormItem("报告目录", reportEntry), + ) + + autoTestForm.OnSubmit = func() { + commCfg := &common.Config{ + Path: jsonPathEntry.Text, + } + var wg sync.WaitGroup + if tb, err := cfg.NewTables(commCfg.Loader); err == nil { + for _, v := range tb.RdtaskCondi.GetDataList() { + wg.Add(1) + params := []int32{v.Data1, v.Data2, v.Data3, v.Data4, v.Data5} + var p []int32 + for _, v := range params { + if v > 0 { + p = append(p, v) + } + } + go func(condId, rtype int32, p []int32) { + defer wg.Done() + if err := service.GetPttService().SendToClient( + t.MainType, + t.SubType, + &pb.RtaskTestReq{ + RtaskType: rtype, + Params: p, + }, + ); err != nil { + logrus.Error(err) + return + } + logrus.Debugf("执行任务 id:%v rtype:%v params:%v", condId, rtype, p) + }(v.Id, v.Type, p) + wg.Wait() + // time.Sleep(time.Millisecond * 100) + } } } - return this.form + + autoTestBtn := widget.NewButton("自动触发配置", func() { + paiWin := dialog.NewCustom("自动触发配置", "关闭", autoTestForm, this.w) + paiWin.Resize(fyne.NewSize(600, 300)) + paiWin.Show() + }) + + autoBtn := widget.NewButton("模拟API测试", func() { + for k, v := range pb2.TaskCase { + if k != "" && strings.Contains(k, ".") && v.Enabled { + if err := service.GetPttService().SendToClient( + v.MainType, + v.SubType, + v.Req, + ); err != nil { + logrus.Errorf("%v.%v err:%v", v.MainType, v.SubType, err) + return + } + logrus.Debugf("%v.%v", v.MainType, v.SubType) + } + } + }) + + c := container.NewBorder( + container.NewHBox(testBtn, autoTestBtn, autoBtn), nil, nil, nil, this.itemList.ItemList) + + return c +} + +func (this *RtaskTestView) loadProtocol() { + for k, v := range pb2.TaskCase { + if k != "" && strings.Contains(k, ".") && v.Enabled { + item := common.Item{ + Id: k, + Text: fmt.Sprintf("%v (%v)", v.NavLabel, k), + } + this.itemList.AddItem(item) + } + } + } diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index 78f9635fa..1a76f1ee7 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -35,7 +35,7 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( freeCount := a.module.ModuleTools.GetGlobalConf().DispatchFreecheck nb := &pb.Noticeboard{ - Lv: 1, //公告初始升级 + Lv: 1, //公告初始等级 FreeCount: freeCount, Tasks: tasks, UpdateTime: configure.Now().Unix(), diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go index 07733d246..e7b291ede 100644 --- a/modules/dispatch/model_dispatch.go +++ b/modules/dispatch/model_dispatch.go @@ -136,20 +136,19 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task func (this *modelDispatch) randomTask(dispatch *pb.DBDispatch, n int) (tasks []*pb.DispatchTask) { total := 0 + existmap := make(map[int32]int32) + for _, v := range dispatch.Nb.Tasks { + if v != nil { + existmap[v.TaskId] = v.TaskId + } + } for total < n { rid := this.getTasksWeight(dispatch.Nb.Lv) if rid == 0 { return nil } - //去重 - exist := false - for _, v := range dispatch.Nb.Tasks { - if v != nil && v.TaskId == rid { - exist = true - } - } - //不存在 - if !exist { + + if _, ok := existmap[rid]; !ok { tasks = append(tasks, &pb.DispatchTask{ TaskId: rid, }) diff --git a/modules/library/api_activationfetter.go b/modules/library/api_activationfetter.go index c1e3749f7..6a7fd32d8 100644 --- a/modules/library/api_activationfetter.go +++ b/modules/library/api_activationfetter.go @@ -25,14 +25,14 @@ func (this *apiComp) ActivationFetter(session comm.IUserSession, req *pb.Library code = pb.ErrorCode_LibraryNoData return } - if fetter.Activation { + if fetter.Fidlv != 0 { code = pb.ErrorCode_LibraryActivation return } - fetter.Activation = true + fetter.Fidlv = 1 mapData := make(map[string]interface{}, 0) - mapData["activation"] = fetter.Activation + mapData["fidlv"] = fetter.Fidlv this.module.modelLibrary.modifyLibraryDataByObjId(session.GetUserId(), fetter.Id, mapData) rsp.Data = fetter diff --git a/modules/library/api_getreward.go b/modules/library/api_lvup.go similarity index 69% rename from modules/library/api_getreward.go rename to modules/library/api_lvup.go index b7c054067..6eb7f8bef 100644 --- a/modules/library/api_getreward.go +++ b/modules/library/api_lvup.go @@ -7,27 +7,27 @@ import ( ) //参数校验 -func (this *apiComp) GetRewardCheck(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode) { - if req.ObjId == "" || req.Fetterlv == 0 { +func (this *apiComp) FetterLvUpCheck(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode) { + if req.LibOid == "" { code = pb.ErrorCode_ReqParameterError } return } // 羁绊等级奖励 -func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewardReq) (code pb.ErrorCode, data *pb.ErrorData) { +func (this *apiComp) FetterLvUp(session comm.IUserSession, req *pb.LibraryFetterLvUpReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( totalFetterLv int32 //羁绊总等级 ) - code = this.GetRewardCheck(session, req) + code = this.FetterLvUpCheck(session, req) if code != pb.ErrorCode_Success { return // 参数校验失败直接返回 } // 配置校验 - rsp := &pb.LibraryGetRewardResp{} - fetter := this.module.getLibraryByObjID(session.GetUserId(), req.ObjId) + rsp := &pb.LibraryFetterLvUpResp{} + fetter := this.module.getLibraryByObjID(session.GetUserId(), req.LibOid) if fetter == nil { code = pb.ErrorCode_LibraryNoData return @@ -38,22 +38,23 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa } } totalFetterLv = 0 - conf := this.module.configure.GetFriendData(fetter.Fid, req.Fetterlv) + conf := this.module.configure.GetFriendData(fetter.Fid, fetter.Fidlv+1) if len(conf) == 0 { code = pb.ErrorCode_ConfigNoFound return } else { + fetter.Fidlv += 1 if conf[0].FavorabilityLv > totalFetterLv { code = pb.ErrorCode_LibraryLvReward return } } - if _, ok := fetter.Prize[req.Fetterlv]; ok { + if _, ok := fetter.Prize[fetter.Fidlv]; ok { code = pb.ErrorCode_LibraryReward return } - fetter.Prize[req.Fetterlv] = 1 + fetter.Prize[fetter.Fidlv] = 1 // 发奖 hProperty := make(map[string][]*cfg.Gameatr, 0) @@ -71,8 +72,9 @@ func (this *apiComp) GetReward(session comm.IUserSession, req *pb.LibraryGetRewa this.module.ModuleHero.AddHeroFetterAttribute(session, hProperty) mapData := make(map[string]interface{}, 0) mapData["prize"] = fetter.Prize + mapData["fidlv"] = fetter.Fidlv this.module.ModifyLibraryData(session.GetUserId(), fetter.Id, mapData) // 更新内存信息 rsp.Data = fetter - session.SendMsg(string(this.module.GetType()), LibraryGetRewardResp, rsp) + session.SendMsg(string(this.module.GetType()), "fetterlvup", rsp) return } diff --git a/modules/rtask/help.go b/modules/rtask/help.go index 33f7e6bce..2eaa8987d 100644 --- a/modules/rtask/help.go +++ b/modules/rtask/help.go @@ -10,6 +10,7 @@ import ( ) func lenParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (n int, err error) { + if cfg.Data1 != 0 && cfg.Data2 != 0 && cfg.Data3 != 0 && cfg.Data4 != 0 && cfg.Data5 != 0 { if len(vals) != 5 { err = errors.New(fmt.Sprintf("%v 参数个数不一致,期望5实际是%v", cfg.Id, len(vals))) @@ -50,7 +51,7 @@ func lenParam(cfg *cfg.GameRdtaskCondiData, vals ...int32) (n int, err error) { } } - if cfg.Data1 != 0 { + if cfg.Data1 != 0 && vals[0] != 0 { if len(vals) != 1 { err = errors.New(fmt.Sprintf("%v 参数个数不一致,期望1实际是%v", cfg.Id, len(vals))) return @@ -149,7 +150,7 @@ func greatEual(actual, expected int32) bool { return actual >= expected } -//小于等于 +// 小于等于 func lessEqual(actual, expected int32) bool { return actual <= expected } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index edfd5e596..10a184727 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -87,7 +87,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq needTemperatureCos = reelcfg.TemperatureCos * req.Count // 熟练度减少的温度 t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv) - needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000 // 千分比 + needTemperatureCos = needTemperatureCos * (1000 - t) / 1000 // 千分比 if req.Lava > 0 { // 熔岩打造 exemption := this.module.ModuleTools.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度 diff --git a/modules/user/api_sellres.go b/modules/user/api_sellres.go new file mode 100644 index 000000000..8c76d4a86 --- /dev/null +++ b/modules/user/api_sellres.go @@ -0,0 +1,58 @@ +package user + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +//参数校验 +func (this *apiComp) SellItemCheck(session comm.IUserSession, req *pb.UserSellResReq) (code pb.ErrorCode) { + if len(req.Atno) == 0 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +//分解道具 +func (this *apiComp) SellItem(session comm.IUserSession, req *pb.UserSellResReq) (code pb.ErrorCode, data *pb.ErrorData) { + var ( + item []*pb.UserAtno // 出售的道具 + equip []*pb.UserAtno // 出售的装备 + sale []*pb.UserAssets + ) + if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { + return + } + for _, v := range req.Atno { + if v.A == "item" { + item = append(item, v) + } else if v.A == "equi" { + equip = append(equip, v) + } + } + if len(item) > 0 { + + } + if len(equip) > 0 { + var id []string + for _, v := range equip { + id = append(id, v.O) + } + if code, d := this.module.ModuleEquipment.SellEquipments(session, id); code != pb.ErrorCode_Success { + //sale = append(sale, d...) + for _, v := range d { + sale = append(sale, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + } + } + + session.SendMsg(string(this.module.GetType()), "sellres", &pb.UserSellResResp{ + Atn: sale, + IsSucc: true, + }) + return +} diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index 34dfd2b75..48517bb89 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -25,6 +25,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal atno []*pb.UserAtno // atno 类型 del []string // 自动出售的装备 changExp map[string]int32 + res []*cfg.Gameatn // 最后获得的资源 ) changExp = make(map[string]int32, 0) mapData = make(map[string]interface{}, 0) @@ -102,22 +103,36 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData["bossTime"] = viking.BossTime // 更新时间 reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励 - if code, atno = this.module.DispenseAtno(session, reward, true); code != pb.ErrorCode_Success { - return - } - - for _, v := range req.Star { - for _, v1 := range atno { - if v1.A == "equp" { - cfg := this.configure.GetEquipmentConfigureById(v1.T) - if cfg != nil && cfg.Star == v { - del = append(del, v1.O) + // 星级校验 + for _, v := range reward { + bFound := false + if v.A == "equp" { + for _, star := range req.Star { + cfg := this.configure.GetEquipmentConfigureById(v.T) + if cfg != nil && star == cfg.Star { // 自动出售 转换成其他道具 + if len(cfg.Sale) != 0 { + bFound = true + res = append(res, cfg.Sale...) + } + break } } } + // else if v.A == "item" { //道具出售 以后补充 + // if cfg, err := this.configure.GetItemConfigureData(v.T); err != nil { // 自动出售 转换成其他道具 + // if len(cfg.Sale) != 0 { + // bFound = true + // res = append(res, cfg.Sale...) + // } + // } + // } + if !bFound { + res = append(res, v) + } } - if len(del) > 0 { // 自动出售 - this.equip.SellEquipments(session, del) + + if code, atno = this.module.DispenseAtno(session, res, true); code != pb.ErrorCode_Success { + return } code = this.module.ModifyVikingData(session.GetUserId(), mapData) diff --git a/pb/library_db.pb.go b/pb/library_db.pb.go index e78626186..b150c9533 100644 --- a/pb/library_db.pb.go +++ b/pb/library_db.pb.go @@ -31,7 +31,7 @@ type DBLibrary struct { Herofetter map[string]string `protobuf:"bytes,4,rep,name=herofetter,proto3" json:"herofetter" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // key: hid value: DBHeroFetter ObjID Prize map[int32]int32 `protobuf:"bytes,5,rep,name=prize,proto3" json:"prize" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //是否领奖 key 好感度等级 Storyid int32 `protobuf:"varint,6,opt,name=storyid,proto3" json:"storyid"` // 故事id 用来判断是否领奖 - Activation bool `protobuf:"varint,7,opt,name=activation,proto3" json:"activation"` // 是否激活 + Fidlv int32 `protobuf:"varint,7,opt,name=fidlv,proto3" json:"fidlv"` // 羁绊领奖等级 } func (x *DBLibrary) Reset() { @@ -108,11 +108,11 @@ func (x *DBLibrary) GetStoryid() int32 { return 0 } -func (x *DBLibrary) GetActivation() bool { +func (x *DBLibrary) GetFidlv() int32 { if x != nil { - return x.Activation + return x.Fidlv } - return false + return 0 } // 羁绊英雄数据 @@ -398,7 +398,7 @@ var File_library_library_db_proto protoreflect.FileDescriptor var file_library_library_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xdb, 0x02, 0x0a, 0x09, 0x44, + 0x79, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd1, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 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, 0x10, 0x0a, 0x03, 0x66, 0x69, @@ -411,55 +411,55 @@ var file_library_library_db_proto_rawDesc = []byte{ 0x61, 0x72, 0x79, 0x2e, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x69, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x1a, - 0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x14, 0x0a, 0x05, 0x66, 0x69, 0x64, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x66, 0x69, 0x64, 0x6c, 0x76, 0x1a, 0x3d, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x66, 0x65, 0x74, + 0x74, 0x65, 0x72, 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, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, - 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, - 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, - 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, - 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, - 0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, - 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, - 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, - 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, - 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 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, 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, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xbe, + 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 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, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x6c, 0x76, 0x12, 0x1a, 0x0a, + 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x66, 0x61, 0x76, 0x6f, 0x72, 0x65, 0x78, 0x70, 0x12, 0x34, 0x0a, 0x07, 0x6c, 0x76, 0x70, + 0x72, 0x69, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x2e, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, + 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x12, + 0x1c, 0x0a, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x67, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, + 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x74, + 0x69, 0x6d, 0x65, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x76, 0x70, 0x72, 0x69, 0x7a, 0x65, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 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, 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, 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 ( diff --git a/pb/library_msg.pb.go b/pb/library_msg.pb.go index d44d25517..79e62949c 100644 --- a/pb/library_msg.pb.go +++ b/pb/library_msg.pb.go @@ -192,109 +192,6 @@ func (x *LibraryGetFetterListResp) GetData() []*DBHeroFetter { return nil } -// 领取羁绊等级奖励 -type LibraryGetRewardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - ObjId string `protobuf:"bytes,1,opt,name=objId,proto3" json:"objId"` // DBLibrary 的ObjID - Fetterlv int32 `protobuf:"varint,2,opt,name=fetterlv,proto3" json:"fetterlv"` // 羁绊等级 -} - -func (x *LibraryGetRewardReq) Reset() { - *x = LibraryGetRewardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *LibraryGetRewardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LibraryGetRewardReq) ProtoMessage() {} - -func (x *LibraryGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use LibraryGetRewardReq.ProtoReflect.Descriptor instead. -func (*LibraryGetRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{4} -} - -func (x *LibraryGetRewardReq) GetObjId() string { - if x != nil { - return x.ObjId - } - return "" -} - -func (x *LibraryGetRewardReq) GetFetterlv() int32 { - if x != nil { - return x.Fetterlv - } - return 0 -} - -type LibraryGetRewardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` -} - -func (x *LibraryGetRewardResp) Reset() { - *x = LibraryGetRewardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *LibraryGetRewardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*LibraryGetRewardResp) ProtoMessage() {} - -func (x *LibraryGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use LibraryGetRewardResp.ProtoReflect.Descriptor instead. -func (*LibraryGetRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{5} -} - -func (x *LibraryGetRewardResp) GetData() *DBLibrary { - if x != nil { - return x.Data - } - return nil -} - // 领取剧情奖励 type LibraryGetStoryRewardReq struct { state protoimpl.MessageState @@ -308,7 +205,7 @@ type LibraryGetStoryRewardReq struct { func (x *LibraryGetStoryRewardReq) Reset() { *x = LibraryGetStoryRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[6] + mi := &file_library_library_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -321,7 +218,7 @@ func (x *LibraryGetStoryRewardReq) String() string { func (*LibraryGetStoryRewardReq) ProtoMessage() {} func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[6] + mi := &file_library_library_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -334,7 +231,7 @@ func (x *LibraryGetStoryRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardReq.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{6} + return file_library_library_msg_proto_rawDescGZIP(), []int{4} } func (x *LibraryGetStoryRewardReq) GetOid() string { @@ -362,7 +259,7 @@ type LibraryGetStoryRewardResp struct { func (x *LibraryGetStoryRewardResp) Reset() { *x = LibraryGetStoryRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[7] + mi := &file_library_library_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -375,7 +272,7 @@ func (x *LibraryGetStoryRewardResp) String() string { func (*LibraryGetStoryRewardResp) ProtoMessage() {} func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[7] + mi := &file_library_library_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -388,7 +285,7 @@ func (x *LibraryGetStoryRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryGetStoryRewardResp.ProtoReflect.Descriptor instead. func (*LibraryGetStoryRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{7} + return file_library_library_msg_proto_rawDescGZIP(), []int{5} } func (x *LibraryGetStoryRewardResp) GetData() *DBHeroFetter { @@ -412,7 +309,7 @@ type LibraryUseGiftReq struct { func (x *LibraryUseGiftReq) Reset() { *x = LibraryUseGiftReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[8] + mi := &file_library_library_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -425,7 +322,7 @@ func (x *LibraryUseGiftReq) String() string { func (*LibraryUseGiftReq) ProtoMessage() {} func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[8] + mi := &file_library_library_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -438,7 +335,7 @@ func (x *LibraryUseGiftReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryUseGiftReq.ProtoReflect.Descriptor instead. func (*LibraryUseGiftReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{8} + return file_library_library_msg_proto_rawDescGZIP(), []int{6} } func (x *LibraryUseGiftReq) GetHeroid() string { @@ -473,7 +370,7 @@ type LibraryUseGiftResp struct { func (x *LibraryUseGiftResp) Reset() { *x = LibraryUseGiftResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[9] + mi := &file_library_library_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -486,7 +383,7 @@ func (x *LibraryUseGiftResp) String() string { func (*LibraryUseGiftResp) ProtoMessage() {} func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[9] + mi := &file_library_library_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -499,7 +396,7 @@ func (x *LibraryUseGiftResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryUseGiftResp.ProtoReflect.Descriptor instead. func (*LibraryUseGiftResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{9} + return file_library_library_msg_proto_rawDescGZIP(), []int{7} } func (x *LibraryUseGiftResp) GetData() *DBHeroFetter { @@ -521,7 +418,7 @@ type LibraryActivationFetterReq struct { func (x *LibraryActivationFetterReq) Reset() { *x = LibraryActivationFetterReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[10] + mi := &file_library_library_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -534,7 +431,7 @@ func (x *LibraryActivationFetterReq) String() string { func (*LibraryActivationFetterReq) ProtoMessage() {} func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[10] + mi := &file_library_library_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -547,7 +444,7 @@ func (x *LibraryActivationFetterReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryActivationFetterReq.ProtoReflect.Descriptor instead. func (*LibraryActivationFetterReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{10} + return file_library_library_msg_proto_rawDescGZIP(), []int{8} } func (x *LibraryActivationFetterReq) GetOid() string { @@ -568,7 +465,7 @@ type LibraryActivationFetterResp struct { func (x *LibraryActivationFetterResp) Reset() { *x = LibraryActivationFetterResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[11] + mi := &file_library_library_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -581,7 +478,7 @@ func (x *LibraryActivationFetterResp) String() string { func (*LibraryActivationFetterResp) ProtoMessage() {} func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[11] + mi := &file_library_library_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -594,7 +491,7 @@ func (x *LibraryActivationFetterResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryActivationFetterResp.ProtoReflect.Descriptor instead. func (*LibraryActivationFetterResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{11} + return file_library_library_msg_proto_rawDescGZIP(), []int{9} } func (x *LibraryActivationFetterResp) GetData() *DBLibrary { @@ -617,7 +514,7 @@ type LibraryChangePush struct { func (x *LibraryChangePush) Reset() { *x = LibraryChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[12] + mi := &file_library_library_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -630,7 +527,7 @@ func (x *LibraryChangePush) String() string { func (*LibraryChangePush) ProtoMessage() {} func (x *LibraryChangePush) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[12] + mi := &file_library_library_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -643,7 +540,7 @@ func (x *LibraryChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryChangePush.ProtoReflect.Descriptor instead. func (*LibraryChangePush) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{12} + return file_library_library_msg_proto_rawDescGZIP(), []int{10} } func (x *LibraryChangePush) GetData() []*DBLibrary { @@ -673,7 +570,7 @@ type LibraryLvRewardReq struct { func (x *LibraryLvRewardReq) Reset() { *x = LibraryLvRewardReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[13] + mi := &file_library_library_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -686,7 +583,7 @@ func (x *LibraryLvRewardReq) String() string { func (*LibraryLvRewardReq) ProtoMessage() {} func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[13] + mi := &file_library_library_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -699,7 +596,7 @@ func (x *LibraryLvRewardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryLvRewardReq.ProtoReflect.Descriptor instead. func (*LibraryLvRewardReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{13} + return file_library_library_msg_proto_rawDescGZIP(), []int{11} } func (x *LibraryLvRewardReq) GetOid() string { @@ -727,7 +624,7 @@ type LibraryLvRewardResp struct { func (x *LibraryLvRewardResp) Reset() { *x = LibraryLvRewardResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[14] + mi := &file_library_library_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -740,7 +637,7 @@ func (x *LibraryLvRewardResp) String() string { func (*LibraryLvRewardResp) ProtoMessage() {} func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[14] + mi := &file_library_library_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -753,7 +650,7 @@ func (x *LibraryLvRewardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryLvRewardResp.ProtoReflect.Descriptor instead. func (*LibraryLvRewardResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{14} + return file_library_library_msg_proto_rawDescGZIP(), []int{12} } func (x *LibraryLvRewardResp) GetData() *DBHeroFetter { @@ -775,7 +672,7 @@ type LibraryFetterstoryTaskReq struct { func (x *LibraryFetterstoryTaskReq) Reset() { *x = LibraryFetterstoryTaskReq{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[15] + mi := &file_library_library_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -788,7 +685,7 @@ func (x *LibraryFetterstoryTaskReq) String() string { func (*LibraryFetterstoryTaskReq) ProtoMessage() {} func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[15] + mi := &file_library_library_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -801,7 +698,7 @@ func (x *LibraryFetterstoryTaskReq) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryFetterstoryTaskReq.ProtoReflect.Descriptor instead. func (*LibraryFetterstoryTaskReq) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{15} + return file_library_library_msg_proto_rawDescGZIP(), []int{13} } func (x *LibraryFetterstoryTaskReq) GetFetterId() int32 { @@ -822,7 +719,7 @@ type LibraryFetterstoryTaskResp struct { func (x *LibraryFetterstoryTaskResp) Reset() { *x = LibraryFetterstoryTaskResp{} if protoimpl.UnsafeEnabled { - mi := &file_library_library_msg_proto_msgTypes[16] + mi := &file_library_library_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -835,7 +732,7 @@ func (x *LibraryFetterstoryTaskResp) String() string { func (*LibraryFetterstoryTaskResp) ProtoMessage() {} func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message { - mi := &file_library_library_msg_proto_msgTypes[16] + mi := &file_library_library_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -848,7 +745,7 @@ func (x *LibraryFetterstoryTaskResp) ProtoReflect() protoreflect.Message { // Deprecated: Use LibraryFetterstoryTaskResp.ProtoReflect.Descriptor instead. func (*LibraryFetterstoryTaskResp) Descriptor() ([]byte, []int) { - return file_library_library_msg_proto_rawDescGZIP(), []int{16} + return file_library_library_msg_proto_rawDescGZIP(), []int{14} } func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { @@ -858,6 +755,101 @@ func (x *LibraryFetterstoryTaskResp) GetList() []*FetterTask { return nil } +// 手动提升羁绊等级 +type LibraryFetterLvUpReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + LibOid string `protobuf:"bytes,1,opt,name=libOid,proto3" json:"libOid"` // 羁绊对象id +} + +func (x *LibraryFetterLvUpReq) Reset() { + *x = LibraryFetterLvUpReq{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryFetterLvUpReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryFetterLvUpReq) ProtoMessage() {} + +func (x *LibraryFetterLvUpReq) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryFetterLvUpReq.ProtoReflect.Descriptor instead. +func (*LibraryFetterLvUpReq) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *LibraryFetterLvUpReq) GetLibOid() string { + if x != nil { + return x.LibOid + } + return "" +} + +type LibraryFetterLvUpResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Data *DBLibrary `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` +} + +func (x *LibraryFetterLvUpResp) Reset() { + *x = LibraryFetterLvUpResp{} + if protoimpl.UnsafeEnabled { + mi := &file_library_library_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LibraryFetterLvUpResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LibraryFetterLvUpResp) ProtoMessage() {} + +func (x *LibraryFetterLvUpResp) ProtoReflect() protoreflect.Message { + mi := &file_library_library_msg_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LibraryFetterLvUpResp.ProtoReflect.Descriptor instead. +func (*LibraryFetterLvUpResp) Descriptor() ([]byte, []int) { + return file_library_library_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *LibraryFetterLvUpResp) GetData() *DBLibrary { + if x != nil { + return x.Data + } + return nil +} + var File_library_library_msg_proto protoreflect.FileDescriptor var file_library_library_msg_proto_rawDesc = []byte{ @@ -874,61 +866,60 @@ var file_library_library_msg_proto_rawDesc = []byte{ 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, - 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x13, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x6c, 0x76, 0x22, 0x36, 0x0a, 0x14, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, - 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x18, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, 0x74, + 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, + 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x0a, + 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, + 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, + 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, 0x65, + 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, 0x65, + 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x22, 0x3e, 0x0a, 0x19, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x47, 0x65, - 0x74, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, 0x62, + 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0x59, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, - 0x65, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x22, 0x37, - 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x55, 0x73, 0x65, 0x47, 0x69, 0x66, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, - 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x1a, 0x4c, 0x69, 0x62, 0x72, 0x61, - 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x3d, 0x0a, 0x1b, 0x4c, 0x69, 0x62, 0x72, 0x61, - 0x72, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, - 0x79, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x25, 0x0a, 0x06, 0x66, - 0x65, 0x74, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x06, 0x66, 0x65, 0x74, 0x74, - 0x65, 0x72, 0x22, 0x36, 0x0a, 0x12, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x38, 0x0a, 0x13, 0x4c, 0x69, - 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x52, 0x04, - 0x64, 0x61, 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, 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, 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, + 0x61, 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, 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, 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, 0x22, 0x2e, 0x0a, 0x14, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70, + 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x69, 0x62, 0x4f, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x4c, 0x76, 0x55, 0x70, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -949,19 +940,19 @@ var file_library_library_msg_proto_goTypes = []interface{}{ (*LibraryGetListResp)(nil), // 1: LibraryGetListResp (*LibraryGetFetterListReq)(nil), // 2: LibraryGetFetterListReq (*LibraryGetFetterListResp)(nil), // 3: LibraryGetFetterListResp - (*LibraryGetRewardReq)(nil), // 4: LibraryGetRewardReq - (*LibraryGetRewardResp)(nil), // 5: LibraryGetRewardResp - (*LibraryGetStoryRewardReq)(nil), // 6: LibraryGetStoryRewardReq - (*LibraryGetStoryRewardResp)(nil), // 7: LibraryGetStoryRewardResp - (*LibraryUseGiftReq)(nil), // 8: LibraryUseGiftReq - (*LibraryUseGiftResp)(nil), // 9: LibraryUseGiftResp - (*LibraryActivationFetterReq)(nil), // 10: LibraryActivationFetterReq - (*LibraryActivationFetterResp)(nil), // 11: LibraryActivationFetterResp - (*LibraryChangePush)(nil), // 12: LibraryChangePush - (*LibraryLvRewardReq)(nil), // 13: LibraryLvRewardReq - (*LibraryLvRewardResp)(nil), // 14: LibraryLvRewardResp - (*LibraryFetterstoryTaskReq)(nil), // 15: LibraryFetterstoryTaskReq - (*LibraryFetterstoryTaskResp)(nil), // 16: LibraryFetterstoryTaskResp + (*LibraryGetStoryRewardReq)(nil), // 4: LibraryGetStoryRewardReq + (*LibraryGetStoryRewardResp)(nil), // 5: LibraryGetStoryRewardResp + (*LibraryUseGiftReq)(nil), // 6: LibraryUseGiftReq + (*LibraryUseGiftResp)(nil), // 7: LibraryUseGiftResp + (*LibraryActivationFetterReq)(nil), // 8: LibraryActivationFetterReq + (*LibraryActivationFetterResp)(nil), // 9: LibraryActivationFetterResp + (*LibraryChangePush)(nil), // 10: LibraryChangePush + (*LibraryLvRewardReq)(nil), // 11: LibraryLvRewardReq + (*LibraryLvRewardResp)(nil), // 12: LibraryLvRewardResp + (*LibraryFetterstoryTaskReq)(nil), // 13: LibraryFetterstoryTaskReq + (*LibraryFetterstoryTaskResp)(nil), // 14: LibraryFetterstoryTaskResp + (*LibraryFetterLvUpReq)(nil), // 15: LibraryFetterLvUpReq + (*LibraryFetterLvUpResp)(nil), // 16: LibraryFetterLvUpResp (*DBLibrary)(nil), // 17: DBLibrary (*DBHeroFetter)(nil), // 18: DBHeroFetter (*FetterTask)(nil), // 19: FetterTask @@ -969,14 +960,14 @@ var file_library_library_msg_proto_goTypes = []interface{}{ var file_library_library_msg_proto_depIdxs = []int32{ 17, // 0: LibraryGetListResp.data:type_name -> DBLibrary 18, // 1: LibraryGetFetterListResp.data:type_name -> DBHeroFetter - 17, // 2: LibraryGetRewardResp.data:type_name -> DBLibrary - 18, // 3: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter - 18, // 4: LibraryUseGiftResp.data:type_name -> DBHeroFetter - 17, // 5: LibraryActivationFetterResp.data:type_name -> DBLibrary - 17, // 6: LibraryChangePush.data:type_name -> DBLibrary - 18, // 7: LibraryChangePush.fetter:type_name -> DBHeroFetter - 18, // 8: LibraryLvRewardResp.data:type_name -> DBHeroFetter - 19, // 9: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 18, // 2: LibraryGetStoryRewardResp.data:type_name -> DBHeroFetter + 18, // 3: LibraryUseGiftResp.data:type_name -> DBHeroFetter + 17, // 4: LibraryActivationFetterResp.data:type_name -> DBLibrary + 17, // 5: LibraryChangePush.data:type_name -> DBLibrary + 18, // 6: LibraryChangePush.fetter:type_name -> DBHeroFetter + 18, // 7: LibraryLvRewardResp.data:type_name -> DBHeroFetter + 19, // 8: LibraryFetterstoryTaskResp.list:type_name -> FetterTask + 17, // 9: LibraryFetterLvUpResp.data:type_name -> DBLibrary 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 @@ -1040,30 +1031,6 @@ func file_library_library_msg_proto_init() { } } file_library_library_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*LibraryGetRewardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryGetStoryRewardReq); i { case 0: return &v.state @@ -1075,7 +1042,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryGetStoryRewardResp); i { case 0: return &v.state @@ -1087,7 +1054,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryUseGiftReq); i { case 0: return &v.state @@ -1099,7 +1066,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryUseGiftResp); i { case 0: return &v.state @@ -1111,7 +1078,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryActivationFetterReq); i { case 0: return &v.state @@ -1123,7 +1090,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryActivationFetterResp); i { case 0: return &v.state @@ -1135,7 +1102,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryChangePush); i { case 0: return &v.state @@ -1147,7 +1114,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryLvRewardReq); i { case 0: return &v.state @@ -1159,7 +1126,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryLvRewardResp); i { case 0: return &v.state @@ -1171,7 +1138,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryFetterstoryTaskReq); i { case 0: return &v.state @@ -1183,7 +1150,7 @@ func file_library_library_msg_proto_init() { return nil } } - file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_library_library_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LibraryFetterstoryTaskResp); i { case 0: return &v.state @@ -1195,6 +1162,30 @@ func file_library_library_msg_proto_init() { return nil } } + file_library_library_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryFetterLvUpReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_library_library_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LibraryFetterLvUpResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 506164042..3c890c817 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -2683,6 +2683,110 @@ func (x *UserChangeTipsResp) GetData() *DBSign { return nil } +//出售资源 +type UserSellResReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Atno []*UserAtno `protobuf:"bytes,1,rep,name=atno,proto3" json:"atno"` +} + +func (x *UserSellResReq) Reset() { + *x = UserSellResReq{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[52] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserSellResReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserSellResReq) ProtoMessage() {} + +func (x *UserSellResReq) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[52] + 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 UserSellResReq.ProtoReflect.Descriptor instead. +func (*UserSellResReq) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{52} +} + +func (x *UserSellResReq) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + +//出售道具请求 回应 +type UserSellResResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Atn []*UserAssets `protobuf:"bytes,1,rep,name=atn,proto3" json:"atn"` + IsSucc bool `protobuf:"varint,2,opt,name=IsSucc,proto3" json:"IsSucc"` +} + +func (x *UserSellResResp) Reset() { + *x = UserSellResResp{} + if protoimpl.UnsafeEnabled { + mi := &file_user_user_msg_proto_msgTypes[53] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *UserSellResResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UserSellResResp) ProtoMessage() {} + +func (x *UserSellResResp) ProtoReflect() protoreflect.Message { + mi := &file_user_user_msg_proto_msgTypes[53] + 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 UserSellResResp.ProtoReflect.Descriptor instead. +func (*UserSellResResp) Descriptor() ([]byte, []int) { + return file_user_user_msg_proto_rawDescGZIP(), []int{53} +} + +func (x *UserSellResResp) GetAtn() []*UserAssets { + if x != nil { + return x.Atn + } + return nil +} + +func (x *UserSellResResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + var File_user_user_msg_proto protoreflect.FileDescriptor var file_user_user_msg_proto_rawDesc = []byte{ @@ -2696,198 +2800,207 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x2f, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x10, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x64, 0x61, - 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, - 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, + 0x74, 0x61, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, + 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, + 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, + 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, + 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x18, 0x0a, + 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, + 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4a, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, + 0x65, 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, 0x74, + 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x6f, 0x75, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, + 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x03, 0x73, 0x69, 0x64, 0x22, 0x65, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, - 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, - 0x78, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4e, 0x6f, 0x77, 0x22, 0x0d, 0x0a, 0x0b, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x4a, 0x0a, 0x0c, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, - 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x71, 0x22, 0x10, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4c, - 0x6f, 0x67, 0x6f, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, - 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, - 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, - 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, - 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, 0xf0, 0x02, - 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, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, - 0x70, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x65, - 0x78, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, - 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, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, - 0x70, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x12, 0x1a, 0x0a, 0x08, - 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, - 0x6e, 0x74, 0x31, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x31, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x12, 0x18, 0x0a, 0x07, - 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, - 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x33, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x34, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, - 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, 0x23, 0x0a, 0x11, - 0x55, 0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, - 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, - 0x73, 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, + 0x03, 0x73, 0x69, 0x64, 0x22, 0x4c, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, + 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, + 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x5b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, + 0x16, 0x0a, 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x06, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 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, 0xf0, 0x02, 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, 0x02, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78, 0x70, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, 0x65, 0x78, 0x70, 0x12, 0x18, + 0x0a, 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x07, 0x64, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x61, 0x72, 0x63, 0x6f, 0x69, 0x6e, 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, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, + 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, + 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, + 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x31, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x31, 0x12, 0x18, + 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, + 0x6e, 0x74, 0x33, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x33, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, 0x18, 0x0e, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x34, 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, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, + 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 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, - 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, 0x2b, - 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, 0x22, 0x2a, 0x0a, 0x12, 0x55, - 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, - 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x50, - 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, - 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, - 0x6e, 0x64, 0x65, 0x78, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, - 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, - 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x31, 0x0a, - 0x12, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 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, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x2b, 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, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x50, + 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x22, 0x2b, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x50, 0x75, 0x7a, 0x7a, 0x6c, + 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, + 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, + 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x31, 0x0a, 0x12, 0x55, 0x73, 0x65, + 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x54, 0x69, 0x70, 0x73, 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, 0x22, 0x2f, 0x0a, 0x0e, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x71, 0x12, 0x1d, + 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, + 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x48, 0x0a, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x1d, 0x0a, 0x03, 0x61, 0x74, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x03, 0x61, 0x74, 0x6e, 0x12, + 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2902,7 +3015,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, 52) +var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 54) var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginResp)(nil), // 1: UserLoginResp @@ -2956,41 +3069,47 @@ var file_user_user_msg_proto_goTypes = []interface{}{ (*UserPuzzleAwardResp)(nil), // 49: UserPuzzleAwardResp (*UserChangeTipsReq)(nil), // 50: UserChangeTipsReq (*UserChangeTipsResp)(nil), // 51: UserChangeTipsResp - (*DBUser)(nil), // 52: DBUser - (*DBUserExpand)(nil), // 53: DBUserExpand - (ErrorCode)(0), // 54: ErrorCode - (*CacheUser)(nil), // 55: CacheUser - (*DBUserSetting)(nil), // 56: DBUserSetting - (*DBPagodaRecord)(nil), // 57: DBPagodaRecord - (*DBHuntingRank)(nil), // 58: DBHuntingRank - (*DBVikingRank)(nil), // 59: DBVikingRank - (*DBServerData)(nil), // 60: DBServerData - (*DBSign)(nil), // 61: DBSign + (*UserSellResReq)(nil), // 52: UserSellResReq + (*UserSellResResp)(nil), // 53: UserSellResResp + (*DBUser)(nil), // 54: DBUser + (*DBUserExpand)(nil), // 55: DBUserExpand + (ErrorCode)(0), // 56: ErrorCode + (*CacheUser)(nil), // 57: CacheUser + (*DBUserSetting)(nil), // 58: DBUserSetting + (*DBPagodaRecord)(nil), // 59: DBPagodaRecord + (*DBHuntingRank)(nil), // 60: DBHuntingRank + (*DBVikingRank)(nil), // 61: DBVikingRank + (*DBServerData)(nil), // 62: DBServerData + (*DBSign)(nil), // 63: DBSign + (*UserAtno)(nil), // 64: UserAtno + (*UserAssets)(nil), // 65: UserAssets } var file_user_user_msg_proto_depIdxs = []int32{ - 52, // 0: UserLoginResp.data:type_name -> DBUser - 53, // 1: UserLoginResp.ex:type_name -> DBUserExpand - 52, // 2: UserInfoResp.data:type_name -> DBUser - 53, // 3: UserInfoResp.ex:type_name -> DBUserExpand - 54, // 4: UserRegisterResp.Code:type_name -> ErrorCode - 55, // 5: UserLoadResp.data:type_name -> CacheUser - 56, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting - 56, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting - 52, // 8: UserBattlerecordResp.data:type_name -> DBUser - 53, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand - 57, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord - 58, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank - 59, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank - 55, // 13: UserOnlineResp.users:type_name -> CacheUser - 52, // 14: UserDataListResp.users:type_name -> DBUser - 60, // 15: UserGetServerDataResp.data:type_name -> DBServerData - 61, // 16: UserSignResp.data:type_name -> DBSign - 61, // 17: UserChangeTipsResp.data:type_name -> DBSign - 18, // [18:18] is the sub-list for method output_type - 18, // [18:18] is the sub-list for method input_type - 18, // [18:18] is the sub-list for extension type_name - 18, // [18:18] is the sub-list for extension extendee - 0, // [0:18] is the sub-list for field type_name + 54, // 0: UserLoginResp.data:type_name -> DBUser + 55, // 1: UserLoginResp.ex:type_name -> DBUserExpand + 54, // 2: UserInfoResp.data:type_name -> DBUser + 55, // 3: UserInfoResp.ex:type_name -> DBUserExpand + 56, // 4: UserRegisterResp.Code:type_name -> ErrorCode + 57, // 5: UserLoadResp.data:type_name -> CacheUser + 58, // 6: UserGetSettingResp.setting:type_name -> DBUserSetting + 58, // 7: UserUpdateSettingReq.setting:type_name -> DBUserSetting + 54, // 8: UserBattlerecordResp.data:type_name -> DBUser + 55, // 9: UserBattlerecordResp.ex:type_name -> DBUserExpand + 59, // 10: UserBattlerecordResp.pagodaRecord:type_name -> DBPagodaRecord + 60, // 11: UserBattlerecordResp.huntingRecord:type_name -> DBHuntingRank + 61, // 12: UserBattlerecordResp.vikingRecord:type_name -> DBVikingRank + 57, // 13: UserOnlineResp.users:type_name -> CacheUser + 54, // 14: UserDataListResp.users:type_name -> DBUser + 62, // 15: UserGetServerDataResp.data:type_name -> DBServerData + 63, // 16: UserSignResp.data:type_name -> DBSign + 63, // 17: UserChangeTipsResp.data:type_name -> DBSign + 64, // 18: UserSellResReq.atno:type_name -> UserAtno + 65, // 19: UserSellResResp.atn:type_name -> UserAssets + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_user_user_msg_proto_init() } @@ -3005,6 +3124,7 @@ func file_user_user_msg_proto_init() { file_viking_viking_db_proto_init() file_hunting_hunting_db_proto_init() file_serverdata_proto_init() + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_user_user_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserLoginReq); i { @@ -3630,6 +3750,30 @@ func file_user_user_msg_proto_init() { return nil } } + file_user_user_msg_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserSellResReq); 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[53].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*UserSellResResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -3637,7 +3781,7 @@ func file_user_user_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_user_user_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 52, + NumMessages: 54, NumExtensions: 0, NumServices: 0, },