Merge branch 'cn/develop' of 120.26.43.151:wasteland/server into cn/develop

liuzujun
2 parents 74bb1229 923a626e
Showing 2 changed files with 15 additions and 1 deletions Show diff stats
src/models/RolePlugin.lua
src/models/RoleTask.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
@@ -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")}},
 	}
 }