fix confict

liuzujun
2 parents dfa9ae5e 219e9654
Showing 11 changed files with 313 additions and 188 deletions Show diff stats
src/GlobalVar.lua
src/actions/GmAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/models/Activity.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
src/models/RoleTask.lua
src/models/RoleTimeReset.lua
src/utils/CommonFunc.lua
@@ -142,7 +142,6 @@ ItemId = {
 TimeReset = {
 	CrossDay = 1,  --通用跨天
 	CrossWeek = 2,  --通用跨周
-	CrossMonth = 1, --通用跨月  索引使用跨天，在回调方法中判断是否跨越 跨月的前置条件是跨天
 	DinerRank = 1,  -- 餐厅排行榜
 	PvpRank = 2,  -- pvp排行榜
 	PvpHight = 11,  --高级竞技场
@@ -225,6 +224,7 @@ AdvBackEventType = {
 	LinkChooseOver = 26, -- 连锁事件结束
 	BuffEffect = 27, -- buff 效果
 	PassiveEffect = 28, -- 被动 效果
+	ChooseDice = 29, -- 选择点随机效果
 }
 AdvScoreType = {
@@ -326,6 +326,7 @@ MailId = {
 	PayBackAward = 242,
 	CBBackAward = 243,
 	CBBackAward2 = 244,
+	ActivityPoolRet = 280,
 }
 TriggerEventType = {
@@ -247,6 +247,7 @@ table.insert(helpDes, {&quot;获得所有零件&quot;, &quot;get&quot;, &quot;RUNE&quot;})
 table.insert(helpDes, {"获得所有碎片", "get", "FRAG"})
 table.insert(helpDes, {"获得所有食物", "get", "FOOD"})
 table.insert(helpDes, {"获得所有角色", "get", "HERO"})
+table.insert(helpDes, {"获得满级满觉醒角色,满级满精进铭文", "get", "MAXHERO"})
 function _M.get(role, pms)
 	if pms.pm1 == "ALL" then
 		local reward = {}
@@ -263,7 +264,7 @@ function _M.get(role, pms)
 			end
 		end
 	elseif pms.pm1 == "RUNE" then
-		for itemId = 2000 , 3000 do
+		for itemId = 10000 , 20000 do
 			if csvdb["itemCsv"][itemId] then
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
@@ -286,6 +287,36 @@ function _M.get(role, pms)
 				role:award({[itemId] = 1}, {log = {desc = "gm"}})
 			end
 		end
+	elseif pms.pm1 == "MAXHERO" then
+		-- 给英雄
+		for itemId = 400 , 700 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		-- 升满级
+		for _, hero in ipairs(role.heros) do
+			hero:updateProperty({field = "level", value = 140})
+			hero:updateProperty({field = "wakeL", value = #csvdb["unit_wakeCsv"]})
+		end
+
+		-- 添加铭文
+		for itemId = 10000 , 20000 do
+			if csvdb["itemCsv"][itemId] then
+				role:award({[itemId] = 1}, {log = {desc = "gm"}})
+			end
+		end
+		for _, rune in ipairs(role.runeBag) do
+			local typ = rune:getProperty("type")
+			local id = rune:getProperty("id")
+
+			local runeSet = csvdb["runeCsv"][typ]
+			if not runeSet then break end
+			local runeData = runeSet[id]
+			if not runeData then break end
+
+			rune:updateProperty({field = "level",value = runeData.lvLimit})
+		end
 	else
 		local itemId = tonum(pms.pm1)
 		if not csvdb["itemCsv"][itemId] then
@@ -561,6 +592,12 @@ function _M.ayncPurchase(role, params)
 	return role:handlePurchase(params) or ""
 end
+-- 获取订单号
+function _M.getPurchaseOrder(role, params)
+	return role:getPurchaseOrderByPlatform(params) or ""
+end
+
+
 function _M.cz(role, pms)
 	local id = tonum(pms.pm1)
 	local csvData = csvdb["shop_rechargeCsv"][id]
@@ -157,6 +157,7 @@ function _M.loginRpc( agent, data )
 	SERV_OPEN = redisproxy:hget("autoincrement_set", "server_start")
 	role:changeStructVersion() -- 数据结构 版本更新
+	role:getAdvData(true) -- 清掉不合格的数据
 	role:advEndlessSeasonCheck(true) -- 冒险赛季更新检查
 	-- 跨天登陆事件
@@ -607,9 +608,9 @@ function _M.openTimeBoxRpc(agent, data)
 		local itemData = csvdb["itemCsv"][itemId]
 		local unitTime = globalCsv.box_key_time[itemId] * 60
 		if quick then
-			stopTime = time + globalCsv.box_productLine_time * 3600
+			stopTime = nowTime + quick
 			local cost_pre = globalCsv.box_timeOpen_diamond:toArray(true, "=")
-			local costKey = math.ceil((stopTime - nowTime) / (cost_pre[1] * 60)) * cost_pre[2]
+			local costKey = math.ceil(quick / (cost_pre[1] * 60)) * cost_pre[2]
 			if not role:checkItemEnough({[ItemId.Diamond] = costKey}) then return 5 end
 			role:costItems({[ItemId.Diamond] = costKey}, {log = {desc = "openTimeBox", int1 = slot, int2 = oper}})
 		else
@@ -1055,6 +1056,10 @@ function _M.chatRpc(agent, data)
 				result = 1
 				return
 			end
+			if role:getProperty("level") < (globalCsv.chat_level or 15) then
+				result = 3
+				return
+			end
 			role._worldChatLimit = role._worldChatLimit or {start = 0, count = 0, canSayt = 0}  --第一次开始说话时间  从第一次说话次数  能说话的时间
@@ -20,8 +20,6 @@ function Adv:ctor(owner)
 	self.advTask = self.owner:getProperty("advTask")
 	self.advMTask = self.owner:getProperty("advMTask")
 	self.advTaskChange = false -- 任务改变才更新
-
-	self:initByInfo(self.owner:getProperty("advInfo"))
 end
 function Adv:mylog(contents)
@@ -36,7 +34,8 @@ function Adv:mylog(contents)
 end
 --初始化adv 信息
-function Adv:initByInfo(advInfo)
+function Adv:initByInfo()
+	local advInfo = self.owner:getProperty("advInfo")
 	if not next(advInfo) then return end --还没有 开始新地图
 	self.chapterId = advInfo.chapterId
@@ -407,10 +406,9 @@ function Adv:isRunning()
 	return false
 end
--- 强制结束
-function Adv:forceOver(notNotify)
-	if self:isRunning() then
-		
+-- 强制结束  逻辑和adv内部无关
+function Adv:forceOver(notNotify, force)
+	if self:isRunning() or force then
 		local advTeam = self.owner:getProperty("advTeam")
 		advTeam.player = nil
@@ -895,25 +893,27 @@ function Adv:over(success, rewardRatio, overType)
 		if not self:isEndless() and self.level >= chapterData.limitlevel then
 			self.owner:checkTaskEnter("AdvAllPass", {id = self.chapterId})
 		end
+	end
-		local roleId = self.owner:getProperty("id")
-		local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
-		if score > oldMaxScore and not self.actid then
-			local team = self.owner:getProperty("advTeam")
-			local curInfo = {
-				name = self.owner:getProperty("name"),
-				headId = self.owner:getProperty("headId"),
-				lv = self.owner:getProperty("level"),
-				batteV = self.owner:getTeamBattleValue(team.heros),
-				chapter = self.chapterId,
-				format = self.owner:getTeamHerosInfo(team).heros,
-			}
-			redisproxy:pipelining(function (red)
-				red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
-				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
-			end)
-		end
+
+	local roleId = self.owner:getProperty("id")
+	local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
+	if score > oldMaxScore and not self.actid then
+		local team = self.owner:getProperty("advTeam")
+		local curInfo = {
+			name = self.owner:getProperty("name"),
+			headId = self.owner:getProperty("headId"),
+			lv = self.owner:getProperty("level"),
+			batteV = self.owner:getTeamBattleValue(team.heros),
+			chapter = self.chapterId,
+			format = self.owner:getTeamHerosInfo(team).heros,
+		}
+		redisproxy:pipelining(function (red)
+			red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
+			red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
+		end)
 	end
+	
 	-- 通关的时候要把引导步骤设定到成就引导
 	if not self.owner:checkOverGuide(57) then
 		self.owner:saveGuide(57,1,true)
@@ -1224,6 +1224,11 @@ local function clickOut(self, room, block, params, isExit)
 			else
 				if self.level > (advPass[self.chapterId] or 0) then
 					self.owner:changeUpdates({{type = "advPass", field = self.chapterId, value = self.level}})
+
+				if (self.level >= csvdb["adv_chapterCsv"][self.chapterId].limitlevel) then --关卡结束
+					self.owner:checkTaskEnter("AdvPassFirst", {id = self.chapterId})
+				end
+
 				end
 			end
@@ -1281,24 +1286,22 @@ local function clickMonster(self, room, block, params)
 	return true
 end
-local function chooseCommon(self, room, block, chooseData, choose, tag)
-	if not choose then return end
-	if not chooseData or not chooseData["button".. choose .."cond"] then return end
-	local conds = chooseData["button".. choose .."cond"]:toTableArray(true)
+local function checkChooseCondFunc(self, condStr, room, block, tag, chooseData)
+	chooseData = chooseData or {}
 	local checkCond = {
 		-- 没有条件
 		[0] = function()
 			return true
 		end,
 		-- 拥有道具
-		[1] = function(_, itemId, count)
+		[1] = function(itemId, count)
 			if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, true) then
 				return true
 			end
 		end,
 		-- xx角色（todo 队长）
-		[2] = function(_, heroType)
+		[2] = function(heroType)
 			for slot, heroId in pairs(self.owner:getProperty("advTeam").heros) do
 				local hero = self.owner.heros[heroId]
 				if hero and hero:getProperty("type") == heroType then
@@ -1318,38 +1321,38 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		--制定属性 
-		[4] = function(_, attrType, value)
+		[4] = function(attrType, value)
 			if (self.battle.player[AttsEnumEx[attrType]] or 0) >= value then
 				return true
 			end
 		end,
 		-- 提交一个物品
-		[5] = function (_, itemId, count)
+		[5] = function (itemId, count)
 			if self:cost({[itemId] = count}, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}) then
 				self:backCost({[itemId] = count})
 				return true
 			end
 		end,
 		-- sp 到达指定值
-		[6] = function(_, value)
+		[6] = function(value)
 			if self.battle.player.sp >= value then
 				self.battle.player:changeSp(-value)
 				return true
 			end
 		end,
 		--7=拥有指定buff指定层数
-		[7] = function(_, buffId, layer)
+		[7] = function(buffId, layer)
 			local buff = self.battle.player:getBuffById(buffId)
 			if buff and buff:getLayer() >= layer then
 				return true
 			end
 		end,
 		--8=拥有x神器
-		[8] = function(_, artifactId)
+		[8] = function(artifactId)
 			return self:isHaveArtifact(artifactId)
 		end,
 		-- 9 = 生命值大于x%
-		[9] = function (_, value)
+		[9] = function (value)
 			local cost = value / 100 * self.battle.player.hpMax
 			if self.battle.player.hp > cost then
 				self.battle.player:hurt(cost, nil, {hurtType = 6, buffId = -1})
@@ -1357,11 +1360,11 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			end
 		end,
 		-- 10 = 未获得x神器
-		[10] = function(_, artifactId)
+		[10] = function(artifactId)
 			return not self:isHaveArtifact(artifactId)
 		end,
 		-- 11 = 地图上没有指定id 的怪
-		[11] = function(_, monsterId, size)
+		[11] = function(monsterId, size)
 			if not size or size == 0 then
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
@@ -1386,7 +1389,7 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		-- 12 = 地图上没有指定id 的建筑
-		[12] = function(_, buildId, size)
+		[12] = function(buildId, size)
 			if not size or size == 0 then
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
@@ -1411,7 +1414,7 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
 		-- 13 = 地图上没有指定的 选择点
-		[13] = function(_, chooseId, size)
+		[13] = function(chooseId, size)
 			if not size or size == 0 then
 				for _, room in pairs(self:getCurMap().rooms) do
 					for _, block in pairs(room.blocks) do
@@ -1436,138 +1439,175 @@ local function chooseCommon(self, room, block, chooseData, choose, tag)
 			return true
 		end,
  	}
- 	for _, cond in ipairs(conds) do
+
+ 	local status, count = true, 0
+ 	for _, cond in ipairs(condStr:toTableArray(true)) do
  		assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
-		if cond[1] and not checkCond[cond[1]](table.unpack(cond)) then return end
+		if not checkCond[cond[1]](select(2, table.unpack(cond))) then 
+			status =  false
+		else
+			count = count + 1
+		end
  	end
-	
-	local clearBlock = chooseData.keep ~= 1
-	local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
-	for _, effect in ipairs(effects) do
-		local doEffect = {
-			[1] = function() -- 获得某道具N个
-				local count = effect[3] or 1
-				local reward = {}
-				for i = 1, count do
-					local dropData = csvdb["event_dropCsv"][effect[2]]
-					if dropData then
-						local item = dropData["range"]:randWeight(true)
-						reward[item[1]] = (reward[item[1]] or 0) + item[2]
-					else
-						skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  effect[2], tag, chooseData.id))
-					end
-				end
-				self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
-			end,
-			[2] = function() --获得冒险buff
-				local layer = effect[3] or 1
-				for i = 1, layer do
-					self.battle.player:addBuff(effect[2])
-				end
-			end,
-			[3] = function() --发现怪物
-				self:getCurMap():addNewMonsterRand(effect[2], {room, block})
-				self:pushBackEvent(AdvBackEventType.Monster, {id = effect[2]})
-				clearBlock = false
-			end,
-			[4] = function() --无事发生
-			end,
-			[5] = function() --5=属性枚举=数值;直接增加玩家属性
-				local attr
-				if effect[3] == 0 then
-					attr = "sp"
+ 	return status, count
+end
+
+local function doChooseEffect(self, effectStr, room, block, tag, chooseData)
+	chooseData = chooseData or {}
+	local clearBlock = true
+	local doEffect = {
+		[1] = function(dropId, count) -- 获得某道具N个
+			count = count or 1
+			local reward = {}
+			for i = 1, count do
+				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]
 				else
-					attr = AttsEnumEx[effect[3]]
-					if not AdvAttsEnum[attr] then return end
+					skynet.error(string.format("[ERROR]: event_dropCsv no id %s in %s id: %s",  dropId, tag, chooseData.id))
 				end
-				self.battle.player:addBaseAttr(attr, effect[4], effect[2])
-			end,
-			[6] = function() -- 商店
-				block:updateEvent({
-					etype = AdvEventType.Trader,
-					id = effect[2]
-				})
-				self:pushBackEvent(AdvBackEventType.Trader, {id = effect[2]})
-				clearBlock = false
-			end,
-			[7] = function() -- 建筑
-				block:updateEvent({
-					etype = AdvEventType.Build,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[8] = function() -- 选择
-				block:updateEvent({
-					etype = AdvEventType.Choose,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[9] = function() -- click
-				block:updateEvent({
-					etype = AdvEventType.Click,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[10] = function() -- 陷阱
-				block:updateEvent({
-					etype = AdvEventType.Trap,
-					id = effect[2]
-				})
-				clearBlock = false
-			end,
-			[11] = function()  -- 获得神器
-				self:waitChooseArtifact() --等待获取神器
-			end,
-			[12] = function()
-				-- buffId
-				local targers = self.battle.player:getTeam(2, nil, nil, true)
-				for _, target in pairs(targers) do
-					target:addBuff(effect[2])
+			end
+			self:award(reward, {log = {desc = "chooseEvent", key1 = tag, int1 = chooseData.id}}, {roomId = room.roomId, blockId = block.blockId})
+		end,
+		[2] = function(buffId, layer) --获得冒险buff
+			self.battle.player:addBuff(buffId, nil, layer or 1)
+		end,
+		[3] = function(id) --发现怪物
+			self:getCurMap():addNewMonsterRand(id, {room, block})
+			self:pushBackEvent(AdvBackEventType.Monster, {id = id})
+			clearBlock = false
+		end,
+		[4] = function() --无事发生
+		end,
+		[5] = function(addType, attrType, value) --5=属性枚举=数值;直接增加玩家属性
+			local attr
+			if attrType == 0 then
+				attr = "sp"
+			else
+				attr = AttsEnumEx[attrType]
+				if not AdvAttsEnum[attr] then return end
+			end
+			self.battle.player:addBaseAttr(attr, value, addType)
+		end,
+		[6] = function(id) -- 商店
+			block:updateEvent({
+				etype = AdvEventType.Trader,
+				id = id
+			})
+			self:pushBackEvent(AdvBackEventType.Trader, {id = id})
+			clearBlock = false
+		end,
+		[7] = function(id) -- 建筑
+			block:updateEvent({
+				etype = AdvEventType.Build,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[8] = function(id) -- 选择
+			block:updateEvent({
+				etype = AdvEventType.Choose,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[9] = function(id) -- click
+			block:updateEvent({
+				etype = AdvEventType.Click,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[10] = function(id) -- 陷阱
+			block:updateEvent({
+				etype = AdvEventType.Trap,
+				id = id
+			})
+			clearBlock = false
+		end,
+		[11] = function()  -- 获得神器
+			self:waitChooseArtifact() --等待获取神器
+		end,
+		[12] = function(id)
+			-- buffId
+			local targers = self.battle.player:getTeam(2, nil, nil, true)
+			for _, target in pairs(targers) do
+				target:addBuff(id)
+			end
+		end,
+		[13] = function() -- 显示地图
+			self:getCurMap():showMap()
+			self:backMapShow()
+		end,
+		[14] = function(eventType, eventId, count, stage) -- 指定地块召唤 指定类型的id
+			local change = self:getCurMap():layEventToStage(eventType, eventId, count, stage)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[13] = function() -- 显示地图
-				self:getCurMap():showMap()
-				self:backMapShow()
-			end,
-			[14] = function() -- 指定地块召唤 指定类型的id
-				local change = self:getCurMap():layEventToStage(effect[2], effect[3], effect[4], effect[5])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[15] = function(eventType, eventId, count) -- 移除指定事件
+			local change = self:getCurMap():clearEventById(eventType, eventId, count)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[15] = function() -- 移除指定事件
-				local change = self:getCurMap():clearEventById(effect[2], effect[3], effect[4])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[16] = function(eventTypeF, eventIdF, eventTypeT, eventIdT, count) -- 指定事件转移
+			local change = self:getCurMap():eventChangeToOther(eventTypeF, eventIdF, eventTypeT, eventIdT, count)
+			for _, one in ipairs(change) do
+				if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
+					clearBlock = false
+				else
+					self:backBlockChange(one[1].roomId, one[2].blockId)
 				end
-			end,
-			[16] = function() -- 指定事件转移
-				local change = self:getCurMap():eventChangeToOther(effect[2], effect[3], effect[4], effect[5], effect[6])
-				for _, one in ipairs(change) do
-					if one[1].roomId == room.roomId and  one[2].blockId == block.blockId then
-						clearBlock = false
-					else
-						self:backBlockChange(one[1].roomId, one[2].blockId)
-					end
+			end
+		end,
+		[17] = function(eventId)
+			local diceCsv = csvdb["event_choose_diceCsv"][eventId]
+			if not diceCsv then return end
+			local weight = math.randomInt(1, 12)
+			local sum = 0
+			local needEffect = nil
+			local pool = {}
+			for _, v in ipairs(diceCsv) do
+				local status, okCount = checkChooseCondFunc(self, v.cond, room, block, tag .. " dice", chooseData)
+				pool[#pool + 1] = v.weight + okCount * v.weightUp
+				sum = sum + pool[#pool + 1]
+				if sum >= weight and not needEffect then
+					-- 达成效果
+					needEffect = v.effect
 				end
-			end,
-		}
+			end
+			if needEffect then
+				self:pushBackEvent(AdvBackEventType.ChooseDice, {id = eventId, pool = pool, result = weight})
+				clearBlock = doChooseEffect(self, needEffect, room, block, tag .. " dice", chooseData)
+			end
+		end,
+	}
+
+	for _, effect in ipairs(effectStr:toTableArray(true)) do
 		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. (block.event and block.event.id or 0) .. "effect  " .. effect[1])
-		doEffect[effect[1]]()
+		doEffect[effect[1]](select(2, table.unpack(effect)))
 	end
-	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
+	return clearBlock
+end
+
+local function chooseCommon(self, room, block, chooseData, choose, tag)
+	if not choose then return end
+	if not chooseData or not chooseData["button".. choose .."cond"] then return end
+ 	if not checkChooseCondFunc(self, chooseData["button".. choose .."cond"], room, block, tag, chooseData) then return end
+	local clearBlock = chooseData.keep ~= 1
+	clearBlock = clearBlock and doChooseEffect(self, chooseData["button".. choose .."effect"], room, block, tag, chooseData)
+	self:scoreChange(AdvScoreType.Event, chooseData.advScore) --增加加分
 	return true, clearBlock
 end
@@ -1821,9 +1861,6 @@ function Adv:clickBlock(roomId, blockId, params)
 	if not block.isOpen then
 		if self.isRelay or checkAroundBlocks() then --开放
 			self:getCurMap():openBlock(roomId, blockId, true, true)
-			if self.isRelay and self:getCurMap():isAllOpen() then  -- 发放翻开的奖励
-				self:passAdvRelay()
-			end
 			status = true
 		end
 	else
@@ -272,6 +272,10 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
+		
+		if self.adv.isRelay and self:isAllOpen() then  -- 发放翻开的奖励
+			self.adv:passAdvRelay()
+		end
 	end
 	return status
 end
@@ -656,6 +656,12 @@ activityFunc[Activity.ActivityType.ActHeroPool] = {
 		local actData = self:getActData(actType)
 		local cfg = csvdb["activity_ctrlCsv"][actId]
 		if not cfg then return end
+		-- 保底次数转换成万能碎片
+		--local count = math.ceil(((actData[cfg.condition] or 0) / 100) * 60)
+		--if count > 0 then
+		--	local gift = {[723] = count}
+		--	self.owner:sendMail(MailId.ActivityPoolRet, nil, gift, {})
+		--end
 		actData[cfg.condition] = nil
 		self:updateActData(actType, actData, not notify)
 	end,
@@ -849,9 +849,16 @@ function RolePlugin.bind(Role)
 		return runeSet
 	end
-	function Role:getAdvData()
+	function Role:getAdvData(notNotify)
 		if not self.advData then
 			self.advData = require("adv.Adv").new(self)
+			local status, err = pcall(function()
+				self.advData:initByInfo()
+			end)
+			if not status then
+				self.advData:forceOver(notNotify, true)
+				skynet.error("getAdvData error adv initByInfo " .. err)
+			end
 		end
 		return self.advData
 	end
@@ -1678,8 +1685,34 @@ function RolePlugin.bind(Role)
 		self:updateProperty({field = "redp", value = redp})
 	end
+	-- 网页支付获取订单号
+	function Role:getPurchaseOrderByPlatform(params)
+		local checkPlatform = {
+			["mycard"] = "mycard_product_id",
+		}
+		local pidField = checkPlatform[params.payMode or ""]
+		if not pidField or not params.product_id or params.product_id == "" then
+			return "no product"
+		end
+
+		for k , v in pairs(csvdb["shop_rechargeCsv"]) do
+			if not v[pidField] then return "no product" end
+			if v[pidField] == params.product_id then
+				if v.rmb ~= params.money then
+					return "error money"
+				end
+				-- 发现需要的id
+				local partnerOrderId = self:getPurchaseOrder(k, params.transactionId)
+				if partnerOrderId == "" then
+					return "no product"
+				end
+				return json.encode({order = partnerOrderId})
+			end
+		end
+	end
+
 	-- 获取充值订单号
-	function Role:getPurchaseOrder(rechargeId)
+	function Role:getPurchaseOrder(rechargeId, transactionId)
 		local roleId = self:getProperty("id")
 		local rechargeData = csvdb["shop_rechargeCsv"][rechargeId]
 		if not rechargeData then
@@ -1716,6 +1749,7 @@ function RolePlugin.bind(Role)
 			order = partnerOrderId, 
 			rechargeId = rechargeId, 
 			createTime = skynet.timex(),
+			transactionId = transactionId,
 		})
 		order:create()
 		-- 正在进行中的订单 缓存
@@ -1794,6 +1828,7 @@ function RolePlugin.bind(Role)
 	request.product_id = data.product_id
 	request.pay_time = data.pay_time
 	request.transactionId = data.order_no
+	request.extension_info = data.extension_info
 	]]
 	function Role:handlePurchase(params)
 		local roleId = self:getProperty("id")
@@ -1824,6 +1859,10 @@ function RolePlugin.bind(Role)
 		})
 		if not status then
+			if params.extension_info == "mycard_web" then
+				-- todo 发邮件
+				skynet.error("mycard_web " .. params.order)
+			end
 			SendPacket(actionCodes.Store_ayncPurchaseRpc, MsgPack.pack({ order = partnerOrderStr,
 				result = "success", reward = reward}))
 		end
@@ -9,7 +9,7 @@ local PVP_RANK_TIME_SORT_PRECISION = 360 -- 时间精度 每6分钟忽略差异
 local PVP_RANK_BASE_SCORE = globalCsv.pvp_base_score -- 初始积分
 -- 匹配规则改为以排名来匹配
-local PVP_GET_ROBOT_SCORE = 2400 -- 2400分以下低档位匹配机器人
+local PVP_GET_ROBOT_SCORE = 1300 -- 1300分以下低档位匹配机器人
 local PRE_RANGE_COUNT = 20 -- 每个档位人数
 local NEED_MATCH = 3 --匹配到多少人
@@ -73,7 +73,7 @@ function Role:changePvpScoreCommon(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((myScore - matchScore) / 400)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(60 / (1 + 10 ^ ((matchScore - myScore) / 400)))
 			myScore = myScore - scoreChange
@@ -139,7 +139,7 @@ function Role:changePvpScoreHigh(matchId, isWin)
 		if isWin then
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((myScore - matchScore) / 1000)))
 			myScore = myScore + scoreChange
-			matchScore = matchScore - math.ceil(scoreChange / 3) -- 防守方失败时，扣分减为原来的1/3
+			matchScore = matchScore - math.ceil(scoreChange / 3 * 2) -- 防守方失败时，扣分减为原来的2/3
 		else
 			local scoreChange = math.ceil(50 / (1 + 10 ^ ((matchScore - myScore) / 1000)))
 			myScore = myScore - scoreChange
@@ -530,7 +530,7 @@ function Role:changeCrossServerPvpSelfInfo(cType)
 			return 
 		end
 		change.battleV = self:getProperty("pvpTBVH")
-		change.heros = self:getProperty("pvpTSH")
+		change.team = self:getProperty("pvpTSH")
 		change.battleInfo = self:getProperty("pvpTBH")
 	end
@@ -55,6 +55,7 @@ local TaskType = {
 	AdvKillBoss	= 415,			-- 拾荒击杀boss
 	AdvHangHeroCnt	= 416,		-- 拾荒人数
 	AdvCostPower = 417,			-- 消耗体力
+	AdvPassFirst = 418,			-- 冒险首次通关			- id
 	--爬塔相关
 	TowerPass = 501,			-- 爬塔通关			- level
@@ -254,7 +255,7 @@ local StoreListener = {
 		[TaskType.HangPass] = {{TriggerEventType.HangPass, f("id")}},
 		[TaskType.RoleLevelUp] = {{TriggerEventType.LevelUp, f("level")}},
 		[TaskType.TowerPass] = {{TriggerEventType.TowerPass, f("level")}},
-		[TaskType.AdvPass] = {{TriggerEventType.AdvPass, f("id")}},
+		[TaskType.AdvPassFirst] = {{TriggerEventType.AdvPass, f("id")}},
 		[TaskType.AddHero] = {{TriggerEventType.AddNewHero, f("heroType")}, {TriggerEventType.SSRCount, f("ssrCount")}},
 	}
 }
@@ -881,4 +882,4 @@ function RoleTask.bind(Role)
 end
-return RoleTask
 \ No newline at end of file
+return RoleTask
@@ -23,6 +23,11 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response, now)
 	end
 	self:setProperty("advMine", advMine)
+	local ltime = self:getProperty("ltime")
+	if isCrossMonth(ltime, now) then
+		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id 
+	end
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 	self:log("onLogin")
@@ -45,13 +50,6 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	self.activity:refreshWeekData(notify)
 end
-ResetFunc["CrossMonth"] = function(self, notify, response)
-	local ltime = self:getProperty("ltime")
-	if isCrossMonth(ltime, skynet.timex()) then
-		self.storeData:resetStoreReored(3)		--商店跨月重置 time_reset表关联id
-	end
-end
-
 ResetFunc["DinerRank"] = function(self, notify, response)
 	self.dinerData:rankResetData(notify)
@@ -91,13 +89,10 @@ function Role:updateTimeReset(now, notify)
 			ResetFunc[funcName](self, notify, response, now)
 			resetMode[funcName] = true
 		end
-		if needResetId[resetId] then
-			-- 充值商城购买记录
-			self.storeData:resetStoreReored(resetId)
-		end
 	end
 	for resetId, round in pairs(needResetId) do
+		self.storeData:resetStoreReored(resetId)
 		timeReset[resetId] = round
 	end
 	self:setProperties({timeReset = timeReset, ltime = now})
@@ -100,7 +100,7 @@ end
 -- 判断是不是同一个月
 function isCrossMonth(target, now)
 	now = now or skynet.timex()
-	local tarTm = os.date("*t", target)
+	local tarTm = os.date("*t", target - RESET_TIME * 3600)
 	local nowTm = os.date("*t", now - RESET_TIME * 3600)
 	if tarTm.year == nowTm.year and tarTm.month == nowTm.month then
 		return false