diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go index 7102c6f7e..0907c9400 100644 --- a/modules/wtask/api_accept.go +++ b/modules/wtask/api_accept.go @@ -50,14 +50,6 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) ( ok = true } } - if conf.Des == 5 { //商队任务 接取任务时 移除下一个任务的完成条件 方便顺序获取任务 - for i, v := range wtask.Completes { - if conf.IdAfter != 0 && conf.IdAfter == v { - wtask.Completes = append(wtask.Completes[0:i], wtask.Completes[i+1:]...) - update["completes"] = wtask.Completes - } - } - } if !ok { errdata = &pb.ErrorData{ diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go index a4cf6291f..9eb1499ee 100644 --- a/modules/wtask/api_finish.go +++ b/modules/wtask/api_finish.go @@ -111,6 +111,15 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) ( } } wtask.Completes = append(wtask.Completes, req.Tid) + + if conf.Des == 5 { //商队任务 完成任务时 移除下一个任务的完成条件 方便顺序获取任务 + for i, v := range wtask.Completes { + if conf.IdAfter != 0 && conf.IdAfter == v { + wtask.Completes = append(wtask.Completes[0:i], wtask.Completes[i+1:]...) + } + } + } + session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award}) this.module.checkgroupState(session, wtask, conf.Group) this.module.fishtask(session, wtask, true) diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 6fdd29d1f..1b0102f90 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -220,7 +220,7 @@ func (this *WTask) AcceptCaravanTask(session comm.IUserSession, groupId int32) ( } for _, v := range grouptask { - if _, ok = completeMap[v.Key]; v.LockAdd == 1 || !ok { //找到一个为完成任务 + if _, ok = completeMap[v.Key]; !ok { //找到一个为完成任务 target = v break }