Merge branch 'develop' into player

zhouhaihai
2 parents 4aa21a1d 2471ce93
Showing 16 changed files with 120 additions and 33 deletions Show diff stats
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/AdvAction.lua
src/actions/GmAction.lua
src/actions/HttpAction.lua
src/actions/PvpAction.lua
src/actions/RoleAction.lua
src/adv/Adv.lua
src/adv/AdvPlayer.lua
src/agent.lua
src/models/HeroPlugin.lua
src/models/Role.lua
src/models/RolePlugin.lua
src/models/RolePvp.lua
src/models/RoleTimeReset.lua
src/services/pvpd.lua
 -- 协议号
 actionCodes = {
 	Sys_heartBeat = 1,
+	Sys_endlessSeason = 2,
 	Sys_errorMsg = 3,
 	Sys_innerErrorMsg = 4,
 	Sys_commonNotice = 5,
@@ -17,7 +17,7 @@ RANK_TOWER 	= &quot;rank:tower&quot;
 RANK_TOWER_INFO = "rank:tower:info"
 -- adv
-RANK_ADV 	= "rank:adv"
+RANK_ADV 	= {"rank:adv1", "rank:adv2"}
 RANK_ADV_INFO = "rank:adv:info"
 RANK_DINER 	= {"rank:diner1", "rank:diner2"} -- 餐厅排行榜 两个每天互换
@@ -721,7 +721,7 @@ function _M.rankRpc(agent, data)
 	local role = agent.role
 	local list = {}
-	local ids = redisproxy:zrevrange(RANK_ADV, 0 , 99, "WITHSCORES")
+	local ids = redisproxy:zrevrange(role:getAdvRankKey(), 0 , 99, "WITHSCORES")
 	local redret = {}
 	if ids and next(ids) then
 		redret = redisproxy:pipelining(function (red)
@@ -739,8 +739,8 @@ function _M.rankRpc(agent, data)
 		list[i].player = player
 	end
 	local redret = redisproxy:pipelining(function(red)
-		red:ZREVRANK(RANK_ADV, role:getProperty("id"))
-		red:zscore(RANK_ADV, role:getProperty("id"))
+		red:ZREVRANK(role:getAdvRankKey(), role:getProperty("id"))
+		red:zscore(role:getAdvRankKey(), role:getProperty("id"))
 	end)
 	local rank = redret[1]
 	if not rank then
@@ -87,6 +87,11 @@ function _M.silent(role, pms)
 	return "禁言成功"
 end
+function _M.pvp_cross_head(role, pms)
+	role:awardExpireItem(tonum(pms.expire), pms.reward, {log = {desc = "pvpCHead"}})
+	return "成功"
+end
+
 local helpDes = {{"描述", "指令", "参数1", "参数2"	,"参数3"}}
@@ -197,6 +197,11 @@ function _M.broadcast(query)
 	return "广播成功"
 end
+function _M.endless_season_check()
+	mcast_util.pub_world(actionCodes.Sys_endlessSeason, "")
+	return "success"
+end
+
 function _M.online(query)
 	local count = datacenter.get("onlineCount") or 0
 	return count
@@ -961,11 +961,11 @@ function _M.crossBetRpc(agent, data)
 	local roleId = role:getProperty("id")
 	local msg = MsgPack.unpack(data)
-	if not role:isTimeResetOpen(TimeReset.PvpCross) then return end
-	if msg.idx ~= 1 and msg.idx ~= 2 then return end
+	if not role:isTimeResetOpen(TimeReset.PvpCross) then return 1 end
+	if msg.idx ~= 1 and msg.idx ~= 2 then return 2 end
-	local result = role:setCrossServerPvpBet(msg.idx)
-	if not result then return end
+	local result, code = role:setCrossServerPvpBet(msg.idx)
+	if not result then return 10 + code end
 	role:log("pvp_action", {desc = "crossBet"})
 	SendPacket(actionCodes.Pvp_crossBetRpc, MsgPack.pack(result))
@@ -942,9 +942,7 @@ function _M.changeHeadRpc(agent, data)
 	if not unlock then 
 		return
 	end
-	role:updateProperty({field = "headId" ,value = id})
-	role:changeCrossServerPvpSelfInfo("headId")
-	role:log("role_action", {desc = "changeHead", int1 = id})
+	role:changeHead(id)
 	SendPacket(actionCodes.Role_changeHeadRpc, "")
 	return true
@@ -716,7 +716,7 @@ function Adv:over(success, rewardRatio, overType)
 		end
 		local roleId = self.owner:getProperty("id")
-		local oldMaxScore = tonum(redisproxy:zscore(RANK_ADV, roleId))
+		local oldMaxScore = tonum(redisproxy:zscore(self.owner:getAdvRankKey(), roleId))
 		if score > oldMaxScore then
 			local team = self.owner:getProperty("advTeam")
 			local curInfo = {
@@ -728,7 +728,7 @@ function Adv:over(success, rewardRatio, overType)
 				format = self.owner:getTeamHerosInfo(team.heros),
 			}
 			redisproxy:pipelining(function (red)
-				red:zadd(RANK_ADV, score, roleId)	--更新分数
+				red:zadd(self.owner:getAdvRankKey(), score, roleId)	--更新分数
 				red:hset(RANK_ADV_INFO, roleId,  MsgPack.pack(curInfo))
 			end)
 		end
@@ -1617,7 +1617,7 @@ function Adv:mapItemChange(ctype)
 					end
 					if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
 						block.event.item = changeTo
-						self:backBlockChange(roomId, blockId)
+						self:backBlockChange(roomId, blockId, ctype)
 					end
 				end
 			end
@@ -1724,8 +1724,8 @@ function Adv:backEnd(success, score, scoreInfo, reward, overType, scoreAward)
 	self:pushBackEvent(AdvBackEventType.End, {success = success, score = score, scoreInfo = scoreInfo, reward = reward, type = overType, scoreAward = scoreAward})
 end
-function Adv:backBlockChange(roomId, blockId)
-	self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId})
+function Adv:backBlockChange(roomId, blockId, itemChangeType)
+	self:pushBackEvent(AdvBackEventType.BlockChange, {roomId = roomId, blockId = blockId, itemChangeType = itemChangeType})
 end
 function Adv:backDead(enemyId, exp)
@@ -414,7 +414,9 @@ function BaseObject:recover(value, releaser, params)
 	params = params or {}
 	value = math.max(0, math.ceil(value))
 	self.hp = math.min(self.hpMax, self.hp + value)
-	self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = value})
+	if self:is("Player") then
+		self.battle.adv:pushBackEvent(AdvBackEventType.HpChange, {change = value})
+	end
 end
 function BaseObject:addSpecialSkill(skillId, skillLevel, target)
@@ -51,6 +51,15 @@ end
 local _pipelinings = {}  --可同时多个序列  栈的形式保证嵌套不出错
 function SendPacket(actionCode, bin, client_fd)
+	-- 内部消息不扩散出去
+	if actionCode == actionCodes.Sys_endlessSeason then
+		if agentInfo.role then
+			agentInfo.role:advEndlessSeasonCheck()
+		end
+		return
+	end
+
+
 	client_fd = client_fd or agentInfo.client_fd
 	local handlerName = actionHandlers[actionCode]
@@ -193,11 +193,12 @@ function HeroPlugin.bind(Hero)
 		return attrs
 	end
-	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 7 + 闪避 * 4）*（攻击 + 命中 * 4）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
-	function Hero:getBattleValue(activeRelation)
-		local attrs = self:getTotalAttrs({activeRelation = activeRelation})
-		local battleValue = ((attrs["hp"] + attrs["def"] * 7 + attrs["miss"] * 4) * (attrs["atk"] + attrs["hit"] * 4) * (1 + attrs["crit"]/100 * attrs["critHurt"]/100) * attrs["atkSpeed"] / 60000) ^ 0.8
-		return math.floor(battleValue)
+
+	-- 战斗力（当前属性）= POWER[（生命 + 防御 * 23 + 闪避 * 4）*（攻击*14 + 命中 * 2）*（1 + 暴击几率/100 * 暴击伤害/100）* 攻击速度 / 60000 ，0.8 ]
+	function Hero:getBattleValue(activeRelation) -- isReal包括队伍加成
+	    local attrs = self:getTotalAttrs({activeRelation = activeRelation})
+	    local battleValue = ((attrs["hp"] + attrs["def"] * 23 + attrs["miss"] * 4) * (attrs["atk"] * 14 + attrs["hit"] * 2) * (1 + attrs["crit"]/100 * attrs["critHurt"]/100) * attrs["atkSpeed"] / 600000) ^ 0.8
+	    return math.floor(battleValue)
 	end
 	function Hero:saveBattleValue()
@@ -54,6 +54,7 @@ Role.schema = {
 	level 				= {"number", 1},
 	exp 				= {"number", 0},
 	items				= {"string", ""},
+	expireItem			= {"table", {}}, --物品过期检查
 	funcOpen			= {"table", {}}, --功能是否开放
 	funcLv				= {"table", {}}, --功能等级
 	-- loveStatus			= {"string", ""}, --统计角色的最高 好感度等级 类型相关 -- type=loveL type=loveL
@@ -139,6 +139,56 @@ function RolePlugin.bind(Role)
 		return reward, allChange --实际获得的奖励 和 最高级奖励转化过程
 	end
+	function Role:awardExpireItem(expireTime, gift, params)
+		if expireTime <= skynet.timex() then
+			return 
+		end
+		local reward = self:award(gift, params)
+		local expireItem = self:getProperty("expireItem")
+		for itemId, _ in pairs(reward) do
+			expireItem[itemId] = expireTime
+		end
+		self:setProperty("expireItem", expireItem)
+	end
+
+	function Role:checkExpireItem(notNotify)
+		local expireItem = self:getProperty("expireItem")
+		local now = skynet.timex()
+		for itemId, expireTime in pairs(expireItem) do
+			if expireTime <= now then
+				expireItem[itemId] = nil
+				local itemCount = self:getItemCount(itemId)
+				if itemCount > 0 then
+					-- 过期物品删掉
+					self:addItem({itemId = itemId, count = -itemCount, log = {desc = "expire"}, notNotify = notNotify}) --过期
+
+					local itemData = csvdb["itemCsv"][itemId]
+					if itemData then
+						if itemData.type == ItemType.Head then
+							-- 检查头像是不是在穿戴
+							if self:getProperty("headId") == itemId then
+								self:changeHead(globalCsv.defaultHead, notNotify)
+
+								local headData = csvdb["player_iconCsv"][itemId]
+								-- pvp 跨服竞技场奖励
+								if headData and headData.path == 2 then
+									redisproxy:insertEmail({roleId = self:getProperty("id"), emailId = 19})
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+		self:setProperty("expireItem", expireItem)
+	end
+
+	function Role:changeHead(id, notNotify)
+		self:updateProperty({field = "headId" ,value = id, notNotify = notNotify})
+		self:changeCrossServerPvpSelfInfo("headId")
+		self:log("role_action", {desc = "changeHead", int1 = id})
+	end
+
 	function Role:addPlayExp(addExp, params)
 		local level = self:getProperty("level")
 		if not csvdb["player_expCsv"][level + 1] then
@@ -996,10 +1046,9 @@ function RolePlugin.bind(Role)
 	function Role:getCurDinerRankKey()
-		local StdDinerRankTime = toUnixtime("20190101"..string.format("%02x", math.floor(self:getTimeResetDataStart(TimeReset.DinerRank) / 3600))) --跨天时间
-		local now  = skynet.timex()
+		local round = self:getTimeResetRound(TimeReset.DinerRank)
 		local idx = 1
-		if math.floor((now - StdDinerRankTime) / 86400) % 2 == 1 then
+		if round % 2 == 1 then
 			idx = 2 
 		end
 		return RANK_DINER[idx]
@@ -1314,6 +1363,15 @@ function RolePlugin.bind(Role)
 		end
 	end
+	function Role:getAdvRankKey()
+		local round = self:getProperty("advElS")
+		local idx = 1
+		if round % 2 == 1 then
+			idx = 2 
+		end
+		return RANK_ADV[idx]
+	end
+
 end
 return RolePlugin
 \ No newline at end of file
@@ -468,31 +468,33 @@ function Role:getCrossServerPvpBetInfo()
 end
 function Role:setCrossServerPvpBet(idx)
-	if not self:isTimeResetOpen(TimeReset.PvpCross) then return end
+	if not self:isTimeResetOpen(TimeReset.PvpCross) then return false , 1 end
 	local crossTime = skynet.timex() - self:getTimeResetStartTime(TimeReset.PvpCross)
 	local aday = 3600 * 24
 	local day = math.ceil(crossTime / aday) -- 当前是第几个比赛日
 	local ctime = crossTime % aday -- 当前在本天 经过多少时间
 	if day > globalCsv.pvp_cross_server_day or ctime >= globalCsv.pvp_cross_server_stop_stake then
-		return 
+		return false , 2
 	end
 	local pvpBet = self:getProperty("pvpBet")
-	if pvpBet[day] then return end
+	if pvpBet[day] then return false , 3 end
-	local cost = {[ItemId.Gold] = self:getProperty("level") * globalCsv.pvp_cross_bet_pre_level}
-	if not self:checkItemEnough(cost) then return end
+	local costNum = self:getProperty("level") * globalCsv.pvp_cross_bet_pre_level
+	local cost = {[ItemId.Gold] = costNum}
+	if not self:checkItemEnough(cost) then return false , 4 end
-	local ok, result = pcall(skynet.call, pvpd, "lua", "setBet", idx)
+	local ok, result = pcall(skynet.call, pvpd, "lua", "setBet", idx, self:getProperty("id"), costNum)
 	if ok then
 		if result then
 			self:costItems(cost, {log = {desc = "crossPvpBet", short1 = day}})
 			pvpBet[day] = {idx, cost[ItemId.Gold]}
 			self:setProperty("pvpBet", pvpBet)
 		end
-		return result
+		return result, 5
 	else
 		print(result)
+		return false , 6
 	end
 end
@@ -11,6 +11,8 @@ ResetFunc[&quot;CrossDay&quot;] = function(self, notify, response)
 	self:setProperty("dTask", {})
 	self:advRandomSupportEffect()
+	self:checkExpireItem(not notify)
+
 	response.dTask = {}
 	response.advSup = self:getProperty("advSup")
 end
@@ -208,6 +208,7 @@ function CMD.getBetInfo()
 			betInfo[cday] = math.randomInt(1, #(MatchCache[cday] or {1}))
 			if cday == lastDay then
 				betNum = {}
+				redisproxy:del("cross:pvpInfo:bet:" .. cday)
 			end
 		end
 	end
@@ -221,7 +222,7 @@ function CMD.getBetInfo()
 	return pvpInfo:getProperties({"betInfo", "betNum"})
 end
-function CMD.setBet(idx)
+function CMD.setBet(idx, roleId, costNum)
 	local day, ctime = getDayAndTime()
 	if day > globalCsv.pvp_cross_server_day or ctime >= globalCsv.pvp_cross_server_stop_stake then return end
@@ -231,6 +232,8 @@ function CMD.setBet(idx)
 	local betNum = pvpInfo:getProperty("betNum")
 	betNum[idx] = (betNum[idx] or 0) + 1
 	pvpInfo:setProperty("betNum", betNum)
+
+	redisproxy:hset("cross:pvpInfo:bet:" .. day, roleId, costNum * 10 + idx)
 	return {betNum = betNum}
 end