liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-06-08 16:29:27 +08:00
commit bd577e4219
12 changed files with 767 additions and 618 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/v2/ui/views/worldtask_mine.go
View File

@ -51,12 +51,12 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
//接取 //接取
acceptBtn := widget.NewButton("接取", func() { acceptBtn := widget.NewButton("接取", func() {
groupId := widget.NewEntry() // groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID" // groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId), // widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
) )
@ -67,8 +67,7 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
"accept", "accept",
&pb.WorldtaskAcceptReq{ &pb.WorldtaskAcceptReq{
GroupId: cast.ToInt32(groupId.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
TaskId: cast.ToInt32(taskIdEntry.Text),
}); err != nil { }); err != nil {
logrus.Error(err) logrus.Error(err)
} }
@ -82,14 +81,14 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
// 完成任务条件 // 完成任务条件
completeBtn := widget.NewButton("任务条件", func() { completeBtn := widget.NewButton("任务条件", func() {
groupId := widget.NewEntry() // groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID" // groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
condiId := widget.NewEntry() condiId := widget.NewEntry()
condiId.PlaceHolder = "条件" condiId.PlaceHolder = "条件"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId), // widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
widget.NewFormItem("完成条件", condiId), widget.NewFormItem("完成条件", condiId),
) )
@ -101,7 +100,6 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
"completecondi", "completecondi",
&pb.WorldtaskCompleteCondiReq{ &pb.WorldtaskCompleteCondiReq{
GroupId: cast.ToInt32(groupId.Text),
TaskId: cast.ToInt32(taskIdEntry.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
CondiId: cast.ToInt32(condiId.Text), CondiId: cast.ToInt32(condiId.Text),
}); err != nil { }); err != nil {
@ -117,12 +115,9 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
// 交付任务 // 交付任务
this.juqingBtn = widget.NewButton("交付任务", func() { this.juqingBtn = widget.NewButton("交付任务", func() {
groupId := widget.NewEntry()
groupId.PlaceHolder = "分组ID"
taskIdEntry := widget.NewEntry() taskIdEntry := widget.NewEntry()
taskIdEntry.PlaceHolder = "任务ID" taskIdEntry.PlaceHolder = "任务ID"
form := widget.NewForm( form := widget.NewForm(
widget.NewFormItem("组ID", groupId),
widget.NewFormItem("任务ID", taskIdEntry), widget.NewFormItem("任务ID", taskIdEntry),
) )
@ -133,7 +128,6 @@ func (this *WorldtaskMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
t.MainType, t.MainType,
worldtask.WorldtaskSubtypeFinish, worldtask.WorldtaskSubtypeFinish,
&pb.WorldtaskFinishReq{ &pb.WorldtaskFinishReq{
GroupId: cast.ToInt32(groupId.Text),
TaskId: cast.ToInt32(taskIdEntry.Text), TaskId: cast.ToInt32(taskIdEntry.Text),
}); err != nil { }); err != nil {
logrus.Error(err) logrus.Error(err)

34
modules/buried/module.go
View File

@ -73,6 +73,8 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
conf *cfg.GameBuriedCondiData conf *cfg.GameBuriedCondiData
bdatas *pb.DBBuried bdatas *pb.DBBuried
model *buriedModel model *buriedModel
bdata *pb.DBBuriedItem
ok bool
chanage bool chanage bool
) )
if model, err = this.modelBuried.getburiedModel(uid); err != nil { if model, err = this.modelBuried.getburiedModel(uid); err != nil {
@ -85,7 +87,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
if conf, err = this.configure.getburiedcondidata(v); err != nil { if conf, err = this.configure.getburiedcondidata(v); err != nil {
return return
} }
if bdata, ok := bdatas.Items[conf.Type]; ok { if bdata, ok = bdatas.Items[conf.Type]; ok {
if conf.Rtype == rtype2 { if conf.Rtype == rtype2 {
ok = false ok = false
for _, v1 := range bdata.Condi { for _, v1 := range bdata.Condi {
@ -98,19 +100,27 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
break break
} }
} }
if !ok {
bdata.Condi = append(bdata.Condi, &pb.DBBuriedConItem{
Conid: v,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Finish: pb.BuriedItemFinishState_buried_unfinish,
Timestamp: time.Now().Unix(),
})
}
chanage = true
} }
} else {
bdata = &pb.DBBuriedItem{
Btype: conf.Type,
Condi: make([]*pb.DBBuriedConItem, 0),
}
bdatas.Items[conf.Type] = bdata
} }
if !ok {
bdata.Condi = append(bdata.Condi, &pb.DBBuriedConItem{
Conid: v,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Finish: pb.BuriedItemFinishState_buried_unfinish,
Timestamp: time.Now().Unix(),
})
chanage = true
}
} }
if chanage { if chanage {
err = model.updateUserBurieds(uid, bdatas) err = model.updateUserBurieds(uid, bdatas)

62
modules/worldtask/api_accept.go
View File

@ -9,7 +9,7 @@ import (
// 任务接取 // 任务接取
func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) { func (a *apiComp) AcceptCheck(session comm.IUserSession, req *pb.WorldtaskAcceptReq) (errdata *pb.ErrorData) {
if req.TaskId <= 0 || req.GroupId <= 0 { if req.TaskId <= 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ReqParameterError.ToString(),
@ -67,7 +67,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
} }
// 前置任务ID 只有世界任务才校验前置 // 前置任务ID 只有世界任务才校验前置
if !a.module.modelWorldtask.IsPreFinished(req.GroupId, myWorldtask, curTaskConf) { if !a.module.modelWorldtask.IsPreFinished(myWorldtask, curTaskConf) {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskLastUnFinished, Code: pb.ErrorCode_WorldtaskLastUnFinished,
Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(),
@ -76,17 +76,49 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
return return
} }
if myWorldtask.CurrentTask == nil { if myWorldtask.CurrentTasks == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) myWorldtask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
TaskId: req.TaskId, if tasks, ok := myWorldtask.CurrentTasks[curTaskConf.Group]; ok {
TaskType: curTaskConf.Des, for _, task := range tasks.TaskMap {
NpcStatus: 1, //接取 if req.TaskId == task.TaskId {
if task.NpcStatus == 1 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskNoAccept,
Title: pb.ErrorCode_WorldtaskNoAccept.ToString(),
Message: fmt.Sprintf("不能重复接取 taskId:%v", req.TaskId),
}
return
} else {
task.NpcStatus = 1
}
break
} else {
if tasks.TaskMap == nil {
tasks.TaskMap = make(map[int32]*pb.Worldtask)
}
tasks.TaskMap[task.TaskId] = &pb.Worldtask{
TaskId: req.TaskId,
TaskType: curTaskConf.Des,
NpcStatus: 1, //接取
}
}
}
} else {
tasks = &pb.Worldtasks{
TaskMap: make(map[int32]*pb.Worldtask),
}
tasks.TaskMap[req.TaskId] = &pb.Worldtask{
TaskId: req.TaskId,
TaskType: curTaskConf.Des,
NpcStatus: 1, //接取
}
myWorldtask.CurrentTasks[curTaskConf.Group] = tasks
} }
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTasks": myWorldtask.CurrentTasks,
} }
if err := a.module.modelWorldtask.Change(uid, update); err != nil { if err := a.module.modelWorldtask.Change(uid, update); err != nil {
@ -102,8 +134,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
curTaskConf.DeliverNpc == 0 { curTaskConf.DeliverNpc == 0 {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
//结束任务 //结束任务
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
} else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 { } else if curTaskConf.DeliverNpc == 0 && len(curTaskConf.Completetask) > 0 {
var flag bool var flag bool
conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...) conds, err := a.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
@ -111,7 +143,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
flag = true flag = true
rsp.CondiIds = append(rsp.CondiIds, cond.Conid) rsp.Conds = append(rsp.Conds, cond)
} else { } else {
flag = false flag = false
break break
@ -121,8 +153,8 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
if flag { if flag {
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
a.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
a.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) a.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
return return
} }
a.sendMsg(session, WorldtaskSubtypeAccept, rsp) a.sendMsg(session, WorldtaskSubtypeAccept, rsp)
@ -133,7 +165,7 @@ func (a *apiComp) Accept(session comm.IUserSession, req *pb.WorldtaskAcceptReq)
var unfinishCondIds []int32 var unfinishCondIds []int32
for _, cond := range conds { for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish { if cond.State == pb.BuriedItemFinishState_buried_finish {
rsp.CondiIds = append(rsp.CondiIds, cond.Conid) rsp.Conds = append(rsp.Conds, cond)
} else if cond.State == pb.BuriedItemFinishState_buried_unfinish { } else if cond.State == pb.BuriedItemFinishState_buried_unfinish {
unfinishCondIds = append(unfinishCondIds, cond.Conid) unfinishCondIds = append(unfinishCondIds, cond.Conid)
} }

25
modules/worldtask/api_battlefinish.go
View File

@ -6,12 +6,11 @@ import (
"go_dreamfactory/lego/sys/log" "go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
) )
// 战斗结束的请求 // 战斗结束的请求
func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) { func (this *apiComp) BattlefinishCheck(session comm.IUserSession, req *pb.WorldtaskBattleFinishReq) (errdata *pb.ErrorData) {
if req.GroupId <= 0 || req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil { if req.BattleConfId <= 0 || req.TaskId <= 0 || req.Report == nil {
this.module.Error("世界任务战斗结束参数错误", this.module.Error("世界任务战斗结束参数错误",
log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "params", Value: req.String()}, log.Field{Key: "params", Value: req.String()},
@ -63,7 +62,7 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
rsp := &pb.WorldtaskBattleFinishResp{} rsp := &pb.WorldtaskBattleFinishResp{}
if len(taskConf.Completetask) == 0 { if len(taskConf.Completetask) == 0 {
if err := this.module.modelWorldtask.finishTask(taskConf.Group, req.TaskId, userTask); err != nil { if err := this.module.modelWorldtask.finishTask(req.TaskId, userTask); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), Title: pb.ErrorCode_DBError.ToString(),
@ -100,26 +99,6 @@ func (this *apiComp) Battlefinish(session comm.IUserSession, req *pb.WorldtaskBa
} else { } else {
//触发任务 //触发任务
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId)) go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId))
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 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(),
}
return
}
} }
} }
} }

39
modules/worldtask/api_completetask.go
View File

@ -7,7 +7,7 @@ import (
// 任务完成条件 // 任务完成条件
func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) { func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.WorldtaskCompleteCondiReq) (errdata *pb.ErrorData) {
if req.GroupId <= 0 || req.TaskId <= 0 || req.CondiId <= 0 { if req.TaskId <= 0 || req.CondiId <= 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(), Title: pb.ErrorCode_ReqParameterError.ToString(),
@ -54,9 +54,9 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
return return
} }
myWorldtask.Uid = uid myWorldtask.Uid = uid
wt := myWorldtask.CurrentTask[req.GroupId]
conds, err := this.module.ModuleBuried.CheckCondition(uid, req.CondiId) // 校验任务条件
conds, err := this.module.ModuleBuried.FinishConditionAndCheck(uid, []int32{req.CondiId}, curTaskConf.Completetask...)
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule, Code: pb.ErrorCode_ExternalModule,
@ -64,16 +64,35 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(), Message: comm.NewExternalModuleErr("buried", "CheckCondition", uid, req.CondiId).Error(),
} }
} }
for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish { // 设置当前任务的完成条件
wt.CondiIds = append(wt.CondiIds, cond.Conid) for _, tasks := range myWorldtask.CurrentTasks {
if task, ok := tasks.TaskMap[req.TaskId]; ok {
for _, cond := range conds {
for _, exist_cond := range task.Conds {
if cond.Conid == exist_cond.Conid {
continue
}
task.Conds = append(task.Conds, cond)
}
}
break
} }
} }
myWorldtask.CurrentTask[req.GroupId] = wt // for _, cond := range conds {
// for _, exist_cond := range wt.Tasks {
// if cond.Conid == exist_cond.Conid {
// continue
// }
// wt.Conds = append(wt.Conds, cond)
// }
// }
// myWorldtask.CurrentTaskMap[curTaskConf.Group] = wt
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTasks": myWorldtask.CurrentTasks,
} }
if err := this.module.modelWorldtask.Change(uid, update); err != nil { if err := this.module.modelWorldtask.Change(uid, update); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -88,8 +107,8 @@ func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.WorldtaskC
//结束任务 //结束任务
if curTaskConf.DeliverNpc == 0 { if curTaskConf.DeliverNpc == 0 {
this.module.modelWorldtask.taskFinish(session, req.GroupId, req.TaskId, myWorldtask, curTaskConf) this.module.modelWorldtask.taskFinish(session, req.TaskId, myWorldtask, curTaskConf)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, myWorldtask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, myWorldtask, curTaskConf)
} }
return return
} }

149
modules/worldtask/api_finish.go
View File

@ -6,13 +6,12 @@ import (
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log" "go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/utils"
) )
// 世界任务完成 // 世界任务完成
func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) { func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WorldtaskFinishReq) (errdata *pb.ErrorData) {
if req.GroupId == 0 || req.TaskId == 0 { if req.TaskId == 0 {
this.module.Error("世界任务完成参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) this.module.Error("世界任务完成参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()})
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError, Code: pb.ErrorCode_ReqParameterError,
@ -52,14 +51,14 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
return return
} }
if curTaskConf.Group != req.GroupId { // if curTaskConf.Group != req.GroupId {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskGroupIdNosame, // Code: pb.ErrorCode_WorldtaskGroupIdNosame,
Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(), // Title: pb.ErrorCode_WorldtaskGroupIdNosame.ToString(),
Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId), // Message: fmt.Sprintf("组ID一致,实际:%d 期望:%d", curTaskConf.Group, req.GroupId),
} // }
return // return
} // }
if curTaskConf.DeliverNpc == 0 { if curTaskConf.DeliverNpc == 0 {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
@ -95,7 +94,7 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
// 前置任务ID 只有世界任务才校验前置 // 前置任务ID 只有世界任务才校验前置
if !this.module.modelWorldtask.IsPreFinished(req.GroupId, userTask, curTaskConf) { if !this.module.modelWorldtask.IsPreFinished(userTask, curTaskConf) {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskLastUnFinished, Code: pb.ErrorCode_WorldtaskLastUnFinished,
Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(), Title: pb.ErrorCode_WorldtaskLastUnFinished.ToString(),
@ -112,46 +111,45 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "taskId", Value: req.TaskId},
) )
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
return return
} }
} }
var condiFlag bool conds, err := this.module.ModuleBuried.CheckCondition(uid, curTaskConf.Completetask...)
// 检查当前任务的完成条件 if err != nil {
for _, condId := range curTaskConf.Completetask {
if v, ok := userTask.CurrentTask[req.GroupId]; ok {
if _, ok := utils.Findx(v.CondiIds, condId); !ok {
conds, err := this.module.ModuleBuried.CheckCondition(uid, condId)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, condId).Error(),
}
return
}
for _, cond := range conds {
if cond.Conid == condId && cond.State == pb.BuriedItemFinishState_buried_finish {
condiFlag = true
}
}
} else {
condiFlag = true
}
}
}
if !condiFlag {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_RtaskCondiNoReach, Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_RtaskCondiNoReach.ToString(), Title: pb.ErrorCode_ExternalModule.ToString(),
Message: comm.NewExternalModuleErr("Buried", "CheckCondition", uid, curTaskConf.Completetask).Error(),
} }
return return
} }
for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_unfinish {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_RtaskCondiNoReach,
Title: pb.ErrorCode_RtaskCondiNoReach.ToString(),
Message: fmt.Sprintf("世界任务[%v] 条件[%v]未达成", req.TaskId, curTaskConf.Completetask),
}
return
}
}
for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_unfinish {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_RtaskCondiNoReach,
Title: pb.ErrorCode_RtaskCondiNoReach.ToString(),
Message: fmt.Sprintf("世界任务[%v]条件[%v]未达标,类型:%v 实际:%v 期望:%v", req.TaskId, cond.Conid, cond.Btype, cond.Value, cond.Target),
}
return
}
}
// 完成任务 // 完成任务
if err := this.module.modelWorldtask.finishTask(req.GroupId, req.TaskId, userTask); err != nil { if err := this.module.modelWorldtask.finishTask(req.TaskId, userTask); err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_WorldtaskFinish, Code: pb.ErrorCode_WorldtaskFinish,
Title: pb.ErrorCode_WorldtaskFinish.ToString(), Title: pb.ErrorCode_WorldtaskFinish.ToString(),
@ -163,7 +161,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
if errdata = this.module.DispenseRes(session, curTaskConf.Reword, true); errdata != nil { if errdata = this.module.DispenseRes(session, curTaskConf.Reword, true); errdata != nil {
this.module.Error("资源发放", this.module.Error("资源发放",
log.Field{Key: "uid", Value: uid}, log.Field{Key: "uid", Value: uid},
log.Field{Key: "groupId", Value: req.GroupId},
log.Field{Key: "taskId", Value: req.TaskId}, log.Field{Key: "taskId", Value: req.TaskId},
log.Field{Key: "reword", Value: curTaskConf.Reword}, log.Field{Key: "reword", Value: curTaskConf.Reword},
log.Field{Key: "errdata", Value: errdata}, log.Field{Key: "errdata", Value: errdata},
@ -183,72 +180,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WorldtaskFinishRe
} }
} }
this.sendMsg(session, WorldtaskSubtypeFinish, rsp) this.sendMsg(session, WorldtaskSubtypeFinish, rsp)
this.module.modelWorldtask.taskFinishPush(session, req.GroupId, userTask, curTaskConf) this.module.modelWorldtask.taskFinishPush(session, userTask, curTaskConf)
return return
} }
// Deprecated
func (this *apiComp) updateCheckCond(uid string, userTask *pb.DBWorldtask, nextTaskId int32) (*pb.DBWorldtask, error) {
//检查下个任务的完成条件
nextTaskConf, err := this.module.configure.getWorldtaskById(nextTaskId)
if err != nil {
return nil, err
}
if nextTaskConf.Des == 1 || nextTaskConf.Des == 4 {
return nil, comm.NewCustomError(pb.ErrorCode_WorldtaskNoProcess)
}
if userTask.CurrentTask == nil {
userTask.CurrentTask = make(map[int32]*pb.Worldtask)
}
update := make(map[string]interface{})
if (len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0) ||
len(nextTaskConf.Completetask) == 0 {
wt := &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
CondiIds: []int32{},
}
userTask.CurrentTask[nextTaskConf.Group] = wt
update["currentTask"] = userTask.CurrentTask
} else {
nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
if ok {
nwt.TaskId = nextTaskId
nwt.TaskType = nextTaskConf.Des
} else {
nwt = &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
}
}
conds, err := this.module.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
if err != nil {
this.module.Errorf("buried err:%v", err.Error())
return nil, err
}
var condIds []int32
for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish {
condIds = append(condIds, cond.Conid)
}
}
nwt.CondiIds = condIds
userTask.CurrentTask[nextTaskConf.Group] = nwt
update["currentTask"] = userTask.CurrentTask
}
if len(update) > 0 {
if err := this.module.modelWorldtask.Change(uid, update); err != nil {
this.module.Error("DB err", log.Field{Key: "err", Value: err.Error()})
return nil, err
}
}
return userTask, nil
}

55
modules/worldtask/api_mine.go
View File

@ -4,6 +4,7 @@ import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/lego/sys/log" "go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/utils"
) )
var ( var (
@ -40,11 +41,59 @@ func (this *apiComp) Mine(session comm.IUserSession, req *pb.WorldtaskMineReq) (
return return
} }
if myWorldtask.CurrentTask == nil { if myWorldtask.CurrentTasks == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) myWorldtask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
this.module.modelWorldtask.updateRandomTask(uid, myWorldtask) //查询当前所有任务组下的完成条件数据
var condIds []int32
condMap := make(map[int32][]int32)
for k, v := range myWorldtask.CurrentTasks {
for _, t := range v.TaskMap {
cfg, err := this.module.configure.getWorldtaskById(t.TaskId)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if (len(cfg.Completetask) == 1 && cfg.Completetask[0] > 0) &&
len(cfg.Completetask) > 0 {
condIds = append(condIds, cfg.Completetask...)
condMap[k] = cfg.Completetask
}
}
}
condIds = utils.RemoveDuplicate(condIds)
// this.module.modelWorldtask.updateRandomTask(uid, myWorldtask)
// 查询任务的条件进度
conds, err := this.module.ModuleBuried.CheckCondition(uid, condIds...)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Title: pb.ErrorCode_ExternalModule.ToString(),
Message: comm.NewExternalModuleErr("buried", "CheckCondition", condIds).Error(),
}
return
}
for k, v := range condMap {
if mw, ok := myWorldtask.CurrentTasks[k]; ok {
for _, task := range mw.TaskMap {
for _, cond := range conds {
if _, ok := utils.Findx(v, cond.Conid); ok {
task.Conds = append(task.Conds, cond)
}
}
}
}
}
rsp := &pb.WorldtaskMineResp{ rsp := &pb.WorldtaskMineResp{
Task: myWorldtask, Task: myWorldtask,

161
modules/worldtask/model_worldtask.go
View File

@ -42,7 +42,7 @@ func (this *ModelWorldtask) getWorldtask(uid string) (*pb.DBWorldtask, error) {
// 判断前置任务是否完成 // 判断前置任务是否完成
// true 已完成 false未完成 // true 已完成 false未完成
func (this *ModelWorldtask) IsPreFinished(groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool { func (this *ModelWorldtask) IsPreFinished(userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) bool {
var ( var (
lastTaskId int32 lastTaskId int32
preTaskFinished bool preTaskFinished bool
@ -73,7 +73,7 @@ func (this *ModelWorldtask) isFinished(taskId int32, list []*pb.Worldtask) bool
} }
// 完成任务 // 完成任务
func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldtask) error { func (this *ModelWorldtask) finishTask(taskId int32, task *pb.DBWorldtask) error {
if task == nil { if task == nil {
return errors.New("worldtask is nil") return errors.New("worldtask is nil")
} }
@ -92,10 +92,10 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
} }
update["uid"] = task.Uid update["uid"] = task.Uid
wt := &pb.Worldtask{ // wt := &pb.Worldtask{
TaskId: taskId, // TaskId: taskId,
TaskType: taskConf.Des, // TaskType: taskConf.Des,
} // }
for _, tId := range task.TaskList { for _, tId := range task.TaskList {
if tId == taskId { if tId == taskId {
@ -105,18 +105,17 @@ func (this *ModelWorldtask) finishTask(groupId, taskId int32, task *pb.DBWorldta
task.TaskList = append(task.TaskList, taskId) task.TaskList = append(task.TaskList, taskId)
if task.CurrentTask == nil { if task.CurrentTasks == nil {
task.CurrentTask = make(map[int32]*pb.Worldtask) task.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
//有下个任务 //有下个任务
if taskConf.IdAfter != 0 { // if taskConf.IdAfter != 0 {
wt.NpcStatus = 0 // wt.NpcStatus = 0
wt.DeliverNpc = 0 // wt.DeliverNpc = 0
wt.CondiIds = []int32{} // task.CurrentTasks[groupId] = wt
task.CurrentTask[groupId] = wt // update[""] = task.CurrentTasks
update["currentTask"] = task.CurrentTask // }
}
update["taskList"] = task.TaskList update["taskList"] = task.TaskList
@ -142,10 +141,8 @@ func (this *ModelWorldtask) findNextTasks(parentTaskId int32) (taskIds []int32)
return return
} }
// 更新当前任务的完成条件 // 更新当前任务的完成条件
func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, userTask *pb.DBWorldtask, nextTaskId int32) *pb.DBWorldtask { func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, userTask *pb.DBWorldtask, currentTaskId, nextTaskId int32) *pb.DBWorldtask {
//检查下个任务的完成条件
nextTaskConf, err := this.moduleWorldtask.configure.getWorldtaskById(nextTaskId) nextTaskConf, err := this.moduleWorldtask.configure.getWorldtaskById(nextTaskId)
if err != nil { if err != nil {
return nil return nil
@ -162,50 +159,31 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
return nil return nil
} }
if userTask.CurrentTask == nil { if userTask.CurrentTasks == nil {
userTask.CurrentTask = make(map[int32]*pb.Worldtask) userTask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
update := make(map[string]interface{}) update := make(map[string]interface{})
if (len(nextTaskConf.Completetask) == 1 && nextTaskConf.Completetask[0] == 0) || nwt, ok := userTask.CurrentTasks[nextTaskConf.Group]
len(nextTaskConf.Completetask) == 0 { if ok {
wt := &pb.Worldtask{ // 删除
TaskId: nextTaskId, delete(nwt.TaskMap, currentTaskId)
TaskType: nextTaskConf.Des,
CondiIds: []int32{},
}
userTask.CurrentTask[nextTaskConf.Group] = wt
update["currentTask"] = userTask.CurrentTask
} else {
nwt, ok := userTask.CurrentTask[nextTaskConf.Group]
if ok {
nwt.TaskId = nextTaskId
nwt.TaskType = nextTaskConf.Des
} else {
nwt = &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
}
}
conds, err := this.moduleWorldtask.ModuleBuried.CheckCondition(uid, nextTaskConf.Completetask...)
if err != nil {
this.moduleWorldtask.Errorf("buried err:%v", err.Error())
return nil
}
var condIds []int32
for _, cond := range conds {
if cond.State == pb.BuriedItemFinishState_buried_finish {
condIds = append(condIds, cond.Conid)
}
}
nwt.CondiIds = condIds
userTask.CurrentTask[nextTaskConf.Group] = nwt
update["currentTask"] = userTask.CurrentTask
} }
if nwt == nil {
nwt = &pb.Worldtasks{
TaskMap: make(map[int32]*pb.Worldtask),
}
userTask.CurrentTasks[nextTaskConf.Group] = nwt
}
nwt.TaskMap[nextTaskId] = &pb.Worldtask{
TaskId: nextTaskId,
TaskType: nextTaskConf.Des,
}
update["currentTasks"] = userTask.CurrentTasks
if len(update) > 0 { if len(update) > 0 {
if err := this.Change(uid, update); err != nil { if err := this.Change(uid, update); err != nil {
return nil return nil
@ -216,8 +194,8 @@ func (this *ModelWorldtask) updateCurrentTaskCond(uid string, userLv int32, user
} }
// 任务完成推送 // 任务完成推送
func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) { func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
this.updateRandomTask(session.GetUserId(), userTask) // this.updateRandomTask(session.GetUserId(), userTask)
u := this.moduleWorldtask.ModuleUser.GetUser(session.GetUserId()) u := this.moduleWorldtask.ModuleUser.GetUser(session.GetUserId())
if u == nil { if u == nil {
return return
@ -226,33 +204,31 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
nextTaskIds := this.findNextTasks(curTaskConf.Key) nextTaskIds := this.findNextTasks(curTaskConf.Key)
this.moduleWorldtask.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds}) this.moduleWorldtask.Debug("nextTaskIds", log.Field{Key: "nextTaskIds", Value: nextTaskIds})
nextTask := make(map[int32]*pb.Worldtask) nextTask := make(map[int32]*pb.Worldtasks)
for _, next := range nextTaskIds { for _, next := range nextTaskIds {
ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, next) ut := this.updateCurrentTaskCond(session.GetUserId(), u.Lv, userTask, curTaskConf.Key, next)
if ut != nil { if ut != nil {
for k, v := range ut.CurrentTask { for k, v := range ut.CurrentTasks {
nextTask[k] = &pb.Worldtask{ nextTask[k] = v
TaskId: v.TaskId,
}
} }
} }
} }
if nextTaskIds == nil { if nextTaskIds == nil {
nextTask[groupId] = &pb.Worldtask{} //表示没有下一个任务 nextTask[curTaskConf.Group] = &pb.Worldtasks{} //表示没有下一个任务
} }
if curTaskConf.IdAfter == 0 { if curTaskConf.IdAfter == 0 {
// 章节完成 // 章节完成
if _, ok := userTask.Chapters[groupId]; !ok { if _, ok := userTask.Chapters[curTaskConf.Group]; !ok {
delete(userTask.CurrentTask, groupId) delete(userTask.CurrentTasks, curTaskConf.Group)
if userTask.Chapters == nil { if userTask.Chapters == nil {
userTask.Chapters = make(map[int32]int32) userTask.Chapters = make(map[int32]int32)
} }
userTask.Chapters[groupId] = 1 //已解锁待领取 userTask.Chapters[curTaskConf.Group] = 1 //已解锁待领取
update := map[string]interface{}{ update := map[string]interface{}{
"chapters": userTask.Chapters, "chapters": userTask.Chapters,
"currentTask": userTask.CurrentTask, "currentTasks": userTask.CurrentTasks,
} }
this.Change(session.GetUserId(), update) this.Change(session.GetUserId(), update)
} }
@ -266,11 +242,10 @@ func (this *ModelWorldtask) taskFinishPush(session comm.IUserSession, groupId in
} }
// 任务完成 // 任务完成
func (this *ModelWorldtask) taskFinish(session comm.IUserSession, groupId, taskId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) { func (this *ModelWorldtask) taskFinish(session comm.IUserSession, taskId int32, userTask *pb.DBWorldtask, curTaskConf *cfg.GameWorldTaskData) {
if err := this.finishTask(groupId, taskId, userTask); err != nil { if err := this.finishTask(taskId, userTask); err != nil {
this.moduleWorldtask.Error("完成任务失败", this.moduleWorldtask.Error("完成任务失败",
log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "uid", Value: session.GetUserId()},
log.Field{Key: "groupId", Value: groupId},
log.Field{Key: "taskId", Value: taskId}, log.Field{Key: "taskId", Value: taskId},
log.Field{Key: "err", Value: err.Error()}, log.Field{Key: "err", Value: err.Error()},
) )
@ -354,9 +329,20 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
if err != nil || gwtd == nil { if err != nil || gwtd == nil {
continue continue
} }
myWorldtask.CurrentTask[gwtd.Group] = &pb.Worldtask{ if task, ok := myWorldtask.CurrentTasks[gwtd.Group]; ok {
TaskId: v, task.TaskMap[v] = &pb.Worldtask{
TaskType: gwtd.Des, TaskId: v,
TaskType: gwtd.Des,
}
} else {
taskMap := make(map[int32]*pb.Worldtask)
taskMap[v] = &pb.Worldtask{
TaskId: v,
TaskType: gwtd.Des,
}
myWorldtask.CurrentTasks[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap,
}
} }
} }
update["daliyRefreshTime"] = configure.Now().Unix() update["daliyRefreshTime"] = configure.Now().Unix()
@ -371,16 +357,29 @@ func (this *ModelWorldtask) updateRandomTask(uid string, myWorldtask *pb.DBWorld
if err != nil || gwtd == nil { if err != nil || gwtd == nil {
continue continue
} }
myWorldtask.CurrentTask[gwtd.Group] = &pb.Worldtask{
TaskId: v, if task, ok := myWorldtask.CurrentTasks[gwtd.Group]; ok {
TaskType: gwtd.Des, task.TaskMap[v] = &pb.Worldtask{
TaskId: v,
TaskType: gwtd.Des,
}
} else {
taskMap := make(map[int32]*pb.Worldtask)
taskMap[v] = &pb.Worldtask{
TaskId: v,
TaskType: gwtd.Des,
}
myWorldtask.CurrentTasks[gwtd.Group] = &pb.Worldtasks{
TaskMap: taskMap,
}
} }
} }
update["weekRefreshTime"] = configure.Now().Unix() update["weekRefreshTime"] = configure.Now().Unix()
} }
} }
update["currentTask"] = myWorldtask.CurrentTask update["currentTasks"] = myWorldtask.CurrentTasks
if err := this.Change(uid, update); err != nil { if err := this.Change(uid, update); err != nil {
return return

182
modules/worldtask/module.go
View File

@ -119,78 +119,98 @@ func (this *Worldtask) TCondFinishNotify(uid string, conds []*pb.ConIProgress) {
return return
} }
var groupId, taskId int32
// 检索condId是否是世界任务的完成条件 // 检索condId是否是世界任务的完成条件
finishedCondIds := []int32{} taskConds := make(map[int32][]*pb.CurrentTask)
for _, c := range worldtaskConf.GetDataList() { finishedCondIds := []*pb.ConIProgress{}
for _, v := range c.Completetask { for _, cfg := range worldtaskConf.GetDataList() {
for _, condId := range cfg.Completetask {
for _, cond := range conds { for _, cond := range conds {
if v == cond.Conid { if condId == cond.Conid {
//校验任务是否是当前任务 //校验任务是否是当前任务
if task, ok := userTask.CurrentTask[c.Group]; ok { if task, ok := userTask.CurrentTasks[cfg.Group]; ok {
if task.NpcStatus == 1 && c.Key == task.TaskId { var currentTasks []*pb.CurrentTask
groupId = c.Group for _, t := range task.TaskMap {
taskId = c.Key if t.NpcStatus == 1 && cfg.Key == t.TaskId {
finishedCondIds = append(finishedCondIds, cond.Conid) finishedCondIds = append(finishedCondIds, cond)
currentTasks = append(currentTasks, &pb.CurrentTask{
GroupId: cfg.Group,
TaskId: cfg.Key,
})
}
} }
taskConds[cfg.Group] = currentTasks
} }
break
} }
} }
} }
} }
this.Debug("完成条件", // this.Debug("完成条件",
log.Field{Key: "taskId", Value: taskId}, // log.Field{Key: "taskId", Value: taskId},
log.Field{Key: "condIds", Value: finishedCondIds}) // log.Field{Key: "condIds", Value: finishedCondIds})
if len(finishedCondIds) == 0 { if len(finishedCondIds) == 0 {
return return
} }
if userTask.CurrentTask == nil { // 当前任务配置
userTask.CurrentTask = make(map[int32]*pb.Worldtask) // curTaskConf, err := this.configure.getWorldtaskById(taskId)
} // if err != nil || curTaskConf == nil {
// return
// }
wt, ok := userTask.CurrentTask[groupId] // if userTask.CurrentTasks == nil {
if !ok { // userTask.CurrentTasks = make(map[int32]*pb.Worldtasks)
wt = &pb.Worldtask{} // }
}
for _, condId := range finishedCondIds { // wt, ok := userTask.CurrentTasks[groupId]
if _, ok := utils.Findx(wt.CondiIds, condId); !ok { // if !ok {
wt.CondiIds = append(wt.CondiIds, condId) // wt = &pb.Worldtasks{}
// }
// // for _, condId := range finishedCondIds {
// for _, cond1 := range finishedCondIds {
// for _, cond2 := range wt.Conds {
// if cond2.Conid == cond1.Conid {
// cond2 = cond1
// } else {
// wt.Conds = append(wt.Conds, cond1)
// }
// }
// }
// userTask.CurrentTasks[groupId] = wt
// for _, v := range userTask.CurrentTasks {
// if curTaskConf.Key == v.TaskId {
// if len(v.Conds) == len(curTaskConf.Completetask) && curTaskConf.DeliverNpc == 0 { // 所有条件全部完成且无需交付
// this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
// this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
// } else {
// update := map[string]interface{}{
// "currentTask": userTask.CurrentTasks,
// }
// this.modelWorldtask.Change(uid, update)
// }
// break
// }
// }
var currentTasks []*pb.CurrentTask
for _, tasks := range taskConds {
for _, t := range tasks {
currentTasks = append(currentTasks, t)
} }
} }
userTask.CurrentTask[groupId] = wt
update := map[string]interface{}{
"currentTask": userTask.CurrentTask,
}
this.modelWorldtask.Change(uid, update)
session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{ session.SendMsg(string(this.GetType()), "completecondis", &pb.WorldtaskCompletecondisPush{
GroupId: groupId, // GroupId: groupId,
TaskId: taskId, // TaskId: taskId,
CondiIds: wt.CondiIds, // Conds: wt.Conds,
Tasks: currentTasks,
}) })
this.Debug("当前任务所有条件完成",
log.Field{Key: "condiIds", Value: wt.CondiIds},
log.Field{Key: "taskId", Value: taskId})
// 当前任务配置
curTaskConf, err := this.configure.getWorldtaskById(taskId)
if err != nil || curTaskConf == nil {
return
}
//结束任务
if curTaskConf.DeliverNpc == 0 {
this.modelWorldtask.taskFinish(session, groupId, taskId, userTask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, groupId, userTask, curTaskConf)
}
return return
} }
@ -268,16 +288,18 @@ func (this *Worldtask) BingoJumpTask(session comm.IUserSession, groupId, taskId
//下个任务 //下个任务
nextTaskIds := this.modelWorldtask.findNextTasks(taskId) nextTaskIds := this.modelWorldtask.findNextTasks(taskId)
if mytask.CurrentTask == nil { if mytask.CurrentTasks == nil {
mytask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
if len(nextTaskIds) >= 1 { if len(nextTaskIds) >= 1 {
mytask.CurrentTask[groupId] = &pb.Worldtask{ if t, ok := mytask.CurrentTasks[groupId]; ok {
TaskId: nextTaskIds[0], t.TaskMap[nextTaskIds[0]] = &pb.Worldtask{
TaskType: 2, //设置主线类型 TaskId: nextTaskIds[0],
TaskType: 2, //设置主线类型
}
} }
update["currentTask"] = mytask.CurrentTask update["currentTasks"] = mytask.CurrentTasks
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -343,15 +365,17 @@ func (this *Worldtask) JumpTaskByTaskId(session comm.IUserSession, taskId int32)
"taskList": mytask.TaskList, "taskList": mytask.TaskList,
} }
if mytask.CurrentTask == nil { if mytask.CurrentTasks == nil {
mytask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
mytask.CurrentTask[taskConf.Group] = &pb.Worldtask{ if t, ok := mytask.CurrentTasks[taskConf.Group]; ok {
TaskId: taskId, t.TaskMap[taskId] = &pb.Worldtask{
TaskType: taskConf.Des, TaskId: taskId,
TaskType: taskConf.Des, //设置主线类型
}
} }
update["currentTask"] = mytask.CurrentTask update["currentTasks"] = mytask.CurrentTasks
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
return err return err
@ -385,29 +409,26 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
return return
} }
myWorldtask, err := this.modelWorldtask.getWorldtask(uid)
if err != nil {
this.Error("获取玩家世界任务失败", log.Field{Key: "uid", Value: uid}, log.Field{Key: "err", Value: err.Error()})
return
}
// 当前任务配置 // 当前任务配置
curTaskConf, err := this.configure.getWorldtaskById(taskId) curTaskConf, err := this.configure.getWorldtaskById(taskId)
if err != nil || curTaskConf == nil { if err != nil || curTaskConf == nil {
return return
} }
if myWorldtask.CurrentTask == nil { if mytask.CurrentTasks == nil {
myWorldtask.CurrentTask = make(map[int32]*pb.Worldtask) mytask.CurrentTasks = make(map[int32]*pb.Worldtasks)
} }
myWorldtask.CurrentTask[curTaskConf.Group] = &pb.Worldtask{
TaskId: taskId, if v, ok1 := mytask.CurrentTasks[curTaskConf.Group]; ok1 {
TaskType: curTaskConf.Des, v.TaskMap[taskId] = &pb.Worldtask{
NpcStatus: 1, TaskId: taskId,
TaskType: curTaskConf.Des,
NpcStatus: 1,
}
} }
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTasks": mytask.CurrentTasks,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
@ -419,8 +440,8 @@ func (this *Worldtask) GetWorldTaskBy(session comm.IUserSession, groupId int32)
len(curTaskConf.Completetask) == 0) && len(curTaskConf.Completetask) == 0) &&
curTaskConf.DeliverNpc == 0 { curTaskConf.DeliverNpc == 0 {
//结束任务 //结束任务
this.modelWorldtask.taskFinish(session, groupId, taskId, myWorldtask, curTaskConf) this.modelWorldtask.taskFinish(session, taskId, mytask, curTaskConf)
this.modelWorldtask.taskFinishPush(session, groupId, myWorldtask, curTaskConf) this.modelWorldtask.taskFinishPush(session, mytask, curTaskConf)
} }
return return
@ -458,13 +479,16 @@ func (this *Worldtask) UpdateTaskStatus(uid string, taskId int32) {
} }
} }
myWorldtask.CurrentTask[curTaskConf.Group] = wt if tasks, ok := myWorldtask.CurrentTasks[curTaskConf.Group]; ok {
tasks.TaskMap[taskId] = wt
}
update := map[string]interface{}{ update := map[string]interface{}{
"currentTask": myWorldtask.CurrentTask, "currentTasks": myWorldtask.CurrentTasks,
} }
if err := this.modelWorldtask.Change(uid, update); err != nil { if err := this.modelWorldtask.Change(uid, update); err != nil {
this.Error(err.Error())
} }
} }

216
pb/worldtask_db.pb.go
View File

@ -25,12 +25,12 @@ type DBWorldtask struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //玩家ID 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"` // 任务列表 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"` //正在进行的任务 CurrentTasks map[int32]*Worldtasks `protobuf:"bytes,4,rep,name=currentTasks,proto3" json:"currentTasks" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"currentTasks"` //正在进行的任务
Chapters map[int32]int32 `protobuf:"bytes,5,rep,name=chapters,proto3" json:"chapters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"chapters"` //key章节ID v状态 1已解锁2已领取 Chapters map[int32]int32 `protobuf:"bytes,5,rep,name=chapters,proto3" json:"chapters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"chapters"` //key章节ID v状态 1已解锁2已领取
DaliyRefreshTime int64 `protobuf:"varint,6,opt,name=daliyRefreshTime,proto3" json:"daliyRefreshTime" bson:"daliyRefreshTime"` DaliyRefreshTime int64 `protobuf:"varint,6,opt,name=daliyRefreshTime,proto3" json:"daliyRefreshTime" bson:"daliyRefreshTime"`
WeekRefreshTime int64 `protobuf:"varint,7,opt,name=weekRefreshTime,proto3" json:"weekRefreshTime" bson:"weekRefreshTime"` WeekRefreshTime int64 `protobuf:"varint,7,opt,name=weekRefreshTime,proto3" json:"weekRefreshTime" bson:"weekRefreshTime"`
} }
func (x *DBWorldtask) Reset() { func (x *DBWorldtask) Reset() {
@ -79,9 +79,9 @@ func (x *DBWorldtask) GetTaskList() []int32 {
return nil return nil
} }
func (x *DBWorldtask) GetCurrentTask() map[int32]*Worldtask { func (x *DBWorldtask) GetCurrentTasks() map[int32]*Worldtasks {
if x != nil { if x != nil {
return x.CurrentTask return x.CurrentTasks
} }
return nil return nil
} }
@ -107,22 +107,69 @@ func (x *DBWorldtask) GetWeekRefreshTime() int64 {
return 0 return 0
} }
type Worldtasks struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TaskMap map[int32]*Worldtask `protobuf:"bytes,1,rep,name=taskMap,proto3" json:"taskMap" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"tasks"` //
}
func (x *Worldtasks) Reset() {
*x = Worldtasks{}
if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *Worldtasks) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*Worldtasks) ProtoMessage() {}
func (x *Worldtasks) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use Worldtasks.ProtoReflect.Descriptor instead.
func (*Worldtasks) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{1}
}
func (x *Worldtasks) GetTaskMap() map[int32]*Worldtask {
if x != nil {
return x.TaskMap
}
return nil
}
type Worldtask struct { type Worldtask struct {
state protoimpl.MessageState state protoimpl.MessageState
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskIds"` //任务ID TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId" bson:"taskId"` //任务ID
TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情 TaskType int32 `protobuf:"varint,3,opt,name=taskType,proto3" json:"taskType" bson:"taskType"` //任务类型 1 日/周常 2随机任务 3支线剧情
NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成 NpcStatus int32 `protobuf:"varint,5,opt,name=npcStatus,proto3" json:"npcStatus" bson:"npcStatus"` //NPC任务完成状态0未完成 1完成
CondiIds []int32 `protobuf:"varint,6,rep,packed,name=condiIds,proto3" json:"condiIds" bson:"condiIds"` //任务完成条件 Conds []*ConIProgress `protobuf:"bytes,6,rep,name=conds,proto3" json:"conds" bson:"conds"` //任务完成条件
DeliverNpc int32 `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"` //交付NPC完成状态0未完成 1完成 DeliverNpc int32 `protobuf:"varint,7,opt,name=deliverNpc,proto3" json:"deliverNpc" bson:"deliverNpc"` //交付NPC完成状态0未完成 1完成
} }
func (x *Worldtask) Reset() { func (x *Worldtask) Reset() {
*x = Worldtask{} *x = Worldtask{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1] mi := &file_worldtask_worldtask_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -135,7 +182,7 @@ func (x *Worldtask) String() string {
func (*Worldtask) ProtoMessage() {} func (*Worldtask) ProtoMessage() {}
func (x *Worldtask) ProtoReflect() protoreflect.Message { func (x *Worldtask) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_db_proto_msgTypes[1] mi := &file_worldtask_worldtask_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -148,7 +195,7 @@ func (x *Worldtask) ProtoReflect() protoreflect.Message {
// Deprecated: Use Worldtask.ProtoReflect.Descriptor instead. // Deprecated: Use Worldtask.ProtoReflect.Descriptor instead.
func (*Worldtask) Descriptor() ([]byte, []int) { func (*Worldtask) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{1} return file_worldtask_worldtask_db_proto_rawDescGZIP(), []int{2}
} }
func (x *Worldtask) GetTaskId() int32 { func (x *Worldtask) GetTaskId() int32 {
@ -172,9 +219,9 @@ func (x *Worldtask) GetNpcStatus() int32 {
return 0 return 0
} }
func (x *Worldtask) GetCondiIds() []int32 { func (x *Worldtask) GetConds() []*ConIProgress {
if x != nil { if x != nil {
return x.CondiIds return x.Conds
} }
return nil return nil
} }
@ -190,43 +237,55 @@ var File_worldtask_worldtask_db_proto protoreflect.FileDescriptor
var file_worldtask_worldtask_db_proto_rawDesc = []byte{ var file_worldtask_worldtask_db_proto_rawDesc = []byte{
0x0a, 0x1c, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x77, 0x6f, 0x72, 0x6c, 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, 0x93, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16,
0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62,
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x98, 0x03, 0x0a, 0x0b, 0x44, 0x42, 0x57, 0x6f, 0x72,
0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x3f, 0x0a, 0x0b, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b,
0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x04, 0x20, 0x03, 0x28, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b,
0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x42, 0x0a, 0x0c, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54,
0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x57,
0x52, 0x0b, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x36, 0x0a, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x75, 0x72, 0x72,
0x1a, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x36, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x70,
0x61, 0x70, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61, 0x74, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x44, 0x42, 0x57,
0x70, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72,
0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x63, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73,
0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x12, 0x2a, 0x0a, 0x10, 0x64, 0x61, 0x6c, 0x69, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x65, 0x12, 0x28, 0x0a, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x64, 0x61, 0x6c, 0x69,
0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x79, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f,
0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x4a, 0x0a, 0x10, 0x43, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x18,
0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x66, 0x72, 0x65,
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x4c, 0x0a, 0x11, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e,
0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x57,
0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3b, 0x0a, 0x0d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x73,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x3a, 0x02, 0x38, 0x01, 0x22, 0x99, 0x01, 0x0a, 0x09, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x01, 0x22, 0x88, 0x01, 0x0a, 0x0a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x12, 0x32, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28,
0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x0b, 0x32, 0x18, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x54,
0x74, 0x75, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6e, 0x70, 0x63, 0x53, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x74, 0x61, 0x73,
0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x1a, 0x46, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4d, 0x61, 0x70, 0x45,
0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x18, 0x07, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x4e, 0x70, 0x63, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x6b, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xa2, 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, 0x23, 0x0a, 0x05,
0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f,
0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 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 ( var (
@ -241,22 +300,28 @@ func file_worldtask_worldtask_db_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_db_proto_rawDescData return file_worldtask_worldtask_db_proto_rawDescData
} }
var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_worldtask_worldtask_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_worldtask_worldtask_db_proto_goTypes = []interface{}{ var file_worldtask_worldtask_db_proto_goTypes = []interface{}{
(*DBWorldtask)(nil), // 0: DBWorldtask (*DBWorldtask)(nil), // 0: DBWorldtask
(*Worldtask)(nil), // 1: Worldtask (*Worldtasks)(nil), // 1: Worldtasks
nil, // 2: DBWorldtask.CurrentTaskEntry (*Worldtask)(nil), // 2: Worldtask
nil, // 3: DBWorldtask.ChaptersEntry nil, // 3: DBWorldtask.CurrentTasksEntry
nil, // 4: DBWorldtask.ChaptersEntry
nil, // 5: Worldtasks.TaskMapEntry
(*ConIProgress)(nil), // 6: ConIProgress
} }
var file_worldtask_worldtask_db_proto_depIdxs = []int32{ var file_worldtask_worldtask_db_proto_depIdxs = []int32{
2, // 0: DBWorldtask.currentTask:type_name -> DBWorldtask.CurrentTaskEntry 3, // 0: DBWorldtask.currentTasks:type_name -> DBWorldtask.CurrentTasksEntry
3, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry 4, // 1: DBWorldtask.chapters:type_name -> DBWorldtask.ChaptersEntry
1, // 2: DBWorldtask.CurrentTaskEntry.value:type_name -> Worldtask 5, // 2: Worldtasks.taskMap:type_name -> Worldtasks.TaskMapEntry
3, // [3:3] is the sub-list for method output_type 6, // 3: Worldtask.conds:type_name -> ConIProgress
3, // [3:3] is the sub-list for method input_type 1, // 4: DBWorldtask.CurrentTasksEntry.value:type_name -> Worldtasks
3, // [3:3] is the sub-list for extension type_name 2, // 5: Worldtasks.TaskMapEntry.value:type_name -> Worldtask
3, // [3:3] is the sub-list for extension extendee 6, // [6:6] is the sub-list for method output_type
0, // [0:3] is the sub-list for field type_name 6, // [6:6] is the sub-list for method input_type
6, // [6:6] is the sub-list for extension type_name
6, // [6:6] is the sub-list for extension extendee
0, // [0:6] is the sub-list for field type_name
} }
func init() { file_worldtask_worldtask_db_proto_init() } func init() { file_worldtask_worldtask_db_proto_init() }
@ -264,6 +329,7 @@ func file_worldtask_worldtask_db_proto_init() {
if File_worldtask_worldtask_db_proto != nil { if File_worldtask_worldtask_db_proto != nil {
return return
} }
file_buried_buried_db_proto_init()
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_worldtask_worldtask_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBWorldtask); i { switch v := v.(*DBWorldtask); i {
@ -278,6 +344,18 @@ func file_worldtask_worldtask_db_proto_init() {
} }
} }
file_worldtask_worldtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Worldtasks); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_worldtask_worldtask_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Worldtask); i { switch v := v.(*Worldtask); i {
case 0: case 0:
return &v.state return &v.state
@ -296,7 +374,7 @@ func file_worldtask_worldtask_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc, RawDescriptor: file_worldtask_worldtask_db_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 4, NumMessages: 6,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

441
pb/worldtask_msg.pb.go
View File

@ -112,8 +112,7 @@ type WorldtaskAcceptReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
} }
func (x *WorldtaskAcceptReq) Reset() { func (x *WorldtaskAcceptReq) Reset() {
@ -148,13 +147,6 @@ func (*WorldtaskAcceptReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{2} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{2}
} }
func (x *WorldtaskAcceptReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
}
func (x *WorldtaskAcceptReq) GetTaskId() int32 { func (x *WorldtaskAcceptReq) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
@ -167,7 +159,7 @@ type WorldtaskAcceptResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
CondiIds []int32 `protobuf:"varint,1,rep,packed,name=condiIds,proto3" json:"condiIds"` //完成条件 Conds []*ConIProgress `protobuf:"bytes,1,rep,name=conds,proto3" json:"conds"` //完成条件
} }
func (x *WorldtaskAcceptResp) Reset() { func (x *WorldtaskAcceptResp) Reset() {
@ -202,9 +194,9 @@ func (*WorldtaskAcceptResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{3} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{3}
} }
func (x *WorldtaskAcceptResp) GetCondiIds() []int32 { func (x *WorldtaskAcceptResp) GetConds() []*ConIProgress {
if x != nil { if x != nil {
return x.CondiIds return x.Conds
} }
return nil return nil
} }
@ -215,9 +207,7 @@ type WorldtaskCompletecondisPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` Tasks []*CurrentTask `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"`
CondiIds []int32 `protobuf:"varint,3,rep,packed,name=condiIds,proto3" json:"condiIds"`
} }
func (x *WorldtaskCompletecondisPush) Reset() { func (x *WorldtaskCompletecondisPush) Reset() {
@ -252,23 +242,72 @@ func (*WorldtaskCompletecondisPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{4} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{4}
} }
func (x *WorldtaskCompletecondisPush) GetGroupId() int32 { func (x *WorldtaskCompletecondisPush) GetTasks() []*CurrentTask {
if x != nil {
return x.Tasks
}
return nil
}
type CurrentTask struct {
state protoimpl.MessageState
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"`
Conds []*ConIProgress `protobuf:"bytes,3,rep,name=conds,proto3" json:"conds"`
}
func (x *CurrentTask) Reset() {
*x = CurrentTask{}
if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *CurrentTask) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*CurrentTask) ProtoMessage() {}
func (x *CurrentTask) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use CurrentTask.ProtoReflect.Descriptor instead.
func (*CurrentTask) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{5}
}
func (x *CurrentTask) GetGroupId() int32 {
if x != nil { if x != nil {
return x.GroupId return x.GroupId
} }
return 0 return 0
} }
func (x *WorldtaskCompletecondisPush) GetTaskId() int32 { func (x *CurrentTask) GetTaskId() int32 {
if x != nil { if x != nil {
return x.TaskId return x.TaskId
} }
return 0 return 0
} }
func (x *WorldtaskCompletecondisPush) GetCondiIds() []int32 { func (x *CurrentTask) GetConds() []*ConIProgress {
if x != nil { if x != nil {
return x.CondiIds return x.Conds
} }
return nil return nil
} }
@ -279,15 +318,14 @@ type WorldtaskCompleteCondiReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"`
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` CondiId int32 `protobuf:"varint,2,opt,name=condiId,proto3" json:"condiId"`
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"`
} }
func (x *WorldtaskCompleteCondiReq) Reset() { func (x *WorldtaskCompleteCondiReq) Reset() {
*x = WorldtaskCompleteCondiReq{} *x = WorldtaskCompleteCondiReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5] mi := &file_worldtask_worldtask_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -300,7 +338,7 @@ func (x *WorldtaskCompleteCondiReq) String() string {
func (*WorldtaskCompleteCondiReq) ProtoMessage() {} func (*WorldtaskCompleteCondiReq) ProtoMessage() {}
func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[5] mi := &file_worldtask_worldtask_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -313,14 +351,7 @@ func (x *WorldtaskCompleteCondiReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskCompleteCondiReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskCompleteCondiReq.ProtoReflect.Descriptor instead.
func (*WorldtaskCompleteCondiReq) Descriptor() ([]byte, []int) { func (*WorldtaskCompleteCondiReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{5} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6}
}
func (x *WorldtaskCompleteCondiReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
} }
func (x *WorldtaskCompleteCondiReq) GetTaskId() int32 { func (x *WorldtaskCompleteCondiReq) GetTaskId() int32 {
@ -349,7 +380,7 @@ type WorldtaskCompleteCondiResp struct {
func (x *WorldtaskCompleteCondiResp) Reset() { func (x *WorldtaskCompleteCondiResp) Reset() {
*x = WorldtaskCompleteCondiResp{} *x = WorldtaskCompleteCondiResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[6] mi := &file_worldtask_worldtask_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -362,7 +393,7 @@ func (x *WorldtaskCompleteCondiResp) String() string {
func (*WorldtaskCompleteCondiResp) ProtoMessage() {} func (*WorldtaskCompleteCondiResp) ProtoMessage() {}
func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[6] mi := &file_worldtask_worldtask_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -375,7 +406,7 @@ func (x *WorldtaskCompleteCondiResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskCompleteCondiResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskCompleteCondiResp.ProtoReflect.Descriptor instead.
func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) { func (*WorldtaskCompleteCondiResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{6} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{7}
} }
func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 { func (x *WorldtaskCompleteCondiResp) GetTaskId() int32 {
@ -398,14 +429,13 @@ type WorldtaskFinishReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //分组ID TaskId int32 `protobuf:"varint,1,opt,name=taskId,proto3" json:"taskId"` //任务ID
TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
} }
func (x *WorldtaskFinishReq) Reset() { func (x *WorldtaskFinishReq) Reset() {
*x = WorldtaskFinishReq{} *x = WorldtaskFinishReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[7] mi := &file_worldtask_worldtask_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -418,7 +448,7 @@ func (x *WorldtaskFinishReq) String() string {
func (*WorldtaskFinishReq) ProtoMessage() {} func (*WorldtaskFinishReq) ProtoMessage() {}
func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[7] mi := &file_worldtask_worldtask_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -431,14 +461,7 @@ func (x *WorldtaskFinishReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishReq.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishReq) Descriptor() ([]byte, []int) { func (*WorldtaskFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{7} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8}
}
func (x *WorldtaskFinishReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
} }
func (x *WorldtaskFinishReq) GetTaskId() int32 { func (x *WorldtaskFinishReq) GetTaskId() int32 {
@ -459,7 +482,7 @@ type WorldtaskFinishResp struct {
func (x *WorldtaskFinishResp) Reset() { func (x *WorldtaskFinishResp) Reset() {
*x = WorldtaskFinishResp{} *x = WorldtaskFinishResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[8] mi := &file_worldtask_worldtask_msg_proto_msgTypes[9]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -472,7 +495,7 @@ func (x *WorldtaskFinishResp) String() string {
func (*WorldtaskFinishResp) ProtoMessage() {} func (*WorldtaskFinishResp) ProtoMessage() {}
func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[8] mi := &file_worldtask_worldtask_msg_proto_msgTypes[9]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -485,7 +508,7 @@ func (x *WorldtaskFinishResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishResp.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) { func (*WorldtaskFinishResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{8} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9}
} }
func (x *WorldtaskFinishResp) GetTaskId() int32 { func (x *WorldtaskFinishResp) GetTaskId() int32 {
@ -501,14 +524,14 @@ type WorldtaskNexttaskPush struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
NextTask map[int32]*Worldtask `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` NextTask map[int32]*Worldtasks `protobuf:"bytes,1,rep,name=nextTask,proto3" json:"nextTask" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
FinishedTaskIds []int32 `protobuf:"varint,2,rep,packed,name=finishedTaskIds,proto3" json:"finishedTaskIds"` // 当前完成的任务 FinishedTaskIds []int32 `protobuf:"varint,2,rep,packed,name=finishedTaskIds,proto3" json:"finishedTaskIds"` // 当前完成的任务
} }
func (x *WorldtaskNexttaskPush) Reset() { func (x *WorldtaskNexttaskPush) Reset() {
*x = WorldtaskNexttaskPush{} *x = WorldtaskNexttaskPush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] mi := &file_worldtask_worldtask_msg_proto_msgTypes[10]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -521,7 +544,7 @@ func (x *WorldtaskNexttaskPush) String() string {
func (*WorldtaskNexttaskPush) ProtoMessage() {} func (*WorldtaskNexttaskPush) ProtoMessage() {}
func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message { func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[9] mi := &file_worldtask_worldtask_msg_proto_msgTypes[10]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -534,10 +557,10 @@ func (x *WorldtaskNexttaskPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskNexttaskPush.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskNexttaskPush.ProtoReflect.Descriptor instead.
func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) { func (*WorldtaskNexttaskPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{9} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{10}
} }
func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtask { func (x *WorldtaskNexttaskPush) GetNextTask() map[int32]*Worldtasks {
if x != nil { if x != nil {
return x.NextTask return x.NextTask
} }
@ -564,7 +587,7 @@ type WorldtaskBattleStartReq struct {
func (x *WorldtaskBattleStartReq) Reset() { func (x *WorldtaskBattleStartReq) Reset() {
*x = WorldtaskBattleStartReq{} *x = WorldtaskBattleStartReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] mi := &file_worldtask_worldtask_msg_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -577,7 +600,7 @@ func (x *WorldtaskBattleStartReq) String() string {
func (*WorldtaskBattleStartReq) ProtoMessage() {} func (*WorldtaskBattleStartReq) ProtoMessage() {}
func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[10] mi := &file_worldtask_worldtask_msg_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -590,7 +613,7 @@ func (x *WorldtaskBattleStartReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleStartReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleStartReq.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleStartReq) Descriptor() ([]byte, []int) { func (*WorldtaskBattleStartReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{10} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{11}
} }
func (x *WorldtaskBattleStartReq) GetBattleConfId() int32 { func (x *WorldtaskBattleStartReq) GetBattleConfId() int32 {
@ -618,7 +641,7 @@ type WorldtaskBattleStartResp struct {
func (x *WorldtaskBattleStartResp) Reset() { func (x *WorldtaskBattleStartResp) Reset() {
*x = WorldtaskBattleStartResp{} *x = WorldtaskBattleStartResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[11] mi := &file_worldtask_worldtask_msg_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -631,7 +654,7 @@ func (x *WorldtaskBattleStartResp) String() string {
func (*WorldtaskBattleStartResp) ProtoMessage() {} func (*WorldtaskBattleStartResp) ProtoMessage() {}
func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[11] mi := &file_worldtask_worldtask_msg_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -644,7 +667,7 @@ func (x *WorldtaskBattleStartResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleStartResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleStartResp.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleStartResp) Descriptor() ([]byte, []int) { func (*WorldtaskBattleStartResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{11} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12}
} }
func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo { func (x *WorldtaskBattleStartResp) GetInfo() *BattleInfo {
@ -660,7 +683,6 @@ type WorldtaskBattleFinishReq struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields 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"` //任务ID TaskId int32 `protobuf:"varint,2,opt,name=taskId,proto3" json:"taskId"` //任务ID
CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //完成条件ID CondiId int32 `protobuf:"varint,3,opt,name=condiId,proto3" json:"condiId"` //完成条件ID
BattleConfId int32 `protobuf:"varint,4,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID BattleConfId int32 `protobuf:"varint,4,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID
@ -670,7 +692,7 @@ type WorldtaskBattleFinishReq struct {
func (x *WorldtaskBattleFinishReq) Reset() { func (x *WorldtaskBattleFinishReq) Reset() {
*x = WorldtaskBattleFinishReq{} *x = WorldtaskBattleFinishReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[12] mi := &file_worldtask_worldtask_msg_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -683,7 +705,7 @@ func (x *WorldtaskBattleFinishReq) String() string {
func (*WorldtaskBattleFinishReq) ProtoMessage() {} func (*WorldtaskBattleFinishReq) ProtoMessage() {}
func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[12] mi := &file_worldtask_worldtask_msg_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -696,14 +718,7 @@ func (x *WorldtaskBattleFinishReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleFinishReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleFinishReq.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) { func (*WorldtaskBattleFinishReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{12} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13}
}
func (x *WorldtaskBattleFinishReq) GetGroupId() int32 {
if x != nil {
return x.GroupId
}
return 0
} }
func (x *WorldtaskBattleFinishReq) GetTaskId() int32 { func (x *WorldtaskBattleFinishReq) GetTaskId() int32 {
@ -745,7 +760,7 @@ type WorldtaskBattleFinishResp struct {
func (x *WorldtaskBattleFinishResp) Reset() { func (x *WorldtaskBattleFinishResp) Reset() {
*x = WorldtaskBattleFinishResp{} *x = WorldtaskBattleFinishResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[13] mi := &file_worldtask_worldtask_msg_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -758,7 +773,7 @@ func (x *WorldtaskBattleFinishResp) String() string {
func (*WorldtaskBattleFinishResp) ProtoMessage() {} func (*WorldtaskBattleFinishResp) ProtoMessage() {}
func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[13] mi := &file_worldtask_worldtask_msg_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -771,7 +786,7 @@ func (x *WorldtaskBattleFinishResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskBattleFinishResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskBattleFinishResp.ProtoReflect.Descriptor instead.
func (*WorldtaskBattleFinishResp) Descriptor() ([]byte, []int) { func (*WorldtaskBattleFinishResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{13} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{14}
} }
func (x *WorldtaskBattleFinishResp) GetTaskId() int32 { func (x *WorldtaskBattleFinishResp) GetTaskId() int32 {
@ -793,7 +808,7 @@ type WorldtaskFinishIdsPush struct {
func (x *WorldtaskFinishIdsPush) Reset() { func (x *WorldtaskFinishIdsPush) Reset() {
*x = WorldtaskFinishIdsPush{} *x = WorldtaskFinishIdsPush{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[14] mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -806,7 +821,7 @@ func (x *WorldtaskFinishIdsPush) String() string {
func (*WorldtaskFinishIdsPush) ProtoMessage() {} func (*WorldtaskFinishIdsPush) ProtoMessage() {}
func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message { func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[14] mi := &file_worldtask_worldtask_msg_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -819,7 +834,7 @@ func (x *WorldtaskFinishIdsPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskFinishIdsPush.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskFinishIdsPush.ProtoReflect.Descriptor instead.
func (*WorldtaskFinishIdsPush) Descriptor() ([]byte, []int) { func (*WorldtaskFinishIdsPush) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{14} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15}
} }
func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask { func (x *WorldtaskFinishIdsPush) GetTaskList() []*Worldtask {
@ -841,7 +856,7 @@ type WorldtaskChapterrewardReq struct {
func (x *WorldtaskChapterrewardReq) Reset() { func (x *WorldtaskChapterrewardReq) Reset() {
*x = WorldtaskChapterrewardReq{} *x = WorldtaskChapterrewardReq{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -854,7 +869,7 @@ func (x *WorldtaskChapterrewardReq) String() string {
func (*WorldtaskChapterrewardReq) ProtoMessage() {} func (*WorldtaskChapterrewardReq) ProtoMessage() {}
func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message { func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[15] mi := &file_worldtask_worldtask_msg_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -867,7 +882,7 @@ func (x *WorldtaskChapterrewardReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskChapterrewardReq.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskChapterrewardReq.ProtoReflect.Descriptor instead.
func (*WorldtaskChapterrewardReq) Descriptor() ([]byte, []int) { func (*WorldtaskChapterrewardReq) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{15} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16}
} }
func (x *WorldtaskChapterrewardReq) GetGroupId() int32 { func (x *WorldtaskChapterrewardReq) GetGroupId() int32 {
@ -888,7 +903,7 @@ type WorldtaskChapterrewardResp struct {
func (x *WorldtaskChapterrewardResp) Reset() { func (x *WorldtaskChapterrewardResp) Reset() {
*x = WorldtaskChapterrewardResp{} *x = WorldtaskChapterrewardResp{}
if protoimpl.UnsafeEnabled { if protoimpl.UnsafeEnabled {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] mi := &file_worldtask_worldtask_msg_proto_msgTypes[17]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi) ms.StoreMessageInfo(mi)
} }
@ -901,7 +916,7 @@ func (x *WorldtaskChapterrewardResp) String() string {
func (*WorldtaskChapterrewardResp) ProtoMessage() {} func (*WorldtaskChapterrewardResp) ProtoMessage() {}
func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message { func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message {
mi := &file_worldtask_worldtask_msg_proto_msgTypes[16] mi := &file_worldtask_worldtask_msg_proto_msgTypes[17]
if protoimpl.UnsafeEnabled && x != nil { if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil { if ms.LoadMessageInfo() == nil {
@ -914,7 +929,7 @@ func (x *WorldtaskChapterrewardResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use WorldtaskChapterrewardResp.ProtoReflect.Descriptor instead. // Deprecated: Use WorldtaskChapterrewardResp.ProtoReflect.Descriptor instead.
func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) { func (*WorldtaskChapterrewardResp) Descriptor() ([]byte, []int) {
return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{16} return file_worldtask_worldtask_msg_proto_rawDescGZIP(), []int{17}
} }
func (x *WorldtaskChapterrewardResp) GetGroupId() int32 { func (x *WorldtaskChapterrewardResp) GetGroupId() int32 {
@ -932,57 +947,58 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 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, 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, 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, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62,
0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d, 0x69, 0x6e, 0x65, 0x52,
0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4d,
0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x18,
0x6b, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x61, 0x73, 0x6b, 0x52, 0x04, 0x74, 0x61, 0x73, 0x6b, 0x22, 0x2c, 0x0a, 0x12, 0x57, 0x6f, 0x72,
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x71, 0x12,
0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x3a, 0x0a, 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23,
0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x6b, 0x0a, 0x1b, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f,
0x6e, 0x64, 0x73, 0x22, 0x41, 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, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x0c, 0x2e, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x52,
0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x22, 0x64, 0x0a, 0x0b, 0x43, 0x75, 0x72, 0x72, 0x65, 0x6e,
0x74, 0x54, 0x61, 0x73, 0x6b, 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, 0x23, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73,
0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f,
0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x4d, 0x0a, 0x19,
0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 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, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73,
0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57,
0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
0x08, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x73, 0x22, 0x67, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49,
0x6e, 0x64, 0x69, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x12, 0x57,
0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65,
0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x57, 0x6f, 0x72,
0x49, 0x64, 0x22, 0x4e, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65, 0x73, 0x70,
0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcd, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x72,
0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75,
0x49, 0x64, 0x22, 0x46, 0x0a, 0x12, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x01,
0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b,
0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x4e, 0x65, 0x78,
0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74,
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x2d, 0x0a, 0x13, 0x57, 0x6f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x28, 0x0a, 0x0f, 0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x66,
0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x1a, 0x48,
0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0xcc, 0x01, 0x0a, 0x15, 0x57, 0x6f, 0x0a, 0x0d, 0x4e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x65, 0x78, 0x74, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
0x75, 0x73, 0x68, 0x12, 0x40, 0x0a, 0x08, 0x6e, 0x65, 0x78, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x18, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x32, 0x0b, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x52, 0x05, 0x76,
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, 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, 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, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e,
@ -993,34 +1009,32 @@ var file_worldtask_worldtask_msg_proto_rawDesc = []byte{
0x65, 0x22, 0x3b, 0x0a, 0x18, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 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, 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, 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, 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, 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, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x74,
0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73,
0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03,
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a,
0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20,
0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49,
0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x62, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74,
0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c,
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73,
0x72, 0x74, 0x22, 0x33, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a,
0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x40, 0x0a, 0x16, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c,
0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c,
0x68, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22,
0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70,
0x08, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x19, 0x57, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07,
0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67,
0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64,
0x22, 0x36, 0x0a, 0x1a, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18,
0x70, 0x74, 0x65, 0x72, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06,
0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -1035,45 +1049,51 @@ func file_worldtask_worldtask_msg_proto_rawDescGZIP() []byte {
return file_worldtask_worldtask_msg_proto_rawDescData return file_worldtask_worldtask_msg_proto_rawDescData
} }
var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) var file_worldtask_worldtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 19)
var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{ var file_worldtask_worldtask_msg_proto_goTypes = []interface{}{
(*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq (*WorldtaskMineReq)(nil), // 0: WorldtaskMineReq
(*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp (*WorldtaskMineResp)(nil), // 1: WorldtaskMineResp
(*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq (*WorldtaskAcceptReq)(nil), // 2: WorldtaskAcceptReq
(*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp (*WorldtaskAcceptResp)(nil), // 3: WorldtaskAcceptResp
(*WorldtaskCompletecondisPush)(nil), // 4: WorldtaskCompletecondisPush (*WorldtaskCompletecondisPush)(nil), // 4: WorldtaskCompletecondisPush
(*WorldtaskCompleteCondiReq)(nil), // 5: WorldtaskCompleteCondiReq (*CurrentTask)(nil), // 5: CurrentTask
(*WorldtaskCompleteCondiResp)(nil), // 6: WorldtaskCompleteCondiResp (*WorldtaskCompleteCondiReq)(nil), // 6: WorldtaskCompleteCondiReq
(*WorldtaskFinishReq)(nil), // 7: WorldtaskFinishReq (*WorldtaskCompleteCondiResp)(nil), // 7: WorldtaskCompleteCondiResp
(*WorldtaskFinishResp)(nil), // 8: WorldtaskFinishResp (*WorldtaskFinishReq)(nil), // 8: WorldtaskFinishReq
(*WorldtaskNexttaskPush)(nil), // 9: WorldtaskNexttaskPush (*WorldtaskFinishResp)(nil), // 9: WorldtaskFinishResp
(*WorldtaskBattleStartReq)(nil), // 10: WorldtaskBattleStartReq (*WorldtaskNexttaskPush)(nil), // 10: WorldtaskNexttaskPush
(*WorldtaskBattleStartResp)(nil), // 11: WorldtaskBattleStartResp (*WorldtaskBattleStartReq)(nil), // 11: WorldtaskBattleStartReq
(*WorldtaskBattleFinishReq)(nil), // 12: WorldtaskBattleFinishReq (*WorldtaskBattleStartResp)(nil), // 12: WorldtaskBattleStartResp
(*WorldtaskBattleFinishResp)(nil), // 13: WorldtaskBattleFinishResp (*WorldtaskBattleFinishReq)(nil), // 13: WorldtaskBattleFinishReq
(*WorldtaskFinishIdsPush)(nil), // 14: WorldtaskFinishIdsPush (*WorldtaskBattleFinishResp)(nil), // 14: WorldtaskBattleFinishResp
(*WorldtaskChapterrewardReq)(nil), // 15: WorldtaskChapterrewardReq (*WorldtaskFinishIdsPush)(nil), // 15: WorldtaskFinishIdsPush
(*WorldtaskChapterrewardResp)(nil), // 16: WorldtaskChapterrewardResp (*WorldtaskChapterrewardReq)(nil), // 16: WorldtaskChapterrewardReq
nil, // 17: WorldtaskNexttaskPush.NextTaskEntry (*WorldtaskChapterrewardResp)(nil), // 17: WorldtaskChapterrewardResp
(*DBWorldtask)(nil), // 18: DBWorldtask nil, // 18: WorldtaskNexttaskPush.NextTaskEntry
(*BattleFormation)(nil), // 19: BattleFormation (*DBWorldtask)(nil), // 19: DBWorldtask
(*BattleInfo)(nil), // 20: BattleInfo (*ConIProgress)(nil), // 20: ConIProgress
(*BattleReport)(nil), // 21: BattleReport (*BattleFormation)(nil), // 21: BattleFormation
(*Worldtask)(nil), // 22: Worldtask (*BattleInfo)(nil), // 22: BattleInfo
(*BattleReport)(nil), // 23: BattleReport
(*Worldtask)(nil), // 24: Worldtask
(*Worldtasks)(nil), // 25: Worldtasks
} }
var file_worldtask_worldtask_msg_proto_depIdxs = []int32{ var file_worldtask_worldtask_msg_proto_depIdxs = []int32{
18, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask 19, // 0: WorldtaskMineResp.task:type_name -> DBWorldtask
17, // 1: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry 20, // 1: WorldtaskAcceptResp.conds:type_name -> ConIProgress
19, // 2: WorldtaskBattleStartReq.battle:type_name -> BattleFormation 5, // 2: WorldtaskCompletecondisPush.tasks:type_name -> CurrentTask
20, // 3: WorldtaskBattleStartResp.info:type_name -> BattleInfo 20, // 3: CurrentTask.conds:type_name -> ConIProgress
21, // 4: WorldtaskBattleFinishReq.report:type_name -> BattleReport 18, // 4: WorldtaskNexttaskPush.nextTask:type_name -> WorldtaskNexttaskPush.NextTaskEntry
22, // 5: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask 21, // 5: WorldtaskBattleStartReq.battle:type_name -> BattleFormation
22, // 6: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtask 22, // 6: WorldtaskBattleStartResp.info:type_name -> BattleInfo
7, // [7:7] is the sub-list for method output_type 23, // 7: WorldtaskBattleFinishReq.report:type_name -> BattleReport
7, // [7:7] is the sub-list for method input_type 24, // 8: WorldtaskFinishIdsPush.taskList:type_name -> Worldtask
7, // [7:7] is the sub-list for extension type_name 25, // 9: WorldtaskNexttaskPush.NextTaskEntry.value:type_name -> Worldtasks
7, // [7:7] is the sub-list for extension extendee 10, // [10:10] is the sub-list for method output_type
0, // [0:7] is the sub-list for field type_name 10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension extendee
0, // [0:10] is the sub-list for field type_name
} }
func init() { file_worldtask_worldtask_msg_proto_init() } func init() { file_worldtask_worldtask_msg_proto_init() }
@ -1083,6 +1103,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
file_battle_battle_msg_proto_init() file_battle_battle_msg_proto_init()
file_worldtask_worldtask_db_proto_init() file_worldtask_worldtask_db_proto_init()
file_buried_buried_db_proto_init()
if !protoimpl.UnsafeEnabled { if !protoimpl.UnsafeEnabled {
file_worldtask_worldtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskMineReq); i { switch v := v.(*WorldtaskMineReq); i {
@ -1145,7 +1166,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskCompleteCondiReq); i { switch v := v.(*CurrentTask); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1157,7 +1178,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskCompleteCondiResp); i { switch v := v.(*WorldtaskCompleteCondiReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1169,7 +1190,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishReq); i { switch v := v.(*WorldtaskCompleteCondiResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1181,7 +1202,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishResp); i { switch v := v.(*WorldtaskFinishReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1193,7 +1214,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskNexttaskPush); i { switch v := v.(*WorldtaskFinishResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1205,7 +1226,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleStartReq); i { switch v := v.(*WorldtaskNexttaskPush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1217,7 +1238,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleStartResp); i { switch v := v.(*WorldtaskBattleStartReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1229,7 +1250,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleFinishReq); i { switch v := v.(*WorldtaskBattleStartResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1241,7 +1262,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskBattleFinishResp); i { switch v := v.(*WorldtaskBattleFinishReq); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1253,7 +1274,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskFinishIdsPush); i { switch v := v.(*WorldtaskBattleFinishResp); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1265,7 +1286,7 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardReq); i { switch v := v.(*WorldtaskFinishIdsPush); i {
case 0: case 0:
return &v.state return &v.state
case 1: case 1:
@ -1277,6 +1298,18 @@ func file_worldtask_worldtask_msg_proto_init() {
} }
} }
file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { file_worldtask_worldtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardReq); 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[17].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*WorldtaskChapterrewardResp); i { switch v := v.(*WorldtaskChapterrewardResp); i {
case 0: case 0:
return &v.state return &v.state
@ -1295,7 +1328,7 @@ func file_worldtask_worldtask_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(), GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc, RawDescriptor: file_worldtask_worldtask_msg_proto_rawDesc,
NumEnums: 0, NumEnums: 0,
NumMessages: 18, NumMessages: 19,
NumExtensions: 0, NumExtensions: 0,
NumServices: 0, NumServices: 0,
}, },

1
utils/trans.go
View File

@ -16,6 +16,7 @@ func ConvertReward(data ...*cfg.Gameatn) (res []*pb.UserAssets) {
return return
} }
// 去重
func RemoveDuplicate(arr []int32) []int32 { func RemoveDuplicate(arr []int32) []int32 {
visited := make(map[int32]bool) visited := make(map[int32]bool)
result := []int32{} result := []int32{}