Merge branch 'cn/develop' into cn/publish/zhaolu

liuzujun
2 parents d02210ec a5b00e35
Showing 14 changed files with 820 additions and 339 deletions Show diff stats
src/ProtocolCode.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/csvdata
src/models/Daily.lua
src/models/DailyPlugin.lua
src/models/Hero.lua
src/models/Role.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -67,6 +67,8 @@ actionCodes = {
 	Role_itemConvertDevilTicketRpc = 148, -- 兑换魔鬼训练营门票
 	Role_unRegisterRpc = 149, --注销账号
 	Role_searchAllRoleRpc = 150, --查询所有服的角色信息
+	Role_takeTreasureRpc = 151, --抓取额外宝藏
+	Role_treasureMapRpc = 152, --兑换宝藏图
 	Adv_startAdvRpc = 151,
 	Adv_startHangRpc = 152,
@@ -121,6 +123,10 @@ actionCodes = {
 	Hero_changeSparkRpc = 227,
 	Hero_saveGeniusTreeRpc = 228,
 	Hero_stickersConvertRpc = 229, --兑换英雄贴纸
+	Hero_trainStartRpc = 230,	--开始魔鬼训练
+	Hero_trainFinishRpc = 231,
+	Hero_trainTaskRewardRpc = 232,	--领取魔鬼训练营任务
+	Hero_trainQuickRpc = 233,	--魔鬼训练营加速
 	Hang_startRpc = 251,
 	Hang_checkRpc = 252,
@@ -692,19 +692,36 @@ function _M.test(role, pms)
 	if id > 100 then
 		actid = tonum(pms.pm2, 0)
 	end
-	--local hero = require ("actions.HeroAction")
-	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
+	--if id == 1 then
+	--	local hero = require ("actions.HeroAction")
+	--	local ret = hero.trainStartRpc({role = role}, MsgPack.pack({id = 1}))
+	--	if ret ~= true then
+	--		return ret
+	--	end
+	--elseif id == 2 then
+	--	local hero = require ("actions.HeroAction")
+	--	local ret = hero.trainFinishRpc({role = role}, MsgPack.pack({id = 1}))
+	--	if ret ~= true then
+	--		return ret
+	--	end
+	--elseif id == 3 then
+	--	local hero = require ("actions.HeroAction")
+	--	local ret = hero.trainQuickRpc({role = role}, MsgPack.pack({id = 1}))
+	--	if ret ~= true then
+	--		return ret
+	--	end
+	--end
 	--role:sendMail(13, nil, "1=2", {111})
-	local file = io.open("draw_hero_"..id..".csv", "a")
-	for i=1, 10000 do
-		local heroIds = _M.drawHero(role, id, actid)
-		for k, v in ipairs(heroIds) do
-			print((i - 1)* 10 + k, v)
-			file:write(v.."\n")
-		end
-	end
-	io.close(file)
+	--local file = io.open("draw_hero_"..id..".csv", "a")
+	--for i=1, 10000 do
+	--	local heroIds = _M.drawHero(role, id, actid)
+	--	for k, v in ipairs(heroIds) do
+	--		print((i - 1)* 10 + k, v)
+	--		file:write(v.."\n")
+	--	end
+	--end
+	--io.close(file)
 	return "成功"
 end
@@ -1012,7 +1029,7 @@ function _M.treasure(role, pms)
 		dump(treasureList)
 		return "宝藏图鉴"
 	elseif pm1 == "FLUSH" then
-		local treasureList= role.dailyData:getTreasrueList(role)
+		local treasureList= role.dailyData:getTreasureList(role)
 		dump(treasureList)
 		return "宝藏图鉴"	
 	elseif pm1 == "CHECK" then
@@ -1175,5 +1192,40 @@ function _M.draw_code(role, pms)
 	return ret
 end
+table.insert(helpDes, {"抓取额外宝藏", "treasure_extra"})
+function _M.treasure_extra(role, pms)
+	local extraCount = role.dailyData:getProperty("treasureExtraCount") --每日发现额外宝藏使用次数(累计)，隔天清零
+	local mapCount = role.dailyData:getProperty("treasureMapCount")
+	local baseExtra = role.dailyData:getProperty("treasureBaseExtra")
+
+	if extraCount >= globalCsv.idle_treasure_extra_limie then return 1 end
+	if mapCount <= 0 then return 2 end
+
+	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
+
+	local tmpTreasure, treasureListExtra = role.dailyData:getTreasureExtra(baseExtra)
+
+	dump(tmpTreasure)
+	dump(treasureListExtra)
+	if not tmpTreasure then return 3 end
+
+	role.dailyData:updateProperty({field = "treasureExtraCount", delta = 1})
+	role.dailyData:updateProperty({field = "treasureBaseExtra", value = mapCount - 1})
+	role.dailyData:updateProperty({field = "treasureBaseExtra", value = baseExtra})
+
+    return "成功"
+end
+
+table.insert(helpDes, {"兑换宝藏图", "treasure_map"})
+function _M.treasure_map(role, pms)
+	local count = tonumber(pms.pm1 or 1)
+	local cost ={[ItemId.Jade] = globalCsv.idle_treasure_buy * count}
+	if not role:checkItemEnough(cost) then return -1 end
+	if not role:costItems(cost,  {log = {desc = "treasureMap", int1 = count}}) then return -2 end
+	role.dailyData:updateProperty({field = "treasureMapCount", delta = 1*count})
+
+	local treasureMapCount = role.dailyData:getProperty("treasureMapCount")
+	return treasureMapCount
+end
 return _M
 \ No newline at end of file
@@ -125,10 +125,18 @@ local function checkReward(role, isTreasure, carbonId)
 		randomItem()
 	end
-	--挂机得到的宝藏加入到挂机奖励
-	if isTreasure or false == true then
-		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId) or {}
-		for _, val in pairs(treasureList) do
+	--挂机得到的宝藏加入到挂机奖励 + 额外宝藏奖励
+	if isTreasure then
+		local treasureList= role.dailyData:checkTreasureList(carbonId or hangInfo.carbonId)
+		for _, val in pairs(treasureList or {}) do
+			local award  = val.award:toNumMap()
+			for k,v in pairs(award) do
+				items[k] = (items[k] or 0) + v
+			end
+		end
+
+		treasureList = role.dailyData:checkTreasureListExtra(carbonId or hangInfo.carbonId)
+		for _, val in pairs(treasureList or {}) do
 			local award  = val.award:toNumMap()
 			for k,v in pairs(award) do
 				items[k] = (items[k] or 0) + v
@@ -339,7 +347,7 @@ function _M.endBattleRpc(agent, data)
 	--刷新宝藏图鉴
 	if isWin and globalCsv.idle_treasure_point and globalCsv.idle_treasure_point == carbonId then
-		role.dailyData:getTreasrueList()
+		role.dailyData:getTreasureList()
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
@@ -513,8 +521,17 @@ function _M.quickRpc(agent , data)
 	end
 	--宝藏加速
-	local treasureList = role.dailyData:quickTreasureList(hangInfo.carbonId, time) or {}
-	for id, val in pairs(treasureList) do
+	local treasureList = role.dailyData:quickTreasureList(hangInfo.carbonId, time)
+	for _, val in pairs(treasureList or {}) do
+		local award  = val.award:toNumMap()
+		for k,v in pairs(award) do
+			reward[k] = (reward[k] or 0) + v
+		end
+	end
+
+	--额外宝藏加速
+	treasureList = role.dailyData:quickTreasureListExtra(hangInfo.carbonId, time)
+	for _, val in pairs(treasureList or {}) do
 		local award  = val.award:toNumMap()
 		for k,v in pairs(award) do
 			reward[k] = (reward[k] or 0) + v
@@ -117,6 +117,8 @@ function _M.wakeRpc(agent, data)
 	local hero = role.heros[msg.id]
 	if not hero then return 1 end
 	if hero:getProperty("wakeL") >= #csvdb["unit_wakeCsv"] then return 2 end
+	if hero:getProperty("trainTs") ~= 0 then return 9 end
+
 	local typ = hero:getProperty("type")
 	local wakeData = csvdb["unit_wakeCsv"][hero:getProperty("wakeL")]
 	if not wakeData then return 3 end
@@ -180,6 +182,8 @@ function _M.wakeRpc(agent, data)
 	role:checkTaskEnter("HeroStarCollect", {})
 	role:checkTaskEnter("HeroStartSum", {})
+	role:checkTaskEnter("SSRHeroStarSum", {})
+	role:checkTaskEnter("SRHeroStarSum", {})
 	return true
 end
@@ -1435,4 +1439,166 @@ function _M.stickersConvertRpc(agent, data)
     return true
 end
+function _M.trainStartRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local hero = role.heros[msg.id]
+	if not hero then return 1 end
+	local rare = hero:getRare()
+	if rare ~= HeroQuality.SSR and rare ~= HeroQuality.SR then return 2 end
+	local trainTimeCfg = (rare == HeroQuality.SSR and globalCsv.training_camp_ssr or globalCsv.training_camp_sr)
+	local trainCostCfg = (rare == HeroQuality.SSR and globalCsv.training_camp_ssr_cost or globalCsv.training_camp_sr_cost)
+	dump(trainTimeCfg)
+	dump(trainCostCfg)
+
+	local curLevel = hero:getProperty("wakeL")
+	local trainTs = hero:getProperty("trainTs")
+	local sparkInfo = hero:getProperty("spark")
+	print(msg.id, rare, curLevel)
+	if trainTs ~= 0 then return 3 end
+
+	local sec = trainTimeCfg[curLevel] or 0
+	if sec == 0 then return 4 end
+
+	if not trainCostCfg[curLevel] then return 10 end
+
+	local costs = trainCostCfg[curLevel]:toNumMap()
+
+	if not role:checkItemEnough(costs) then return 5 end
+
+	-- 大于等于7的时候需要装备火花才能升
+	if curLevel >= 7 then
+		if #sparkInfo == 0 then
+			return 6
+		end
+		local ok = false
+		for _, info in ipairs(sparkInfo) do
+			local cfg = csvdb["sparkCsv"][info.cfg_id][info.level or 0]
+			if not cfg then return 7 end
+			if cfg.star == curLevel then
+				ok = true
+				break
+			end
+		end
+		if not ok then return 8 end
+	end
+
+	if not role:costItems(costs, {log = {desc = "trainHero", int1 = hero:getProperty("type")}}) then return 9 end
+
+	hero:updateProperty({field="trainTs", value = skynet.timex() + sec})
+
+	hero:mylog({desc = "trainHeroStart", int1 = hero:getProperty("type"), int2 = curLevel})
+
+	SendPacket(actionCodes.Hero_trainStartRpc, '')
+
+	return true
+end
+
+function _M.trainQuickRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local hero = role.heros[msg.id]
+	if not hero then return 1 end
+	local trainTs = hero:getProperty("trainTs")
+	if trainTs == 0 then return 2 end
+	local timeNow = skynet.timex()
+	if timeNow >= trainTs then return 3 end
+
+	local h = math.ceil((trainTs - timeNow)/3600)
+
+	local cost = {[ItemId.Jade] = h * (globalCsv.training_camp_quick or 60)}
+	if not role:checkItemEnough(cost) then return 4 end
+
+	if not role:costItems(cost, {log = {desc = "trainQuickHero", int1 = hero:getProperty("type")}}) then return 9 end
+
+	hero:updateProperty({field="trainTs", value = skynet.timex()})
+
+	hero:mylog({desc = "trainQuick", int1 = hero:getProperty("type")})
+
+	SendPacket(actionCodes.Hero_trainQuickRpc, '')
+
+	return true
+end
+
+
+function _M.trainFinishRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local hero = role.heros[msg.id]
+	if not hero then return 1 end
+
+	local curLevel = hero:getProperty("wakeL")
+	local trainTs = hero:getProperty("trainTs")
+	local typ = hero:getProperty("type")
+	if trainTs == 0 then return 2 end
+	if skynet.timex() < trainTs then return 3 end
+
+	hero:updateProperty({field = "wakeL", delta = 1})
+	hero:updateProperty({field = "trainTs", value = 0})
+
+	curLevel = curLevel + 1
+	role:checkTaskEnter("Wake", {heroType = typ, wakeL = curLevel})
+	if curLevel == 3 then -- 解锁cg
+		role:checkTaskEnter("WakeCG", {heroType = typ})
+		role:checkTaskEnter("WakeCGSum", {count = 1})
+	end
+
+	if curLevel >= 4 then --自动觉醒技能
+		local new = hero:increGeniusTree()
+		hero:updateProperty({field = "genius", value = new})
+	end
+	hero:mylog({desc = "trainFinish", int1 = hero:getProperty("type")})
+
+	SendPacket(actionCodes.Hero_trainFinishRpc, '')
+
+	role:checkTaskEnter("HeroStarCollect", {})
+	role:checkTaskEnter("HeroStartSum", {})
+	role:checkTaskEnter("SSRHeroStarSum", {})
+	role:checkTaskEnter("SRHeroStarSum", {})
+
+	return true
+end
+
+function _M.trainTaskRewardRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local taskId = msg.id
+	local trainTask = role:getProperty("trainTask") or {}
+	local record = trainTask["r"] or {}
+	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
+
+	--只有类型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})
+
+	local reward, change = role:award(taskCfg.reward, {log = {desc = "trainTask"}})
+
+	SendPacket(actionCodes.Hero_trainTaskRewardRpc, MsgPack.pack(role:packReward(reward, change)))
+
+	return true
+end
+
 return _M
@@ -185,6 +185,7 @@ function _M.loginRpc( agent, data )
 		role.activity:checkActivityStatus(now, false, false)
 		role:log("onLogin")
 	end
+	role:checkTaskEnter("LoginAddUp", {})
 	redisproxy:zadd(FRIEND_RECOMMEND, now, roleId)
@@ -357,6 +358,14 @@ function _M.loginRpc( agent, data )
 		end
 	end
+	local hangPass = role:getProperty("hangPass")
+	for _, carbonId in pairs(hangPass) do
+		role:checkTaskEnter("HangPass", {id = carbonId})
+	end
+
+	role:checkTaskEnter("SSRHeroStarSum", {})
+	role:checkTaskEnter("SRHeroStarSum", {})
+
 	return true
 end
@@ -1900,4 +1909,40 @@ function _M.itemConvertDevilTicketRpc(agent, data)
 	return true
 end
+function _M.takeTreasureRpc(agent, data)
+	local role = agent.role
+	local extraCount = role.dailyData:getProperty("treasureExtraCount") --每日发现额外宝藏使用次数(累计)，隔天清零
+	local mapCount = role.dailyData:getProperty("treasureMapCount")
+	local baseExtra = role.dailyData:getProperty("treasureBaseExtra")
+
+	if extraCount >= globalCsv.idle_treasure_extra_limie then return 1 end
+	if mapCount <= 0 then return 2 end
+
+	baseExtra =  baseExtra + globalCsv.idle_treasure_base_extra
+
+	local tmpTreasure, treasureListExtra = role.dailyData:getTreasureExtra(baseExtra)
+    if not tmpTreasure then return 3 end
+
+	role.dailyData:updateProperty({field = "treasureExtraCount", delta = 1})
+	role.dailyData:updateProperty({field = "treasureBaseExtra", value = mapCount - 1})
+	role.dailyData:updateProperty({field = "treasureBaseExtra", value = baseExtra})
+
+	SendPacket(actionCodes.Role_takeTreasureRpc, MsgPack.pack({treasureListExtra = treasureListExtra, treasure = tmpTreasure}))
+	return true
+end
+
+function _M.treasureMapRpc(agent,data)
+    local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local count = msg.count or 1
+	local cost ={[ItemId.Jade] = globalCsv.idle_treasure_buy * count}
+	if not role:checkItemEnough(cost) then return 1 end
+    if not role:costItems(cost,  {log = {desc = "treasureMap", int1 = count}}) then return 2 end
+	role.dailyData:updateProperty({field = "treasureMapCount", delta = 1*count})
+
+	local treasureMapCount = role.dailyData:getProperty("treasureMapCount")
+	SendPacket(actionCodes.Role_treasureMapRpc, MsgPack.pack({mapCount = treasureMapCount}))
+	return true
+end
+
 return _M
 \ No newline at end of file
-Subproject commit 6883d567759b8f50bf1bace2d7e53e658083fa75
+Subproject commit 007bdd1f580a9f31e64e55ac6e1cb72387ed3698
 -- 日常数据
 local Daily = class("Daily", require("shared.ModelBaseMysql"))
-
-oneDay = 60*60*24
+local DailyPlugin = import(".DailyPlugin")  --宝藏相关
+DailyPlugin.bind(Daily)
 function Daily:ctor(properties)
 	Daily.super.ctor(self, properties)
@@ -37,6 +37,11 @@ Daily.schema = {
 	treasureBase	= {"number", 0}, 		-- 资源值
 	treasureList 	= {"table", {}}, 		--挂机图鉴
+	treasureListExtra 	= {"table", {}}, 	--额外宝藏，挂机图鉴扩展功能
+	treasureMapCount = {"number", 0}, 		--宝藏图，消耗一张宝藏图可以发现一次额外宝藏
+	treasureExtraCount = {"number", 0}, 	--每日发现额外宝藏使用次数(累计)，隔天清零
+	treasureBaseExtra = {"number", 0}, 		--额外宝藏资源值
+
 	chatTimes 		= {"number", 0},		--每日发言次数
 }
@@ -73,7 +78,9 @@ function Daily:refreshDailyData(notify)
 		elseif field == "treasureBase" then
 			dataMap[field] = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
 		elseif field == "treasureList" then
-			dataMap[field] = self:getTreasrueList()
+			dataMap[field] = self:getTreasureList()
+		elseif field == "treasureExtraCount" then
+			dataMap[field] = 0
 		elseif field == "pvpBought" then
 			dataMap[field] = 0
 		elseif field ~= "key" then
@@ -101,300 +108,6 @@ function Daily:refreshDailyData(notify)
 	end
 end
---解锁
-function Daily:checkUnlock(treaval)
-	local role = self.owner
-	local treasureC = treaval.unlock:toArray(true, "=")
-	local show = false
-	if treasureC[1] == 1 then --通关关卡
-		show = self.owner:checkHangPass(treasureC[2])
-	elseif treasureC[1] == 2 then --通关拾荒章节=x层
-		show = role:checkAdvChapterPass(treasureC[2])
-	elseif treasureC[1] == 3 then --拥有指定id的角色时
-		local hero = role:getHeroByID(treasureC[2])
-		if hero then show = true end
-	else
-		show = true
-    end
-	return show
-end
-
---CD
-function Daily:checkTreasureExpired(treasureAttr, treasureList)
-	local curInfo = treasureList[treasureAttr.id]
-	if curInfo then
-		-- check finish
-		if curInfo["expire_time"] then
-			if curInfo.cool_time > 1 then
-				if skynet.timex() >= curInfo["expire_time"] then
-					treasureList[treasureAttr.id] = nil
-					curInfo = clone(treasureAttr)
-				elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
-					curInfo = nil
-				else
-					curInfo = clone(treasureAttr)
-				end
-			else
-				if skynet.timex() >= curInfo["expire_time"] then
-					treasureList[treasureAttr.id] = nil
-				end
-				curInfo = clone(treasureAttr)
-			end
-		end
-	else
-		curInfo = clone(treasureAttr)
-	end
-
-	return curInfo
-end
-
---资源
-function Daily:checkTreasureBase(treasureList, treasureBase, removeId)
-	local tmptreasure = {}
-	local num = 0
-	for k, val in pairs(treasureList) do
-		if removeId and val.id == removeId then
-			treasureList[k] = nil
-		else
-			if treasureBase >= val.treasure_value then
-				treasureBase = treasureBase - val.treasure_value
-				tmptreasure[val.id] = val
-				num = num + 1
-			end
-		end
-
-	end
-	return tmptreasure, num
-end
-
---绑定通关关卡
-function Daily:checkChapters()
-	local  chapters = {}
-	local tmp_chapters = {}
-	local treasureList = self:getProperty("treasureList")
-	if next(treasureList) then
-		for _, curInfo in pairs(treasureList) do
-			if curInfo["expire_time"] or not curInfo["end_time"] then
-				tmp_chapters[curInfo.chapter_id] = curInfo
-			end
-		end
-	end
-	local hangInfo = self.owner:getProperty("hangInfo") or {}
-	for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
-		if chapter_id ~= hangInfo.carbonId then
-			if self.owner:checkHangPass(chapter_id) then
-				if next(tmp_chapters) and not tmp_chapters[chapter_id] then
-					chapters[chapter_id] = val
-				else
-					chapters[chapter_id] = val
-				end
-			end
-		end
-
-	end
-	return chapters
-end
-
---权重
-function Daily:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
-	local removeId
-	local chapters = self:checkChapters()
-	local treasure
-	if next(chapters) == nil then return end
-
-    --扣除在挖宝列表里未过期宝藏的资源值
-	for _, val in pairs(treasureList) do
-		if not val["expire_time"] then
-			treasureBase = treasureBase - val["treasure_value"]
-		end
-	end
-
-	while next(tmptreasure) do
-		local tmp, num = self:checkTreasureBase(tmptreasure, treasureBase, removeId)
-
-		if num == 0 then
-			break
-		elseif num == 1 then
-			for _, val in pairs(tmp) do
-				treasure = val
-			end
-		else
-			local id = math.randWeight(tmp, "weight") --宝藏id
-			if not id then
-				break
-			end
-			treasure = tmp[id]
-		end
-	
-		if treasureBase >= treasure.treasure_value  then
-			--扣除资源值
-			treasureBase =  treasureBase - treasure.treasure_value
-		else
-			break
-		end
-		local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
-		if not chapterId then
-			break
-		end
-
-		treasure.chapter_id = chapterId
-		treasureList[treasure.id] = treasure
-		removeId = treasure.id
-	end
-end
-
---chapterId
-function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId)
-	local treasure = nil
-
-	if not curInfo then
-		return treasure
-	end
-	local treasureBase = self:getProperty("treasureBase")
-
-	--开始挖宝关卡ID=挂机关卡ID
-	if chapterId == curInfo.chapter_id then
-		--开始挖宝
-		if not curInfo["end_time"] then
-			curInfo["end_time"] = skynet.timex() + curInfo.working_time
-		else
-			if skynet.timex() >= curInfo["end_time"] then
-				if curInfo.cool_time > 1 then
-					--宝藏冷却时间
-					if not curInfo["expire_time"] then
-						if treasureBase >= curInfo["treasure_value"] then
-							treasureBase = treasureBase - curInfo["treasure_value"]
-
-							treasure = treasureList[curInfo.id]
-							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
-						end
-					else
-						--已经领取宝藏 检索宝藏冷却时间
-						if skynet.timex() >= curInfo["expire_time"] then
-							treasureList[curInfo.id] = nil
-						end
-					end
-				else
-					if treasureBase >= curInfo["treasure_value"] then
-						treasureBase = treasureBase - curInfo["treasure_value"]
-
-						treasure = treasureList[curInfo.id]
-						treasureList[curInfo.id] = nil
-					end
-				end
-			end
-		end
-	else
-		--已经开始挖宝
-		if curInfo["end_time"] then
-			if skynet.timex() >= curInfo["end_time"] then
-				if curInfo.cool_time > 1 then
-					--宝藏冷却时间
-					if not curInfo["expire_time"] then
-						if treasureBase >= curInfo["treasure_value"] then
-							treasureBase = treasureBase - curInfo["treasure_value"]
-
-							treasure = treasureList[curInfo.id]
-							curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
-						end
-						
-					else
-						--已经领取宝藏 检索宝藏冷却时间
-						if skynet.timex() >= curInfo["expire_time"] then
-							treasureList[curInfo.id] = nil
-						end
-					end
-				else
-					if treasureBase >= curInfo["treasure_value"] then
-						treasureBase = treasureBase - curInfo["treasure_value"]
-
-						treasure = treasureList[curInfo.id]
-						treasureList[curInfo.id] = nil
-					end
-				end
-			else
-				curInfo["end_time"]	= nil
-			end
-		end
-	end
-	return treasure
-end
-
-function Daily:buyTreasure(treasureList)
-	local boughtTreasurer = {}
-	local treasureBase = self:getProperty("treasureBase")
-	for id, val in pairs(treasureList) do
-		if treasureBase >= val.treasure_value then
-			boughtTreasurer[id] = val
-			treasureBase = treasureBase - val.treasure_value
-		end
-	end
-	self:updateProperty({field = "treasureBase", value = treasureBase})
-	return boughtTreasurer
-end
-
---重置宝藏图鉴
-function Daily:resetTreasureList()
-	self:updateProperty({field = "treasureList", value = {}})
-end
-
---宝藏图鉴
-function Daily:getTreasrueList()
-	local tmpcsv = csvdb["idle_treasureCsv"]
-	local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
-	local tmptreasure = {}
-	local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
-	for id, val in pairs(tmpcsv) do
-		if self:checkUnlock(val) == true then
-			local treasure = self:checkTreasureExpired(val, treasureList)
-			if treasure then
-				table.insert(tmptreasure, treasure)
-			end
-		end
-	end
-	table.sort(tmptreasure, function (a,b) return a.treasure_value > b.treasure_value end)
-
-	self:checkTreasureWeight(treasureList, tmptreasure, treasureBase)
-	self:updateProperty({field = "treasureList", value = treasureList})
-	self:updateProperty({field = "treasureBase", value = treasureBase})
-	return treasureList
-end
-
-
---检索挖宝列表
-function Daily:checkTreasureList(chapterId)
-	local treasureList = self:getProperty("treasureList") or {}
-	local tmptreasure = {}
-	for id, val in pairs(treasureList) do
-		local treasure = self:checkTreasureChapterId(val, treasureList, chapterId)
-		if treasure ~= nil then
-			tmptreasure[id] = treasure
-		end
-	end
-
-	if next(tmptreasure) == nil then
-		self:updateProperty({field = "treasureList", value = treasureList})
-		return nil
-	end
-	local boughtTreasurer = self:buyTreasure(tmptreasure)
-	self:updateProperty({field = "treasureList", value = treasureList})
-	return boughtTreasurer
-end
-
---宝藏加速
-function Daily:quickTreasureList(chapterId, time)
-	local treasureList = self:getProperty("treasureList") or {}
-	if next(treasureList) then
-		for id, val in pairs(treasureList) do
-			if val["end_time"] and val["chapter_id"] and chapterId == val["chapter_id"] then
-				val["end_time"] = val["end_time"] - time
-			end
-		end
-	end
-	self:updateProperty({field = "treasureList", value = treasureList})
-	return self:checkTreasureList(chapterId)
-end
-
 function Daily:data()
 	return {
 		hangQC = self:getProperty("hangQC"),
@@ -417,6 +130,10 @@ function Daily:data()
 		curPool = self:getProperty("curPool"),
 		treasureBase = self:getProperty("treasureBase"),
 		treasureList = self:getProperty("treasureList"),
+		treasureListExtra = self:getProperty("treasureListExtra"),
+		treasureMapCount = self:getProperty("treasureMapCount"),
+		treasureExtraCount = self:getProperty("treasureExtraCount"),
+		treasureBaseExtra = self:getProperty("treasureBaseExtra"),
 		chatTimes = self:getProperty("chatTimes"),
 	}
 end
@@ -0,0 +1,402 @@
+
+local DailyPlugin = {}
+oneDay = 60*60*24
+function DailyPlugin.bind(Daily)
+    --解锁
+    function Daily:checkUnlock(treaval)
+        local role = self.owner
+        local treasureC = treaval.unlock:toArray(true, "=")
+        if treasureC[1] == 1 then --通关关卡
+            return self.owner:checkHangPass(treasureC[2])
+        elseif treasureC[1] == 2 then --通关拾荒章节=x层
+            return role:checkAdvChapterPass(treasureC[2])
+        elseif treasureC[1] == 3 then --拥有指定id的角色时
+            local hero = role:getHeroByID(treasureC[2])
+            if hero then return true end
+        else
+            return true
+        end
+        return  false
+    end
+
+    --CD
+    function Daily:checkTreasureExpired(treasureAttr, treasureList)
+        local curInfo = treasureList[treasureAttr.id]
+        if curInfo then
+            -- check finish
+            if curInfo["expire_time"] then
+                if curInfo.cool_time > 1 then
+                    if skynet.timex() >= curInfo["expire_time"] then
+                        treasureList[treasureAttr.id] = nil
+                        curInfo = clone(treasureAttr)
+                    elseif skynet.timex() >= curInfo["expire_time"] -  curInfo.cool_time * oneDay then --未冷却
+                        curInfo = nil
+                    else
+                        curInfo = clone(treasureAttr)
+                    end
+                else
+                    if skynet.timex() >= curInfo["expire_time"] then
+                        treasureList[treasureAttr.id] = nil
+                    end
+                    curInfo = clone(treasureAttr)
+                end
+            end
+        else
+            curInfo = clone(treasureAttr)
+        end
+
+        return curInfo
+    end
+
+    --绑定通关关卡
+    function Daily:checkChapters(treasureList, treasureListOther)
+        local chapters = {}
+        local tmp_chapters = {}
+
+        for _, curInfo in pairs(treasureList or {}) do
+            if curInfo["expire_time"] or not curInfo["end_time"] then
+                tmp_chapters[curInfo.chapter_id] = curInfo
+            end
+        end
+
+        for _, curInfo in pairs(treasureListOther or {}) do
+            if curInfo["expire_time"] or not curInfo["end_time"] then
+                tmp_chapters[curInfo.chapter_id] = curInfo
+            end
+        end
+
+        local hangInfo = self.owner:getProperty("hangInfo") or {}
+        for chapter_id, val in pairs(csvdb["idle_battleCsv"]) do
+            if chapter_id ~= hangInfo.carbonId then
+                if self.owner:checkHangPass(chapter_id) then
+                    if next(tmp_chapters) and not tmp_chapters[chapter_id] then
+                        chapters[chapter_id] = val
+                    else
+                        chapters[chapter_id] = val
+                    end
+                end
+            end
+
+        end
+        return chapters
+    end
+
+    --权重
+    function Daily:checkTreasureWeight(treasureList, tmpTreasure, treasureBase, treasureListOther)
+        local chapters = self:checkChapters(treasureList, treasureListOther)
+        if not chapters or not next(chapters) then return end
+
+        --扣除在挖宝列表里未过期宝藏的资源值
+        for _, val in pairs(treasureList) do
+            if not val["expire_time"] then
+                treasureBase = treasureBase - val["treasure_value"]
+            end
+        end
+
+        if tmpTreasure and next(tmpTreasure) then
+            table.sort(tmpTreasure, function (a, b) return a.treasure_value > b.treasure_value end)
+        end
+
+        local treasure
+        while next(tmpTreasure or {}) do
+            local tmp = {}
+            local tmpBase = treasureBase
+            for _, val in pairs(tmpTreasure) do
+                if tmpBase >= val.treasure_value then
+                    tmpBase = tmpBase - val.treasure_value
+                    tmp[val.id] = val
+                end
+            end
+            if not next(tmp) then break end
+
+            local id = math.randWeight(tmp, "weight") --宝藏id
+            if not id then break end
+
+            treasure = tmp[id]
+            if treasureBase < treasure.treasure_value  then break end
+            --扣除资源值
+            treasureBase = treasureBase - treasure.treasure_value
+
+            local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
+            if not chapterId then break end
+
+            treasure.chapter_id = chapterId
+            treasureList[treasure.id] = treasure
+
+            tmpTreasure[treasure.id] = nil
+            chapters[chapterId] = nil
+        end
+    end
+
+    --只抓一个 额外宝藏
+    function Daily:getOneTreasureExtra(treasureList, tmpTreasure, treasureBase, treasureListOther)
+        local chapters = self:checkChapters(treasureList, treasureListOther)
+        if not chapters or not next(chapters) then return end
+
+        --扣除在挖宝列表里未过期宝藏的资源值
+        for _, val in pairs(treasureList) do
+            if not val["expire_time"] then
+                treasureBase = treasureBase - val["treasure_value"]
+            end
+        end
+
+        if tmpTreasure and next(tmpTreasure) then
+            table.sort(tmpTreasure, function (a, b) return a.treasure_value > b.treasure_value end)
+        end
+
+        local treasure
+        local tmp = {}
+        local tmpBase = treasureBase
+        for _, val in pairs(tmpTreasure) do
+            if tmpBase >= val.treasure_value then
+                tmpBase = tmpBase - val.treasure_value
+                tmp[val.id] = val
+            end
+        end
+        if not next(tmp) then  return end
+
+        local id = math.randWeight(tmp, "weight") --宝藏id
+        if not id then return end
+
+        treasure = tmp[id]
+        if treasureBase < treasure.treasure_value  then return end
+        --扣除资源值
+        treasureBase =  treasureBase - treasure.treasure_value
+
+        local chapterId = math.randWeight(chapters, "treasure_weight") --关卡id
+        if not chapterId then return end
+
+
+        treasure.chapter_id = chapterId
+        treasureList[treasure.id] = treasure
+
+        return treasure
+    end
+
+    --chapterId
+    function Daily:checkTreasureChapterId(curInfo, treasureList, chapterId, treasureBase)
+        if not curInfo then return nil end
+
+        local treasure = nil
+        --开始挖宝关卡ID=挂机关卡ID
+        if chapterId == curInfo.chapter_id then
+            --开始挖宝
+            if not curInfo["end_time"] then
+                curInfo["end_time"] = skynet.timex() + curInfo.working_time
+            else
+                if skynet.timex() >= curInfo["end_time"] then
+                    if curInfo.cool_time > 1 then
+                        --宝藏冷却时间
+                        if not curInfo["expire_time"] then
+                            if treasureBase >= curInfo["treasure_value"] then
+                                treasureBase = treasureBase - curInfo["treasure_value"]
+
+                                treasure = treasureList[curInfo.id]
+                                curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+                            end
+                        else
+                            --已经领取宝藏 检索宝藏冷却时间
+                            if skynet.timex() >= curInfo["expire_time"] then
+                                treasureList[curInfo.id] = nil
+                            end
+                        end
+                    else
+                        if treasureBase >= curInfo["treasure_value"] then
+                            treasureBase = treasureBase - curInfo["treasure_value"]
+
+                            treasure = treasureList[curInfo.id]
+                            treasureList[curInfo.id] = nil
+                        end
+                    end
+                end
+            end
+        else
+            --已经开始挖宝
+            if curInfo["end_time"] then
+                if skynet.timex() >= curInfo["end_time"] then
+                    if curInfo.cool_time > 1 then
+                        --宝藏冷却时间
+                        if not curInfo["expire_time"] then
+                            if treasureBase >= curInfo["treasure_value"] then
+                                treasureBase = treasureBase - curInfo["treasure_value"]
+
+                                treasure = treasureList[curInfo.id]
+                                curInfo["expire_time"] = skynet.timex() + curInfo.cool_time * oneDay
+                            end
+
+                        else
+                            --已经领取宝藏 检索宝藏冷却时间
+                            if skynet.timex() >= curInfo["expire_time"] then
+                                treasureList[curInfo.id] = nil
+                            end
+                        end
+                    else
+                        if treasureBase >= curInfo["treasure_value"] then
+                            treasureBase = treasureBase - curInfo["treasure_value"]
+
+                            treasure = treasureList[curInfo.id]
+                            treasureList[curInfo.id] = nil
+                        end
+                    end
+                else
+                    curInfo["end_time"]	= nil
+                end
+            end
+        end
+        return treasure
+    end
+
+    function Daily:buyTreasure(treasureList)
+        local boughtTreasure = {}
+        local treasureBase = self:getProperty("treasureBase")
+        for id, val in pairs(treasureList) do
+            if treasureBase >= val.treasure_value then
+                boughtTreasure[id] = val
+                treasureBase = treasureBase - val.treasure_value
+            end
+        end
+        self:updateProperty({field = "treasureBase", value = treasureBase})
+        return boughtTreasure
+    end
+
+    --重置宝藏图鉴
+    function Daily:resetTreasureList()
+        self:updateProperty({field = "treasureList", value = {}})
+        self:updateProperty({field = "treasureListExtra", value = {}})
+    end
+
+    --宝藏图鉴
+    function Daily:getTreasureList()
+        local tmpcsv = csvdb["idle_treasureCsv"]
+        local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
+        local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏列表 过期删除 领取奖励删除 跨天更新
+        local tmpTreasure = {}
+        local treasureBase = globalCsv.idle_treasure_base + self.owner:getBnousTreasureBaseMaximum()
+        for _, val in pairs(tmpcsv) do
+            if self:checkUnlock(val) == true then
+                local treasure = self:checkTreasureExpired(val, treasureList)
+                if treasure then
+                    table.insert(tmpTreasure, treasure)
+                end
+            end
+        end
+
+        if not next(tmpTreasure) then return treasureList end
+
+        self:checkTreasureWeight(treasureList, tmpTreasure, treasureBase, treasureListExtra)
+        self:updateProperty({field = "treasureList", value = treasureList})
+        self:updateProperty({field = "treasureBase", value = treasureBase})
+        return treasureList
+    end
+
+
+    --检索挖宝列表 获得宝藏
+    function Daily:checkTreasureList(chapterId)
+        local treasureList = self:getProperty("treasureList") or {}
+        local treasureBase = self:getProperty("treasureBase") or {}
+        local tmpTreasure = {}
+        for id, val in pairs(treasureList) do
+            local treasure = self:checkTreasureChapterId(val, treasureList, chapterId, treasureBase)
+            if treasure then
+                tmpTreasure[id] = treasure
+            end
+        end
+
+        if not next(tmpTreasure) then
+            self:updateProperty({field = "treasureList", value = treasureList})
+            return nil
+        end
+        local boughtTreasure = self:buyTreasure(tmpTreasure)
+        self:updateProperty({field = "treasureList", value = treasureList})
+        return boughtTreasure
+    end
+
+    --宝藏加速
+    function Daily:quickTreasureList(chapterId, time)
+        local treasureList = self:getProperty("treasureList") or {}
+        if next(treasureList) then
+            for _, val in pairs(treasureList) do
+                if val["end_time"] and val["chapter_id"] and chapterId == val["chapter_id"] then
+                    val["end_time"] = val["end_time"] - time
+                end
+            end
+        end
+        self:updateProperty({field = "treasureList", value = treasureList})
+        return self:checkTreasureList(chapterId)
+    end
+
+    --宝藏功能优化——增加"发现宝藏"功能
+    function Daily:buyTreasureExtra(treasureList)
+        local boughtTreasure = {}
+        local treasureBase = self:getProperty("treasureExtraBase")
+        for id, val in pairs(treasureList) do
+            if treasureBase >= val.treasure_value then
+                boughtTreasure[id] = val
+                treasureBase = treasureBase - val.treasure_value
+            end
+        end
+        self:updateProperty({field = "treasureExtraBase", value = treasureBase})
+        return boughtTreasure
+    end
+
+    function Daily:getTreasureExtra(tmpBaseExtra)
+        local tmpcsv = csvdb["idle_treasureCsv"]
+        local treasureList = self:getProperty("treasureList") or {} --挖宝列表 过期删除 领取奖励删除 跨天更新
+        local treasureListExtra = self:getProperty("treasureListExtra") or {} --额外宝藏 过期删除 领取奖励删除 跨天更新
+
+        local tmpTreasure = {}
+        for _, val in pairs(tmpcsv) do
+            if self:checkUnlock(val) then
+                local treasure = self:checkTreasureExpired(val, treasureListExtra)
+                if treasure then
+                    table.insert(tmpTreasure, treasure)
+                end
+            end
+        end
+        if not next(tmpTreasure) then return nil, treasureListExtra end
+
+        local tmp = self:getOneTreasureExtra(treasureListExtra, tmpTreasure, tmpBaseExtra, treasureList)
+        self:updateProperty({field = "treasureListExtra", value = treasureListExtra})
+        return tmp, treasureListExtra
+    end
+
+    --检索宝藏列表 获得额外宝藏
+    function Daily:checkTreasureListExtra(chapterId)
+        local treasureListExtra = self:getProperty("treasureListExtra") or {}
+        local treasureBaseExtra = self:getProperty("treasureBaseExtra") or {}
+        local tmpTreasure = {}
+        for id, val in pairs(treasureListExtra) do
+            local treasure = self:checkTreasureChapterId(val, treasureListExtra, chapterId, treasureBaseExtra)
+            if treasure then
+                tmpTreasure[id] = treasure
+            end
+        end
+
+        if next(tmpTreasure) then
+            self:updateProperty({field = "treasureListExtra", value = treasureListExtra})
+            return nil
+        end
+
+        local boughtTreasure = self:buyTreasureExtra(tmpTreasure)
+        self:updateProperty({field = "treasureListExtra", value = treasureListExtra})
+        return boughtTreasure
+    end
+
+    --额外宝藏加速
+    function Daily:quickTreasureListExtra(chapterId, time)
+        local treasureListExtra = self:getProperty("treasureListExtra") or {}
+        if next(treasureListExtra) then
+            for _, val in pairs(treasureListExtra) do
+                if val["end_time"] and val["chapter_id"] and chapterId == val["chapter_id"] then
+                    val["end_time"] = val["end_time"] - time
+                end
+            end
+        end
+
+        self:updateProperty({field = "treasureListExtra", value = treasureListExtra})
+        return self:checkTreasureListExtra(chapterId)
+    end
+end
+
+
+return DailyPlugin
 \ No newline at end of file
@@ -19,6 +19,7 @@ Hero.schema = {
 	faith	   = {"number", 0},			-- 信赖
 	spark		= {"table", {}},		-- 火花属性
 	genius	   = {"string", "" }, --天赋点 4=10201 5=10201 6=10203 7=10204
+	trainTs		= {"number", 0},	-- 魔鬼训练营截止时间 0为未训练
 }
 function Hero:ctor( properties )
@@ -113,6 +114,7 @@ function Hero:data()
 		faith = self:getProperty("faith"),
 		spark = self:getProperty("spark"),
 		genius = self:getProperty("genius"),
+		trainTs = self:getProperty("trainTs"),
 	}
 end
@@ -218,6 +218,7 @@ Role.schema = {
 	worldChangePoints   = {"table", {}}, 	-- 世界变动积分 {[1]= 转盘抽取次数, [2]= 获得的积分, [3]=魔导石消耗, [4]= 虹光玉消耗}
     worldLineReward 	= {"table", {}},    -- 世界积分 领取记录 {[id] = 1}
 	del   				= {"number", 0}, 	-- 标记删除 0=未删除，1=已删除
+	trainTask 			= {"table", {}},	-- 训练营任务
 }
@@ -463,6 +464,7 @@ function Role:data()
 		bgId	= self:getProperty("bgId"),
 		worldChangePoints = self:getProperty("worldChangePoints"),
 		worldLineReward = self:getProperty("worldLineReward"),
+		trainTask = self:getProperty("trainTask"),
 	}
 end
@@ -74,6 +74,9 @@ local ItemReason = {
 	regularWorldBossMilestone = 158,	-- 常规世界boss伤害里程碑
 	regularWorldBossBattle = 159, -- 常规世界boss战斗奖励
 	itemConvertDevilTicket = 160, -- 兑换魔鬼训练营门票
+	trainHero = 161, -- 魔鬼训练开始
+	trainQuickHero = 162, -- 魔鬼训练加速
+	treasureMap = 163, --虹光玉兑换宝藏图
@@ -185,6 +185,8 @@ function RolePlugin.bind(Role)
 				itemType = itemCfg.type
 			end
 			self:checkTaskEnter("AddItem", {id = itemId, count = count, type = itemType})
+		elseif count < 0 then
+			self:checkTaskEnter("CostItem", {id = itemId, count = count})
 		end
 		-- 对数量筛查
 		count = checkItemCount(self, itemId, count)
@@ -647,6 +649,8 @@ function RolePlugin.bind(Role)
 		self:checkTaskEnter("AddHero", {heroType = heroType, wakeL = newHero:getProperty("wakeL"), camp = unitData.camp, job = unitData.job, ssrCount = ssrCount}, params.notNotify)
 		self:checkTaskEnter("HeroQualityCollect", {})
 		self:checkTaskEnter("HeroStartSum", {})
+		self:checkTaskEnter("SSRHeroStarSum", {})
+		self:checkTaskEnter("SRHeroStarSum", {})
 		if not params.notNotify then
 			local heroResponse = {}
@@ -2315,6 +2319,18 @@ function RolePlugin.bind(Role)
 		-- 	end
 		-- end
+		--月卡-特刊加判断;
+		-- 问题描述: 支付回调里订单支付完成，但是没有奖励，对应的特刊也没有购买成功。
+		-- 避免这种情况发生，在生成订单的时候就判断是否能购买特刊，生成对应的订单id
+		if rechargeData.shop == 2 and rechargeData.type == CardType.SuperMonthCard then
+			local card = csvdb["shop_cardCsv"][rechargeData.id]
+			if not card then return "" end
+
+			if not self.storeData:buySMonthCardLimit(card["buyLimit"]) then
+				return ""
+			end
+		end
+
 		local orderId = redisproxy:hincrby("autoincrement_set", "order", 1)
 		local uid = orderId * MAX_SVR_ID + serverId
 		local partnerOrderId = string.format("%d", orderId * MAX_SVR_ID + serverId)
@@ -19,6 +19,8 @@ local TaskType = {
 	DrawHeroLimitPack = 14,		-- 抽卡限时礼貌		-- count
     HeroStartSum = 15, 			-- 英雄星级总数
 	WakeCGSum = 16, 			-- 累计解锁xx张CG
+    SSRHeroStarSum = 17, 			-- SSR英雄星级总数
+    SRHeroStarSum = 18, 			-- SR英雄星级总数
 	--装备相关
@@ -117,6 +119,8 @@ local TaskType = {
 	Rename = 913,				-- 重命名
     CostJade = 914, 			-- 消耗虹光玉
 	BuyLimitPack = 915, 		-- 购买指定id礼包触发
+	CostItem = 916,			-- 消耗道具
+	LoginAddUp = 917,			-- 累计登录
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -333,6 +337,7 @@ local CalendaTaskListener = {
 		[TaskType.CostJade] = {{43, 1, f("count")}},
 		[TaskType.HeroStartSum] = {{44, 3}},
 		[TaskType.WakeCGSum] = {{45, 1, f("count")}},
+		[TaskType.LoginAddUp] = {{46, 1}},
 	}
 }
@@ -351,6 +356,16 @@ local ReturnerTask = {
 	listen = CalendaTaskListener["listen"]
 }
+local TraningCampTask = {
+	func = "checkTraingCampTask",
+	listen = {
+		[TaskType.HangPass]= {{1, 3}},
+		[TaskType.SSRHeroStarSum] = {{2, 3}},
+		[TaskType.SRHeroStarSum] = {{3, 3}},
+		[TaskType.CostItem] = {{4, 3, f("id"), f("count")}},
+	}
+}
+
 local TaskListeners = {
 	StoryListener,
 	CommonListener,
@@ -362,6 +377,7 @@ local TaskListeners = {
 	BattleCommandTaskListener,
 	ReturnerTask,
 	NewUserTaskListener,
+	TraningCampTask,
 }
 local RoleTask = {}
@@ -900,6 +916,52 @@ function RoleTask.bind(Role)
 		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 	end
+	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	-- 增加数值
+						trainTask[id] = (trainTask[id] or 0) + param1
+					elseif subType == 2 then	-- 直接赋值
+						trainTask[id] = param1
+					elseif subType == 3 then	-- 自定义类型
+						if cfg.type == 1 then -- 通关关卡
+							if (trainTask[id] or 0) == 0 then
+								if self:checkHangPass(cfg.condition2) then
+									trainTask[id] = 1
+								end
+							end
+						elseif cfg.type == 2 then --玩家拥有SR拾荒者总星级达到xxx
+							local count = 0
+							for _, hero in pairs(self.heros) do
+								if hero:getRare() == HeroQuality.SR then
+									count = count + hero:getProperty("wakeL")
+								end
+							end
+							if (trainTask[id] or 0) < count then
+								trainTask[id] = count
+							end
+						elseif cfg.type == 3 then --玩家拥有SR拾荒者总星级达到xxx
+							local count = 0
+							for _, hero in pairs(self.heros) do
+								if hero:getRare() == HeroQuality.SSR then
+									count = count + hero:getProperty("wakeL")
+								end
+							end
+							if (trainTask[id] or 0) < count then
+								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
+						end
+					end
+				end
+		end
+		self:updateProperty({field = "trainTask", value = trainTask, notNotify = notNotify})
+	end
 end
 return RoleTask
@@ -342,26 +342,26 @@ function Store:isSMonthCardExpired(id)
 end
 function Store:buySMonthCardLimit(buylimit)
+    if not buylimit or buylimit == "" then return true end
+
     local smonthCards = self:getProperty("smonthCards") or {}
-    for k, v in pairs(buylimit) do
+    for k, v in pairs(buylimit:toNumMap() or {}) do
         if k == 1 then
             if v == 101 then
                 if self:isMonthCardExpire() then
-                    skynet.error("月卡过期")
                     return false
                 end
             else
-                if smonthCards[v] == nil then
-                    skynet.error("没有购买增刊里的条件, %d", v)
+                if not smonthCards[v] then
                     return false
                 end
             end
         elseif k == 2 then
-            if smonthCards[v] == nil and v ~= 101 then
+            if not smonthCards[v] then
                 skynet.error("没有购买增刊条件里的特刊, %d", v)
                 return false
             end
-            if self:isSMonthCardExpired(v) == false and v ~= 101 then
+            if not self:isSMonthCardExpired(v) then
                 skynet.error("上期特刊奖励没领完") --策划yc+hbw 没领完上期特刊，新一期特刊不展示，不允许购买
                 return false
             end
@@ -372,18 +372,17 @@ end
 function Store:buySMonthCard(id)
     local smonthCards = self:getProperty("smonthCards") or {}
+    local card = csvdb["shop_cardCsv"][id]
+    if not card then return false end
+
+    if not self:buySMonthCardLimit(card["buyLimit"]) then
+        skynet.error("不满足购买条件")
+        return false
+    end
     local BuyMonthCard = {}
     BuyMonthCard["renewal"]= function()
         --续刊
-        local card = csvdb["shop_cardCsv"][id] or {}
-        if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
-                skynet.error("不满足购买条件")
-                return false
-            end
-        end
-
         local smonthCard = smonthCards[id] or {}
         if next(smonthCard) then
             smonthCard["buyCount"] = (smonthCard["buyCount"] or 0) + 1
@@ -397,14 +396,6 @@ function Store:buySMonthCard(id)
     BuyMonthCard["order"] = function()
         --增刊
-        local card = csvdb["shop_cardCsv"][id] or {}
-        if card["buyLimit"] and card["buyLimit"] ~= "" then
-            if not self:buySMonthCardLimit(card["buyLimit"]:toNumMap()) then
-                skynet.error("不满足增刊条件")
-                return false
-            end
-        end
-
         smonthCards[id] = {["periods"] = (card["amount"] or 30), ["buyCount"] = 1}
         self:updateProperty({field= "smonthCards", value = smonthCards})
         return true