From 27bef42a956e2e3cfad1607362d6635bbb2eeaea Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 29 Mar 2023 19:06:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=96=E7=95=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/dispatch/api_notice.go | 5 + modules/dispatch/model_dispatch.go | 5 +- modules/gateway/agent.go | 3 +- modules/rtask/updateHandle.go | 11 +- modules/worldtask/api_accept.go | 9 +- modules/worldtask/api_battlefinish.go | 42 +- modules/worldtask/api_completetask.go | 15 +- modules/worldtask/api_finish.go | 75 ++- pb/errorcode.pb.go | 842 +++++++++++++------------- pb/worldtask_db.pb.go | 46 +- pb/worldtask_msg.pb.go | 391 ++++++++---- 11 files changed, 804 insertions(+), 640 deletions(-) diff --git a/modules/dispatch/api_notice.go b/modules/dispatch/api_notice.go index f80529975..90164cfe2 100644 --- a/modules/dispatch/api_notice.go +++ b/modules/dispatch/api_notice.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" + "sort" "google.golang.org/protobuf/proto" ) @@ -75,6 +76,10 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) ( a.module.modelDispatch.updateNotice(session.GetUserId(), d) } + // 排序 + sort.SliceStable(d.Nb.Tasks, func(i, j int) bool { + return d.Nb.Tasks[i].TaskId < d.Nb.Tasks[j].TaskId + }) rsp.Dispatch = d.Nb session.SendMsg(string(a.module.GetType()), "notice", rsp) return diff --git a/modules/dispatch/model_dispatch.go b/modules/dispatch/model_dispatch.go index 25c061eb7..8b4b73f4b 100644 --- a/modules/dispatch/model_dispatch.go +++ b/modules/dispatch/model_dispatch.go @@ -80,12 +80,11 @@ func (this *modelDispatch) getDBDispatch(uid string) (dis *pb.DBDispatch) { // 获取任务权重数据 func (this *modelDispatch) getTasksWeight(uid string, d *pb.DBDispatch) []int32 { - dispatch := this.getDBDispatch(uid) - if dispatch == nil { + if d == nil { return []int32{} } - if dispatch.Nb == nil { + if d.Nb == nil { return []int32{} } diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index b14188b33..74b540bbf 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -321,7 +321,8 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { } stime := time.Now() // this.gateway.Debugf("----------3 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) - ctx, _ := context.WithTimeout(context.Background(), time.Second*5) + // ctx, _ := context.WithTimeout(context.Background(), time.Second*5) + ctx := context.Background() if len(serviceTag) == 0 { // this.gateway.Debugf("----------4 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) if err = this.gateway.Service().RpcCall(ctx, servicePath, string(comm.Rpc_GatewayRoute), req, reply); err != nil { diff --git a/modules/rtask/updateHandle.go b/modules/rtask/updateHandle.go index 5e46308db..6e6a60e93 100644 --- a/modules/rtask/updateHandle.go +++ b/modules/rtask/updateHandle.go @@ -2,7 +2,6 @@ package rtask import ( - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" @@ -38,11 +37,11 @@ func (this *ModelRtaskRecord) overrideUpdate(uid string, cfg *cfg.GameRdtaskCond if v, ok := record.Vals[cfg.Id]; ok { v.Data = hasUpdateData(paramLen, v, vals...) if len(v.Data) > 0 { - this.moduleRtask.Debug("打印V", - log.Field{Key: "v", Value: v.Data}, - log.Field{Key: "paramLen", Value: paramLen}, - log.Field{Key: "vals", Value: vals}, - ) + // this.moduleRtask.Debug("打印V", + // log.Field{Key: "v", Value: v.Data}, + // log.Field{Key: "paramLen", Value: paramLen}, + // log.Field{Key: "vals", Value: vals}, + // ) update := map[string]interface{}{ "vals": record.Vals, } diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index efa980c1c..1b46a3760 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -39,22 +39,21 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) } myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{ TaskId: req.TaskId, - TaskType: 2, + TaskType: curTaskConf.Des, } - myWorldtask.CurrentTask[curTaskConf.Group].NpcStatus=1 + myWorldtask.CurrentTask[curTaskConf.Group].NpcStatus = 1 update := map[string]interface{}{ "currentTask": myWorldtask.CurrentTask, } + if err := a.module.modelWorldtask.Change(uid, update); err != nil { code = pb.ErrorCode_DBError - return } rsp := &pb.WorldtaskAcceptResp{ - GroupId: req.GroupId, - TaskId: req.TaskId, + Code: code, } session.SendMsg(string(a.module.GetType()), "accept", rsp) diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 724c3e403..74432bda7 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -6,13 +6,14 @@ import ( "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "go_dreamfactory/utils" "google.golang.org/protobuf/proto" ) // 战斗结束的请求 func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (code pb.ErrorCode) { - if req.BattleConfId == 0 || req.TaskId == 0 || req.Report == nil { + if req.GroupId <= 0 || req.CondiId <= 0 || req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil { this.module.Error("世界任务战斗结束参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}, @@ -60,24 +61,6 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa code = pb.ErrorCode_SystemError return } - - if taskConf.IdAfter != 0 { - nextTaskIds := this.module.modelWorldtask.findNextTasks(req.TaskId) - nextMap := make(map[int32]*pb.Worldtask) - nextMap[req.GroupId] = &pb.Worldtask{ - CondiIds: nextTaskIds, - } - if err := session.SendMsg(string(this.module.GetType()), "nexttask", &pb.WorldtaskNexttaskPush{ - NextTask: nextMap, - }); err != nil { - log.Error("任务条件达成推送", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "err", Value: err.Error()}, - ) - return - } - } - } battleModule, err := this.module.service.GetModule(comm.ModuleBattle) @@ -101,6 +84,27 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa } } } + if userTask.CurrentTask == nil { + userTask.CurrentTask = make(map[int32]*pb.Worldtask) + } + if _, ok := utils.Findx(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId); !ok { + userTask.CurrentTask[req.GroupId].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, req.CondiId) + } + + update := map[string]interface{}{ + "currentTask": userTask.CurrentTask, + } + if err := this.module.modelWorldtask.Change(uid, update); err != nil { + code = pb.ErrorCode_DBError + return + } + + //推送 + session.SendMsg(string(this.module.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ + GroupId: req.GroupId, + TaskId: req.TaskId, + CondiIds: userTask.CurrentTask[req.GroupId].CondiIds, + }) } this.module.Debug("校验战报", log.Field{Key: "uid", Value: session.GetUserId()}, diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index f01534892..75a0575cc 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -21,6 +21,7 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC if code = this.CompleteCondiCheck(session, req); code != pb.ErrorCode_Success { return } + rsp := &pb.WorldtaskCompleteCondiResp{} uid := session.GetUserId() myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { @@ -34,6 +35,14 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC iwt, ok := m.(comm.IRtask) if ok { if code = iwt.CheckCondi(uid, req.CondiId); code != pb.ErrorCode_Success { + rsp.Code = code + rsp.CondiId = req.CondiId + rsp.TaskId = req.TaskId + this.module.Debug("任务完成条件不满足", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "taskId", Value: req.TaskId}, + log.Field{Key: "condiId", Value: req.CondiId}, + ) return } if wt == nil { @@ -55,12 +64,6 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC return } - rsp := &pb.WorldtaskCompleteCondiResp{ - GroupId: req.GroupId, - TaskId: req.TaskId, - CondiId: req.CondiId, - } - session.SendMsg(string(this.module.GetType()), "completecondi", rsp) return } diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 91b830a01..5772a883c 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -26,10 +26,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe uid := session.GetUserId() - rsp := &pb.WorldtaskFinishResp{ - GroupId: req.GroupId, - TaskId: req.TaskId, - } + rsp := &pb.WorldtaskFinishResp{} // 获取用户信息 user := this.module.ModuleUser.GetUser(uid) @@ -51,7 +48,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } // 判断玩家等级要求 - if curTaskConf.Des == 2 && user.Lv < curTaskConf.Lock { + if user.Lv < curTaskConf.Lock { code = pb.ErrorCode_WorldtaskLvNotEnough return } @@ -67,12 +64,10 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } // 前置任务ID 只有世界任务才校验前置 - if curTaskConf.Des == 2 { - if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { - this.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key}) - code = pb.ErrorCode_WorldtaskLastUnFinished - return - } + if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { + this.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key}) + code = pb.ErrorCode_WorldtaskLastUnFinished + return } updateCheckCond := func(nextTaskId int32) *pb.DBWorldtask { @@ -105,21 +100,26 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { iwt, ok := m.(comm.IRtask) if ok { - if code = iwt.CheckCondi(uid, condiId); code != pb.ErrorCode_Success { - return nil - } - _, ok := userTask.CurrentTask[nextTaskConf.Group] - if ok { - userTask.CurrentTask[nextTaskConf.Group].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, condiId) + if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { + this.module.Debug("任务完成条件不满足", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "taskId", Value: req.TaskId}, + log.Field{Key: "condiId", Value: condiId}, + ) + rsp.CondiId = condiId + rsp.TaskId = req.TaskId } else { - condiIds := []int32{condiId} - userTask.CurrentTask[nextTaskConf.Group] = &pb.Worldtask{ - TaskId: nextTaskId, - TaskType: nextTaskConf.Des, - CondiIds: condiIds, + _, ok := userTask.CurrentTask[nextTaskConf.Group] + if ok { + userTask.CurrentTask[nextTaskConf.Group].CondiIds = append(userTask.CurrentTask[req.GroupId].CondiIds, condiId) + } else { + condiIds := []int32{condiId} + userTask.CurrentTask[nextTaskConf.Group].CondiIds = condiIds } } + userTask.CurrentTask[nextTaskConf.Group].TaskId = nextTaskId + userTask.CurrentTask[nextTaskConf.Group].TaskType = nextTaskConf.Des } } } @@ -138,26 +138,25 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } finishRsp := func() { + nextTaskIds := this.module.modelWorldtask.findNextTasks(curTaskConf.Key) + this.module.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds}) + + nextTask := make(map[int32]*pb.Worldtask) + for _, next := range nextTaskIds { + userTask = updateCheckCond(next) + if userTask != nil { + for k, v := range userTask.CurrentTask { + nextTask[k] = &pb.Worldtask{ + TaskId: v.TaskId, + } + } + } + } if err := session.SendMsg(string(this.module.GetType()), WorldtaskSubtypeFinish, rsp); err != nil { code = pb.ErrorCode_SystemError return } if curTaskConf.IdAfter != 0 { - nextTaskIds := this.module.modelWorldtask.findNextTasks(curTaskConf.Key) - this.module.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds}) - - nextTask := make(map[int32]*pb.Worldtask) - for _, next := range nextTaskIds { - userTask = updateCheckCond(next) - if userTask != nil { - for k, v := range userTask.CurrentTask { - nextTask[k] = &pb.Worldtask{ - TaskId: v.TaskId, - } - } - } - } - // 任务完成推送 if err := session.SendMsg(string(this.module.GetType()), WorldtaskNexttaskPush, &pb.WorldtaskNexttaskPush{ NextTask: nextTask, @@ -166,6 +165,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe return } } else { + // 章节完成 // if _, ok := utils.Findx(userTask.Chapters, req.GroupId); !ok { // userTask.Chapters = append(userTask.Chapters, req.GroupId) // update := map[string]interface{}{ @@ -177,7 +177,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } finishCall := func() { - // 完成任务 if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { code = pb.ErrorCode_WorldtaskFinish diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 5e5fc8a5f..510d016d8 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -238,48 +238,48 @@ const ( ErrorCode_BattleUserOff ErrorCode = 2905 //由用户离线 ErrorCode_BattleCapskillCheckFailed ErrorCode = 2906 //战斗队长技校验失败 // sociaty - ErrorCode_SociatyNoFound ErrorCode = 3000 //公会不存在 - ErrorCode_SociatyAdded ErrorCode = 3001 //已在公会里 - ErrorCode_SociatyDiamondNoEnough ErrorCode = 3002 //钻石不足 - ErrorCode_SociatyNoMember ErrorCode = 3003 //不是公会成员 - ErrorCode_SociatyNoRight ErrorCode = 3004 //无权限 - ErrorCode_SociatyNoAdded ErrorCode = 3005 //未加入公会 - ErrorCode_SociatyDismiss ErrorCode = 3006 //解散失败 - ErrorCode_SociatyQuit ErrorCode = 3007 //退会失败 - ErrorCode_SociatyAgree ErrorCode = 3008 //申请-同意失败 - ErrorCode_SociatyRefuse ErrorCode = 3009 //申请-拒绝失败 - ErrorCode_SociatyLogParams ErrorCode = 30010 //公会日志参数错误 - ErrorCode_SociatyMasterNoDiss ErrorCode = 30011 //会长不能被踢出 - ErrorCode_SociatySettingJob ErrorCode = 30012 //设置职位失败 - ErrorCode_SociatySetting ErrorCode = 30013 //公会修改失败 - ErrorCode_SociatyNoAccuse ErrorCode = 30014 //无需弹劾 - ErrorCode_SociatySign ErrorCode = 30015 //签到失败 - ErrorCode_SociatySigned ErrorCode = 30016 //已签到 - ErrorCode_SociatyCDLimit ErrorCode = 30017 // CD时间限制 - ErrorCode_SociatyApplyMax ErrorCode = 30018 //最大申请该公会人数 - ErrorCode_SociatySelfSetting ErrorCode = 30019 // 不能设置自己 - ErrorCode_SociatyMemberCountLimit ErrorCode = 30020 //超出人数限制 - ErrorCode_SociatyRewardReceived ErrorCode = 30021 //奖励已领取 - ErrorCode_SociatyRewardReceive ErrorCode = 30022 //奖励领取失败 - ErrorCode_SociatyResource ErrorCode = 30023 //更新公会资源失败 - ErrorCode_SociatyBelongTo ErrorCode = 30025 //已是公会成员 - ErrorCode_SociatyApplied ErrorCode = 30026 //已申请 - ErrorCode_SociatyAppyLvNoEnough ErrorCode = 30027 //申请等级不满足 - ErrorCode_SociatyTaskValidation ErrorCode = 30028 //任务未完成 - ErrorCode_SociatyActivityNoEnough ErrorCode = 30029 //活跃度不足 - ErrorCode_SociatyAcitvityReceive ErrorCode = 30030 //活跃度领取失败 - ErrorCode_SociatyDismissed ErrorCode = 30031 //公会已解散 - ErrorCode_SociatyNameExist ErrorCode = 30032 //公会名存在 - ErrorCode_SociatyQuitNoAllowed ErrorCode = 30033 //会长不允许退公会 - ErrorCode_SociatyNoMaster ErrorCode = 30034 //无会长 - ErrorCode_SociatyNoFormation ErrorCode = 30035 //无阵容 - ErrorCode_SociatyTicketsNoEnough ErrorCode = 30036 //挑战券不足 - ErrorCode_SociatySportsNoinit ErrorCode = 30037 //赛季未初始 - ErrorCode_SociatySportsEnd ErrorCode = 30038 //赛季已结束 - ErrorCode_SociatyTeamUnlock ErrorCode = 30039 //队伍解锁条件不满足 - ErrorCode_SociatyTaskNoFound ErrorCode = 30040 //未找到boss任务 - ErrorCode_SociatyTaskNoFinished ErrorCode = 30041 //任务未完成 - ErrorCode_SociatyTaskReceived ErrorCode = 30042 //任务奖励已领取 + ErrorCode_SociatyNoFound ErrorCode = 3000 //公会不存在 + ErrorCode_SociatyAdded ErrorCode = 3001 //已在公会里 + ErrorCode_SociatyDiamondNoEnough ErrorCode = 3002 //钻石不足 + ErrorCode_SociatyNoMember ErrorCode = 3003 //不是公会成员 + ErrorCode_SociatyNoRight ErrorCode = 3004 //无权限 + ErrorCode_SociatyNoAdded ErrorCode = 3005 //未加入公会 + ErrorCode_SociatyDismiss ErrorCode = 3006 //解散失败 + ErrorCode_SociatyQuit ErrorCode = 3007 //退会失败 + ErrorCode_SociatyAgree ErrorCode = 3008 //申请-同意失败 + ErrorCode_SociatyRefuse ErrorCode = 3009 //申请-拒绝失败 + ErrorCode_SociatyLogParams ErrorCode = 3010 //公会日志参数错误 + ErrorCode_SociatyMasterNoDiss ErrorCode = 3011 //会长不能被踢出 + ErrorCode_SociatySettingJob ErrorCode = 3012 //设置职位失败 + ErrorCode_SociatySetting ErrorCode = 3013 //公会修改失败 + ErrorCode_SociatyNoAccuse ErrorCode = 3014 //无需弹劾 + ErrorCode_SociatySign ErrorCode = 3015 //签到失败 + ErrorCode_SociatySigned ErrorCode = 3016 //已签到 + ErrorCode_SociatyCDLimit ErrorCode = 3017 // CD时间限制 + ErrorCode_SociatyApplyMax ErrorCode = 3018 //最大申请该公会人数 + ErrorCode_SociatySelfSetting ErrorCode = 3019 // 不能设置自己 + ErrorCode_SociatyMemberCountLimit ErrorCode = 3020 //超出人数限制 + ErrorCode_SociatyRewardReceived ErrorCode = 3021 //奖励已领取 + ErrorCode_SociatyRewardReceive ErrorCode = 3022 //奖励领取失败 + ErrorCode_SociatyResource ErrorCode = 3023 //更新公会资源失败 + ErrorCode_SociatyBelongTo ErrorCode = 3025 //已是公会成员 + ErrorCode_SociatyApplied ErrorCode = 3026 //已申请 + ErrorCode_SociatyAppyLvNoEnough ErrorCode = 3027 //申请等级不满足 + ErrorCode_SociatyTaskValidation ErrorCode = 3028 //任务未完成 + ErrorCode_SociatyActivityNoEnough ErrorCode = 3029 //活跃度不足 + ErrorCode_SociatyAcitvityReceive ErrorCode = 3030 //活跃度领取失败 + ErrorCode_SociatyDismissed ErrorCode = 3031 //公会已解散 + ErrorCode_SociatyNameExist ErrorCode = 3032 //公会名存在 + ErrorCode_SociatyQuitNoAllowed ErrorCode = 3033 //会长不允许退公会 + ErrorCode_SociatyNoMaster ErrorCode = 3034 //无会长 + ErrorCode_SociatyNoFormation ErrorCode = 3035 //无阵容 + ErrorCode_SociatyTicketsNoEnough ErrorCode = 3036 //挑战券不足 + ErrorCode_SociatySportsNoinit ErrorCode = 3037 //赛季未初始 + ErrorCode_SociatySportsEnd ErrorCode = 3038 //赛季已结束 + ErrorCode_SociatyTeamUnlock ErrorCode = 3039 //队伍解锁条件不满足 + ErrorCode_SociatyTaskNoFound ErrorCode = 3040 //未找到boss任务 + ErrorCode_SociatyTaskNoFinished ErrorCode = 3041 //任务未完成 + ErrorCode_SociatyTaskReceived ErrorCode = 3042 //任务奖励已领取 // arena ErrorCode_ArenaTicketBuyUp ErrorCode = 3101 //票据上限 ErrorCode_ArenaTicketNotEnough ErrorCode = 3102 //票据不足 @@ -358,302 +358,302 @@ const ( // Enum value maps for ErrorCode. var ( ErrorCode_name = map[int32]string{ - 0: "Success", - 1: "GatewayException", - 10: "NoFindService", - 11: "NoFindServiceHandleFunc", - 12: "RpcFuncExecutionError", - 13: "CacheReadError", - 14: "SqlExecutionError", - 15: "ReqParameterError", - 16: "SignError", - 17: "InsufficientPermissions", - 18: "NoLogin", - 19: "UserSessionNobeing", - 20: "StateInvalid", - 21: "DBError", - 22: "SystemError", - 23: "DecodeError", - 24: "TimestampTimeout", - 25: "PbError", - 26: "AgentUidEmpty", - 100: "Exception", - 101: "Unknown", - 102: "ResNoEnough", - 103: "ConfigurationException", - 104: "ConfigNoFound", - 105: "UserLogined", - 106: "NoOpened", - 107: "DataNotFound", - 1000: "SecKeyInvalid", - 1001: "SecKey", - 1002: "BindUser", - 1003: "GoldNoEnough", - 1004: "DiamondNoEnough", - 1005: "RoleCreated", - 1006: "UserNickNameExist", - 1007: "VeriCodeNoValid", - 1008: "VeriCodeExpired", - 1009: "UserResetData", - 1010: "UserModiNameCount", - 1011: "UserNickNameEmpty", - 1012: "UserExpandNull", - 1013: "UserExpNoEnough", - 1014: "UserFriendNoEnough", - 1015: "UserSociatyCoinNoEnough", - 1016: "UserArenaCoinNoEnough", - 1017: "UserVitNoEnough", - 1018: "UserVitLimit", - 1019: "UserMoongoldNoEnough", - 1020: "UserOffline", - 1021: "UserNofound", - 1100: "FriendNotSelf", - 1101: "FriendSelfMax", - 1102: "FriendTargetMax", - 1103: "FriendSelfNoData", - 1104: "FriendTargetNoData", - 1105: "FriendYet", - 1106: "FriendApplyYet", - 1107: "FriendSelfBlackYet", - 1108: "FriendTargetBlackYet", - 1109: "FriendApplyError", - 1110: "FriendBlackMax", - 1111: "FriendSearchNameEmpty", - 1112: "FriendZaned", - 1113: "FriendZanreceived", - 1114: "FriendZanSelf", - 1115: "FriendPointLimit", - 1116: "FriendNoreceived", - 1117: "FriendQiecuoTimeout", - 1118: "FriendQiecuoRequested", - 1119: "FriendQiecuoNoRequest", - 1120: "FriendQiecuoing", - 1121: "FriendQiecuoTargetPk", - 1122: "FriendTicketNoEnough", - 1200: "ItemsNoEnough", - 1201: "ItemsNoFoundGird", - 1202: "ItemsGridNumUpper", - 1203: "ItemsGirdAmountUpper", - 1204: "ItemsUseNotSupported", - 1205: "ItemsUseNoCanSell", - 1206: "ItemsBuyPsUpperLimit", - 1300: "HeroNoExist", - 1301: "HeroNoEnough", - 1302: "HeroMaxLv", - 1303: "HeroInitCreat", - 1304: "HeroColorErr", - 1305: "HeroSkillUpErr", - 1306: "HeroMaxResonate", - 1307: "HeroNoResonate", - 1308: "HeroNotNeedResonate", - 1309: "HeroNoEnergy", - 1310: "HeroCreate", - 1311: "HeroEquipUpdate", - 1312: "HeroMaxAwaken", - 1313: "HeroIsLock", - 1314: "HeroMaxCount", - 1315: "HeroCostTypeErr", - 1316: "HeroStarErr", - 1317: "HeroTypeErr", - 1318: "HeroExpTypeErr", - 1319: "HeroAddMaxExp", - 1320: "HeroStarLvErr", - 1321: "HeroMaxStarLv", - 1322: "DrawCardTypeNotFound", - 1323: "HeroMaxSkillLv", - 1324: "HeroAlreadyKongFuStatus", - 1325: "HeroLvNoEnough", - 1326: "HeroIsRegister", - 1400: "EquipmentOnFoundEquipment", - 1401: "EquipmentLvlimitReached", - 1402: "EquipmentIsWorn", - 1403: "EquipmentNoCanSell", - 1404: "EquipmentSuiteNotFound", - 1500: "MainlineNotFindChapter", - 1501: "MainlineIDFailed", - 1502: "MainlineNotFound", - 1503: "MainlinePreNotFound", - 1504: "MainlineRepeatReward", - 1505: "MainlineCompleteReward", - 1506: "MainlineNoEnoughStar", - 1600: "TaskInit", - 1601: "TaskReset", - 1602: "TaskHandle", - 1603: "TaskReceived", - 1604: "TaskActiveInit", - 1605: "TaskActiveNofound", - 1606: "TaskActiveNoenough", - 1607: "TaskNoFinished", - 1608: "TaskFinished", - 1609: "TaskTagEmpty", - 1610: "TaskIdEmpty", - 1611: "TaskNotFound", - 1700: "ShopGoodsIsSoldOut", - 1701: "ShopNoSurplusRefreshNum", - 1800: "MailErr", - 1900: "PagodaNotFound", - 1901: "PagodaLevlErr", - 1902: "PagodaGetRewardErr", - 1903: "PagodaConditionErr", - 1904: "PagodaUnlock", - 2000: "MartialhallNotUnlocked", - 2001: "MartialhallInUse", - 2002: "MartialhallUnlocked", - 2003: "MartialhallNoUnlocked", - 2004: "MartialhallAtlasError", - 2005: "MartialhallAtlasNoReward", - 2101: "GourmetMoreOrderTime", - 2102: "GourmetSkillMaxLv", - 2201: "RtaskFinished", - 2202: "RtaskUnFinished", - 2203: "RtaskNoRtask", - 2204: "RtaskRewarded", - 2205: "RtaskPreNoFinish", - 2206: "RtaskCondiNoReach", - 2207: "RtaskNoLastOne", - 2208: "RtaskCondiNoFound", - 2301: "VikingLvErr", - 2302: "VikingBoosType", - 2303: "VikingBuyMaxCount", - 2304: "VikingMaxChallengeCount", - 2401: "MoonfantasyHasExpired", - 2402: "MoonfantasyJoinUp", - 2403: "MoonfantasyDareUp", - 2404: "MoonfantasyBattleNoEnd", - 2405: "MoonfantasyBattleNoWin", - 2406: "MoonfantasyNoJoin", - 2407: "MoonfantasyNotEnoughbattles", - 2501: "BattleNoFoundRecord", - 2601: "LinestoryTaskFinished", - 2602: "LinestoryNoReceive", - 2603: "LinestoryTaskDisabledEnter", - 2604: "LinestoryChapterNoOpen", - 2605: "LinestoryPreNoComplete", - 2701: "HuntingLvErr", - 2702: "HuntingBoosType", - 2703: "HuntingBuyMaxCount", - 2704: "HuntingMaxChallengeCount", - 2705: "HuntingNoChallengeCount", - 2711: "EnchantLvErr", - 2712: "EnchantBoosType", - 2713: "EnchantBuyMaxCount", - 2714: "EnchantMaxChallengeCount", - 2715: "EnchantNoChallengeCount", - 2801: "LibraryMaxLv", - 2802: "LibraryNoData", - 2803: "LibraryActivation", - 2804: "LibraryReward", - 2805: "LibraryLvReward", - 2806: "LibraryFetterTaskNoFound", - 2807: "LibraryPreTaskNoFinished", - 2901: "BattleValidationFailed", - 2902: "BattleNoWin", - 2903: "BattleCreateFailed", - 2904: "BattleInCmdFailed", - 2905: "BattleUserOff", - 2906: "BattleCapskillCheckFailed", - 3000: "SociatyNoFound", - 3001: "SociatyAdded", - 3002: "SociatyDiamondNoEnough", - 3003: "SociatyNoMember", - 3004: "SociatyNoRight", - 3005: "SociatyNoAdded", - 3006: "SociatyDismiss", - 3007: "SociatyQuit", - 3008: "SociatyAgree", - 3009: "SociatyRefuse", - 30010: "SociatyLogParams", - 30011: "SociatyMasterNoDiss", - 30012: "SociatySettingJob", - 30013: "SociatySetting", - 30014: "SociatyNoAccuse", - 30015: "SociatySign", - 30016: "SociatySigned", - 30017: "SociatyCDLimit", - 30018: "SociatyApplyMax", - 30019: "SociatySelfSetting", - 30020: "SociatyMemberCountLimit", - 30021: "SociatyRewardReceived", - 30022: "SociatyRewardReceive", - 30023: "SociatyResource", - 30025: "SociatyBelongTo", - 30026: "SociatyApplied", - 30027: "SociatyAppyLvNoEnough", - 30028: "SociatyTaskValidation", - 30029: "SociatyActivityNoEnough", - 30030: "SociatyAcitvityReceive", - 30031: "SociatyDismissed", - 30032: "SociatyNameExist", - 30033: "SociatyQuitNoAllowed", - 30034: "SociatyNoMaster", - 30035: "SociatyNoFormation", - 30036: "SociatyTicketsNoEnough", - 30037: "SociatySportsNoinit", - 30038: "SociatySportsEnd", - 30039: "SociatyTeamUnlock", - 30040: "SociatyTaskNoFound", - 30041: "SociatyTaskNoFinished", - 30042: "SociatyTaskReceived", - 3101: "ArenaTicketBuyUp", - 3102: "ArenaTicketNotEnough", - 3103: "ArenaTicketNpcInCd", - 3201: "TalentRepeatLearn", - 3202: "TalentErrData", - 3203: "TalentUnLockerBefore", - 3204: "TalentResetState", - 3301: "TrollBuyMax", - 3302: "TrollSellMax", - 3303: "TrollMaxSellCount", - 3304: "TrollMaxItemCount", - 3305: "TrollRepeatedReward", - 3401: "HoroscopeNotTurnedOn", - 3402: "HoroscopeRestCDNoEnd", - 3501: "PrivilegeNotFound", - 3502: "PrivilegeRenewTime", - 3503: "VipLvError", - 3504: "VipGiftError", - 3505: "VipBuyRepeat", - 3601: "GrowtaskReceive", - 3602: "GrowtaskAdvReceive", - 3701: "PayBuyNumNotEnough", - 3702: "PayRenewTimeErr", - 3703: "PayOrderCompleted", - 3801: "WorldtaskFinish", - 3802: "WorldtaskLvNotEnough", - 3803: "WorldtaskNoAccept", - 3804: "WorldtaskNoComplete", - 3805: "WorldtaskFinihed", - 3806: "WorldtaskLastUnFinished", - 3807: "WorldtaskGroupIdNosame", - 3901: "AcademyTaskNoCompleteTask", - 4001: "AutoBattleNoData", - 4002: "AutoBattleStatesErr", - 4101: "SmithyNoReel", - 4102: "SmithyNoTemperature", - 4103: "SmithyStoveMaxLv", - 4104: "SmithyCustomerLimit", - 4105: "SmithyCustomerEquipNoEnough", - 4106: "SmithyMaxTemperature", - 4107: "SmithyLackLava", - 4108: "SmithyAtlasMaxLv", - 4109: "SmithyAtlasLackLv", - 4110: "SmithyTaskNoFinished", - 4111: "SmithyTaskReceived", - 4112: "SmithyNoFoundAtlas", - 4113: "SmithyNoActivateAtlas", - 4114: "SmithyLvToolsFailed", - 4115: "SmithyLvToolsPre", - 4201: "DispatchHeroNoReached", - 4202: "DispatchNoFree", - 4203: "DispatchTicketNoEnough", - 4204: "DispatchHeroAssigned", - 4205: "DispatchTaskExpired", - 4206: "DispatchRefreshMax", - 4207: "DispatchNoFinished", - 4208: "DispatchHeroNoEnough", - 4301: "PracticeQiecuoing", - 4302: "PracticeSent", - 4303: "PracticeInviteTimeOut", + 0: "Success", + 1: "GatewayException", + 10: "NoFindService", + 11: "NoFindServiceHandleFunc", + 12: "RpcFuncExecutionError", + 13: "CacheReadError", + 14: "SqlExecutionError", + 15: "ReqParameterError", + 16: "SignError", + 17: "InsufficientPermissions", + 18: "NoLogin", + 19: "UserSessionNobeing", + 20: "StateInvalid", + 21: "DBError", + 22: "SystemError", + 23: "DecodeError", + 24: "TimestampTimeout", + 25: "PbError", + 26: "AgentUidEmpty", + 100: "Exception", + 101: "Unknown", + 102: "ResNoEnough", + 103: "ConfigurationException", + 104: "ConfigNoFound", + 105: "UserLogined", + 106: "NoOpened", + 107: "DataNotFound", + 1000: "SecKeyInvalid", + 1001: "SecKey", + 1002: "BindUser", + 1003: "GoldNoEnough", + 1004: "DiamondNoEnough", + 1005: "RoleCreated", + 1006: "UserNickNameExist", + 1007: "VeriCodeNoValid", + 1008: "VeriCodeExpired", + 1009: "UserResetData", + 1010: "UserModiNameCount", + 1011: "UserNickNameEmpty", + 1012: "UserExpandNull", + 1013: "UserExpNoEnough", + 1014: "UserFriendNoEnough", + 1015: "UserSociatyCoinNoEnough", + 1016: "UserArenaCoinNoEnough", + 1017: "UserVitNoEnough", + 1018: "UserVitLimit", + 1019: "UserMoongoldNoEnough", + 1020: "UserOffline", + 1021: "UserNofound", + 1100: "FriendNotSelf", + 1101: "FriendSelfMax", + 1102: "FriendTargetMax", + 1103: "FriendSelfNoData", + 1104: "FriendTargetNoData", + 1105: "FriendYet", + 1106: "FriendApplyYet", + 1107: "FriendSelfBlackYet", + 1108: "FriendTargetBlackYet", + 1109: "FriendApplyError", + 1110: "FriendBlackMax", + 1111: "FriendSearchNameEmpty", + 1112: "FriendZaned", + 1113: "FriendZanreceived", + 1114: "FriendZanSelf", + 1115: "FriendPointLimit", + 1116: "FriendNoreceived", + 1117: "FriendQiecuoTimeout", + 1118: "FriendQiecuoRequested", + 1119: "FriendQiecuoNoRequest", + 1120: "FriendQiecuoing", + 1121: "FriendQiecuoTargetPk", + 1122: "FriendTicketNoEnough", + 1200: "ItemsNoEnough", + 1201: "ItemsNoFoundGird", + 1202: "ItemsGridNumUpper", + 1203: "ItemsGirdAmountUpper", + 1204: "ItemsUseNotSupported", + 1205: "ItemsUseNoCanSell", + 1206: "ItemsBuyPsUpperLimit", + 1300: "HeroNoExist", + 1301: "HeroNoEnough", + 1302: "HeroMaxLv", + 1303: "HeroInitCreat", + 1304: "HeroColorErr", + 1305: "HeroSkillUpErr", + 1306: "HeroMaxResonate", + 1307: "HeroNoResonate", + 1308: "HeroNotNeedResonate", + 1309: "HeroNoEnergy", + 1310: "HeroCreate", + 1311: "HeroEquipUpdate", + 1312: "HeroMaxAwaken", + 1313: "HeroIsLock", + 1314: "HeroMaxCount", + 1315: "HeroCostTypeErr", + 1316: "HeroStarErr", + 1317: "HeroTypeErr", + 1318: "HeroExpTypeErr", + 1319: "HeroAddMaxExp", + 1320: "HeroStarLvErr", + 1321: "HeroMaxStarLv", + 1322: "DrawCardTypeNotFound", + 1323: "HeroMaxSkillLv", + 1324: "HeroAlreadyKongFuStatus", + 1325: "HeroLvNoEnough", + 1326: "HeroIsRegister", + 1400: "EquipmentOnFoundEquipment", + 1401: "EquipmentLvlimitReached", + 1402: "EquipmentIsWorn", + 1403: "EquipmentNoCanSell", + 1404: "EquipmentSuiteNotFound", + 1500: "MainlineNotFindChapter", + 1501: "MainlineIDFailed", + 1502: "MainlineNotFound", + 1503: "MainlinePreNotFound", + 1504: "MainlineRepeatReward", + 1505: "MainlineCompleteReward", + 1506: "MainlineNoEnoughStar", + 1600: "TaskInit", + 1601: "TaskReset", + 1602: "TaskHandle", + 1603: "TaskReceived", + 1604: "TaskActiveInit", + 1605: "TaskActiveNofound", + 1606: "TaskActiveNoenough", + 1607: "TaskNoFinished", + 1608: "TaskFinished", + 1609: "TaskTagEmpty", + 1610: "TaskIdEmpty", + 1611: "TaskNotFound", + 1700: "ShopGoodsIsSoldOut", + 1701: "ShopNoSurplusRefreshNum", + 1800: "MailErr", + 1900: "PagodaNotFound", + 1901: "PagodaLevlErr", + 1902: "PagodaGetRewardErr", + 1903: "PagodaConditionErr", + 1904: "PagodaUnlock", + 2000: "MartialhallNotUnlocked", + 2001: "MartialhallInUse", + 2002: "MartialhallUnlocked", + 2003: "MartialhallNoUnlocked", + 2004: "MartialhallAtlasError", + 2005: "MartialhallAtlasNoReward", + 2101: "GourmetMoreOrderTime", + 2102: "GourmetSkillMaxLv", + 2201: "RtaskFinished", + 2202: "RtaskUnFinished", + 2203: "RtaskNoRtask", + 2204: "RtaskRewarded", + 2205: "RtaskPreNoFinish", + 2206: "RtaskCondiNoReach", + 2207: "RtaskNoLastOne", + 2208: "RtaskCondiNoFound", + 2301: "VikingLvErr", + 2302: "VikingBoosType", + 2303: "VikingBuyMaxCount", + 2304: "VikingMaxChallengeCount", + 2401: "MoonfantasyHasExpired", + 2402: "MoonfantasyJoinUp", + 2403: "MoonfantasyDareUp", + 2404: "MoonfantasyBattleNoEnd", + 2405: "MoonfantasyBattleNoWin", + 2406: "MoonfantasyNoJoin", + 2407: "MoonfantasyNotEnoughbattles", + 2501: "BattleNoFoundRecord", + 2601: "LinestoryTaskFinished", + 2602: "LinestoryNoReceive", + 2603: "LinestoryTaskDisabledEnter", + 2604: "LinestoryChapterNoOpen", + 2605: "LinestoryPreNoComplete", + 2701: "HuntingLvErr", + 2702: "HuntingBoosType", + 2703: "HuntingBuyMaxCount", + 2704: "HuntingMaxChallengeCount", + 2705: "HuntingNoChallengeCount", + 2711: "EnchantLvErr", + 2712: "EnchantBoosType", + 2713: "EnchantBuyMaxCount", + 2714: "EnchantMaxChallengeCount", + 2715: "EnchantNoChallengeCount", + 2801: "LibraryMaxLv", + 2802: "LibraryNoData", + 2803: "LibraryActivation", + 2804: "LibraryReward", + 2805: "LibraryLvReward", + 2806: "LibraryFetterTaskNoFound", + 2807: "LibraryPreTaskNoFinished", + 2901: "BattleValidationFailed", + 2902: "BattleNoWin", + 2903: "BattleCreateFailed", + 2904: "BattleInCmdFailed", + 2905: "BattleUserOff", + 2906: "BattleCapskillCheckFailed", + 3000: "SociatyNoFound", + 3001: "SociatyAdded", + 3002: "SociatyDiamondNoEnough", + 3003: "SociatyNoMember", + 3004: "SociatyNoRight", + 3005: "SociatyNoAdded", + 3006: "SociatyDismiss", + 3007: "SociatyQuit", + 3008: "SociatyAgree", + 3009: "SociatyRefuse", + 3010: "SociatyLogParams", + 3011: "SociatyMasterNoDiss", + 3012: "SociatySettingJob", + 3013: "SociatySetting", + 3014: "SociatyNoAccuse", + 3015: "SociatySign", + 3016: "SociatySigned", + 3017: "SociatyCDLimit", + 3018: "SociatyApplyMax", + 3019: "SociatySelfSetting", + 3020: "SociatyMemberCountLimit", + 3021: "SociatyRewardReceived", + 3022: "SociatyRewardReceive", + 3023: "SociatyResource", + 3025: "SociatyBelongTo", + 3026: "SociatyApplied", + 3027: "SociatyAppyLvNoEnough", + 3028: "SociatyTaskValidation", + 3029: "SociatyActivityNoEnough", + 3030: "SociatyAcitvityReceive", + 3031: "SociatyDismissed", + 3032: "SociatyNameExist", + 3033: "SociatyQuitNoAllowed", + 3034: "SociatyNoMaster", + 3035: "SociatyNoFormation", + 3036: "SociatyTicketsNoEnough", + 3037: "SociatySportsNoinit", + 3038: "SociatySportsEnd", + 3039: "SociatyTeamUnlock", + 3040: "SociatyTaskNoFound", + 3041: "SociatyTaskNoFinished", + 3042: "SociatyTaskReceived", + 3101: "ArenaTicketBuyUp", + 3102: "ArenaTicketNotEnough", + 3103: "ArenaTicketNpcInCd", + 3201: "TalentRepeatLearn", + 3202: "TalentErrData", + 3203: "TalentUnLockerBefore", + 3204: "TalentResetState", + 3301: "TrollBuyMax", + 3302: "TrollSellMax", + 3303: "TrollMaxSellCount", + 3304: "TrollMaxItemCount", + 3305: "TrollRepeatedReward", + 3401: "HoroscopeNotTurnedOn", + 3402: "HoroscopeRestCDNoEnd", + 3501: "PrivilegeNotFound", + 3502: "PrivilegeRenewTime", + 3503: "VipLvError", + 3504: "VipGiftError", + 3505: "VipBuyRepeat", + 3601: "GrowtaskReceive", + 3602: "GrowtaskAdvReceive", + 3701: "PayBuyNumNotEnough", + 3702: "PayRenewTimeErr", + 3703: "PayOrderCompleted", + 3801: "WorldtaskFinish", + 3802: "WorldtaskLvNotEnough", + 3803: "WorldtaskNoAccept", + 3804: "WorldtaskNoComplete", + 3805: "WorldtaskFinihed", + 3806: "WorldtaskLastUnFinished", + 3807: "WorldtaskGroupIdNosame", + 3901: "AcademyTaskNoCompleteTask", + 4001: "AutoBattleNoData", + 4002: "AutoBattleStatesErr", + 4101: "SmithyNoReel", + 4102: "SmithyNoTemperature", + 4103: "SmithyStoveMaxLv", + 4104: "SmithyCustomerLimit", + 4105: "SmithyCustomerEquipNoEnough", + 4106: "SmithyMaxTemperature", + 4107: "SmithyLackLava", + 4108: "SmithyAtlasMaxLv", + 4109: "SmithyAtlasLackLv", + 4110: "SmithyTaskNoFinished", + 4111: "SmithyTaskReceived", + 4112: "SmithyNoFoundAtlas", + 4113: "SmithyNoActivateAtlas", + 4114: "SmithyLvToolsFailed", + 4115: "SmithyLvToolsPre", + 4201: "DispatchHeroNoReached", + 4202: "DispatchNoFree", + 4203: "DispatchTicketNoEnough", + 4204: "DispatchHeroAssigned", + 4205: "DispatchTaskExpired", + 4206: "DispatchRefreshMax", + 4207: "DispatchNoFinished", + 4208: "DispatchHeroNoEnough", + 4301: "PracticeQiecuoing", + 4302: "PracticeSent", + 4303: "PracticeInviteTimeOut", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -860,38 +860,38 @@ var ( "SociatyQuit": 3007, "SociatyAgree": 3008, "SociatyRefuse": 3009, - "SociatyLogParams": 30010, - "SociatyMasterNoDiss": 30011, - "SociatySettingJob": 30012, - "SociatySetting": 30013, - "SociatyNoAccuse": 30014, - "SociatySign": 30015, - "SociatySigned": 30016, - "SociatyCDLimit": 30017, - "SociatyApplyMax": 30018, - "SociatySelfSetting": 30019, - "SociatyMemberCountLimit": 30020, - "SociatyRewardReceived": 30021, - "SociatyRewardReceive": 30022, - "SociatyResource": 30023, - "SociatyBelongTo": 30025, - "SociatyApplied": 30026, - "SociatyAppyLvNoEnough": 30027, - "SociatyTaskValidation": 30028, - "SociatyActivityNoEnough": 30029, - "SociatyAcitvityReceive": 30030, - "SociatyDismissed": 30031, - "SociatyNameExist": 30032, - "SociatyQuitNoAllowed": 30033, - "SociatyNoMaster": 30034, - "SociatyNoFormation": 30035, - "SociatyTicketsNoEnough": 30036, - "SociatySportsNoinit": 30037, - "SociatySportsEnd": 30038, - "SociatyTeamUnlock": 30039, - "SociatyTaskNoFound": 30040, - "SociatyTaskNoFinished": 30041, - "SociatyTaskReceived": 30042, + "SociatyLogParams": 3010, + "SociatyMasterNoDiss": 3011, + "SociatySettingJob": 3012, + "SociatySetting": 3013, + "SociatyNoAccuse": 3014, + "SociatySign": 3015, + "SociatySigned": 3016, + "SociatyCDLimit": 3017, + "SociatyApplyMax": 3018, + "SociatySelfSetting": 3019, + "SociatyMemberCountLimit": 3020, + "SociatyRewardReceived": 3021, + "SociatyRewardReceive": 3022, + "SociatyResource": 3023, + "SociatyBelongTo": 3025, + "SociatyApplied": 3026, + "SociatyAppyLvNoEnough": 3027, + "SociatyTaskValidation": 3028, + "SociatyActivityNoEnough": 3029, + "SociatyAcitvityReceive": 3030, + "SociatyDismissed": 3031, + "SociatyNameExist": 3032, + "SociatyQuitNoAllowed": 3033, + "SociatyNoMaster": 3034, + "SociatyNoFormation": 3035, + "SociatyTicketsNoEnough": 3036, + "SociatySportsNoinit": 3037, + "SociatySportsEnd": 3038, + "SociatyTeamUnlock": 3039, + "SociatyTaskNoFound": 3040, + "SociatyTaskNoFinished": 3041, + "SociatyTaskReceived": 3042, "ArenaTicketBuyUp": 3101, "ArenaTicketNotEnough": 3102, "ArenaTicketNpcInCd": 3103, @@ -986,7 +986,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, 0x85, 0x36, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xe5, 0x35, 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, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1275,58 +1275,56 @@ var file_errorcode_proto_rawDesc = []byte{ 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, - 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, - 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, - 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, 0x12, - 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, 0x0b, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, 0x12, - 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, - 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, - 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, 0xea, - 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, - 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, - 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, 0xea, - 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, - 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x10, 0xc1, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x6f, + 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xc2, 0x17, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, 0x69, 0x73, + 0x73, 0x10, 0xc3, 0x17, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, + 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xc4, 0x17, 0x12, 0x13, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc5, + 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x63, + 0x63, 0x75, 0x73, 0x65, 0x10, 0xc6, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xc7, 0x17, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x10, 0xc8, 0x17, 0x12, 0x13, 0x0a, + 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, + 0xc9, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, + 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xca, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xcb, + 0x17, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, + 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xcc, 0x17, 0x12, + 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xcd, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x10, 0xce, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xcf, 0x17, 0x12, 0x14, 0x0a, 0x0f, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, + 0xd1, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, + 0x6c, 0x69, 0x65, 0x64, 0x10, 0xd2, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, - 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, - 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, 0xea, - 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, - 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, 0x01, - 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, - 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, 0x16, - 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, - 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, 0x1a, - 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, - 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, - 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, 0xea, - 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, - 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd3, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, - 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd4, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, 0x74, - 0x10, 0xd5, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, - 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xd6, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, 0x63, - 0x6b, 0x10, 0xd7, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xd8, 0xea, 0x01, 0x12, - 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, - 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xd9, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, - 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, - 0x76, 0x65, 0x64, 0x10, 0xda, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, + 0x10, 0xd3, 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, + 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd4, 0x17, 0x12, + 0x1c, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, + 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd5, 0x17, 0x12, 0x1b, 0x0a, + 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, 0x76, 0x69, 0x74, 0x79, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xd6, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x65, 0x64, 0x10, 0xd7, + 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, + 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd8, 0x17, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, + 0x10, 0xd9, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, + 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xda, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, + 0xdb, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdc, 0x17, 0x12, + 0x18, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, + 0x4e, 0x6f, 0x69, 0x6e, 0x69, 0x74, 0x10, 0xdd, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xde, 0x17, + 0x12, 0x16, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, + 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xdf, 0x17, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xe0, + 0x17, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, + 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xe1, 0x17, 0x12, 0x18, 0x0a, + 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x64, 0x10, 0xe2, 0x17, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, 0x65, diff --git a/pb/worldtask_db.pb.go b/pb/worldtask_db.pb.go index febba6241..862b3690c 100644 --- a/pb/worldtask_db.pb.go +++ b/pb/worldtask_db.pb.go @@ -28,6 +28,7 @@ type DBWorldtask struct { Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID TaskList []int32 `protobuf:"varint,3,rep,packed,name=taskList,proto3" json:"taskList" bson:"taskList"` // 任务列表 CurrentTask map[int32]*Worldtask `protobuf:"bytes,4,rep,name=currentTask,proto3" json:"currentTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTask"` //正在进行的任务 + Chapters []int32 `protobuf:"varint,5,rep,packed,name=chapters,proto3" json:"chapters" bson:"chapters"` //章节ID } func (x *DBWorldtask) Reset() { @@ -83,6 +84,13 @@ func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask { return nil } +func (x *DBWorldtask) GetChapters() []int32 { + if x != nil { + return x.Chapters + } + return nil +} + type Worldtask struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -166,7 +174,7 @@ var File_worldtask_worldtask_db_proto protoreflect.FileDescriptor var file_worldtask_worldtask_db_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc8, + 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe4, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, @@ -174,23 +182,25 @@ var file_worldtask_worldtask_db_proto_rawDesc = []byte{ 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x4a, 0x0a, - 0x10, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, - 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, - 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x49, 0x64, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, - 0x4e, 0x70, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, - 0x65, 0x72, 0x4e, 0x70, 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x1a, 0x0a, + 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, + 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x75, 0x72, + 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, + 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, + 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, + 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, + 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, + 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, + 0x63, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go index 3f91bae49..7bc2cdff2 100644 --- a/pb/worldtask_msg.pb.go +++ b/pb/worldtask_msg.pb.go @@ -167,8 +167,7 @@ type WorldtaskAcceptResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` - TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` + Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` } func (x *WorldtaskAcceptResp) Reset() { @@ -203,18 +202,11 @@ func (*WorldtaskAcceptResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{3} } -func (x *WorldtaskAcceptResp) GetGroupId() int32 { +func (x *WorldtaskAcceptResp) GetCode() ErrorCode { if x != nil { - return x.GroupId + return x.Code } - return 0 -} - -func (x *WorldtaskAcceptResp) GetTaskId() int32 { - if x != nil { - return x.TaskId - } - return 0 + return ErrorCode_Success } //任务完成条件推送 @@ -350,9 +342,9 @@ type WorldtaskCompleteCondiResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` - TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` - CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` + TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` + CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` } func (x *WorldtaskCompleteCondiResp) Reset() { @@ -387,11 +379,11 @@ func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6} } -func (x *WorldtaskCompleteCondiResp) GetGroupId() int32 { +func (x *WorldtaskCompleteCondiResp) GetCode() ErrorCode { if x != nil { - return x.GroupId + return x.Code } - return 0 + return ErrorCode_Success } func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 { @@ -469,8 +461,9 @@ type WorldtaskFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` - TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` + TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` + CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` } func (x *WorldtaskFinishResp) Reset() { @@ -505,11 +498,11 @@ func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8} } -func (x *WorldtaskFinishResp) GetGroupId() int32 { +func (x *WorldtaskFinishResp) GetCode() ErrorCode { if x != nil { - return x.GroupId + return x.Code } - return 0 + return ErrorCode_Success } func (x *WorldtaskFinishResp) GetTaskId() int32 { @@ -519,6 +512,13 @@ func (x *WorldtaskFinishResp) GetTaskId() int32 { return 0 } +func (x *WorldtaskFinishResp) GetCondiId() int32 { + if x != nil { + return x.CondiId + } + return 0 +} + //任务完成条件达成的推送 type WorldtaskNexttaskPush struct { state protoimpl.MessageState @@ -678,8 +678,9 @@ type WorldtaskBattleFinishReq struct { GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID - BattleConfId int32 `protobuf:"varint,3,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID - Report *BattleReport `protobuf:"bytes,4,opt,name=report,proto3" json:"report"` //战报 + CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //完成条件ID + BattleConfId int32 `protobuf:"varint,4,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID + Report *BattleReport `protobuf:"bytes,5,opt,name=report,proto3" json:"report"` //战报 } func (x *WorldtaskBattleFinishReq) Reset() { @@ -728,6 +729,13 @@ func (x *WorldtaskBattleFinishReq) GetTaskId() int32 { return 0 } +func (x *WorldtaskBattleFinishReq) GetCondiId() int32 { + if x != nil { + return x.CondiId + } + return 0 +} + func (x *WorldtaskBattleFinishReq) GetBattleConfId() int32 { if x != nil { return x.BattleConfId @@ -837,6 +845,101 @@ func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask { return nil } +// 章节奖励领取 +type WorldtaskChapterawardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` +} + +func (x *WorldtaskChapterawardReq) Reset() { + *x = WorldtaskChapterawardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WorldtaskChapterawardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WorldtaskChapterawardReq) ProtoMessage() {} + +func (x *WorldtaskChapterawardReq) ProtoReflect() protoreflect.Message { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WorldtaskChapterawardReq.ProtoReflect.Descriptor instead. +func (*WorldtaskChapterawardReq) Descriptor() ([]byte, []int) { + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15} +} + +func (x *WorldtaskChapterawardReq) GetGroupId() int32 { + if x != nil { + return x.GroupId + } + return 0 +} + +type WorldtaskChapterawardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` +} + +func (x *WorldtaskChapterawardResp) Reset() { + *x = WorldtaskChapterawardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *WorldtaskChapterawardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*WorldtaskChapterawardResp) ProtoMessage() {} + +func (x *WorldtaskChapterawardResp) ProtoReflect() protoreflect.Message { + mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use WorldtaskChapterawardResp.ProtoReflect.Descriptor instead. +func (*WorldtaskChapterawardResp) Descriptor() ([]byte, []int) { + return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16} +} + +func (x *WorldtaskChapterawardResp) GetCode() ErrorCode { + if x != nil { + return x.Code + } + return ErrorCode_Success +} + var File_worldtask_worldtask_msg_proto protoreflect.FileDescriptor var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ @@ -845,88 +948,100 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, - 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, - 0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, - 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, - 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x13, 0x57, 0x6f, 0x72, - 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, + 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, + 0x73, 0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, + 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x13, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, + 0x65, 0x22, 0x6b, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x22, 0x6b, 0x0a, 0x1b, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x73, 0x50, 0x75, 0x73, - 0x68, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, - 0x67, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x68, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, - 0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, - 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, - 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, - 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x13, 0x57, 0x6f, - 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x22, 0xa2, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, - 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, - 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x1a, - 0x47, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, - 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, - 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, - 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, - 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x97, - 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, + 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x03, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x67, + 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, + 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x22, 0x0a, - 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, - 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, - 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, - 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, - 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x6e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, + 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, + 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, + 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, + 0x67, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, + 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, + 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0xa2, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72, + 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78, + 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, + 0x54, 0x61, 0x73, 0x6b, 0x1a, 0x47, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x67, 0x0a, + 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, + 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, + 0x6e, 0x66, 0x6f, 0x22, 0xb1, 0x01, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, + 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, + 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, + 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, + 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, + 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x34, + 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, + 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x61, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -941,7 +1056,7 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte { return file_worldtask_worldtask_msg_proto_rawDescData } -var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp @@ -958,26 +1073,33 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq (*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp (*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush - nil, // 15: WorldtaskNexttaskPush.NextTaskEntry - (*DBWorldtask)(nil), // 16: DBWorldtask - (*BattleFormation)(nil), // 17: BattleFormation - (*BattleInfo)(nil), // 18: BattleInfo - (*BattleReport)(nil), // 19: BattleReport - (*Worldtask)(nil), // 20: Worldtask + (*WorldtaskChapterawardReq)(nil), // 15: WorldtaskChapterawardReq + (*WorldtaskChapterawardResp)(nil), // 16: WorldtaskChapterawardResp + nil, // 17: WorldtaskNexttaskPush.NextTaskEntry + (*DBWorldtask)(nil), // 18: DBWorldtask + (ErrorCode)(0), // 19: ErrorCode + (*BattleFormation)(nil), // 20: BattleFormation + (*BattleInfo)(nil), // 21: BattleInfo + (*BattleReport)(nil), // 22: BattleReport + (*Worldtask)(nil), // 23: Worldtask } var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ - 16, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask - 15, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry - 17, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation - 18, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo - 19, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport - 20, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask - 20, // 6: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask + 19, // 1: WorldtaskAcceptResp.Code:type_name -> ErrorCode + 19, // 2: WorldtaskCompleteCondiResp.code:type_name -> ErrorCode + 19, // 3: WorldtaskFinishResp.code:type_name -> ErrorCode + 17, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry + 20, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation + 21, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo + 22, // 7: WorldtaskBattleFinishReq.report:type_name -> BattleReport + 23, // 8: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask + 19, // 9: WorldtaskChapterawardResp.code:type_name -> ErrorCode + 23, // 10: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_worldtask_worldtask_msg_proto_init() } @@ -987,6 +1109,7 @@ func file_worldtask_worldtask_msg_proto_init() { } file_battle_battle_msg_proto_init() file_worldtask_worldtask_db_proto_init() + file_errorcode_proto_init() if !protoimpl.UnsafeEnabled { file_worldtask_worldtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WorldtaskMineReq); i { @@ -1168,6 +1291,30 @@ func file_worldtask_worldtask_msg_proto_init() { return nil } } + file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WorldtaskChapterawardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*WorldtaskChapterawardResp); 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{ @@ -1175,7 +1322,7 @@ func file_worldtask_worldtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 16, + NumMessages: 18, NumExtensions: 0, NumServices: 0, }, From 7253886ac51ecaadc28dfc9812093bf9b20b1138 Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Wed, 29 Mar 2023 19:24:17 +0800 Subject: [PATCH 2/3] update --- modules/gateway/agent.go | 3 +-- modules/worldtask/module.go | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/gateway/agent.go b/modules/gateway/agent.go index 74b540bbf..b14188b33 100644 --- a/modules/gateway/agent.go +++ b/modules/gateway/agent.go @@ -321,8 +321,7 @@ func (this *Agent) messageDistribution(msg *pb.UserMessage) (err error) { } stime := time.Now() // this.gateway.Debugf("----------3 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) - // ctx, _ := context.WithTimeout(context.Background(), time.Second*5) - ctx := context.Background() + ctx, _ := context.WithTimeout(context.Background(), time.Second*5) if len(serviceTag) == 0 { // this.gateway.Debugf("----------4 agent:%s uId:%s MainType:%s SubType:%s ", this.sessionId, this.uId, msg.MainType, msg.SubType) if err = this.gateway.Service().RpcCall(ctx, servicePath, string(comm.Rpc_GatewayRoute), req, reply); err != nil { diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index ab50e3bb9..267b92c9a 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -8,6 +8,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" cfg "go_dreamfactory/sys/configure/structs" + "go_dreamfactory/utils" ) var _ comm.IWorldtask = (*Worldtask)(nil) @@ -89,7 +90,9 @@ func (this *Worldtask) TaskCondFinishNotify(session comm.IUserSession, condId in wt = &pb.Worldtask{} } - wt.CondiIds = append(wt.CondiIds, condId) + if _, ok := utils.Findx(wt.CondiIds, condId); !ok { + wt.CondiIds = append(wt.CondiIds, condId) + } userTask.CurrentTask[groupId] = wt From 977d69832f91455aaaca3e12189077e190d0b393 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 29 Mar 2023 20:58:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/practice/api_practice.go | 1 + modules/practice/api_receive.go | 2 +- modules/practice/api_unLock.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/practice/api_practice.go b/modules/practice/api_practice.go index d12789915..8fbb444b2 100644 --- a/modules/practice/api_practice.go +++ b/modules/practice/api_practice.go @@ -104,6 +104,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.PracticePractic "knapsack": room.Knapsack, filed: pillar, }) + go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype149, 1)) session.SendMsg(string(this.module.GetType()), "practice", &pb.PracticePracticeResp{Pillar: pillar}) return } diff --git a/modules/practice/api_receive.go b/modules/practice/api_receive.go index eef40ef54..d4ebe2e3f 100644 --- a/modules/practice/api_receive.go +++ b/modules/practice/api_receive.go @@ -237,7 +237,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.PracticeReceiveR filed: pillar, }) } - + go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype135, minutes)) session.SendMsg(string(this.module.GetType()), "receive", &pb.PracticeReceiveResp{Pillar: pillar, Knapsack: room.Knapsack}) return } diff --git a/modules/practice/api_unLock.go b/modules/practice/api_unLock.go index 3f4d0bb16..9d56af4e8 100644 --- a/modules/practice/api_unLock.go +++ b/modules/practice/api_unLock.go @@ -63,6 +63,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.PracticeUnLockReq filed: pillar, "pillarf": room.Pillarf, }) + go this.module.ModuleRtask.TriggerTask(session.GetUserId(), comm.GettaskParam(comm.Rtype152, 1)) session.SendMsg(string(this.module.GetType()), "unlock", &pb.PracticeUnLockResp{Info: room}) return }