From 923a626e679f6e12398144b320c0107a48e53ff2 Mon Sep 17 00:00:00 2001
From: zqj <582132116@qq.com>
Date: Wed, 11 Aug 2021 15:14:10 +0800
Subject: [PATCH] feat: 远征， 增加消耗虹光玉的任务， 任务类型是43

---
 src/models/RolePlugin.lua | 14 +++++++++++++-
 src/models/RoleTask.lua   |  2 ++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index 6bd754b..3e65dbc 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -426,8 +426,15 @@ function RolePlugin.bind(Role)
 				return
 			end
 		end
+
+		if itemCountT[ItemId.Jade] then --扣除
+			pms.itemId = ItemId.Jade
+			pms.count = - itemCountT[ItemId.Jade]
+			self:costJade(pms)
+		end
+
 		for itemId, count in pairs(itemCountT) do
-			if itemId ~= ItemId.Diamond then
+			if itemId ~= ItemId.Diamond and itemId ~= ItemId.Jade then
 				pms.itemId = itemId
 				pms.count = - count
 				self:addItem(pms)
@@ -566,6 +573,11 @@ function RolePlugin.bind(Role)
 		return true
 	end
 
+	function Role:costJade(param)
+        self:addItem(param)
+		self:checkTaskEnter("CostJade", {count = - param.count})
+	end
+
 	function Role:increBy(field, val)
 		local roleIncre = self:getProperty("roleIncre")
 		local curId = roleIncre[field] or 0
diff --git a/src/models/RoleTask.lua b/src/models/RoleTask.lua
index 0e3ff54..245623c 100644
--- a/src/models/RoleTask.lua
+++ b/src/models/RoleTask.lua
@@ -112,6 +112,7 @@ local TaskType = {
 	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
 	Appoint = 912, 				-- 触发限时礼包，指定id
 	Rename = 913,				-- 重命名
+    CostJade = 914, 			-- 消耗虹光玉
 
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -318,6 +319,7 @@ local CalendaTaskListener = {
 		[TaskType.AdvKill] = {{39, 1, f("chapterId")}},
 		[TaskType.ActBattlePass] = {{40, 3, f("chapterId")}},
 		[TaskType.AdvPass] = {{41, 3, f("id")}},
+		[TaskType.CostJade] = {{43, 1, f("count")}},
 	}
 }
 
--
libgit2 0.21.2