From a8f3add1a73d651c0c4ebc80bce56e98827e8b75 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Tue, 27 Sep 2022 21:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/rtask/api_battlefinish.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/rtask/api_battlefinish.go b/modules/rtask/api_battlefinish.go
index c6600b25f..5f74fedc7 100644
--- a/modules/rtask/api_battlefinish.go
+++ b/modules/rtask/api_battlefinish.go
@@ -69,6 +69,7 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
 	}
 
 	// 校验完成条件
+	var checkCondi bool
 	for _, v := range sideConf.EndTid {
 		if v == -1 {
 			continue
@@ -77,9 +78,15 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.RtaskBattle
 			if err != nil {
 				this.moduleRtask.Error(err.Error())
 			}
-			code = pb.ErrorCode_RtaskCondiNoReach
-			return
+			this.moduleRtask.Debugf("条件未达成 condiID:%v rtaskId:%v subRtaskId:%v chooseID:%v", v, req.RtaskId, req.RtaskSubId, req.ChooseId)
+			break
 		}
+		checkCondi = true
+	}
+
+	if !checkCondi {
+		code = pb.ErrorCode_RtaskCondiNoReach
+		return
 	}
 
 	// 更新完成的任务