Merge branch 'tr/bugfix' into cn/develop

熊润斐
2 parents 9cf14ecd 21419818
Showing 17 changed files with 256 additions and 170 deletions Show diff stats
src/GlobalVar.lua
src/actions/ActivityAction.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HeroAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
src/csvdata
src/models/Activity.lua
src/models/Daily.lua
src/models/RoleTask.lua
src/models/Store.lua
@@ -242,6 +242,7 @@ AdvBackEventType = {
 	BuffEffect = 27, -- buff 效果
 	PassiveEffect = 28, -- 被动 效果
 	ChooseDice = 29, -- 选择点随机效果
+	NoEffect = 30, -- 没有效果
 }
 AdvScoreType = {
@@ -355,6 +356,7 @@ TriggerEventType = {
 	AddNewHero = 5,
 	SSRCount = 6,
 	AfterTs = 7, 	-- 某时间以后
+	DrawHeroCnt = 8,	-- 每日抽卡次数
 }
 DrawCardType = {
@@ -723,7 +723,9 @@ function _M.endBattleRpc(agent, data)
  			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
  				curStar = curStar + (1 << (i - 1))
  			end
- 		end
+		 end
+
+		role:checkTaskEnter("ActBattlePass", {chapterId = id})
 	 else
 		curStar = 0
 		if battleCfg.rank ~= 0 then
@@ -1302,21 +1304,21 @@ function _M.newSignRpc(agent, data)
 	if not open then return 1 end
 	local actData = role.activity:getActData("NewSign")
-	if actData[actData[0] or 0] then
+	if actData[tostring(actData["0"] or 0)] then
 		return 2
 	end
 	local actCfg = csvdb["activity_signInCsv"][actId]
 	if not actCfg then return 4 end
-	local sumDay = actData[0] or 0
+	local sumDay = actData["0"] or 0
 	local award = {}
 	for k, data in pairs(actCfg) do
-		if not actData[data.day] and data.day <= sumDay then
+		if not actData[tostring(data.day)] and data.day <= sumDay then
 			for id, value in pairs(data.reward:toNumMap()) do
 				award[id] = (award[id] or 0) + value
 			end
-			actData[data.day] = 1
+			actData[tostring(data.day)] = 1
 		end
 	end
@@ -334,7 +334,7 @@ function _M.startHangRpc(agent, data)
 	role:changeUpdates({{type = "advHang", field = chapterId, value = info}})
 	role:changeAdvCount(adv_idle_energy)
-	role:checkTaskEnter("AdvStart", {id = chapterId})
+	role:checkTaskEnter("AdvStart", {id = chapterId, actid = actid})
 	role:mylog("adv_action", {desc = "startHang", int1 = chapterId})
 	SendPacket(actionCodes.Adv_startHangRpc, '')
@@ -80,6 +80,10 @@ function _M.pvp_cross_head(role, pms)
 	return "成功"
 end
+function _M.expire_item(role, pms)
+	role:awardExpireItem(tonum(pms.pm1), pms.pm2, {log = {desc = "gm"}})
+	return "成功"
+end
 local helpDes = {{"描述", "指令", "参数1", "参数2"	,"参数3"}}
@@ -289,14 +293,15 @@ function _M.get(role, pms)
 		end
 	elseif pms.pm1 == "MAXHERO" then
 		-- 给英雄
-		for itemId = 400 , 700 do
-			if csvdb["itemCsv"][itemId] then
-				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+		for heroId = 100, 500 do 
+			local heroCfg = csvdb["unitCsv"][heroId]
+			if heroCfg and heroCfg.open == 1 then
+				role:award({[heroId + 300] = 1}, {log = {desc = "gm"}})
 			end
 		end
 		-- 升满级
 		for _, hero in ipairs(role.heros) do
-			hero:updateProperty({field = "level", value = 140})
+			_M.herol(role, {pm1 = hero:getProperty("type"), pm2 = 130})
 			hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]})
 		end
@@ -580,6 +585,50 @@ function _M.clearbag(role, pms)
 	return "成功"
 end
+table.insert(helpDes, {"发送跑马灯", "notice"})
+function _M.notice(role, pms)
+	local msg = pms.pm1
+	SendPacket(actionCodes.Sys_commonNotice, MsgPack.pack({body = msg}))
+
+	return "成功"
+end
+
+table.insert(helpDes, {"活动关卡", "actbp", "id", "actid"})
+function _M.actbp(role, pms)
+	local id = tonum(pms.pm1, 0)
+	local actid = tonum(pms.pm2, 0)
+	if not role.activity:isOpenById(actid, "ChallengeLevel") then return end
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+
+	local actCfg = csvdb["activity_battleCsv"][actid]
+	if not actCfg then return end
+	for k, v in pairs(actCfg) do
+		if k <= id then
+			local bpInfo = actData[i] or {}
+			bpInfo["star"] = 1
+			actData[k] = bpInfo
+		end
+	end
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	return "成功"
+end
+
+table.insert(helpDes, {"活动拾荒", "actadv", "id", "actid"})
+function _M.actadv(role, pms)
+	local id = tonum(pms.pm1, 0)
+	local actid = tonum(pms.pm2, 0)
+	if not role.activity:isOpenById(actid, "AdvLevel") then return end
+	local actData = role.activity:getActData("AdvLevel") or {}
+	local advInfo = actData[id]
+	advInfo["pass"] = 1
+	actData[id] = advInfo
+
+	role.activity:updateActData("AdvLevel", actData)
+
+	return "成功"
+end
+
 function _M.helpRpc(agent, data)
 	SendPacket(actionCodes.Gm_helpRpc, MsgPack.pack({help = helpDes}))
 	return true
@@ -72,6 +72,7 @@ function _M.breakRpc( agent, data )
 	if hero:getProperty("level") < hero:getMaxLevel() then return 2 end
 	if hero:getProperty("breakL") >= #csvdb["unit_breakCsv"] then return 3 end
 	local curData = csvdb["unit_breakCsv"][hero:getProperty("breakL")]
+	if hero:getProperty("wakeL") < curData["starLimit"] then return 4 end
 	local cost = {[ItemId.BreakCost] = curData.cost, [ItemId.Gold] = curData.gold}
 	if not role:checkItemEnough(cost) then return 4 end
 	role:costItems(cost, {log = {desc = "heroBreak", int1 = msg.id, int2 = hero:getProperty("type")}})
@@ -914,6 +915,8 @@ function _M.drawHeroRpc(agent, data)
 	local ssrCount = 0
 	local reward = {}
 	local logReward = {}
+	-- 限时礼包
+	local dailyDrawCnt = role.dailyData:getProperty("drawHeroCnt") or 0
 	for i = 1, drawCount[drawType] do
 		floorHeroCount = floorHeroCount + 1
 		local isFloorBack = draw_floor_back_counts and floorHeroCount >= draw_floor_back_counts
@@ -962,8 +965,13 @@ function _M.drawHeroRpc(agent, data)
 			logReward[itemId] = (logReward[itemId] or 0) + 1
 			table.insert(reward, {id = itemId, count = 1})
 		end
+
+		dailyDrawCnt = dailyDrawCnt + 1
+		role:checkTaskEnter("DrawHeroLimitPack", {count = dailyDrawCnt})
 	end
+	role.dailyData:setProperty("drawHeroCnt", dailyDrawCnt)
+
 	if draw_floor_back_counts then
 		local floorHero = role:getProperty("floorHero")
 		floorHero[btype] = floorHeroCount
@@ -1126,7 +1134,7 @@ function _M.changeCrown(agent, data)
 	local heroType = msg.heroType
-	if not role:isHaveHero(heroType) then return true end
+	if heroType < 10000 and not role:isHaveHero(heroType) then return true end
 	role:setProperty("crown", heroType)
 	role:log("hero_show", {
@@ -754,6 +754,17 @@ function _M.openSpeedUpBoxRpc(agent, data)
 		role:costItems({[id] = count}, {log = {desc = "speedUpBox"}})
 	end
+	local doubleCoef = role.activity:isOpen("DoubleDrop") and 2 or 1
+	-- 特权卡获取加速获得额外道具
+	local coef = role.storeData:getProduceItemSpeedCoef()
+	if coef > 1 or doubleCoef > 1 then
+		for k, cnt in pairs(reward) do
+			if k == ItemId.Gold or k == ItemId.Exp then
+				reward[k] = math.floor(cnt * coef * doubleCoef)
+			end
+		end
+	end
+
 	local change
 	reward, change = role:award(reward, {log = {desc = "speedUpBox"}})
@@ -160,8 +160,11 @@ function Adv:initByChapter(params)
 	self:checkAdvUnlock(1, self.level)
 	-- 中继进入奖励
-	if relayData and isEnter then
-		self:awardRelay(relayData, notNotify)
+	if isEnter then
+		relayData = relayData or self:isHaveRelay(level, chapterId, true)
+		if relayData then
+			self:awardRelay(relayData, notNotify)
+		end
 	end
 	if not notNotify then
@@ -240,7 +243,6 @@ end
 function Adv:awardRelay(relayData, notNotify)
 	local gift = {}
-
 	if relayData.artifact > 0 then
 		local pool = {}
 		for id, temp in pairs(csvdb["adv_artifactCsv"]) do
@@ -265,7 +267,9 @@ function Adv:awardRelay(relayData, notNotify)
 				local dropData = csvdb["event_dropCsv"][dropId]
 				if dropData then
 					local item = dropData["range"]:randWeight(true)
-					gift[item[1]] = (gift[item[1]] or 0) + item[2]
+					if item[1] ~= 0 then
+						gift[item[1]] = (gift[item[1]] or 0) + item[2]
+					end
 				else
 					skynet.error(string.format("[ERROR]: event_dropCsv no id %s,  adv_chapter_campsite",  dropId))
 				end
@@ -827,7 +831,7 @@ function Adv:over(success, rewardRatio, overType)
 			local actData = self.owner.activity:getActData("AdvLevel")
 			-- 计算活动积分up
-			local upMap = actCfg["upCharacter"]
+			local upMap = actCfg["upCharacter"]:toNumMap()
 			local team = self.owner:getProperty("advTeam")
 			local format = self.owner:getTeamHerosInfo(team).heros
 			local upVal = 0
@@ -1131,6 +1135,7 @@ function Adv:useItem(itemId, count, target)
 	end
 	self:checkAchievement(self.AchievType.UseItem, count, itemId)
+	self.owner:checkTaskEnter("AdvUseItem", {itemId = itemId, count = count})
 	self:mylog({desc = "useItem", int1 = itemId, int2 = count})
 	self.owner:log("mission_pick_use", {
@@ -1191,7 +1196,8 @@ function Adv:supplyPotion()
 			local old = advItems:getv(potionId,0)
 			local need = max - old
-			if need < count then
+			if need < 0 then
+			elseif need < count then
 				advItems = advItems:setv(potionId,max)
 				potionBag[potionId] = count - need
 			else
@@ -1376,7 +1382,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
 						if block:isMonster() then
-							if not monsterId then return false end
+							if not monsterId or monsterId == 0 then return false end
 							if block.event.id == monsterId then
 								return false
 							end
@@ -1386,7 +1392,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 			else
 				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
 					if cblock:isMonster() then
-						if not monsterId then return false end
+						if not monsterId or monsterId == 0 then return false end
 						if cblock.event.id == monsterId then
 							return false
 						end
@@ -1401,7 +1407,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
 						if block:isBuild() then
-							if not buildId then return false end
+							if not buildId or buildId == 0 then return false end
 							if block.event.id == buildId then
 								return false
 							end
@@ -1411,7 +1417,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 			else
 				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
 					if cblock:isBuild() then
-						if not buildId then return false end
+						if not buildId or buildId == 0 then return false end
 						if cblock.event.id == buildId then
 							return false
 						end
@@ -1426,7 +1432,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
 						if block:isChoose() then
-							if not chooseId then return false end
+						if not chooseId or chooseId == 0 then return false end
 							if block.event.id == chooseId then
 								return false
 							end
@@ -1436,7 +1442,7 @@ local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
 			else
 				for _, cblock in ipairs(self:getCurMap():getBlocksBySize(room.roomId, block.blockId, size)) do
 					if cblock:isChoose() then
-						if not chooseId then return false end
+						if not chooseId or chooseId == 0 then return false end
 						if cblock.event.id == chooseId then
 							return false
 						end
@@ -1470,7 +1476,9 @@ local function doChooseEffect(self, effectStr, room, block, tag, chooseData)
 				local dropData = csvdb["event_dropCsv"][dropId]
 				if dropData then
 					local item = dropData["range"]:randWeight(true)
-					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					if item[1] ~= 0 then
+						reward[item[1]] = (reward[item[1]] or 0) + item[2]
+					end
 				else
 					skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  dropId, tag, chooseData.id))
 				end
@@ -1755,6 +1763,7 @@ local function clickBuild(self, room, block, params)
 	self:checkTask(Adv.TaskType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.Build, 1, oldId)
 	self:checkAchievement(Adv.AchievType.BuildBySelect, 1, oldId, choose)
+	self.owner:checkTaskEnter("AdvBuild", {buildId = oldId})
 	if clearBlock then
 		block:clear()
@@ -1777,7 +1786,9 @@ local function clickClick(self, room, block, params)
 			local reward = {}
 			for _, dropId in ipairs(clickData.effect:toArray(true, "=")) do
 				local item = csvdb["event_dropCsv"][dropId]["range"]:randWeight(true)
-				reward[item[1]] = (reward[item[1]] or 0) + item[2]
+				if item[1] ~= 0 then
+					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+				end
 			end
 			self:award(reward, {log = {desc = "clickClick", int1 = block.event.id}}, {roomId = room.roomId, blockId = block.blockId})
 		end,
@@ -1878,6 +1889,18 @@ function Adv:clickBlock(roomId, blockId, params)
 			return 
 		end
+		if not block:isMonster() then
+			for _, one in ipairs(map:getAroundBlocksPlus(room, block)) do
+				local _room, _block = one[1], one[2]
+				if _block:isMonster() then
+					local enemy = self.battle:getEnemy(_room.roomId, _block.blockId)
+					if enemy:hadBuff(Buff.OBSTACLE_PLUS) then
+						return
+					end
+				end
+			end
+		end
+
 		if block:isHinder() then
 			if not checkAroundBlocks(true) then return end
 		end
@@ -2012,9 +2035,18 @@ function Adv:doActive(activeId, target)
 	-- 5：放逐目标
 	doActiveEffect[5] = function(_)
 		for _,  target in ipairs(targers) do
+			local had = false
 			if not target.lock and not target.isDead then
-				target:kill()
-				self:backBlockChange(target.roomId, target.blockId)
+				if target:getMonsterCsv().type == 5 then
+					-- 假boss 不能用
+					had = true
+				else
+					target:kill()
+					self:backBlockChange(target.roomId, target.blockId)
+				end
+			end
+			if had then
+				self:pushBackEvent(AdvBackEventType.NoEffect)
 			end
 		end
 		return true
@@ -2043,13 +2075,8 @@ function Adv:doActive(activeId, target)
 	end
 	-- 7=道具燃烧效果
-	doActiveEffect[7] = function(_)
-		for _ , target in ipairs(targers) do
-			if target:getEventType() ==  AdvEventType.Drop then
-				target:updateEvent(nil)
-				self:backBlockChange(target.room.roomId, target.blockId)
-			end
-		end
+	doActiveEffect[7] = function(_, ctype)
+		self:blockDropChange(ctype, targers)
 		return true
 	end
@@ -2279,7 +2306,7 @@ function Adv:enemyDead(enemy, escape)
 					end
 				end
 				-- 这些奖励可能会有被动加成
-				self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops})
+				self.battle.player:triggerPassive(Passive.BATTLE_WIN, {drops = drops, trigger = enemy})
 				-- 自身带的掉落是不会被改变的 也不会被加成
 				if block.event.item and block.event.item[1] ~= 0 then
@@ -2319,6 +2346,8 @@ function Adv:enemyDead(enemy, escape)
 			self:checkAchievement(Adv.AchievType.Kill, 1, enemyId)
 			self:checkAchievement(Adv.AchievType.KillHadBuff, 1, enemy)
+			self.owner:checkTaskEnter("AdvKill", {chapterId = self.chapterId})
+
 			self:checkAchievement(Adv.AchievType.KillWithBuff, 1)
 			self:checkAchievement(Adv.AchievType.KillNoBuff, 1)
 			self:checkAchievement(Adv.AchievType.KillWithMWeapon, 1)
@@ -134,6 +134,9 @@ function Block:randomEvent()
 	randomFunc[AdvEventType.Drop] = function()
 		if not self.event.item then
 			self.event.item = csvdb["event_dropCsv"][self.event.id]["range"]:randWeight(true)
+			if self.event.item[1] == 0 then
+				self:clear()
+			end
 		end
 	end
 	--交易
@@ -38,6 +38,7 @@ Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
 Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  2 - 1
 Buff.DISABLE_AURA = 36 -- 禁用光环
 Buff.GET_AURA = 37 -- 获得光环
+Buff.OBSTACLE_PLUS = 38 -- 周围8格不能点击
 --角色一些属性的变化
@@ -383,6 +383,24 @@ function Map:getAroundBlocks(room, block)
 	return blocks
 end
+function Map:getAroundBlocksPlus(room, block)
+	local blocks = {}
+	local range = {1, 0, -1}
+	local col, row = room:tranLtoG(block.col, block.row)
+	for _, c in ipairs(range) do
+		for _, r in ipairs(range) do
+			if c == 0 and r == 0 then
+			else
+				local rroom, rblock = self:getRBByPos(col + c, row + r)
+				if rroom then
+					table.insert(blocks, {rroom, rblock})
+				end
+			end
+		end
+	end
+	return blocks
+end
+
 function Map:getBlocksBySize(roomId, blockId, size)
 	local blocks = {}
 	local room = self.rooms[roomId]
@@ -877,7 +895,7 @@ getEventLib = function(self, needEventType) -- needEventType  需要的事件
 		level = AdvCommon.getEndlessDataLv(chapterId, level)
 	end
 	local libsToType = {
-		["event_monsterCsv"] = {AdvEventType.Monster, AdvEventType.BOSS, AdvEventType.Monster},
+		["event_monsterCsv"] = {AdvEventType.Monster, AdvEventType.BOSS, AdvEventType.Monster, AdvEventType.Monster, AdvEventType.Monster},
 		["event_chooseCsv"] = AdvEventType.Choose,
 		["event_dropCsv"] = AdvEventType.Drop,
 		["event_buildingCsv"] = AdvEventType.Build,
@@ -527,8 +527,9 @@ function Passive:effect8(dropId)
 		skynet.error(string.format("CSVDATA Error  adv_map_passive %s effect 8 not id %s in event_drop", self.id, dropId))
 	end
 	local item = dropData["range"]:randWeight(true)
-	self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
-	
+	if item[1] ~= 0 then
+		self.owner.battle.adv:award({[item[1]] = item[2]}, {log = {desc = "passive", int1 = self.id}}, {roomId = self.owner.roomId, blockId = self.owner.blockId})
+	end
 end
 --9=直接获得item（可在结算触发时使用）
@@ -677,6 +677,10 @@ function Enemy:getClassify()
 	return csvdb["event_monsterCsv"][self.monsterId].classify
 end
+function Enemy:getMonsterCsv()
+	return csvdb["event_monsterCsv"][self.monsterId]
+end
+
 -- 0=所有  1=怪物  2=玩家
 function Enemy:checkAuraBuff(buffs)
 	local needBuffs = {}
@@ -795,7 +799,7 @@ function Player:changeSp(value, cType)
 	if cType == 0 then
 		change = value
 	elseif cType == 1 then
-		change = self.sp * value / 100
+		change = self.spMax * value / 100
 	end
 	local old = self.sp
 	self.sp = math.floor(math.min(self.spMax, math.max(0, self.sp + change)))
-Subproject commit b86293f02222b1fbd499e57de9ead6cbd6e0d736
+Subproject commit 9ab88a62f1c2ff1121be7547f02668db43dc1f75
@@ -1097,9 +1097,11 @@ activityFunc[Activity.ActivityType.NewSign] = {
 	-- end,
 	["crossDay"] = function(self, actType, notify)
 		local curData = self:getActData(actType)
-		curData[0] = (curData[0] or 0) + 1
-		local actData = csvdb["activity_signInCsv"][48] or {}
-		if curData[0] > #actData then return end -- 满了就忽略了
+		local isOpen, actId = self:isOpen(actType)
+		local actData = csvdb["activity_signInCsv"][actId] or {}
+		curData["0"] = curData["0"] or 0
+		if curData["0"] >= #actData then return end -- 满了就忽略了
+		curData["0"] = curData["0"] + 1
 		-- 没满更新一下
 		self:updateActData(actType, curData, not notify)
@@ -1146,7 +1148,6 @@ local function closeActAdvHang(role, chapterId)
 		end
 		reward, change = role:award(idleReward, {log = {desc = "advHang", int1 = chapterId}})
 	end
-	
 	role:changeUpdates({{type = "advHang", field = chapterId, value = nil}})
 	role:mylog("adv_action", {desc = "endHang", int1 = chapterId, short1 = 2})
@@ -1163,13 +1164,17 @@ activityFunc[Activity.ActivityType.AdvLevel] = {
 	["close"] = function(self, actType, notify, actid)
 		local actCfg = csvdb["activity_adv_chapterCsv"][actid]
 		if not actCfg then return end
-		for chapterId, _ in ipairs(actCfg) do
+		for chapterId, _ in pairs(actCfg) do
 			local advPass = self.owner:getProperty("advPass")
 			advPass[chapterId] = nil
-			self.owner:updateProperty({field="advPass", value=advPass})
-
+			local advRelay = self.owner:getProperty("advRelay")
+			advRelay[chapterId] = nil
+			self.owner:updateProperties({
+				advPass = advPass,
+				advRelay = advRelay,
+			}, not notify)
 			-- 关闭活动代理拾荒
-			closeActAdvHang(chapterId)
+			closeActAdvHang(self.owner, chapterId)
 		end
 		-- 强制关闭活动拾荒关卡
 		local adv = self.owner:getAdvData()
@@ -28,6 +28,7 @@ Daily.schema = {
 	unlockPool		= {"table", {}},		-- 解锁的属性卡池
 	curPool 		= {"number", 0},		-- 属性卡池当前索引
+	drawHeroCnt		= {"number", 0},		-- 每日抽卡次数
 }
 function Daily:updateProperty(params)
@@ -16,6 +16,7 @@ local TaskType = {
 	HeroQualityCollect = 11,	-- 英雄品质收集进度
 	HeroStarCollect = 12,		-- 英雄星级收集进度
 	DrawHeroNotFriend = 13,		-- 非友情招募		-- count
+	DrawHeroLimitPack = 14,		-- 抽卡限时礼貌		-- count
 	--装备相关
 	AddEquip = 101,				-- 获得装备			- equipId	rarity
@@ -56,6 +57,9 @@ local TaskType = {
 	AdvHangHeroCnt	= 416,		-- 拾荒人数
 	AdvCostPower = 417,			-- 消耗体力
 	AdvPassFirst = 418,			-- 冒险首次通关			- id
+	AdvUseItem = 419,			-- 使用道具				- itemId 	count
+	AdvBuild = 420,				-- 建筑交互				- buildId
+	AdvKill = 421,				-- 拾荒击败敌人
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -104,6 +108,7 @@ local TaskType = {
 	Login = 908,				-- 登入
 	CostDiamond = 909,			-- 消耗钻石
 	WeekTask = 910,				-- 完成每周活跃任务
+	ActBattlePass = 911,		-- 活动关卡通关		-- chapterId
 	--功能未实现 todo
 	AdvShop = 1002,				-- 冒险商城
@@ -257,6 +262,7 @@ local StoreListener = {
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
 		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
+		[TaskType.DrawHeroLimitPack] = {{TriggerEventType.DrawHeroCnt, f("count")}},
 	}
 }
@@ -268,7 +274,7 @@ local CalendaTaskListener = {
 		[TaskType.AdvStart]= {{3, 1}},
 		[TaskType.DinerLevelUp]= {{4, 2, f("level")}},
 		[TaskType.HeroLvlCollect]= {{5, 3}},		-- x名y级英雄
-		[TaskType.AdvHang]= {{6, 1}},			----
+		[TaskType.AdvHang]= {{6, 3, f("actid")}},			----
 		[TaskType.HeroQualityCollect]= {{7, 3}},
 		[TaskType.OverOderTask]= {{8, 1}},
 		[TaskType.VillageApply]= {{9, 1}},
@@ -294,10 +300,16 @@ local CalendaTaskListener = {
 		[TaskType.DailyTask] = {{30, 2, f("cur")}},
 		[TaskType.WeekTask] = {{31, 2, f("cur")}},
 		[TaskType.MakeFood] = {{32, 1, f("count")}},
-		[TaskType.AddItem] = {{33, 3, f("type"), f("count")}},
+		[TaskType.AddItem] = {{33, 3, f("type"), f("count")}, {42, 3, f("id"), f("count")}},
 		[TaskType.CostDiamond] = {{34, 1, f("count")}},
 		[TaskType.DrawHeroNotFriend] = {{35, 1, f("count")}},
 		[TaskType.AdvCostPower] = {{36, 1, f("count")}},
+
+		[TaskType.AdvUseItem] = {{37, 3, f("itemId"), f("count")}},
+		[TaskType.AdvBuild] = {{38, 3, f("buildId")}},
+		[TaskType.AdvKill] = {{39, 1, f("chapterId")}},
+		[TaskType.ActBattlePass] = {{40, 3, f("chapterId")}},
+		[TaskType.AdvPass] = {{41, 3, f("id")}},
 	}
 }
@@ -642,17 +654,7 @@ function RoleTask.bind(Role)
 		self.storeData:OnTriggerLimitTimePack(triggerType, param)
 	end
-	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
-		--print("check calenda task", mainType, subType, param1, param2)
-		local actEnum = "CalendaTask"
-		local keyName = "calTask"
-		if not self.activity then return end
-		local open, actId = self.activity:isOpen(actEnum)
-		local actData = csvdb["activity_ctrlCsv"][actId]
-		if not actData then return end
-		if not open then return end
-
-		local change = false
+	function Role:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 		local calTask = self:getProperty(keyName) or {}
 		param1 = param1 or 1
@@ -744,13 +746,49 @@ function RoleTask.bind(Role)
 								calTask[id] = (calTask[id] or 0) + (param1 or 0)
 							elseif cfg.type == 28 then	-- 完成指定任务
 								--print(actId,param2, cfg.condition2, param1)
-								if actId == param2 and cfg.condition2 == param1 then
+								if actData.id == param2 and cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + 1
 								end
 							elseif cfg.type == 33 then	-- 获得指定类型道具多少个
 								if cfg.condition2 == param1 then
 									calTask[id] = (calTask[id] or 0) + (param2 or 0)
 								end
+							elseif cfg.type == 42 then	-- 获得指定id道具多少个
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + (param2 or 0)
+								end
+							elseif cfg.type == 6 then  -- 代理拾荒次数
+								if cfg.condition2 == 0 or (cfg.condition2 == 1 and param1) then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
+							elseif cfg.type == 37 then -- 拾荒使用道具
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + (param2 or 0)
+								end	
+							elseif cfg.type == 38 then	-- 和指定建筑交互
+								local condArr = cfg.condition3:toArray(true, "=")
+								for i = 0, #condArr do
+									if condArr[i] == param1 then
+										calTask[id] = (calTask[id] or 0) + 1
+										break
+									end
+								end
+							elseif cfg.type == 39 then	-- 拾荒特定章节消灭敌人
+								local condArr = cfg.condition3:toArray(true, "=")
+								for i = 0, #condArr do
+									if condArr[i] == param1 then
+										calTask[id] = (calTask[id] or 0) + 1
+										break
+									end
+								end
+							elseif cfg.type == 40 then	-- 指定活动关卡通关
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
+							elseif cfg.type == 41 then	-- 通关拾荒指定关卡
+								if cfg.condition2 == param1 then
+									calTask[id] = (calTask[id] or 0) + 1
+								end
 							end
 						end
 					end
@@ -758,7 +796,19 @@ function RoleTask.bind(Role)
 			end
 		end
 		self:updateProperty({field = keyName, value = calTask, notNotify = notNotify})
-		--dump(calTask)
+	end
+
+	function Role:checkCalendaTask(notNotify, mainType, subType, param1, param2)
+		--print("check calenda task", mainType, subType, param1, param2)
+		local actEnum = "CalendaTask"
+		local keyName = "calTask"
+		if not self.activity then return end
+		local open, actId = self.activity:isOpen(actEnum)
+		local actData = csvdb["activity_ctrlCsv"][actId]
+		if not actData then return end
+		if not open then return end
+
+		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 	end
 	function Role:checkBattleCommandTask(notNotify, mainType, subType, param1, param2)
@@ -771,113 +821,7 @@ function RoleTask.bind(Role)
 		if not actData then return end
 		if not open then return end
-		local change = false
-		local calTask = self:getProperty(keyName) or {}
-		param1 = param1 or 1
-
-		local cid = actData.condition
-		for k, taskList in pairs(csvdb["activity_taskCsv"]) do
-			if k == cid then
-				for id, cfg in pairs(taskList) do
-					if cfg.type == mainType then
-						if subType == 1 then	-- 增加数值
-							calTask[id] = (calTask[id] or 0) + param1
-						elseif subType == 2 then	-- 直接赋值
-							calTask[id] = param1
-						elseif subType == 3 then	-- 自定义类型
-							if cfg.type == 7 then	-- 英雄品质收集进度
-								local count = 0
-								for _, hero in pairs(self.heros) do
-									local unitData = csvdb["unitCsv"][hero:getProperty("type")]
-									if unitData then
-										if cfg.condition2 <= unitData.rare then
-											count = count + 1
-										end
-									end
-								end
-								if (calTask[id] or 0) < count then
-									calTask[id] = count
-								end
-							elseif cfg.type == 5 then	-- 英雄等级收集进度
-								local count = 0
-								for _, hero in pairs(self.heros) do
-									if cfg.condition2 <= hero:getProperty("level") then
-										count = count + 1
-									end
-								end
-								if (calTask[id] or 0) < count then
-									calTask[id] = count
-								end
-							elseif cfg.type == 16 then	-- 英雄星级收集进度
-								local count = 0
-								for _, hero in pairs(self.heros) do
-									if cfg.condition2 <= hero:getProperty("wakeL") then
-										count = count + 1
-									end
-								end
-								if (calTask[id] or 0) < count then
-									calTask[id] = count
-								end
-							elseif cfg.type == 18 then	-- 挂机累计收获id,y个
-								for rid, v in pairs(param1) do
-									if cfg.condition2 == rid then
-										calTask[id] = (calTask[id] or 0) + v
-									end
-								end
-							elseif cfg.type == 19 then	-- x名英雄装备y品质以上符文套装
-								local count = 0
-								for _, hero in pairs(self.heros) do
-									local rcount = 0
-									for _,uid in pairs(hero:getRunes()) do
-										if uid > 0 then
-											local runeData = self.runeBag[uid]
-											if runeData then 
-												local csvData = csvdb["runeCsv"][runeData:getProperty("type")][runeData:getProperty("id")]
-
-												if csvData and cfg.condition2 <= csvData.rarity then
-													rcount = rcount + 1
-												end
-											end
-										end
-									end
-									if rcount == 6 then
-										count = count + 1
-									end
-								end
-								calTask[id] = count
-							elseif cfg.type == 20 then	-- 开启x品质时钟箱子
-								if cfg.condition2 <= (param2 or 0) then
-									calTask[id] = (calTask[id] or 0) + param1
-								end
-							elseif cfg.type == 15 then -- 通关关卡
-								if (calTask[id] or 0) == 0 then
-									local hangPass = self:getProperty("hangPass")
-									local diff = math.floor(cfg.condition2 / 10000)
-									if (hangPass[diff] or 0) >= cfg.condition1 then
-										calTask[id] = 1
-									end
-								end
-							elseif cfg.type == 22 then	-- 电台任务出勤人数
-								calTask[id] = (calTask[id] or 0) + (param1 or 0)
-							elseif cfg.type == 24 then	-- 代理拾荒出勤人数
-								calTask[id] = (calTask[id] or 0) + (param1 or 0)
-							elseif cfg.type == 28 then	-- 完成指定任务
-								--print(actId,param2, cfg.condition2, param1)
-								if actId == param2 and cfg.condition2 == param1 then
-									calTask[id] = (calTask[id] or 0) + 1
-								end
-							elseif cfg.type == 33 then	-- 获得指定类型道具多少个
-								if cfg.condition2 == param1 then
-									calTask[id] = (calTask[id] or 0) + (param2 or 0)
-								end
-							end
-						end
-					end
-				end
-			end
-		end
-		self:updateProperty({field = keyName, value = calTask, notNotify = notNotify})
-		--dump(calTask)
+		self:checkActTask(notNotify, keyName, actData, mainType, subType, param1, param2)
 	end
 end
@@ -375,6 +375,14 @@ function Store:OnTriggerLimitTimePack(eventType, param)
                 gift_id = rechargeCfg.id, --礼包ID
                 gift_name = rechargeCfg.title,   --礼包名称
             })
+            -- 每日抽卡限时礼包 触发重置
+            if eventType == TriggerEventType.DrawHeroCnt then
+                local payR = self:getProperty("payR")
+                if payR[rechargeCfg.id] then
+                    payR[rechargeCfg.id] = nil
+                    self:updateProperty({field = "payR", value = payR})
+                end
+            end
             self:updateProperty({field = "limitTPack", value = limitPack})
         end
     end