Merge branch 'tr/bugfix' into tr/bugfix-qa

* tr/bugfix: 无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断 # Conflicts: # src/csvdata

Merge branch 'tr/bugfix' into tr/bugfix-qa
* tr/bugfix: 无论什么方式翻开中继层格子都给奖励跨天礼包重置月重置跨月拾荒失败也记录积分编队世界聊天等级15判断 # Conflicts: # src/csvdata
zhouhaihai
2 parents a25b4535 ab4aa967
Showing 7 changed files with 34 additions and 34 deletions Show diff stats
src/GlobalVar.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvMap.lua
src/models/RolePvp.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,  --高级竞技场
@@ -1018,6 +1018,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}  --第一次开始说话时间  从第一次说话次数  能说话的时间
@@ -838,25 +838,26 @@ 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 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 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)
@@ -1734,9 +1735,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
@@ -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
@@ -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")
@@ -43,13 +48,6 @@ ResetFunc[&quot;CrossWeek&quot;] = function(self, notify, response)
 	response.dinerS = {}
 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)
@@ -89,13 +87,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