diff --git a/modules/wtask/module.go b/modules/wtask/module.go index 913418e4f..14071d8d5 100644 --- a/modules/wtask/module.go +++ b/modules/wtask/module.go @@ -691,18 +691,11 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断 continue } - if v.Des == 5 { //商队任务不主动触发 + if v.Des == 5 || v.Des == 1 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中 continue } wtask.Activations = append(wtask.Activations, v.Key) changeActiva = true - // if v.AutoAccept == 0 { - // wtask.Activations = append(wtask.Activations, v.Key) - // changeActiva = true - // } else if v.AutoAccept == 1 { //自动接取任务 - // wtask.Accepts = append(wtask.Accepts, v.Key) - // changeAccept = true - // } if v.Des == 2 { //主线任务 wtask.Currchapter = v.Group }