From 2015c30bc6ef05d1a9313a8649a3ae6c72b431b4 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Tue, 25 Jul 2023 17:02:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8F=AF=E6=8E=A5=E5=8F=96?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/wtask/module.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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
 		}