From a7faed061b8c2f4929e71fb5dd03a5b4a8889fab Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Tue, 30 May 2023 15:53:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0ErrorData?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/sociaty/api.go | 3 +- modules/sociaty/api_cross_accuse.go | 3 + modules/sociaty/api_cross_activitylist.go | 4 +- modules/sociaty/api_cross_activityreceive.go | 10 +- modules/worldtask/api_accept.go | 24 +- modules/worldtask/api_battlefinish.go | 16 +- modules/worldtask/api_battlestart.go | 16 +- modules/worldtask/api_chapterreward.go | 14 +- modules/worldtask/api_completetask.go | 30 +-- modules/worldtask/api_finish.go | 49 ++-- modules/worldtask/configure.go | 3 +- modules/worldtask/module.go | 1 + pb/errorcode.pb.go | 4 +- pb/errorcode_string.go | 2 +- pb/unitls.go | 2 +- pb/worldtask_msg.pb.go | 229 +++++++------------ 16 files changed, 152 insertions(+), 258 deletions(-) diff --git a/modules/sociaty/api.go b/modules/sociaty/api.go index 22f380689..2f032fd4d 100644 --- a/modules/sociaty/api.go +++ b/modules/sociaty/api.go @@ -46,7 +46,8 @@ const ( ) const ( - SociatyNoFound = "未找到该玩家的公会" + SociatyNoFound = "The user's guild was not found" + SociatyNoRight = "no operation permission" ) type apiComp struct { diff --git a/modules/sociaty/api_cross_accuse.go b/modules/sociaty/api_cross_accuse.go index 4bf8c133f..a614be09b 100644 --- a/modules/sociaty/api_cross_accuse.go +++ b/modules/sociaty/api_cross_accuse.go @@ -32,6 +32,7 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) pb.SociatyJob_ADMIN, pb.SociatyJob_MEMBER) { code = pb.ErrorCode_SociatyNoRight + data.Message = SociatyNoRight return } @@ -43,9 +44,11 @@ func (this *apiComp) Accuse(session comm.IUserSession, req *pb.SociatyAccuseReq) } else { code = pb.ErrorCode_DBError } + data.Datastring = sociaty.Id this.module.Error("弹劾", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: sociaty.Id}, + log.Field{Key: "err", Value: err.Error()}, ) return } diff --git a/modules/sociaty/api_cross_activitylist.go b/modules/sociaty/api_cross_activitylist.go index 10508c355..0c34705da 100644 --- a/modules/sociaty/api_cross_activitylist.go +++ b/modules/sociaty/api_cross_activitylist.go @@ -2,7 +2,6 @@ package sociaty import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" ) @@ -17,7 +16,8 @@ func (this *apiComp) Activitylist(session comm.IUserSession, req *pb.SociatyActi sociaty := this.module.modelSociaty.getUserSociaty(uid) if sociaty == nil { code = pb.ErrorCode_SociatyNoFound - this.module.Error("当前玩家所在的公会未找到", log.Field{Key: "uid", Value: uid}) + data.Datastring = uid + data.Message = SociatyNoFound return } diff --git a/modules/sociaty/api_cross_activityreceive.go b/modules/sociaty/api_cross_activityreceive.go index 6126e8466..a7f7f32c3 100644 --- a/modules/sociaty/api_cross_activityreceive.go +++ b/modules/sociaty/api_cross_activityreceive.go @@ -1,6 +1,7 @@ package sociaty import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" @@ -48,13 +49,8 @@ func (this *apiComp) Activityreceive(session comm.IUserSession, req *pb.SociatyA //是否满足领取条件 if sociaty.Activity < conf.Activity { code = pb.ErrorCode_SociatyActivityNoEnough - this.module.Debug("活跃度不足", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "sociatyId", Value: sociaty.Id}, - log.Field{Key: "confId", Value: req.Id}, - log.Field{Key: "实际活跃度", Value: sociaty.Activity}, - log.Field{Key: "期望活跃度", Value: conf.Activity}, - ) + data.Datastring = uid + data.Message = fmt.Sprintf("活跃度不足 实际:%d 期望:%d", sociaty.Activity, conf.Activity) return } diff --git a/modules/worldtask/api_accept.go b/modules/worldtask/api_accept.go index b3f328f10..3cc686ea4 100644 --- a/modules/worldtask/api_accept.go +++ b/modules/worldtask/api_accept.go @@ -1,8 +1,8 @@ package worldtask import ( + "fmt" "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "go_dreamfactory/utils" ) @@ -24,14 +24,16 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) user := a.module.ModuleUser.GetUser(uid) if user == nil { code = pb.ErrorCode_UserSessionNobeing + data.Title = code.String() return } rsp := &pb.WorldtaskAcceptResp{} myWorldtask, err := a.module.modelWorldtask.getWorldtask(uid) if err != nil { - a.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) code = pb.ErrorCode_DBError + data.Title = code.String() + data.Datastring = uid return } @@ -39,25 +41,23 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) curTaskConf, err := a.module.configure.getWorldtaskById(req.TaskId) if err != nil || curTaskConf == nil { code = pb.ErrorCode_ConfigNoFound - log.Error("世界任务配置未找到", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "taskId", Value: req.TaskId}, - ) + data.Title = code.String() + data.Message = err.Error() return } // 判断玩家等级要求 if user.Lv < curTaskConf.Lock { - rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough - a.sendMsg(session, WorldtaskSubtypeAccept, rsp) + code = pb.ErrorCode_WorldtaskLvNotEnough + data.Title = code.String() + data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock) return } // 前置任务ID 只有世界任务才校验前置 if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) { - a.module.Debug("前置任务未完成", log.Field{Key: "uid", Value: uid}, log.Field{Key: "preTaskId", Value: curTaskConf.Ontxe}, log.Field{Key: "taskId", Value: curTaskConf.Key}) - rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished - a.sendMsg(session, WorldtaskSubtypeAccept, rsp) + code = pb.ErrorCode_WorldtaskLastUnFinished + data.Message = fmt.Sprintf("%v前置任务%v未完成", curTaskConf.Key, curTaskConf.Ontxe) return } @@ -67,7 +67,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq) myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{ TaskId: req.TaskId, TaskType: curTaskConf.Des, - NpcStatus: 1, + NpcStatus: 1, //接取 } update := map[string]interface{}{ diff --git a/modules/worldtask/api_battlefinish.go b/modules/worldtask/api_battlefinish.go index 47d300419..b2e5ebd7a 100644 --- a/modules/worldtask/api_battlefinish.go +++ b/modules/worldtask/api_battlefinish.go @@ -84,11 +84,11 @@ 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, } @@ -96,19 +96,13 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa 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, - // }) + } } } - + } else { - rsp.Code = code + data.Title = code.String() this.sendMsg(session, WorldtaskBattleFinish, rsp) return } diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index 8ebaae4ab..ca25ccd53 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -1,6 +1,7 @@ package worldtask import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" @@ -22,16 +23,14 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat if code = this.BattlestartCheck(session, req); code != pb.ErrorCode_Success { return } - uid := session.GetUserId() + resp := &pb.WorldtaskBattleStartResp{} battleConf, err := this.module.configure.getWorldtaskBattleById(req.BattleConfId) if err != nil || battleConf == nil { code = pb.ErrorCode_ConfigNoFound - log.Error("战斗配置未找到", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "battleConfId", Value: req.BattleConfId}, - ) + data.Title = code.String() + data.Message = fmt.Sprintf("战斗配置未找到 %v", req.BattleConfId) return } @@ -52,8 +51,7 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat }) if code != pb.ErrorCode_Success { - resp.Code = code - this.sendMsg(session, WorldtaskBattleStart, resp) + data.Title = code.String() return } @@ -72,8 +70,8 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat }, } } else { - resp.Code = pb.ErrorCode_WorldtaskBattleCreate - this.sendMsg(session, WorldtaskBattleStart, resp) + code = pb.ErrorCode_WorldtaskBattleCreate + data.Title = code.String() return } diff --git a/modules/worldtask/api_chapterreward.go b/modules/worldtask/api_chapterreward.go index e730af752..f95c45e02 100644 --- a/modules/worldtask/api_chapterreward.go +++ b/modules/worldtask/api_chapterreward.go @@ -2,7 +2,6 @@ package worldtask import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" ) @@ -22,19 +21,19 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC rsp := &pb.WorldtaskChapterrewardResp{} myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { - this.module.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()}) code = pb.ErrorCode_DBError + data.Title = code.String() return } if stats, ok := myWorldtask.Chapters[req.GroupId]; !ok { - rsp.Code = pb.ErrorCode_WorldtaskChapterUnFinished - this.sendMsg(session, WorldtaskChapterReward, rsp) + code = pb.ErrorCode_WorldtaskChapterUnFinished + data.Title = code.String() return } else { if stats == 2 { - rsp.Code = pb.ErrorCode_WorldtaskChapterReceived - this.sendMsg(session, WorldtaskChapterReward, rsp) + code = pb.ErrorCode_WorldtaskChapterReceived + data.Title = code.String() return } } @@ -42,12 +41,15 @@ func (this *apiComp) Chapterreward(session comm.IUserSession, req *pb.WorldtaskC gwa, err := this.module.configure.getWorldAllCfg() if err != nil || gwa == nil { code = pb.ErrorCode_ConfigNoFound + data.Title = code.String() + data.Message = err.Error() return } rewardCnf := gwa.GetDataMap()[req.GroupId] if rewardCnf == nil { code = pb.ErrorCode_ConfigNoFound + data.Title = code.String() return } diff --git a/modules/worldtask/api_completetask.go b/modules/worldtask/api_completetask.go index 2f47b84be..972c13e6f 100644 --- a/modules/worldtask/api_completetask.go +++ b/modules/worldtask/api_completetask.go @@ -28,42 +28,22 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC } if (len(curTaskConf.Completetask) == 1 && curTaskConf.Completetask[0] == 0) || len(curTaskConf.Completetask) == 0 { - rsp.Code = pb.ErrorCode_WorldtaskNoProcess - this.sendMsg(session, WorldtaskComplete, rsp) + code = pb.ErrorCode_WorldtaskNoProcess + data.Title = code.ToString() + data.Message = "无完成条件" return } myWorldtask, err := this.module.modelWorldtask.getWorldtask(uid) if err != nil { code = pb.ErrorCode_DBError + data.Title = code.ToString() return } myWorldtask.Uid = uid wt := myWorldtask.CurrentTask[req.GroupId] - // if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - // 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}, - // ) - // this.sendMsg(session, WorldtaskComplete, rsp) - // return - // } - // if wt == nil { - // wt = &pb.Worldtask{} - // } - // if _, b := utils.Findx(wt.CondiIds, req.CondiId); !b { - // wt.CondiIds = append(wt.CondiIds, req.CondiId) - // } - // } - // } + condIds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) if err == nil && len(condIds) > 0 { wt.CondiIds = append(wt.CondiIds, condIds...) diff --git a/modules/worldtask/api_finish.go b/modules/worldtask/api_finish.go index 2c9278a9f..ee80c06aa 100644 --- a/modules/worldtask/api_finish.go +++ b/modules/worldtask/api_finish.go @@ -1,6 +1,7 @@ package worldtask import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" @@ -38,25 +39,28 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe curTaskConf, err := this.module.configure.getWorldtaskById(req.TaskId) if err != nil || curTaskConf == nil { code = pb.ErrorCode_ConfigNoFound + data.Title = code.ToString() + data.Message = err.Error() return } if curTaskConf.Group != req.GroupId { - rsp.Code = pb.ErrorCode_WorldtaskGroupIdNosame - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + code = pb.ErrorCode_WorldtaskGroupIdNosame + data.Title = code.ToString() return } if curTaskConf.DeliverNpc == 0 { - rsp.Code = pb.ErrorCode_WorldtaskNoProcess - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + code = pb.ErrorCode_WorldtaskNoProcess + data.Title = code.ToString() return } // 判断玩家等级要求 if user.Lv < curTaskConf.Lock { - rsp.Code = pb.ErrorCode_WorldtaskLvNotEnough - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + code = pb.ErrorCode_WorldtaskLvNotEnough + data.Title = code.ToString() + data.Message = fmt.Sprintf("实际等级:%d 期望等级:%d", user.Lv, curTaskConf.Lock) return } @@ -73,7 +77,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe // 前置任务ID 只有世界任务才校验前置 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}) - rsp.Code = pb.ErrorCode_WorldtaskLastUnFinished + code = pb.ErrorCode_WorldtaskLastUnFinished this.sendMsg(session, WorldtaskSubtypeFinish, rsp) return } @@ -91,7 +95,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } var ( - condiId int32 condiFlag bool ) @@ -99,12 +102,12 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe for _, condId := range curTaskConf.Completetask { if v, ok := userTask.CurrentTask[req.GroupId]; ok { if _, ok := utils.Findx(v.CondiIds, condId); !ok { + // conIds, err := this.module.ModuleBuried.CheckCondition(uid, condId) if err == nil && len(conIds) > 0 { condiFlag = true } else { condiFlag = false - condiId = condId } } else { condiFlag = true @@ -113,10 +116,8 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } if !condiFlag { - rsp.Code = pb.ErrorCode_RtaskCondiNoReach - rsp.CondiId = condiId - rsp.TaskId = req.TaskId - this.sendMsg(session, WorldtaskSubtypeFinish, rsp) + code = pb.ErrorCode_RtaskCondiNoReach + data.Title = code.ToString() return } @@ -156,7 +157,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe } this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) - + this.sendMsg(session, WorldtaskSubtypeFinish, rsp) return } @@ -203,25 +204,7 @@ func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextT TaskType: nextTaskConf.Des, } } - // if m, err := this.module.service.GetModule(comm.ModuleRtask); err == nil { - // iwt, ok := m.(comm.IRtask) - // if ok { - // if mc := iwt.CheckCondi(uid, condiId); mc != pb.ErrorCode_Success { - // this.module.Debug("任务完成条件不满足", - // log.Field{Key: "uid", Value: uid}, - // log.Field{Key: "taskId", Value: nextTaskId}, - // log.Field{Key: "condiId", Value: condiId}, - // ) - // } else { - // if ok { - // nwt.CondiIds = append(nwt.CondiIds, condiId) - // } else { - // condiIds := []int32{condiId} - // nwt.CondiIds = condiIds - // } - // } - // } - // } + condIds, err := this.module.ModuleBuried.CheckCondition(uid, condiId) if err == nil && len(condIds) > 0 { nwt.CondiIds = condIds diff --git a/modules/worldtask/configure.go b/modules/worldtask/configure.go index dd9233fe4..20bbf8135 100644 --- a/modules/worldtask/configure.go +++ b/modules/worldtask/configure.go @@ -2,6 +2,7 @@ package worldtask import ( "fmt" + "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/modules" cfg "go_dreamfactory/sys/configure/structs" @@ -67,7 +68,7 @@ func (this *configureComp) getWorldtaskById(taskId int32) (*cfg.GameWorldTaskDat if data, ok := gwt.GetDataMap()[taskId]; ok { return data, nil } - return nil, fmt.Errorf("GameWorldTask config id:%v not found", taskId) + return nil, comm.NewNotFoundConfErr(moduleName_cn, gameWorldTask, taskId) } func (this *configureComp) getWorldtaskBattleCfg() (data *cfg.GameWorldBattle, err error) { diff --git a/modules/worldtask/module.go b/modules/worldtask/module.go index 06f383160..ad0c7dcfb 100644 --- a/modules/worldtask/module.go +++ b/modules/worldtask/module.go @@ -14,6 +14,7 @@ import ( var _ comm.IWorldtask = (*Worldtask)(nil) +var moduleName_cn = "世界任务" type Worldtask struct { modules.ModuleBase api *apiComp diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 186416a30..96bc8b5fd 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -20,7 +20,9 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// go:generate stringer -type ErrorCode -linecomment +// 在pb目录下执行 go generate (先安装工具stringer go install golang.org/x/tools/cmd/stringer) 会生成errorcode_strings.go +// ps: 手动注释或删除 errorcode.pb.go中的String()重定义方法 +//go:generate stringer -type ErrorCode -linecomment type ErrorCode int32 const ( diff --git a/pb/errorcode_string.go b/pb/errorcode_string.go index 4466ec275..7dffbcb1c 100644 --- a/pb/errorcode_string.go +++ b/pb/errorcode_string.go @@ -677,7 +677,7 @@ var _ErrorCode_map = map[ErrorCode]string{ 4605: _ErrorCode_name[6153:6171], } -func (i ErrorCode) tString() string { +func (i ErrorCode) ToString() string { if str, ok := _ErrorCode_map[i]; ok { return str } diff --git a/pb/unitls.go b/pb/unitls.go index 1a5403eae..9c5f70161 100644 --- a/pb/unitls.go +++ b/pb/unitls.go @@ -1,5 +1,5 @@ package pb func GetErrorCodeMsg(code ErrorCode) string { - return code.tString() + return code.ToString() } diff --git a/pb/worldtask_msg.pb.go b/pb/worldtask_msg.pb.go index 0054a49ad..050c1f944 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 - Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` - CondiIds []int32 `protobuf:"varint,2,rep,packed,name=condiIds,proto3" json:"condiIds"` //完成条件 + CondiIds []int32 `protobuf:"varint,1,rep,packed,name=condiIds,proto3" json:"condiIds"` //完成条件 } func (x *WorldtaskAcceptResp) Reset() { @@ -203,13 +202,6 @@ func (*WorldtaskAcceptResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{3} } -func (x *WorldtaskAcceptResp) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - func (x *WorldtaskAcceptResp) GetCondiIds() []int32 { if x != nil { return x.CondiIds @@ -350,9 +342,8 @@ type WorldtaskCompleteCondiResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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"` + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` + CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"` } func (x *WorldtaskCompleteCondiResp) Reset() { @@ -387,13 +378,6 @@ func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6} } -func (x *WorldtaskCompleteCondiResp) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 { if x != nil { return x.TaskId @@ -469,9 +453,7 @@ type WorldtaskFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - 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"` + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` } func (x *WorldtaskFinishResp) Reset() { @@ -506,13 +488,6 @@ func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8} } -func (x *WorldtaskFinishResp) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - func (x *WorldtaskFinishResp) GetTaskId() int32 { if x != nil { return x.TaskId @@ -520,13 +495,6 @@ 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 @@ -645,7 +613,6 @@ type WorldtaskBattleStartResp struct { unknownFields protoimpl.UnknownFields Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息 - Code ErrorCode `protobuf:"varint,2,opt,name=code,proto3,enum=ErrorCode" json:"code"` } func (x *WorldtaskBattleStartResp) Reset() { @@ -687,13 +654,6 @@ func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo { return nil } -func (x *WorldtaskBattleStartResp) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - // 战斗完成 type WorldtaskBattleFinishReq struct { state protoimpl.MessageState @@ -779,8 +739,7 @@ type WorldtaskBattleFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID - Code ErrorCode `protobuf:"varint,2,opt,name=code,proto3,enum=ErrorCode" json:"code"` + TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID } func (x *WorldtaskBattleFinishResp) Reset() { @@ -822,13 +781,6 @@ func (x *WorldtaskBattleFinishResp) GetTaskId() int32 { return 0 } -func (x *WorldtaskBattleFinishResp) GetCode() ErrorCode { - if x != nil { - return x.Code - } - return ErrorCode_Success -} - // 当前完成的任务列表推送 type WorldtaskFinishIdsPush struct { state protoimpl.MessageState @@ -930,7 +882,7 @@ type WorldtaskChapterrewardResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=code,proto3,enum=ErrorCode" json:"code"` + GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` } func (x *WorldtaskChapterrewardResp) Reset() { @@ -965,11 +917,11 @@ func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) { return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16} } -func (x *WorldtaskChapterrewardResp) GetCode() ErrorCode { +func (x *WorldtaskChapterrewardResp) GetGroupId() int32 { if x != nil { - return x.Code + return x.GroupId } - return ErrorCode_Success + return 0 } var File_worldtask_worldtask_msg_proto protoreflect.FileDescriptor @@ -990,11 +942,9 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 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, 0x51, 0x0a, 0x13, 0x57, 0x6f, + 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x31, 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, 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, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 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, @@ -1009,78 +959,68 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{ 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, 0x6e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, + 0x69, 0x49, 0x64, 0x22, 0x4e, 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, + 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, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, - 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, + 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 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, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 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, 0xcc, 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, - 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 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, 0x5b, 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, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, - 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 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, 0x53, 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, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, - 0x64, 0x65, 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, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, - 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 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, 0x3c, 0x0a, 0x1a, 0x57, - 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, - 0x65, 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, + 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, 0xcc, 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, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, + 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, + 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, + 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, 0x35, 0x0a, 0x19, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, + 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, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, + 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -1117,31 +1057,24 @@ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ (*WorldtaskChapterrewardResp)(nil), // 16: WorldtaskChapterrewardResp 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 + (*BattleFormation)(nil), // 19: BattleFormation + (*BattleInfo)(nil), // 20: BattleInfo + (*BattleReport)(nil), // 21: BattleReport + (*Worldtask)(nil), // 22: Worldtask } var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ 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 - 19, // 7: WorldtaskBattleStartResp.code:type_name -> ErrorCode - 22, // 8: WorldtaskBattleFinishReq.report:type_name -> BattleReport - 19, // 9: WorldtaskBattleFinishResp.code:type_name -> ErrorCode - 23, // 10: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask - 19, // 11: WorldtaskChapterrewardResp.code:type_name -> ErrorCode - 23, // 12: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 17, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry + 19, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation + 20, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo + 21, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport + 22, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask + 22, // 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 } func init() { file_worldtask_worldtask_msg_proto_init() }