From 76685f3a37419b9a9db4de6ac9451f377b49dc22 Mon Sep 17 00:00:00 2001
From: liwei <2211068034@qq.com>
Date: Tue, 11 Jul 2023 11:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=BB=E5=8A=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/wtask/api_accept.go       |  1 +
 modules/wtask/api_battlefinish.go |  2 +-
 modules/wtask/api_battlestart.go  |  2 +-
 modules/wtask/api_info.go         |  2 +-
 modules/wtask/module.go           | 20 ++++++++++----------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/wtask/api_accept.go b/modules/wtask/api_accept.go
index e8942a940..60f860c49 100644
--- a/modules/wtask/api_accept.go
+++ b/modules/wtask/api_accept.go
@@ -58,6 +58,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.WTaskAcceptReq) (
 			Title:   pb.ErrorCode_ReqParameterError.ToString(),
 			Message: fmt.Sprintf("task:%d no fund in Activations:%v", req.Tid, wtask.Activations),
 		}
+		return
 	}
 
 	for i, v := range wtask.Activations {
diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go
index a299367df..faba5d760 100644
--- a/modules/wtask/api_battlefinish.go
+++ b/modules/wtask/api_battlefinish.go
@@ -42,7 +42,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle
 		return
 	}
 
-	if errdata, isWin = this.module.modelBattle.CheckBattleReport(session, req.Report); errdata == nil {
+	if errdata, isWin = this.module.modelBattle.CheckBattleReport(session, req.Report); errdata != nil {
 		return
 	}
 
diff --git a/modules/wtask/api_battlestart.go b/modules/wtask/api_battlestart.go
index 45d0a70d3..d9237d317 100644
--- a/modules/wtask/api_battlestart.go
+++ b/modules/wtask/api_battlestart.go
@@ -47,7 +47,7 @@ func (this *apiComp) BattleStart(session comm.IUserSession, req *pb.WTaskBattleS
 	}); err != nil {
 		return
 	}
-	session.SendMsg(string(this.module.GetType()), "battle", &pb.WTaskBattleStartResp{
+	session.SendMsg(string(this.module.GetType()), "battlestart", &pb.WTaskBattleStartResp{
 		BattleConfId: req.BattleConfId,
 		Info: &pb.BattleInfo{
 			Id:         record.Id,
diff --git a/modules/wtask/api_info.go b/modules/wtask/api_info.go
index bc81b2c04..4a273376e 100644
--- a/modules/wtask/api_info.go
+++ b/modules/wtask/api_info.go
@@ -29,7 +29,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WTaskInfoReq) (errd
 		}
 		return
 	}
-	if progress, errdata = this.module.fishtask(session, wtask, false); errdata != nil {
+	if _, errdata = this.module.fishtask(session, wtask, false); errdata != nil {
 		return
 	}
 	if progress, errdata = this.module.pushtaskprogress(session, wtask, false); errdata != nil {
diff --git a/modules/wtask/module.go b/modules/wtask/module.go
index 0eb06677d..b35296d0c 100644
--- a/modules/wtask/module.go
+++ b/modules/wtask/module.go
@@ -97,7 +97,7 @@ func (this *WTask) BuriedsNotify(uid string, condis []*pb.ConIProgress) {
 		if temptasks, ok = condlTask[v.Conid]; ok {
 			for _, task := range temptasks {
 				if _, ok = accepttaskMap[task.Key]; ok { //任务列表进度有变化
-					if _, ok = changetasks[task.Key]; ok {
+					if _, ok = changetasks[task.Key]; !ok {
 						changetasks[task.Key] = task
 						for _, cid := range task.Completetask {
 							if _, ok = checkcondlsMap[cid]; !ok {
@@ -448,15 +448,15 @@ func (this *WTask) inquireActivations(session comm.IUserSession, wtask *pb.DBWTa
 		if v.Des == 5 { //商队任务不主动触发
 			continue
 		}
-
-		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
-		}
+		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
 		}