diff --git a/bin/json/game_rdtaksall.json b/bin/json/game_rdtaksall.json deleted file mode 100644 index 7347b8308..000000000 --- a/bin/json/game_rdtaksall.json +++ /dev/null @@ -1,66 +0,0 @@ -[ - { - "rdtaks_id": 1001, - "task_type": 2, - "rdtaks_num": [ - 101, - 102 - ], - "id_last": [ - 0 - ], - "id_after": 1002, - "id_tag": 1, - "story": 3, - "completetask": 0, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 10 - }, - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ], - "choose_id": [ - 10001, - 10002, - 10003 - ] - }, - { - "rdtaks_id": 1002, - "task_type": 2, - "rdtaks_num": [ - 101, - 104 - ], - "id_last": [ - 1001 - ], - "id_after": 0, - "id_tag": 2, - "story": 3, - "completetask": 0, - "reword": [ - { - "a": "attr", - "t": "diamond", - "n": 15 - }, - { - "a": "attr", - "t": "gold", - "n": 1500 - } - ], - "choose_id": [ - 10011, - 10012, - 10013 - ] - } -] \ No newline at end of file diff --git a/bin/json/game_rdtakschoose.json b/bin/json/game_rdtakschoose.json deleted file mode 100644 index 8ef50afe8..000000000 --- a/bin/json/game_rdtakschoose.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "choose_id": 10001, - "num": 1, - "rdtaks_num": 104, - "rdtaks_id": 0 - }, - { - "choose_id": 10002, - "num": 2, - "rdtaks_num": 105, - "rdtaks_id": 1002 - }, - { - "choose_id": 10003, - "num": 3, - "rdtaks_num": 0, - "rdtaks_id": 0 - }, - { - "choose_id": 10011, - "num": 1, - "rdtaks_num": 106, - "rdtaks_id": 0 - }, - { - "choose_id": 10012, - "num": 2, - "rdtaks_num": 107, - "rdtaks_id": 0 - }, - { - "choose_id": 10013, - "num": 3, - "rdtaks_num": 0, - "rdtaks_id": 0 - } -] \ No newline at end of file diff --git a/bin/json/game_rdtaskall.json b/bin/json/game_rdtaskall.json new file mode 100644 index 000000000..64cbcf8ce --- /dev/null +++ b/bin/json/game_rdtaskall.json @@ -0,0 +1,228 @@ +[ + { + "id": 1001, + "type": 2, + "lastend": 0, + "rdtaks_num": [ + 101 + ], + "aftertaks": 1002, + "icetime": 0, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [ + 10001, + 1002, + 1003 + ], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 10 + }, + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "id": 1002, + "type": 2, + "lastend": 1001, + "rdtaks_num": [ + 101, + 102 + ], + "aftertaks": 1003, + "icetime": 0, + "tag": 2, + "story": 3, + "completetask": 0, + "chooseid": [ + 10011, + 10012, + 10013 + ], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1003, + "type": 2, + "lastend": 1002, + "rdtaks_num": [ + 101, + 103 + ], + "aftertaks": 1004, + "icetime": 0, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1004, + "type": 2, + "lastend": 1003, + "rdtaks_num": [ + 101, + 103 + ], + "aftertaks": 1005, + "icetime": 0, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1005, + "type": 2, + "lastend": 1004, + "rdtaks_num": [ + 104, + 105 + ], + "aftertaks": 1006, + "icetime": 0, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1006, + "type": 2, + "lastend": 1005, + "rdtaks_num": [ + 106 + ], + "aftertaks": 0, + "icetime": 0, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [ + 10021, + 10022 + ], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1007, + "type": 1, + "lastend": 0, + "rdtaks_num": [ + 107 + ], + "aftertaks": 1002, + "icetime": 1, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + }, + { + "id": 1008, + "type": 1, + "lastend": 0, + "rdtaks_num": [ + 108 + ], + "aftertaks": 1002, + "icetime": -1, + "tag": 1, + "story": 3, + "completetask": 0, + "chooseid": [ + 10041, + 10042 + ], + "reword": [ + { + "a": "attr", + "t": "diamond", + "n": 15 + }, + { + "a": "attr", + "t": "gold", + "n": 1500 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json new file mode 100644 index 000000000..68e98b36d --- /dev/null +++ b/bin/json/game_rdtaskchoose.json @@ -0,0 +1,98 @@ +[ + { + "chooseid": 10001, + "num": 1, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10002, + "num": 2, + "rdtaks_num": 107, + "need": [ + 0 + ] + }, + { + "chooseid": 10003, + "num": 3, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10011, + "num": 1, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10012, + "num": 2, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10013, + "num": 3, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10021, + "num": 1, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10022, + "num": 2, + "rdtaks_num": 101, + "need": [ + 0 + ] + }, + { + "chooseid": 10031, + "num": 1, + "rdtaks_num": 0, + "need": [ + 10012 + ] + }, + { + "chooseid": 10032, + "num": 2, + "rdtaks_num": 0, + "need": [ + 0 + ] + }, + { + "chooseid": 10041, + "num": 1, + "rdtaks_num": 0, + "need": [ + 10010 + ] + }, + { + "chooseid": 10042, + "num": 2, + "rdtaks_num": 0, + "need": [ + 0 + ] + } +] \ No newline at end of file diff --git a/bin/json/game_rdtakstype.json b/bin/json/game_rdtasktype.json similarity index 83% rename from bin/json/game_rdtakstype.json rename to bin/json/game_rdtasktype.json index 08ee6b0e7..6a8ba67cc 100644 --- a/bin/json/game_rdtakstype.json +++ b/bin/json/game_rdtasktype.json @@ -13,7 +13,7 @@ "typdes": 2, "datatime": 1, "typtask_id": 2, - "data1": 10, + "data1": 3, "data2": 0, "data3": 0 }, @@ -22,7 +22,7 @@ "typdes": 2, "datatime": 1, "typtask_id": 3, - "data1": 3, + "data1": 2, "data2": 0, "data3": 0 }, @@ -31,44 +31,44 @@ "typdes": 2, "datatime": 1, "typtask_id": 4, - "data1": 2, - "data2": 0, + "data1": 90001, + "data2": 15, "data3": 0 }, { "rdtaks_num": 105, "typdes": 2, "datatime": 1, - "typtask_id": 5, - "data1": 101, - "data2": 0, + "typtask_id": 4, + "data1": 25001, + "data2": 10, "data3": 0 }, { "rdtaks_num": 106, "typdes": 2, "datatime": 1, - "typtask_id": 6, - "data1": 3, - "data2": 0, + "typtask_id": 5, + "data1": 90001, + "data2": 2, "data3": 0 }, { "rdtaks_num": 107, "typdes": 2, "datatime": 1, - "typtask_id": 7, - "data1": 10002, - "data2": 0, + "typtask_id": 4, + "data1": 25001, + "data2": 20, "data3": 0 }, { "rdtaks_num": 108, "typdes": 2, "datatime": 1, - "typtask_id": 8, + "typtask_id": 6, "data1": 90001, - "data2": 15, + "data2": 5, "data3": 0 } ] \ No newline at end of file diff --git a/comm/const.go b/comm/const.go index 626ec5f70..84b49b34b 100644 --- a/comm/const.go +++ b/comm/const.go @@ -48,6 +48,7 @@ const ( ModulePagoda core.M_Modules = "pagoda" //魔塔模块 ModuleMartialhall core.M_Modules = "martialhall" //武馆模块 ModuleGourmet core.M_Modules = "gourmet" //美食馆 + ModuleRtask core.M_Modules = "rtask" //随机任务 ) //数据表名定义处 @@ -96,6 +97,8 @@ const ( TableMartialhall = "martialhall" // 美食馆 TableGourmet = "gourmet" + // 随机任务 + TableRtask = "rtask" ) //RPC服务接口定义处 @@ -158,6 +161,7 @@ const ( type TaskType int32 +// 日常任务事件类型 const ( TaskTypeUpEquip TaskType = 101 //任意装备升级 TaskTypeUpHeroStar TaskType = 102 //获取星级英雄 @@ -174,6 +178,16 @@ const ( TASK_STRATEGY TaskTag = 4 // 攻略 ) +// 随机任务类型 +const ( + RtaskTypeHeroTarget TaskType = 1 //英雄指定 + RtaskTypeHeroLvTarget TaskType = 2 //指定英雄的等级 + RtaskTypeEquipNum TaskType = 3 //装备数量 + RtaskTypePoltId TaskType = 4 //剧情ID + RtaskTypeTaskDay TaskType = 5 //每日任务 + +) + const ( MailLineEasy string = "mainline_data_easy" // 简单 MailLineHard string = "mainline_data_hard" // 困难 diff --git a/comm/imodule.go b/comm/imodule.go index cc11cc821..87607355f 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -102,6 +102,12 @@ type ( CleanData(uid string) } + // 随机任务 + IRtask interface { + //任务触发 + SendToRtask(session IUserSession, param *pb.RtaskParam) (code pb.ErrorCode) + } + //好友 IFriend interface { // 重置点赞列表和每日友情点 diff --git a/modules/rtask/api.go b/modules/rtask/api.go new file mode 100644 index 000000000..01595de65 --- /dev/null +++ b/modules/rtask/api.go @@ -0,0 +1,29 @@ +package rtask + +import ( + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +const ( + RtaskSubTypeChoose = "choose" //选择 +) + +type apiComp struct { + modules.MCompGate + service core.IService + moduleRtask *ModuleRtask +} + +//组件初始化接口 +func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompGate.Init(service, module, comp, options) + this.moduleRtask = module.(*ModuleRtask) + this.service = service + return +} + +func (this *apiComp) Start() (err error) { + err = this.MCompGate.Start() + return +} diff --git a/modules/rtask/api_choose.go b/modules/rtask/api_choose.go new file mode 100644 index 000000000..3c1912e4f --- /dev/null +++ b/modules/rtask/api_choose.go @@ -0,0 +1,56 @@ +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + "go_dreamfactory/utils" + + "google.golang.org/protobuf/proto" +) + +func (this *apiComp) ChooseCheck(session comm.IUserSession, req *pb.RtaskChooseReq) (code pb.ErrorCode) { + + return +} + +func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (code pb.ErrorCode, data proto.Message) { + if code = this.ChooseCheck(session, req); code != pb.ErrorCode_Success { + return + } + + rtask := &pb.DBRtask{} + if err := this.moduleRtask.modelRtask.Get(session.GetUserId(), rtask); err != nil { + return + } + + // 是否已完成 + if _, ok := utils.Findx(rtask.FrtaskIds, req.RtaskId); !ok { + code = pb.ErrorCode_RtaskUnFinished + return + } + + // 获取当前任务配置 + conf := this.moduleRtask.configure.getRtaskById(req.RtaskId) + if conf == nil { + code = pb.ErrorCode_ConfigNoFound + return + } + + // var nextTaskId int32 + if req.ChooseId == 0 { + //读任务配置中的next taskId + // nextTaskId = conf.IdAfter + } else { + // nextTaskId = + } + + //发奖励 + code = this.moduleRtask.DispenseRes(session, conf.Reword, true) + + rsp := &pb.RtaskChooseResp{} + + if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeChoose, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/rtask/config.go b/modules/rtask/config.go new file mode 100644 index 000000000..052dd2246 --- /dev/null +++ b/modules/rtask/config.go @@ -0,0 +1,116 @@ +package rtask + +import ( + "fmt" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + cfg "go_dreamfactory/sys/configure/structs" +) + +const ( + gameRtask = "game_rdtaskall.json" + gameRtaskChoose = "rdtaskchoose.json" + gameRtaskType = "rdtasktype.json" +) + +type configureComp struct { + modules.MCompConfigure +} + +func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompConfigure.Init(service, module, comp, options) + err = this.LoadMultiConfigure(map[string]interface{}{ + gameRtask: cfg.NewGameRdtaskAll, + gameRtaskChoose: cfg.NewGameRdtaskChoose, + gameRtaskType: cfg.NewGameRdtaskType, + }) + return +} + +func (this *configureComp) getRtaskCfg() (data *cfg.GameRdtaskAll, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(gameRtask); err != nil { + return + } else { + if data, ok = v.(*cfg.GameRdtaskAll); !ok { + err = fmt.Errorf("%T no is *cfg.GameRdtaskAll", v) + return + } + } + return +} + +func (this *configureComp) getRtaskTypeCfg() (data *cfg.GameRdtaskType, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(gameRtask); err != nil { + return + } else { + if data, ok = v.(*cfg.GameRdtaskType); !ok { + err = fmt.Errorf("%T is *cfg.GameRdtaskType", v) + return + } + } + return +} + +// 获取随机任务配置 +func (this *configureComp) getRtaskList() (data []*cfg.GameRdtaskAllData, err error) { + cfg, err := this.getRtaskCfg() + if err != nil { + return + } + if cfg != nil { + data = cfg.GetDataList() + } + return +} + +// 查询任务类型 +func (this *configureComp) getRtaskTypeById(typeId int32) (data *cfg.GameRdtaskTypeData, err error) { + cfg, err := this.getRtaskTypeCfg() + if err != nil { + return + } + if cfg != nil { + if data, ok := cfg.GetDataMap()[typeId]; ok { + return data, nil + } + } + return +} + +// 任务 +func (this *configureComp) getRtaskById(taskId int32) (data *cfg.GameRdtaskAllData) { + cfg, err := this.getRtaskCfg() + if err != nil { + return + } + if cfg != nil { + if data, ok := cfg.GetDataMap()[taskId]; ok { + return data + } + } + return nil +} + +// 首个任务 +func (this *configureComp) getFirstTask() *cfg.GameRdtaskAllData { + cfg, err := this.getRtaskCfg() + if err != nil { + return nil + } + if cfg != nil { + for _, v := range cfg.GetDataList() { + if v.IdLast == 0 { + return v + } + } + } + return nil +} diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go new file mode 100644 index 000000000..9dc44caa3 --- /dev/null +++ b/modules/rtask/model_rtask.go @@ -0,0 +1,86 @@ +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +type ModelRtask struct { + modules.MCompModel + moduleRtask *ModuleRtask +} + +func (this *ModelRtask) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = comm.TableRtask + err = this.MCompModel.Init(service, module, comp, options) + this.moduleRtask = module.(*ModuleRtask) + return +} + +func (this *ModelRtask) setNextTask(uid string, rtaskId int32) error { + update := map[string]interface{}{ + "nextRtaskId": rtaskId, + } + + return this.Change(uid, update) +} + +func (this *ModelRtask) doRtaskHandle(uid string, param *pb.RtaskParam) (rtaskId int32, err error) { + log.Debugf("do rtask params: %v %v %v ", param.Param1, param.Param2, param.Param3) + //查询玩家的 + rtask := &pb.DBRtask{} + if err = this.Get(uid, rtask); err != nil { + return + } + + var taskId int32 + if len(rtask.FrtaskIds) == 0 { + conf := this.moduleRtask.configure.getFirstTask() + if conf != nil { + taskId = conf.IdLast + } + } else { + //TODO + } + + if rtask, ok := this.moduleRtask.rtaskHandleMap[taskId]; ok { + for _, handle := range rtask.handlers { + if ok := handle.fn(handle.cfg, param); !ok { + log.Infof("uid: %v do rtask %v condition not", uid, taskId) + break + } + } + rtaskId = taskId + } + + return +} + +// 1 英雄指定 +func (this *ModelRtask) HeroTarget(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) { + return cfg.Data1 == tp.Param1 +} + +// 2 指定英雄的等级 +func (this *ModelRtask) HeroLvTarget(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) { + return cfg.Data1 == tp.Param1 && cfg.Data1 == tp.Param2 +} + +// 3 指定英雄的指定装备的数量 +func (this *ModelRtask) EquipNum(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) { + return cfg.Data1 == tp.Param1 && cfg.Data2 == tp.Param2 && cfg.Data3 == tp.Param3 +} + +// 4 剧情ID +func (this *ModelRtask) PoltId(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) { + return cfg.Data1 == tp.Param1 +} + +// 5 每日任务 +func (this *ModelRtask) TaskDay(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) { + return cfg.Data1 == tp.Param1 +} diff --git a/modules/rtask/module.go b/modules/rtask/module.go new file mode 100644 index 000000000..1be0f62c0 --- /dev/null +++ b/modules/rtask/module.go @@ -0,0 +1,131 @@ +// package 随机任务 +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 随机任务 +type rtask struct { + rtaskId int32 + handlers []*rtaskCondi +} + +// 限定条件 +type rtaskCondi struct { + cfg *cfg.GameRdtaskTypeData + fn rtaskHandle +} + +// 设定返回值 +type rtaskHandle func(cfg *cfg.GameRdtaskTypeData, tp *pb.RtaskParam) (ok bool) + +type ModuleRtask struct { + modules.ModuleBase + modelRtask *ModelRtask + api *apiComp + configure *configureComp + + rtaskHandleMap map[int32]*rtask // 任务处理器 +} + +func NewModule() core.IModule { + return &ModuleRtask{ + rtaskHandleMap: make(map[int32]*rtask), + } +} + +func (this *ModuleRtask) GetType() core.M_Modules { + return comm.ModuleRtask +} + +func (this *ModuleRtask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { + err = this.ModuleBase.Init(service, module, options) + this.initRtaskHandle() + return +} + +func (this *ModuleRtask) OnInstallComp() { + this.ModuleBase.OnInstallComp() + +} + +func (this *ModuleRtask) register(rtaskId int32, rtask *rtask) { + if _, ok := this.rtaskHandleMap[rtaskId]; !ok { + this.rtaskHandleMap[rtaskId] = rtask + } +} + +func (this *ModuleRtask) initRtaskHandle() { + if data, err := this.configure.getRtaskList(); err == nil { + for _, v := range data { + var handlers []*rtaskCondi + rtask := &rtask{ + rtaskId: v.RdtaksId, + handlers: handlers, + } + + //遍历任务的限定条件 + for _, rtaskTypeId := range v.RdtaksNum { + // 获取每个限定条件配置 + if typeCfg, err2 := this.configure.getRtaskTypeById(rtaskTypeId); err2 == nil { + if typeCfg != nil { + switch comm.TaskType(typeCfg.GetTypeId()) { + case comm.RtaskTypeHeroTarget: + handlers = append(handlers, &rtaskCondi{ + cfg: typeCfg, + fn: this.modelRtask.HeroTarget, + }) + case comm.RtaskTypeHeroLvTarget: + handlers = append(handlers, &rtaskCondi{ + cfg: typeCfg, + fn: this.modelRtask.HeroLvTarget, + }) + case comm.RtaskTypeEquipNum: + handlers = append(handlers, &rtaskCondi{ + cfg: typeCfg, + fn: this.modelRtask.EquipNum, + }) + case comm.RtaskTypePoltId: + handlers = append(handlers, &rtaskCondi{ + cfg: typeCfg, + fn: this.modelRtask.PoltId, + }) + case comm.RtaskTypeTaskDay: + handlers = append(handlers, &rtaskCondi{ + cfg: typeCfg, + fn: this.modelRtask.TaskDay, + }) + + default: + log.Warnf("%v rtask type not configure", typeCfg.GetTypeId()) + } + } + } + } + + this.register(v.RdtaksId, rtask) + + } + } +} + +// 通知随机任务 +func (this *ModuleRtask) SendToRtask(session comm.IUserSession, param *pb.RtaskParam) (code pb.ErrorCode) { + if taskId, err := this.modelRtask.doRtaskHandle(session.GetUserId(), param); err != nil { + code = pb.ErrorCode_TaskHandle + } else { + if err := session.SendMsg(string(comm.ModuleRtask), "", &pb.RtaskFinishPush{ + RtaskId: taskId, + }); err != nil { + code = pb.ErrorCode_SystemError + } + } + + return +} diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 529b5dc1a..63e26ac16 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -957,6 +957,69 @@ func (x *TaskParam) GetSecond() int32 { return 0 } +type RtaskParam struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Param1 int32 `protobuf:"varint,1,opt,name=param1,proto3" json:"param1"` + Param2 int32 `protobuf:"varint,2,opt,name=param2,proto3" json:"param2"` + Param3 int32 `protobuf:"varint,3,opt,name=param3,proto3" json:"param3"` +} + +func (x *RtaskParam) Reset() { + *x = RtaskParam{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskParam) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskParam) ProtoMessage() {} + +func (x *RtaskParam) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[13] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RtaskParam.ProtoReflect.Descriptor instead. +func (*RtaskParam) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{13} +} + +func (x *RtaskParam) GetParam1() int32 { + if x != nil { + return x.Param1 + } + return 0 +} + +func (x *RtaskParam) GetParam2() int32 { + if x != nil { + return x.Param2 + } + return 0 +} + +func (x *RtaskParam) GetParam3() int32 { + if x != nil { + return x.Param3 + } + return 0 +} + var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ @@ -1065,13 +1128,18 @@ var file_comm_proto_rawDesc = []byte{ 0x05, 0x52, 0x01, 0x4e, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x2a, - 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, - 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, - 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, - 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22, + 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x33, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, + 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, + 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, + 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1087,7 +1155,7 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 14) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*UserMessage)(nil), // 1: UserMessage @@ -1103,18 +1171,19 @@ var file_comm_proto_goTypes = []interface{}{ (*NoticeUserCloseReq)(nil), // 11: NoticeUserCloseReq (*UserAssets)(nil), // 12: UserAssets (*TaskParam)(nil), // 13: TaskParam - (*anypb.Any)(nil), // 14: google.protobuf.Any - (ErrorCode)(0), // 15: ErrorCode + (*RtaskParam)(nil), // 14: RtaskParam + (*anypb.Any)(nil), // 15: google.protobuf.Any + (ErrorCode)(0), // 16: ErrorCode } var file_comm_proto_depIdxs = []int32{ - 14, // 0: UserMessage.data:type_name -> google.protobuf.Any - 14, // 1: AgentMessage.Message:type_name -> google.protobuf.Any - 15, // 2: RPCMessageReply.Code:type_name -> ErrorCode - 14, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any + 15, // 0: UserMessage.data:type_name -> google.protobuf.Any + 15, // 1: AgentMessage.Message:type_name -> google.protobuf.Any + 16, // 2: RPCMessageReply.Code:type_name -> ErrorCode + 15, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any 1, // 4: RPCMessageReply.Reply:type_name -> UserMessage 1, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage - 14, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any - 14, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 15, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any + 15, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 8, // [8:8] is the sub-list for method output_type 8, // [8:8] is the sub-list for method input_type 8, // [8:8] is the sub-list for extension type_name @@ -1285,6 +1354,18 @@ func file_comm_proto_init() { return nil } } + file_comm_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskParam); 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{ @@ -1292,7 +1373,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 13, + NumMessages: 14, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 80a968251..1c67f8477 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -149,6 +149,9 @@ const ( // 美食馆 ErrorCode_GourmetMoreOrderTime ErrorCode = 2101 // 超过订单时长 ErrorCode_GourmetSkillMaxLv ErrorCode = 2102 // 技能已经达到满级 + // rtask + ErrorCode_RtaskFinished ErrorCode = 2201 //任务已完成 + ErrorCode_RtaskUnFinished ErrorCode = 2202 //任务未完成 ) // Enum value maps for ErrorCode. @@ -268,6 +271,8 @@ var ( 2002: "MartialhallUnlocked", 2101: "GourmetMoreOrderTime", 2102: "GourmetSkillMaxLv", + 2201: "RtaskFinished", + 2202: "RtaskUnFinished", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -384,6 +389,8 @@ var ( "MartialhallUnlocked": 2002, "GourmetMoreOrderTime": 2101, "GourmetSkillMaxLv": 2102, + "RtaskFinished": 2201, + "RtaskUnFinished": 2202, } ) @@ -418,7 +425,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0x8c, 0x13, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xb6, 0x13, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -571,7 +578,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, + 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, + 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index abec55ce8..bcaacbc84 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -28,7 +28,7 @@ type FriendBase struct { UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` // ID NickName string `protobuf:"bytes,2,opt,name=NickName,proto3" json:"NickName"` //昵称 Level int32 `protobuf:"varint,3,opt,name=level,proto3" json:"level"` //等级 - Avatar int32 `protobuf:"varint,4,opt,name=avatar,proto3" json:"avatar"` //头像 + Avatar string `protobuf:"bytes,4,opt,name=avatar,proto3" json:"avatar"` //头像 Strength int64 `protobuf:"varint,5,opt,name=strength,proto3" json:"strength"` //战力 ServerId int32 `protobuf:"varint,6,opt,name=serverId,proto3" json:"serverId"` //服务编号 OfflineTime int64 `protobuf:"varint,7,opt,name=offlineTime,proto3" json:"offlineTime"` //最近一次下线时间 0在线 @@ -87,11 +87,11 @@ func (x *FriendBase) GetLevel() int32 { return 0 } -func (x *FriendBase) GetAvatar() int32 { +func (x *FriendBase) GetAvatar() string { if x != nil { return x.Avatar } - return 0 + return "" } func (x *FriendBase) GetStrength() int64 { @@ -201,6 +201,92 @@ func (x *FriendListResp) GetList() []*FriendBase { return nil } +// 随机的在线玩家 +type FriendOnlineReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *FriendOnlineReq) Reset() { + *x = FriendOnlineReq{} + if protoimpl.UnsafeEnabled { + mi := &file_friend_friend_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FriendOnlineReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FriendOnlineReq) ProtoMessage() {} + +func (x *FriendOnlineReq) ProtoReflect() protoreflect.Message { + mi := &file_friend_friend_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use FriendOnlineReq.ProtoReflect.Descriptor instead. +func (*FriendOnlineReq) Descriptor() ([]byte, []int) { + return file_friend_friend_msg_proto_rawDescGZIP(), []int{3} +} + +type FriendOnlineResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` +} + +func (x *FriendOnlineResp) Reset() { + *x = FriendOnlineResp{} + if protoimpl.UnsafeEnabled { + mi := &file_friend_friend_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *FriendOnlineResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*FriendOnlineResp) ProtoMessage() {} + +func (x *FriendOnlineResp) ProtoReflect() protoreflect.Message { + mi := &file_friend_friend_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 FriendOnlineResp.ProtoReflect.Descriptor instead. +func (*FriendOnlineResp) Descriptor() ([]byte, []int) { + return file_friend_friend_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *FriendOnlineResp) GetList() []*FriendBase { + if x != nil { + return x.List + } + return nil +} + //申请好友 type FriendApplyReq struct { state protoimpl.MessageState @@ -213,7 +299,7 @@ type FriendApplyReq struct { func (x *FriendApplyReq) Reset() { *x = FriendApplyReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[3] + mi := &file_friend_friend_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -226,7 +312,7 @@ func (x *FriendApplyReq) String() string { func (*FriendApplyReq) ProtoMessage() {} func (x *FriendApplyReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[3] + mi := &file_friend_friend_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -239,7 +325,7 @@ func (x *FriendApplyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyReq.ProtoReflect.Descriptor instead. func (*FriendApplyReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{3} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{5} } func (x *FriendApplyReq) GetFriendId() string { @@ -261,7 +347,7 @@ type FriendApplyResp struct { func (x *FriendApplyResp) Reset() { *x = FriendApplyResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[4] + mi := &file_friend_friend_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -274,7 +360,7 @@ func (x *FriendApplyResp) String() string { func (*FriendApplyResp) ProtoMessage() {} func (x *FriendApplyResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[4] + mi := &file_friend_friend_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -287,7 +373,7 @@ func (x *FriendApplyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyResp.ProtoReflect.Descriptor instead. func (*FriendApplyResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{4} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{6} } func (x *FriendApplyResp) GetUserId() string { @@ -316,7 +402,7 @@ type FriendDelReq struct { func (x *FriendDelReq) Reset() { *x = FriendDelReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[5] + mi := &file_friend_friend_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -329,7 +415,7 @@ func (x *FriendDelReq) String() string { func (*FriendDelReq) ProtoMessage() {} func (x *FriendDelReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[5] + mi := &file_friend_friend_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -342,7 +428,7 @@ func (x *FriendDelReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelReq.ProtoReflect.Descriptor instead. func (*FriendDelReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{5} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{7} } func (x *FriendDelReq) GetFriendId() string { @@ -364,7 +450,7 @@ type FriendDelResp struct { func (x *FriendDelResp) Reset() { *x = FriendDelResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[6] + mi := &file_friend_friend_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -377,7 +463,7 @@ func (x *FriendDelResp) String() string { func (*FriendDelResp) ProtoMessage() {} func (x *FriendDelResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[6] + mi := &file_friend_friend_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -390,7 +476,7 @@ func (x *FriendDelResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelResp.ProtoReflect.Descriptor instead. func (*FriendDelResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{6} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{8} } func (x *FriendDelResp) GetFriendId() string { @@ -419,7 +505,7 @@ type FriendAgreeReq struct { func (x *FriendAgreeReq) Reset() { *x = FriendAgreeReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[7] + mi := &file_friend_friend_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -432,7 +518,7 @@ func (x *FriendAgreeReq) String() string { func (*FriendAgreeReq) ProtoMessage() {} func (x *FriendAgreeReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[7] + mi := &file_friend_friend_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -445,7 +531,7 @@ func (x *FriendAgreeReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAgreeReq.ProtoReflect.Descriptor instead. func (*FriendAgreeReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{7} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{9} } func (x *FriendAgreeReq) GetFriendIds() []string { @@ -466,7 +552,7 @@ type FriendAgreeResp struct { func (x *FriendAgreeResp) Reset() { *x = FriendAgreeResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[8] + mi := &file_friend_friend_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -479,7 +565,7 @@ func (x *FriendAgreeResp) String() string { func (*FriendAgreeResp) ProtoMessage() {} func (x *FriendAgreeResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[8] + mi := &file_friend_friend_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -492,7 +578,7 @@ func (x *FriendAgreeResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAgreeResp.ProtoReflect.Descriptor instead. func (*FriendAgreeResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{8} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{10} } func (x *FriendAgreeResp) GetNum() int32 { @@ -514,7 +600,7 @@ type FriendRefuseReq struct { func (x *FriendRefuseReq) Reset() { *x = FriendRefuseReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[9] + mi := &file_friend_friend_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -527,7 +613,7 @@ func (x *FriendRefuseReq) String() string { func (*FriendRefuseReq) ProtoMessage() {} func (x *FriendRefuseReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[9] + mi := &file_friend_friend_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -540,7 +626,7 @@ func (x *FriendRefuseReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendRefuseReq.ProtoReflect.Descriptor instead. func (*FriendRefuseReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{9} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{11} } func (x *FriendRefuseReq) GetFriendIds() []string { @@ -561,7 +647,7 @@ type FriendRefuseResp struct { func (x *FriendRefuseResp) Reset() { *x = FriendRefuseResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[10] + mi := &file_friend_friend_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -574,7 +660,7 @@ func (x *FriendRefuseResp) String() string { func (*FriendRefuseResp) ProtoMessage() {} func (x *FriendRefuseResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[10] + mi := &file_friend_friend_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -587,7 +673,7 @@ func (x *FriendRefuseResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendRefuseResp.ProtoReflect.Descriptor instead. func (*FriendRefuseResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{10} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{12} } func (x *FriendRefuseResp) GetNum() int32 { @@ -607,7 +693,7 @@ type FriendApplyListReq struct { func (x *FriendApplyListReq) Reset() { *x = FriendApplyListReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[11] + mi := &file_friend_friend_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -620,7 +706,7 @@ func (x *FriendApplyListReq) String() string { func (*FriendApplyListReq) ProtoMessage() {} func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[11] + mi := &file_friend_friend_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -633,7 +719,7 @@ func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyListReq.ProtoReflect.Descriptor instead. func (*FriendApplyListReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{11} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{13} } type FriendApplyListResp struct { @@ -647,7 +733,7 @@ type FriendApplyListResp struct { func (x *FriendApplyListResp) Reset() { *x = FriendApplyListResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[12] + mi := &file_friend_friend_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -660,7 +746,7 @@ func (x *FriendApplyListResp) String() string { func (*FriendApplyListResp) ProtoMessage() {} func (x *FriendApplyListResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[12] + mi := &file_friend_friend_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -673,7 +759,7 @@ func (x *FriendApplyListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyListResp.ProtoReflect.Descriptor instead. func (*FriendApplyListResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{12} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{14} } func (x *FriendApplyListResp) GetList() []*FriendBase { @@ -695,7 +781,7 @@ type FriendSearchReq struct { func (x *FriendSearchReq) Reset() { *x = FriendSearchReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[13] + mi := &file_friend_friend_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -708,7 +794,7 @@ func (x *FriendSearchReq) String() string { func (*FriendSearchReq) ProtoMessage() {} func (x *FriendSearchReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[13] + mi := &file_friend_friend_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -721,7 +807,7 @@ func (x *FriendSearchReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendSearchReq.ProtoReflect.Descriptor instead. func (*FriendSearchReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{13} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{15} } func (x *FriendSearchReq) GetNickName() string { @@ -742,7 +828,7 @@ type FriendSearchResp struct { func (x *FriendSearchResp) Reset() { *x = FriendSearchResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[14] + mi := &file_friend_friend_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -755,7 +841,7 @@ func (x *FriendSearchResp) String() string { func (*FriendSearchResp) ProtoMessage() {} func (x *FriendSearchResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[14] + mi := &file_friend_friend_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -768,7 +854,7 @@ func (x *FriendSearchResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendSearchResp.ProtoReflect.Descriptor instead. func (*FriendSearchResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{14} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{16} } func (x *FriendSearchResp) GetFriend() *FriendBase { @@ -788,7 +874,7 @@ type FriendBlackListReq struct { func (x *FriendBlackListReq) Reset() { *x = FriendBlackListReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[15] + mi := &file_friend_friend_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -801,7 +887,7 @@ func (x *FriendBlackListReq) String() string { func (*FriendBlackListReq) ProtoMessage() {} func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[15] + mi := &file_friend_friend_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -814,7 +900,7 @@ func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackListReq.ProtoReflect.Descriptor instead. func (*FriendBlackListReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{15} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{17} } type FriendBlackListResp struct { @@ -828,7 +914,7 @@ type FriendBlackListResp struct { func (x *FriendBlackListResp) Reset() { *x = FriendBlackListResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[16] + mi := &file_friend_friend_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -841,7 +927,7 @@ func (x *FriendBlackListResp) String() string { func (*FriendBlackListResp) ProtoMessage() {} func (x *FriendBlackListResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[16] + mi := &file_friend_friend_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -854,7 +940,7 @@ func (x *FriendBlackListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackListResp.ProtoReflect.Descriptor instead. func (*FriendBlackListResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{16} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{18} } func (x *FriendBlackListResp) GetFriends() []*FriendBase { @@ -876,7 +962,7 @@ type FriendBlackAddReq struct { func (x *FriendBlackAddReq) Reset() { *x = FriendBlackAddReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[17] + mi := &file_friend_friend_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -889,7 +975,7 @@ func (x *FriendBlackAddReq) String() string { func (*FriendBlackAddReq) ProtoMessage() {} func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[17] + mi := &file_friend_friend_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -902,7 +988,7 @@ func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackAddReq.ProtoReflect.Descriptor instead. func (*FriendBlackAddReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{17} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{19} } func (x *FriendBlackAddReq) GetFriendId() string { @@ -924,7 +1010,7 @@ type FriendBlackAddResp struct { func (x *FriendBlackAddResp) Reset() { *x = FriendBlackAddResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[18] + mi := &file_friend_friend_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -937,7 +1023,7 @@ func (x *FriendBlackAddResp) String() string { func (*FriendBlackAddResp) ProtoMessage() {} func (x *FriendBlackAddResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[18] + mi := &file_friend_friend_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -950,7 +1036,7 @@ func (x *FriendBlackAddResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackAddResp.ProtoReflect.Descriptor instead. func (*FriendBlackAddResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{18} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{20} } func (x *FriendBlackAddResp) GetFriendId() string { @@ -979,7 +1065,7 @@ type FriendDelBlackReq struct { func (x *FriendDelBlackReq) Reset() { *x = FriendDelBlackReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[19] + mi := &file_friend_friend_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -992,7 +1078,7 @@ func (x *FriendDelBlackReq) String() string { func (*FriendDelBlackReq) ProtoMessage() {} func (x *FriendDelBlackReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[19] + mi := &file_friend_friend_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1005,7 +1091,7 @@ func (x *FriendDelBlackReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelBlackReq.ProtoReflect.Descriptor instead. func (*FriendDelBlackReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{19} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{21} } func (x *FriendDelBlackReq) GetFriendId() string { @@ -1027,7 +1113,7 @@ type FriendDelBlackResp struct { func (x *FriendDelBlackResp) Reset() { *x = FriendDelBlackResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[20] + mi := &file_friend_friend_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1040,7 +1126,7 @@ func (x *FriendDelBlackResp) String() string { func (*FriendDelBlackResp) ProtoMessage() {} func (x *FriendDelBlackResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[20] + mi := &file_friend_friend_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1053,7 +1139,7 @@ func (x *FriendDelBlackResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelBlackResp.ProtoReflect.Descriptor instead. func (*FriendDelBlackResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{20} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{22} } func (x *FriendDelBlackResp) GetFriendId() string { @@ -1082,7 +1168,7 @@ type FriendReceiveReq struct { func (x *FriendReceiveReq) Reset() { *x = FriendReceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[21] + mi := &file_friend_friend_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1095,7 +1181,7 @@ func (x *FriendReceiveReq) String() string { func (*FriendReceiveReq) ProtoMessage() {} func (x *FriendReceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[21] + mi := &file_friend_friend_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1108,7 +1194,7 @@ func (x *FriendReceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendReceiveReq.ProtoReflect.Descriptor instead. func (*FriendReceiveReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{21} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{23} } func (x *FriendReceiveReq) GetFriendId() string { @@ -1130,7 +1216,7 @@ type FriendReceiveResp struct { func (x *FriendReceiveResp) Reset() { *x = FriendReceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[22] + mi := &file_friend_friend_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1143,7 +1229,7 @@ func (x *FriendReceiveResp) String() string { func (*FriendReceiveResp) ProtoMessage() {} func (x *FriendReceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[22] + mi := &file_friend_friend_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1156,7 +1242,7 @@ func (x *FriendReceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendReceiveResp.ProtoReflect.Descriptor instead. func (*FriendReceiveResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{22} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{24} } func (x *FriendReceiveResp) GetFriendId() string { @@ -1185,7 +1271,7 @@ type FriendGiveReq struct { func (x *FriendGiveReq) Reset() { *x = FriendGiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[23] + mi := &file_friend_friend_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1198,7 +1284,7 @@ func (x *FriendGiveReq) String() string { func (*FriendGiveReq) ProtoMessage() {} func (x *FriendGiveReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[23] + mi := &file_friend_friend_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1211,7 +1297,7 @@ func (x *FriendGiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendGiveReq.ProtoReflect.Descriptor instead. func (*FriendGiveReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{23} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{25} } func (x *FriendGiveReq) GetFriendId() string { @@ -1233,7 +1319,7 @@ type FriendGiveResp struct { func (x *FriendGiveResp) Reset() { *x = FriendGiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[24] + mi := &file_friend_friend_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1246,7 +1332,7 @@ func (x *FriendGiveResp) String() string { func (*FriendGiveResp) ProtoMessage() {} func (x *FriendGiveResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[24] + mi := &file_friend_friend_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1259,7 +1345,7 @@ func (x *FriendGiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendGiveResp.ProtoReflect.Descriptor instead. func (*FriendGiveResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{24} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{26} } func (x *FriendGiveResp) GetFriendId() string { @@ -1288,7 +1374,7 @@ type FriendTotalReq struct { func (x *FriendTotalReq) Reset() { *x = FriendTotalReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[25] + mi := &file_friend_friend_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1301,7 +1387,7 @@ func (x *FriendTotalReq) String() string { func (*FriendTotalReq) ProtoMessage() {} func (x *FriendTotalReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[25] + mi := &file_friend_friend_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1314,7 +1400,7 @@ func (x *FriendTotalReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendTotalReq.ProtoReflect.Descriptor instead. func (*FriendTotalReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{25} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{27} } func (x *FriendTotalReq) GetFriendId() string { @@ -1336,7 +1422,7 @@ type FriendTotalResp struct { func (x *FriendTotalResp) Reset() { *x = FriendTotalResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[26] + mi := &file_friend_friend_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1349,7 +1435,7 @@ func (x *FriendTotalResp) String() string { func (*FriendTotalResp) ProtoMessage() {} func (x *FriendTotalResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[26] + mi := &file_friend_friend_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1362,7 +1448,7 @@ func (x *FriendTotalResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendTotalResp.ProtoReflect.Descriptor instead. func (*FriendTotalResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{26} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{28} } func (x *FriendTotalResp) GetFriendId() string { @@ -1389,7 +1475,7 @@ type FriendZanlistReq struct { func (x *FriendZanlistReq) Reset() { *x = FriendZanlistReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[27] + mi := &file_friend_friend_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1402,7 +1488,7 @@ func (x *FriendZanlistReq) String() string { func (*FriendZanlistReq) ProtoMessage() {} func (x *FriendZanlistReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[27] + mi := &file_friend_friend_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1415,7 +1501,7 @@ func (x *FriendZanlistReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanlistReq.ProtoReflect.Descriptor instead. func (*FriendZanlistReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{27} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{29} } type FriendZanlistResp struct { @@ -1429,7 +1515,7 @@ type FriendZanlistResp struct { func (x *FriendZanlistResp) Reset() { *x = FriendZanlistResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[28] + mi := &file_friend_friend_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1442,7 +1528,7 @@ func (x *FriendZanlistResp) String() string { func (*FriendZanlistResp) ProtoMessage() {} func (x *FriendZanlistResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[28] + mi := &file_friend_friend_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1455,7 +1541,7 @@ func (x *FriendZanlistResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanlistResp.ProtoReflect.Descriptor instead. func (*FriendZanlistResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{28} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{30} } func (x *FriendZanlistResp) GetList() []*FriendBase { @@ -1477,7 +1563,7 @@ type FriendZanReq struct { func (x *FriendZanReq) Reset() { *x = FriendZanReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[29] + mi := &file_friend_friend_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1490,7 +1576,7 @@ func (x *FriendZanReq) String() string { func (*FriendZanReq) ProtoMessage() {} func (x *FriendZanReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[29] + mi := &file_friend_friend_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1503,7 +1589,7 @@ func (x *FriendZanReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanReq.ProtoReflect.Descriptor instead. func (*FriendZanReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{29} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{31} } func (x *FriendZanReq) GetFriendId() string { @@ -1524,7 +1610,7 @@ type FriendZanResp struct { func (x *FriendZanResp) Reset() { *x = FriendZanResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[30] + mi := &file_friend_friend_msg_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1537,7 +1623,7 @@ func (x *FriendZanResp) String() string { func (*FriendZanResp) ProtoMessage() {} func (x *FriendZanResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[30] + mi := &file_friend_friend_msg_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1550,7 +1636,7 @@ func (x *FriendZanResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanResp.ProtoReflect.Descriptor instead. func (*FriendZanResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{30} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{32} } func (x *FriendZanResp) GetFlag() bool { @@ -1572,7 +1658,7 @@ type FriendZanreceiveReq struct { func (x *FriendZanreceiveReq) Reset() { *x = FriendZanreceiveReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[31] + mi := &file_friend_friend_msg_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1585,7 +1671,7 @@ func (x *FriendZanreceiveReq) String() string { func (*FriendZanreceiveReq) ProtoMessage() {} func (x *FriendZanreceiveReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[31] + mi := &file_friend_friend_msg_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1598,7 +1684,7 @@ func (x *FriendZanreceiveReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanreceiveReq.ProtoReflect.Descriptor instead. func (*FriendZanreceiveReq) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{31} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{33} } func (x *FriendZanreceiveReq) GetFriendId() string { @@ -1619,7 +1705,7 @@ type FriendZanreceiveResp struct { func (x *FriendZanreceiveResp) Reset() { *x = FriendZanreceiveResp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_friend_msg_proto_msgTypes[32] + mi := &file_friend_friend_msg_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1632,7 +1718,7 @@ func (x *FriendZanreceiveResp) String() string { func (*FriendZanreceiveResp) ProtoMessage() {} func (x *FriendZanreceiveResp) ProtoReflect() protoreflect.Message { - mi := &file_friend_friend_msg_proto_msgTypes[32] + mi := &file_friend_friend_msg_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1645,7 +1731,7 @@ func (x *FriendZanreceiveResp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendZanreceiveResp.ProtoReflect.Descriptor instead. func (*FriendZanreceiveResp) Descriptor() ([]byte, []int) { - return file_friend_friend_msg_proto_rawDescGZIP(), []int{32} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{34} } func (x *FriendZanreceiveResp) GetFlag() bool { @@ -1666,7 +1752,7 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, + 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, @@ -1676,103 +1762,107 @@ var file_friend_friend_msg_proto_rawDesc = []byte{ 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x31, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, - 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, - 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, - 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, - 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, - 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, - 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x4e, 0x75, 0x6d, 0x22, 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, - 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, - 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, - 0x22, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, - 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, - 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, - 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, - 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, - 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, - 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, - 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, - 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, - 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, - 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, + 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x11, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22, 0x33, 0x0a, 0x10, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, + 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, + 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, + 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, + 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, + 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, - 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x2f, 0x0a, 0x0f, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, + 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, + 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, + 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, + 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0x37, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, + 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3c, + 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, + 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, + 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, + 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, + 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, + 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x12, 0x0a, 0x10, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, - 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, - 0x69, 0x73, 0x74, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, + 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0d, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x47, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, + 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, + 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, + 0x6c, 0x22, 0x12, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, + 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, + 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2a, 0x0a, 0x0c, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x23, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x31, 0x0a, 0x13, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, - 0x23, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, - 0x66, 0x6c, 0x61, 0x67, 0x22, 0x31, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, - 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, - 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x2a, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1787,53 +1877,56 @@ func file_friend_friend_msg_proto_rawDescGZIP() []byte { return file_friend_friend_msg_proto_rawDescData } -var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 33) +var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 35) var file_friend_friend_msg_proto_goTypes = []interface{}{ (*FriendBase)(nil), // 0: FriendBase (*FriendListReq)(nil), // 1: FriendListReq (*FriendListResp)(nil), // 2: FriendListResp - (*FriendApplyReq)(nil), // 3: FriendApplyReq - (*FriendApplyResp)(nil), // 4: FriendApplyResp - (*FriendDelReq)(nil), // 5: FriendDelReq - (*FriendDelResp)(nil), // 6: FriendDelResp - (*FriendAgreeReq)(nil), // 7: FriendAgreeReq - (*FriendAgreeResp)(nil), // 8: FriendAgreeResp - (*FriendRefuseReq)(nil), // 9: FriendRefuseReq - (*FriendRefuseResp)(nil), // 10: FriendRefuseResp - (*FriendApplyListReq)(nil), // 11: FriendApplyListReq - (*FriendApplyListResp)(nil), // 12: FriendApplyListResp - (*FriendSearchReq)(nil), // 13: FriendSearchReq - (*FriendSearchResp)(nil), // 14: FriendSearchResp - (*FriendBlackListReq)(nil), // 15: FriendBlackListReq - (*FriendBlackListResp)(nil), // 16: FriendBlackListResp - (*FriendBlackAddReq)(nil), // 17: FriendBlackAddReq - (*FriendBlackAddResp)(nil), // 18: FriendBlackAddResp - (*FriendDelBlackReq)(nil), // 19: FriendDelBlackReq - (*FriendDelBlackResp)(nil), // 20: FriendDelBlackResp - (*FriendReceiveReq)(nil), // 21: FriendReceiveReq - (*FriendReceiveResp)(nil), // 22: FriendReceiveResp - (*FriendGiveReq)(nil), // 23: FriendGiveReq - (*FriendGiveResp)(nil), // 24: FriendGiveResp - (*FriendTotalReq)(nil), // 25: FriendTotalReq - (*FriendTotalResp)(nil), // 26: FriendTotalResp - (*FriendZanlistReq)(nil), // 27: FriendZanlistReq - (*FriendZanlistResp)(nil), // 28: FriendZanlistResp - (*FriendZanReq)(nil), // 29: FriendZanReq - (*FriendZanResp)(nil), // 30: FriendZanResp - (*FriendZanreceiveReq)(nil), // 31: FriendZanreceiveReq - (*FriendZanreceiveResp)(nil), // 32: FriendZanreceiveResp + (*FriendOnlineReq)(nil), // 3: FriendOnlineReq + (*FriendOnlineResp)(nil), // 4: FriendOnlineResp + (*FriendApplyReq)(nil), // 5: FriendApplyReq + (*FriendApplyResp)(nil), // 6: FriendApplyResp + (*FriendDelReq)(nil), // 7: FriendDelReq + (*FriendDelResp)(nil), // 8: FriendDelResp + (*FriendAgreeReq)(nil), // 9: FriendAgreeReq + (*FriendAgreeResp)(nil), // 10: FriendAgreeResp + (*FriendRefuseReq)(nil), // 11: FriendRefuseReq + (*FriendRefuseResp)(nil), // 12: FriendRefuseResp + (*FriendApplyListReq)(nil), // 13: FriendApplyListReq + (*FriendApplyListResp)(nil), // 14: FriendApplyListResp + (*FriendSearchReq)(nil), // 15: FriendSearchReq + (*FriendSearchResp)(nil), // 16: FriendSearchResp + (*FriendBlackListReq)(nil), // 17: FriendBlackListReq + (*FriendBlackListResp)(nil), // 18: FriendBlackListResp + (*FriendBlackAddReq)(nil), // 19: FriendBlackAddReq + (*FriendBlackAddResp)(nil), // 20: FriendBlackAddResp + (*FriendDelBlackReq)(nil), // 21: FriendDelBlackReq + (*FriendDelBlackResp)(nil), // 22: FriendDelBlackResp + (*FriendReceiveReq)(nil), // 23: FriendReceiveReq + (*FriendReceiveResp)(nil), // 24: FriendReceiveResp + (*FriendGiveReq)(nil), // 25: FriendGiveReq + (*FriendGiveResp)(nil), // 26: FriendGiveResp + (*FriendTotalReq)(nil), // 27: FriendTotalReq + (*FriendTotalResp)(nil), // 28: FriendTotalResp + (*FriendZanlistReq)(nil), // 29: FriendZanlistReq + (*FriendZanlistResp)(nil), // 30: FriendZanlistResp + (*FriendZanReq)(nil), // 31: FriendZanReq + (*FriendZanResp)(nil), // 32: FriendZanResp + (*FriendZanreceiveReq)(nil), // 33: FriendZanreceiveReq + (*FriendZanreceiveResp)(nil), // 34: FriendZanreceiveResp } var file_friend_friend_msg_proto_depIdxs = []int32{ 0, // 0: FriendListResp.list:type_name -> FriendBase - 0, // 1: FriendApplyListResp.list:type_name -> FriendBase - 0, // 2: FriendSearchResp.friend:type_name -> FriendBase - 0, // 3: FriendBlackListResp.friends:type_name -> FriendBase - 0, // 4: FriendZanlistResp.list:type_name -> FriendBase - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 0, // 1: FriendOnlineResp.list:type_name -> FriendBase + 0, // 2: FriendApplyListResp.list:type_name -> FriendBase + 0, // 3: FriendSearchResp.friend:type_name -> FriendBase + 0, // 4: FriendBlackListResp.friends:type_name -> FriendBase + 0, // 5: FriendZanlistResp.list:type_name -> FriendBase + 6, // [6:6] is the sub-list for method output_type + 6, // [6:6] is the sub-list for method input_type + 6, // [6:6] is the sub-list for extension type_name + 6, // [6:6] is the sub-list for extension extendee + 0, // [0:6] is the sub-list for field type_name } func init() { file_friend_friend_msg_proto_init() } @@ -1879,7 +1972,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyReq); i { + switch v := v.(*FriendOnlineReq); i { case 0: return &v.state case 1: @@ -1891,7 +1984,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyResp); i { + switch v := v.(*FriendOnlineResp); i { case 0: return &v.state case 1: @@ -1903,7 +1996,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelReq); i { + switch v := v.(*FriendApplyReq); i { case 0: return &v.state case 1: @@ -1915,7 +2008,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelResp); i { + switch v := v.(*FriendApplyResp); i { case 0: return &v.state case 1: @@ -1927,7 +2020,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendAgreeReq); i { + switch v := v.(*FriendDelReq); i { case 0: return &v.state case 1: @@ -1939,7 +2032,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendAgreeResp); i { + switch v := v.(*FriendDelResp); i { case 0: return &v.state case 1: @@ -1951,7 +2044,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendRefuseReq); i { + switch v := v.(*FriendAgreeReq); i { case 0: return &v.state case 1: @@ -1963,7 +2056,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendRefuseResp); i { + switch v := v.(*FriendAgreeResp); i { case 0: return &v.state case 1: @@ -1975,7 +2068,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyListReq); i { + switch v := v.(*FriendRefuseReq); i { case 0: return &v.state case 1: @@ -1987,7 +2080,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendApplyListResp); i { + switch v := v.(*FriendRefuseResp); i { case 0: return &v.state case 1: @@ -1999,7 +2092,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendSearchReq); i { + switch v := v.(*FriendApplyListReq); i { case 0: return &v.state case 1: @@ -2011,7 +2104,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendSearchResp); i { + switch v := v.(*FriendApplyListResp); i { case 0: return &v.state case 1: @@ -2023,7 +2116,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackListReq); i { + switch v := v.(*FriendSearchReq); i { case 0: return &v.state case 1: @@ -2035,7 +2128,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackListResp); i { + switch v := v.(*FriendSearchResp); i { case 0: return &v.state case 1: @@ -2047,7 +2140,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackAddReq); i { + switch v := v.(*FriendBlackListReq); i { case 0: return &v.state case 1: @@ -2059,7 +2152,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendBlackAddResp); i { + switch v := v.(*FriendBlackListResp); i { case 0: return &v.state case 1: @@ -2071,7 +2164,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelBlackReq); i { + switch v := v.(*FriendBlackAddReq); i { case 0: return &v.state case 1: @@ -2083,7 +2176,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendDelBlackResp); i { + switch v := v.(*FriendBlackAddResp); i { case 0: return &v.state case 1: @@ -2095,7 +2188,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendReceiveReq); i { + switch v := v.(*FriendDelBlackReq); i { case 0: return &v.state case 1: @@ -2107,7 +2200,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendReceiveResp); i { + switch v := v.(*FriendDelBlackResp); i { case 0: return &v.state case 1: @@ -2119,7 +2212,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendGiveReq); i { + switch v := v.(*FriendReceiveReq); i { case 0: return &v.state case 1: @@ -2131,7 +2224,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendGiveResp); i { + switch v := v.(*FriendReceiveResp); i { case 0: return &v.state case 1: @@ -2143,7 +2236,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendTotalReq); i { + switch v := v.(*FriendGiveReq); i { case 0: return &v.state case 1: @@ -2155,7 +2248,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendTotalResp); i { + switch v := v.(*FriendGiveResp); i { case 0: return &v.state case 1: @@ -2167,7 +2260,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendZanlistReq); i { + switch v := v.(*FriendTotalReq); i { case 0: return &v.state case 1: @@ -2179,7 +2272,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendZanlistResp); i { + switch v := v.(*FriendTotalResp); i { case 0: return &v.state case 1: @@ -2191,7 +2284,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendZanReq); i { + switch v := v.(*FriendZanlistReq); i { case 0: return &v.state case 1: @@ -2203,7 +2296,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendZanResp); i { + switch v := v.(*FriendZanlistResp); i { case 0: return &v.state case 1: @@ -2215,7 +2308,7 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*FriendZanreceiveReq); i { + switch v := v.(*FriendZanReq); i { case 0: return &v.state case 1: @@ -2227,6 +2320,30 @@ func file_friend_friend_msg_proto_init() { } } file_friend_friend_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FriendZanResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_friend_friend_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*FriendZanreceiveReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_friend_friend_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendZanreceiveResp); i { case 0: return &v.state @@ -2245,7 +2362,7 @@ func file_friend_friend_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_friend_friend_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 33, + NumMessages: 35, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/rtask_db.pb.go b/pb/rtask_db.pb.go new file mode 100644 index 000000000..a556aea36 --- /dev/null +++ b/pb/rtask_db.pb.go @@ -0,0 +1,170 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: rtask/rtask_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +type DBRtask struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + FrtaskIds []int32 `protobuf:"varint,3,rep,packed,name=frtaskIds,proto3" json:"frtaskIds" bson:"frtaskIds"` //已完成的任务Id + NextRtaskId int32 `protobuf:"varint,4,opt,name=nextRtaskId,proto3" json:"nextRtaskId"` //@go_tags(`bson:"nextRtaskId"`)下个任务Id +} + +func (x *DBRtask) Reset() { + *x = DBRtask{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBRtask) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBRtask) ProtoMessage() {} + +func (x *DBRtask) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_db_proto_msgTypes[0] + 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 DBRtask.ProtoReflect.Descriptor instead. +func (*DBRtask) Descriptor() ([]byte, []int) { + return file_rtask_rtask_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DBRtask) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBRtask) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *DBRtask) GetFrtaskIds() []int32 { + if x != nil { + return x.FrtaskIds + } + return nil +} + +func (x *DBRtask) GetNextRtaskId() int32 { + if x != nil { + return x.NextRtaskId + } + return 0 +} + +var File_rtask_rtask_db_proto protoreflect.FileDescriptor + +var file_rtask_rtask_db_proto_rawDesc = []byte{ + 0x0a, 0x14, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6b, 0x0a, 0x07, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, + 0x6b, 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, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x66, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x6e, 0x65, 0x78, 0x74, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x6e, 0x65, 0x78, 0x74, 0x52, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, +} + +var ( + file_rtask_rtask_db_proto_rawDescOnce sync.Once + file_rtask_rtask_db_proto_rawDescData = file_rtask_rtask_db_proto_rawDesc +) + +func file_rtask_rtask_db_proto_rawDescGZIP() []byte { + file_rtask_rtask_db_proto_rawDescOnce.Do(func() { + file_rtask_rtask_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_rtask_rtask_db_proto_rawDescData) + }) + return file_rtask_rtask_db_proto_rawDescData +} + +var file_rtask_rtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_rtask_rtask_db_proto_goTypes = []interface{}{ + (*DBRtask)(nil), // 0: DBRtask +} +var file_rtask_rtask_db_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_rtask_rtask_db_proto_init() } +func file_rtask_rtask_db_proto_init() { + if File_rtask_rtask_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_rtask_rtask_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBRtask); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_rtask_rtask_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_rtask_rtask_db_proto_goTypes, + DependencyIndexes: file_rtask_rtask_db_proto_depIdxs, + MessageInfos: file_rtask_rtask_db_proto_msgTypes, + }.Build() + File_rtask_rtask_db_proto = out.File + file_rtask_rtask_db_proto_rawDesc = nil + file_rtask_rtask_db_proto_goTypes = nil + file_rtask_rtask_db_proto_depIdxs = nil +} diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go new file mode 100644 index 000000000..a23959e04 --- /dev/null +++ b/pb/rtask_msg.pb.go @@ -0,0 +1,268 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: rtask/rtask_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// 对话选项 +type RtaskChooseReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` + ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` +} + +func (x *RtaskChooseReq) Reset() { + *x = RtaskChooseReq{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskChooseReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskChooseReq) ProtoMessage() {} + +func (x *RtaskChooseReq) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[0] + 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 RtaskChooseReq.ProtoReflect.Descriptor instead. +func (*RtaskChooseReq) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} +} + +func (x *RtaskChooseReq) GetRtaskId() int32 { + if x != nil { + return x.RtaskId + } + return 0 +} + +func (x *RtaskChooseReq) GetChooseId() int32 { + if x != nil { + return x.ChooseId + } + return 0 +} + +type RtaskChooseResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *RtaskChooseResp) Reset() { + *x = RtaskChooseResp{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskChooseResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskChooseResp) ProtoMessage() {} + +func (x *RtaskChooseResp) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RtaskChooseResp.ProtoReflect.Descriptor instead. +func (*RtaskChooseResp) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} +} + +// 任务完成推送 +type RtaskFinishPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` +} + +func (x *RtaskFinishPush) Reset() { + *x = RtaskFinishPush{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskFinishPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskFinishPush) ProtoMessage() {} + +func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RtaskFinishPush.ProtoReflect.Descriptor instead. +func (*RtaskFinishPush) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *RtaskFinishPush) GetRtaskId() int32 { + if x != nil { + return x.RtaskId + } + return 0 +} + +var File_rtask_rtask_msg_proto protoreflect.FileDescriptor + +var file_rtask_rtask_msg_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x6d, 0x73, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, + 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, + 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x22, + 0x11, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_rtask_rtask_msg_proto_rawDescOnce sync.Once + file_rtask_rtask_msg_proto_rawDescData = file_rtask_rtask_msg_proto_rawDesc +) + +func file_rtask_rtask_msg_proto_rawDescGZIP() []byte { + file_rtask_rtask_msg_proto_rawDescOnce.Do(func() { + file_rtask_rtask_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_rtask_rtask_msg_proto_rawDescData) + }) + return file_rtask_rtask_msg_proto_rawDescData +} + +var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_rtask_rtask_msg_proto_goTypes = []interface{}{ + (*RtaskChooseReq)(nil), // 0: RtaskChooseReq + (*RtaskChooseResp)(nil), // 1: RtaskChooseResp + (*RtaskFinishPush)(nil), // 2: RtaskFinishPush +} +var file_rtask_rtask_msg_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_rtask_rtask_msg_proto_init() } +func file_rtask_rtask_msg_proto_init() { + if File_rtask_rtask_msg_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_rtask_rtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskChooseReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskChooseResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskFinishPush); 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{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_rtask_rtask_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 3, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_rtask_rtask_msg_proto_goTypes, + DependencyIndexes: file_rtask_rtask_msg_proto_depIdxs, + MessageInfos: file_rtask_rtask_msg_proto_msgTypes, + }.Build() + File_rtask_rtask_msg_proto = out.File + file_rtask_rtask_msg_proto_rawDesc = nil + file_rtask_rtask_msg_proto_goTypes = nil + file_rtask_rtask_msg_proto_depIdxs = nil +} diff --git a/services/worker/main.go b/services/worker/main.go index 3b964b178..b1131ce5c 100644 --- a/services/worker/main.go +++ b/services/worker/main.go @@ -16,6 +16,7 @@ import ( "go_dreamfactory/modules/martialhall" "go_dreamfactory/modules/notify" "go_dreamfactory/modules/pagoda" + "go_dreamfactory/modules/rtask" "go_dreamfactory/modules/shop" "go_dreamfactory/modules/task" "go_dreamfactory/modules/user" @@ -63,6 +64,7 @@ func main() { pagoda.NewModule(), gourmet.NewModule(), martialhall.NewModule(), + rtask.NewModule(), ) } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 9cad90257..1c8bef618 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -11,9 +11,6 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - LocalizeConfig_CNCategory *LocalizeLocalizeConfig_CNCategory - LocalizeConfig_ENCategory *LocalizeLocalizeConfig_ENCategory - LocalizeConfig_TWCategory *LocalizeLocalizeConfig_TWCategory global *Gameglobal ui *Gameui plot *Gameplot @@ -70,6 +67,14 @@ type Tables struct { pagoda *Gamepagoda pagodaTaskReward *GamepagodaTaskReward pagodaSeasonReward *GamepagodaSeasonReward + pagodaseasonLoop *GamepagodaseasonLoop + rdtaskAll *GamerdtaskAll + rdtaskType *GamerdtaskType + rdtaskChoose *GamerdtaskChoose + kungfu_unlock *Gamekungfu_unlock + kungfu_masterworker *Gamekungfu_masterworker + Gourmet *GameGourmet + GourmetSkill *GameGourmetSkill } func NewTables(loader JsonLoader) (*Tables, error) { @@ -77,24 +82,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { var buf []map[string]interface{} tables := &Tables{} - if buf, err = loader("LocalizeConfig_CN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_CNCategory, err = NewLocalizeLocalizeConfig_CNCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_EN") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_ENCategory, err = NewLocalizeLocalizeConfig_ENCategory(buf) ; err != nil { - return nil, err - } - if buf, err = loader("LocalizeConfig_TW") ; err != nil { - return nil, err - } - if tables.LocalizeConfig_TWCategory, err = NewLocalizeLocalizeConfig_TWCategory(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_global") ; err != nil { return nil, err } @@ -431,5 +418,53 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.pagodaSeasonReward, err = NewGamepagodaSeasonReward(buf) ; err != nil { return nil, err } + if buf, err = loader("game_pagodaseasonloop") ; err != nil { + return nil, err + } + if tables.pagodaseasonLoop, err = NewGamepagodaseasonLoop(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_rdtaskall") ; err != nil { + return nil, err + } + if tables.rdtaskAll, err = NewGamerdtaskAll(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_rdtasktype") ; err != nil { + return nil, err + } + if tables.rdtaskType, err = NewGamerdtaskType(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_rdtaskchoose") ; err != nil { + return nil, err + } + if tables.rdtaskChoose, err = NewGamerdtaskChoose(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_kungfu_unlock") ; err != nil { + return nil, err + } + if tables.kungfu_unlock, err = NewGamekungfu_unlock(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_kungfu_masterworker") ; err != nil { + return nil, err + } + if tables.kungfu_masterworker, err = NewGamekungfu_masterworker(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_gourmet") ; err != nil { + return nil, err + } + if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_gourmetskill") ; err != nil { + return nil, err + } + if tables.GourmetSkill, err = NewGameGourmetSkill(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.rdtaskAll.go b/sys/configure/structs/game.rdtaskAll.go new file mode 100644 index 000000000..7ccb34b8b --- /dev/null +++ b/sys/configure/structs/game.rdtaskAll.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamerdtaskAll struct { + _dataMap map[int32]*GamerdtaskAllData + _dataList []*GamerdtaskAllData +} + +func NewGamerdtaskAll(_buf []map[string]interface{}) (*GamerdtaskAll, error) { + _dataList := make([]*GamerdtaskAllData, 0, len(_buf)) + dataMap := make(map[int32]*GamerdtaskAllData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamerdtaskAllData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamerdtaskAll{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamerdtaskAll) GetDataMap() map[int32]*GamerdtaskAllData { + return table._dataMap +} + +func (table *GamerdtaskAll) GetDataList() []*GamerdtaskAllData { + return table._dataList +} + +func (table *GamerdtaskAll) Get(key int32) *GamerdtaskAllData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.rdtaskAllData.go b/sys/configure/structs/game.rdtaskAllData.go new file mode 100644 index 000000000..c438ec8b7 --- /dev/null +++ b/sys/configure/structs/game.rdtaskAllData.go @@ -0,0 +1,94 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamerdtaskAllData struct { + Id int32 + Type int32 + Lastend int32 + RdtaksNum []int32 + Aftertaks int32 + Icetime int32 + Tag int32 + Story int32 + Completetask int32 + Chooseid []int32 + Reword []*Gameatn +} + +const TypeId_GamerdtaskAllData = 762735928 + +func (*GamerdtaskAllData) GetTypeId() int32 { + return 762735928 +} + +func (_v *GamerdtaskAllData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lastend"].(float64); !_ok_ { err = errors.New("lastend error"); return }; _v.Lastend = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["rdtaks_num"].([]interface{}); !_ok_ { err = errors.New("rdtaks_num error"); return } + + _v.RdtaksNum = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.RdtaksNum = append(_v.RdtaksNum, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["aftertaks"].(float64); !_ok_ { err = errors.New("aftertaks error"); return }; _v.Aftertaks = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icetime"].(float64); !_ok_ { err = errors.New("icetime error"); return }; _v.Icetime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tag"].(float64); !_ok_ { err = errors.New("tag error"); return }; _v.Tag = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story"].(float64); !_ok_ { err = errors.New("story error"); return }; _v.Story = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["completetask"].(float64); !_ok_ { err = errors.New("completetask error"); return }; _v.Completetask = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["chooseid"].([]interface{}); !_ok_ { err = errors.New("chooseid error"); return } + + _v.Chooseid = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Chooseid = append(_v.Chooseid, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return } + + _v.Reword = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Reword = append(_v.Reword, _list_v_) + } + } + + return +} + +func DeserializeGamerdtaskAllData(_buf map[string]interface{}) (*GamerdtaskAllData, error) { + v := &GamerdtaskAllData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/game.rdtaskChoose.go b/sys/configure/structs/game.rdtaskChoose.go new file mode 100644 index 000000000..a848533a1 --- /dev/null +++ b/sys/configure/structs/game.rdtaskChoose.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamerdtaskChoose struct { + _dataMap map[int32]*GamerdtaskChooseData + _dataList []*GamerdtaskChooseData +} + +func NewGamerdtaskChoose(_buf []map[string]interface{}) (*GamerdtaskChoose, error) { + _dataList := make([]*GamerdtaskChooseData, 0, len(_buf)) + dataMap := make(map[int32]*GamerdtaskChooseData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamerdtaskChooseData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Chooseid] = _v + } + } + return &GamerdtaskChoose{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamerdtaskChoose) GetDataMap() map[int32]*GamerdtaskChooseData { + return table._dataMap +} + +func (table *GamerdtaskChoose) GetDataList() []*GamerdtaskChooseData { + return table._dataList +} + +func (table *GamerdtaskChoose) Get(key int32) *GamerdtaskChooseData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go new file mode 100644 index 000000000..f8b4fbe9d --- /dev/null +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -0,0 +1,54 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamerdtaskChooseData struct { + Chooseid int32 + Num int32 + RdtaksNum int32 + Need []int32 +} + +const TypeId_GamerdtaskChooseData = 1478012660 + +func (*GamerdtaskChooseData) GetTypeId() int32 { + return 1478012660 +} + +func (_v *GamerdtaskChooseData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chooseid"].(float64); !_ok_ { err = errors.New("chooseid error"); return }; _v.Chooseid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return } + + _v.Need = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Need = append(_v.Need, _list_v_) + } + } + + return +} + +func DeserializeGamerdtaskChooseData(_buf map[string]interface{}) (*GamerdtaskChooseData, error) { + v := &GamerdtaskChooseData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/game.rdtaskType.go b/sys/configure/structs/game.rdtaskType.go new file mode 100644 index 000000000..a666ffac2 --- /dev/null +++ b/sys/configure/structs/game.rdtaskType.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GamerdtaskType struct { + _dataMap map[int32]*GamerdtaskTypeData + _dataList []*GamerdtaskTypeData +} + +func NewGamerdtaskType(_buf []map[string]interface{}) (*GamerdtaskType, error) { + _dataList := make([]*GamerdtaskTypeData, 0, len(_buf)) + dataMap := make(map[int32]*GamerdtaskTypeData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamerdtaskTypeData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.RdtaksNum] = _v + } + } + return &GamerdtaskType{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamerdtaskType) GetDataMap() map[int32]*GamerdtaskTypeData { + return table._dataMap +} + +func (table *GamerdtaskType) GetDataList() []*GamerdtaskTypeData { + return table._dataList +} + +func (table *GamerdtaskType) Get(key int32) *GamerdtaskTypeData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.rdtaskTypeData.go b/sys/configure/structs/game.rdtaskTypeData.go new file mode 100644 index 000000000..880f3aecf --- /dev/null +++ b/sys/configure/structs/game.rdtaskTypeData.go @@ -0,0 +1,47 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GamerdtaskTypeData struct { + RdtaksNum int32 + Typdes int32 + Datatime int32 + TyptaskId int32 + Data1 int32 + Data2 int32 + Data3 int32 +} + +const TypeId_GamerdtaskTypeData = -279607465 + +func (*GamerdtaskTypeData) GetTypeId() int32 { + return -279607465 +} + +func (_v *GamerdtaskTypeData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typdes"].(float64); !_ok_ { err = errors.New("typdes error"); return }; _v.Typdes = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatime"].(float64); !_ok_ { err = errors.New("datatime error"); return }; _v.Datatime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typtask_id"].(float64); !_ok_ { err = errors.New("typtask_id error"); return }; _v.TyptaskId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) } + return +} + +func DeserializeGamerdtaskTypeData(_buf map[string]interface{}) (*GamerdtaskTypeData, error) { + v := &GamerdtaskTypeData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/utils/strings.go b/utils/strings.go index c533256e6..dfb17a1ba 100644 --- a/utils/strings.go +++ b/utils/strings.go @@ -20,6 +20,16 @@ func UIdSplit(uid string) (string, string, bool) { return s[0], s[1], true } +func Findx[T string | int32](slice []T, val T) (int, bool) { + for i, item := range slice { + if item == val { + return i, true + } + } + return -1, false +} + +// Deprecated: Use Findx instead func Find(slice []string, val string) (int, bool) { for i, item := range slice { if item == val {