From 1bc39a111402a85d6099b05bfde224fcd9db7101 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Fri, 14 Jul 2023 14:57:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=95=86=E9=98=9F=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A5=E5=8F=96=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/wtask/api_accept.go | 8 --------
 modules/wtask/api_finish.go | 9 +++++++++
 modules/wtask/module.go     | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

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
 		}