From 522c3684e57ed385ca1cd778fdbfdf295c56efb2 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Wed, 26 Jul 2023 20:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=B8=96=E7=95=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/mainline/api_levelpass.go |  1 +
 modules/wtask/api_finish.go       | 25 +++++++++++++++++++++++++
 modules/wtask/module.go           |  8 +-------
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/modules/mainline/api_levelpass.go b/modules/mainline/api_levelpass.go
index c93ac65c0..6c710ae74 100644
--- a/modules/mainline/api_levelpass.go
+++ b/modules/mainline/api_levelpass.go
@@ -114,6 +114,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP
 			})
 		}
 	}
+	consumPs = info.Ps[req.Level]
 	userExp, _ = this.module.ModuleUser.ConsumePsAddExp(session, consumPs)
 	session.SendMsg(string(this.module.GetType()), "levelpass", &pb.MainlineLevelPassResp{
 		Level:   req.Level,
diff --git a/modules/wtask/api_finish.go b/modules/wtask/api_finish.go
index 9793c6ec6..3e40dc652 100644
--- a/modules/wtask/api_finish.go
+++ b/modules/wtask/api_finish.go
@@ -18,6 +18,7 @@ func (this *apiComp) FinishCheck(session comm.IUserSession, req *pb.WTaskFinishR
 func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (errdata *pb.ErrorData) {
 	var (
 		conf         *cfg.GameWorldTaskData
+		afterconf    *cfg.GameWorldTaskData
 		wtask        *pb.DBWTask
 		condis       []*pb.ConIProgress
 		award        []*pb.UserAssets
@@ -130,6 +131,30 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (
 	} else {
 		wtask.Completes = append(wtask.Completes, req.Tid)
 	}
+
+	if conf.Des == 1 && conf.IdAfter != 0 { //日常任务自动接取下一个任务
+		if afterconf, err = this.module.configure.gettaskconfconfigure(conf.IdAfter); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ConfigNoFound,
+				Title:   pb.ErrorCode_ConfigNoFound.ToString(),
+				Message: err.Error(),
+			}
+			return
+		}
+		wtask.Accepts = append(wtask.Accepts, afterconf.Key)
+		if err = this.module.ModuleBuried.ActiveCondition(session.GetUserId(), afterconf.Completetask...); err != nil {
+			errdata = &pb.ErrorData{
+				Code:    pb.ErrorCode_ExternalModule,
+				Title:   pb.ErrorCode_ExternalModule.ToString(),
+				Message: fmt.Sprintf("ModuleBuried.ActiveCondition uid:%s condiIds:%v", session.GetUserId(), conf.Completetask),
+			}
+			return
+		}
+		if _, errdata = this.module.pushtaskprogress(session, wtask, true); errdata != nil {
+			return
+		}
+	}
+
 	this.module.checkgroupState(session, wtask, conf.Group)
 	session.SendMsg(string(this.module.GetType()), "finish", &pb.WTaskFinishResp{Tid: req.Tid, Award: award, Completes: wtask.Completes, Groups: wtask.Groups})
 	this.module.fishtask(session, wtask, true)
diff --git a/modules/wtask/module.go b/modules/wtask/module.go
index 9df35219a..4f3bf6ef1 100644
--- a/modules/wtask/module.go
+++ b/modules/wtask/module.go
@@ -743,13 +743,7 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
 		if _, ok = completeMap[v.Ontxe]; v.Ontxe != 0 && !ok { //前置任务判断
 			continue
 		}
-		if v.Des == 5 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中
-			continue
-		}
-		if v.Des == 1 {
-			changeAccept = true
-			wtask.Accepts = append(wtask.Activations, v.Key)
-			condiIds = append(condiIds, v.Completetask...)
+		if v.Des == 5 || v.Des == 1 { //商队任务不主动触发 日常任务直接接取不进入可接取列表中
 			continue
 		}
 		wtask.Activations = append(wtask.Activations, v.Key)