Merge branch 'tr/bugfix' into tr/publish/release

* tr/bugfix: 拾荒bug 无论什么方式翻开中继层格子都给奖励跨天礼包重置

Merge branch 'tr/bugfix' into tr/publish/release
* tr/bugfix: 拾荒bug 无论什么方式翻开中继层格子都给奖励跨天礼包重置
zhouhaihai
2 parents f9aa5539 70cc72d7
Showing 6 changed files with 19 additions and 22 deletions Show diff stats
src/GlobalVar.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/models/RolePlugin.lua
src/models/RoleTimeReset.lua
@@ -142,7 +142,6 @@ ItemId = {
 TimeReset = {
 	CrossDay = 1,  --通用跨天
 	CrossWeek = 2,  --通用跨周
-	CrossMonth = 1, --通用跨月  索引使用跨天，在回调方法中判断是否跨越 跨月的前置条件是跨天
 	DinerRank = 1,  -- 餐厅排行榜
 	PvpRank = 2,  -- pvp排行榜
 	PvpHight = 11,  --高级竞技场
@@ -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) -- 冒险赛季更新检查
 	-- 跨天登陆事件
@@ -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
@@ -397,10 +396,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
@@ -1690,9 +1688,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
@@ -804,9 +804,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
@@ -48,10 +48,6 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 end
--- 30天 非自然月
-ResetFunc["CrossMonth"] = function(self, notify, response)
-end
-
 ResetFunc["DinerRank"] = function(self, notify, response)
 	self.dinerData:rankResetData(notify)
@@ -91,15 +87,10 @@ function Role:updateTimeReset(now, notify)
 			ResetFunc[funcName](self, notify, response, now)
 			resetMode[funcName] = true
 		end
-		if needResetId[resetId] then
-			-- 充值商城购买记录
-			if resetId ~= TimeReset.CrossMonth then 
-				self.storeData:resetStoreReored(resetId)
-			end
-		end
 	end
 	for resetId, round in pairs(needResetId) do
+		self.storeData:resetStoreReored(resetId)
 		timeReset[resetId] = round
 	end
 	self:setProperties({timeReset = timeReset, ltime = now})