From a5b00e35488e9ddda527408dcd1554cdb30e065f Mon Sep 17 00:00:00 2001
From: zhanghualin <286990256@qq.com>
Date: Mon, 17 Jan 2022 16:19:44 +0800
Subject: [PATCH] 魔鬼训练营改成 两个前置任务都完成才能领取奖励

---
 src/actions/HeroAction.lua | 19 ++++++++++++++++++-
 src/models/RoleTask.lua    |  8 +++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/actions/HeroAction.lua b/src/actions/HeroAction.lua
index 393cd75..ec9c723 100644
--- a/src/actions/HeroAction.lua
+++ b/src/actions/HeroAction.lua
@@ -1568,11 +1568,28 @@ function _M.trainTaskRewardRpc(agent, data)
 	local flag = record[taskId] or 0
 	if flag == 1 then return 1 end
 	local taskCfg = csvdb["training_camp_taskCsv"][taskId]
+	
 	if not taskCfg then return 2 end
 
-	if (trainTask[taskId] or 0) < taskCfg.condition1 then return 3 end
+	--只有类型4的任务可以完成，领取奖励
+	if taskCfg.type < 4 then
+		return 3
+	end
+
+	--前置任务1一
+	local preTask1 = csvdb["training_camp_taskCsv"][taskCfg.condition1]
+	if trainTask[preTask1.id] < preTask1.condition1 then
+		return 4
+	end
+
+	--前置任务2一
+	local preTask2 = csvdb["training_camp_taskCsv"][taskCfg.condition2]
+	if trainTask[preTask2.id] < preTask1.condition1 then
+		return 5
+	end
 
 	record[taskId] = 1
+
 	trainTask["r"] = record
 
 	role:updateProperty({field = "trainTask", value = trainTask})
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index c8d163d..1597940 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -919,7 +919,6 @@ function RoleTask.bind(Role)
 	function Role:checkTraingCampTask(notNotify, mainType, subType, param1, param2)
 		local trainTask = self:getProperty("trainTask") or {}
 		param1 = param1 or 1
-
 		for id, cfg in pairs(csvdb["training_camp_taskCsv"]) do
 				if cfg.type == mainType then
 					if subType == 1 then	-- 增加数值
@@ -954,16 +953,15 @@ function RoleTask.bind(Role)
 								trainTask[id] = count
 							end
 						elseif cfg.type == 4 then	-- 消耗指定id道具多少个
-							if cfg.condition2 == param1 then
-								trainTask[id] = (trainTask[id] or 0) + (param2 or 0)
-							end
+							-- if cfg.condition2 == param1 then
+							-- 	trainTask[id] = (trainTask[id] or 0) + (param2 or 0)
+							-- end
 						end
 					end
 				end
 		end
 		self:updateProperty({field = "trainTask", value = trainTask, notNotify = notNotify})
 	end
-
 end
 
 return RoleTask
--
libgit2 0.21.2