Merge branch 'develop' into qa

zhouhaihai
2 parents 2d9a616a 668f2960
Showing 6 changed files with 33 additions and 14 deletions Show diff stats
skynet
src/GlobalVar.lua
src/actions/PvpAction.lua
src/adv/AdvPassive.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
-Subproject commit 6c778575d99577c0c653b65b4025e2a88e6ce705
+Subproject commit b3902c899238c55e59d376ea71849077c8c96f11
 XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
 RESET_TIME = 4
-START_RESET_TIME_BASE = 1584921600 -- 0时区
+START_RESET_TIME_BASE = 1584316800 -- 0时区
 TIME_ZONE = math.floor(os.difftime(START_RESET_TIME_BASE, os.time(os.date("!*t", START_RESET_TIME_BASE))) / 3600)  -- 本地时区
 START_RESET_TIME = START_RESET_TIME_BASE - TIME_ZONE * 3600
@@ -824,18 +824,8 @@ function _M.highDivisionGiftRpc(agent, data)
 	local pvpHGTime = role:getProperty("pvpHGTime")
 	if pvpHGTime == 0 then return end
-	local score = role:unpackPvpScore(redisproxy:zscore(role:getPvpDBKey(RANK_PVP_HIGHT), roleId))
-	local divisionId = nil
-	for _id, division in ipairs(csvdb["pvp_group_divisionCsv"]) do
-		if score >= division.division then
-			divisionId = _id
-		else
-			break
-		end
-	end
-
-	local newTime, newReward = role:calculatePvpHGift(divisionId)
+	local newTime, newReward = role:calculatePvpHGift(role:getPvpHDivision())
 	if not next(newReward) then return end
 	role:updateProperties({
@@ -300,7 +300,7 @@ function Passive:canEffect(effType, effValue)
 		return
 	end
 	--禁用被动技
-	if self.owner:getPassiveIdx(self) <= self.owner:getDisablePassiveCount() then
+	if self.owner:getDisablePassiveCount() == 0 or self.owner:getPassiveIdx(self) <= self.owner:getDisablePassiveCount() then
 		return
 	end
 	return true
@@ -1291,6 +1291,7 @@ function RolePlugin.bind(Role)
 	end
 	local breathes = {
 		["email"] = breath(120), -- email
+		["pvphg"] = breath(300), -- 高级竞技场 奖励满的红点
 	}
 	function Role:checkNewEvent(now)
 		if now - self:getProperty("ltime") < 5 then
@@ -1337,6 +1338,21 @@ function RolePlugin.bind(Role)
 				end
 			end
 		end
+
+		checks["pvphg"] = function()
+			if not self:isTimeResetOpen(TimeReset.PvpHight) then return end
+
+			local pvpHGTime = self:getProperty("pvpHGTime")
+			if pvpHGTime == 0 then return end
+			local division = self:getPvpHDivision()
+			local divisionData = csvdb["pvp_group_divisionCsv"][division]
+
+			local newTime, newReward = self:calculatePvpHGift(division)
+			if table.pack(next(newReward))[2] >= divisionData.limit then
+				return true
+			end
+			
+		end
 		local events = {}
 		for name, breath in pairs(breathes) do
@@ -82,6 +82,19 @@ function Role:changePvpScoreCommon(matchId, isWin)
 	return table.unpack(result)
 end
+function Role:getPvpHDivision(score)
+	local score = score or self:unpackPvpScore(redisproxy:zscore(self:getPvpDBKey(RANK_PVP_HIGHT), self:getProperty("id")))
+	local divisionId = nil
+	for _id, division in ipairs(csvdb["pvp_group_divisionCsv"]) do
+		if score >= division.division then
+			divisionId = _id
+		else
+			break
+		end
+	end
+	return divisionId
+end
+
 function Role:calculatePvpHGift(division)
 	local now = skynet.timex()
 	local oldTime = self:getProperty("pvpHGTime")