Merge branch 'develop' into player

熊润斐
2 parents 46b128fd 576c791c
Showing 15 changed files with 540 additions and 14 deletions Show diff stats
src/GlobalVar.lua
src/ProtocolCode.lua
src/RedisKeys.lua
src/actions/ActivityAction.lua
src/actions/GmAction.lua
src/actions/HangAction.lua
src/actions/HeroAction.lua
src/adv/AdvBuff.lua
src/adv/AdvPassive.lua
src/csvdata
src/models/Activity.lua
src/models/RoleBattle.lua
src/models/RoleLog.lua
src/models/RolePlugin.lua
src/services/globald.lua
+BUG_LOG = false
+
+function buglog(tag, advstr, ...)
+	if BUG_LOG then
+		print(string.format("[%s] %s", tag, string.format(advstr, ...)))
+	end
+end
+
+
 XXTEA_KEY = "699D448D6D24f7F941E9F6E99F823E18"
 RESET_TIME = 4
@@ -223,6 +223,10 @@ actionCodes = {
 	Activity_exchangeRpc = 657,
 	Activity_gachakonRpc = 658,
 	Activity_hangDropRpc = 659,
+	Activity_startBattleRpc = 660,
+	Activity_endBattleRpc = 661,
+	Activity_battleRankRpc = 662,
+	Activity_battleMilestoneRpc = 663,
 	Radio_startQuestRpc = 700,
 	Radio_finishQuestRpc = 701,
@@ -15,6 +15,11 @@ R_STORE = &quot;role:%d:store&quot;   -- 商店
 R_ORDERS = "role:%d:orders" -- 订单
 R_ORDER = "order:%d:%d"
+-- 通用排行榜
+RANK_COMMON 	= "rank:common:"
+RANK_TYPE = {
+    ActBattleBoss = "act_battle_boss",
+}
 -- rank
 RANK_TOWER 	= "rank:tower"
@@ -319,7 +319,6 @@ function _M.gachakonRpc(agent, data)
 	for i = 1, count do
 		local tmpCfg = clone(actCfg)
 		remain = 0
-		print("-----------------, ", i)
 		for id, cfg in pairs(tmpCfg) do
 			local num = gachakonInfo[id] or 0
 			num = cfg.amount >= num and cfg.amount - num or 0
@@ -327,7 +326,7 @@ function _M.gachakonRpc(agent, data)
 			if cfg.weight > 0 then
 				remain = remain + num
 			end
-			print("num ".. num, id, cfg.weight, cfg.amount)
+			--print("num ".. num, id, cfg.weight, cfg.amount)
 		end
 		if remain == 0 then
 			break
@@ -350,9 +349,9 @@ function _M.gachakonRpc(agent, data)
 	role:costItems(cost, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
 	local reward, change = role:award(award, {log = {desc = "actGachakon", int1 = actid, int2 = count}})
-	if remain <= count then
+	--print("-----------", remain, count)
+	if remain <= 1 then
 		gachakonInfo = {}
-		print("hahaha")
 	end
 	role.activity:updateActData("Gachakon", gachakonInfo)
@@ -408,11 +407,329 @@ function _M.hangDropRpc(agent, data)
 	reward, change  = role:award(reward, {log = {desc = "actHangDrop", int1 = actid, int2 = num}})
-	role.activity:updateActData("HangDrop", timeNow)
+	if num < 8 then
+		actData = actData + num * period
+	else
+		actData = timeNow
+	end
+
+	role.activity:updateActData("HangDrop", actData)
 	SendPacket(actionCodes.Activity_hangDropRpc, MsgPack.pack(role:packReward(reward, change)))
 	return true
 end
+local function getStarCount(cfg, data)
+	local count = 0
+	for i = 0, #(cfg.sweep_condition:toTableArray(true)) do
+		if (1 << i & data) > 0 then
+			count = count + 1
+		end
+	end
+
+	return count
+end
+
+function _M.startBattleRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	local count = msg.count
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	local actCfg = csvdb["activity_battleCsv"][actid]
+	if not actCfg then return 2 end
+
+	local battleCfg = actCfg[id]
+	if not battleCfg then return 3 end
+
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+
+	local preArr = battleCfg.prepose:toArray(true, "=")
+	for _, v in ipairs(preArr) do
+		local battleInfo = actData[v]
+		if not battleInfo then
+			return 4
+		end
+		local star = battleInfo["star"] or 0
+		if star <= 0 then
+			return 4
+		end
+	end
+	-- check cost
+	local changeFlag = false
+	local ticket = actData["ticket"]
+	if battleCfg.type ~= "" then
+		role.activity:getBattleTicket(actid)
+		local num = battleCfg.type:toArray(true, "=")[3]
+		if count and count > 0 then
+			if battleCfg.rank == 0 then
+				return 7
+			end
+			local bi = actData[id]
+			if not bi then return 8 end
+			local star = bi["star"] or 0
+			if star < 1 then
+				return 9
+			end
+			num = num * count
+		end
+		if ticket < num then
+			return 6
+		end
+		actData["ticket"] = ticket - num
+		changeFlag = true
+	end
+
+	if not count then
+		role.__actBattleCache = {
+			key = tostring(math.random()),
+			actid = actid,
+			id = id,
+		}
+		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack({key = role.__actBattleCache.key}))
+	else
+		if count <= 0 then
+			return
+		end
+		if battleCfg.rank == 0 then
+			return 7
+		end
+		local bi = actData[id]
+		local star = bi["star"]
+		local award = battleCfg.item_clear:toNumMap()
+		if getStarCount(battleCfg, star) == 3 then
+			local aw = battleCfg.perfect_reward:toNumMap()
+			for k, v in pairs(aw) do
+				award[k] = (award[k] or 0) + v
+			end
+		end
+		for k, v in pairs(award) do
+			award[k] = v * count
+		end
+		local reward, change  = role:award(award, {log = {desc = "actBattle", int1 = actid, int2 = count or 0}})
+		SendPacket(actionCodes.Activity_startBattleRpc, MsgPack.pack(role:packReward(reward, change)))
+
+		bi["sum"] = bi["sum"] + bi["top"]
+		actData[id] = bi
+		changeFlag = true
+
+		local rankVal = 0
+		if battleCfg.rank == 1 then
+			rankVal = bi["sum"]
+		elseif battleCfg.rank == 2 then
+			rankVal = bi["top"]
+		end
+		role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
+	end
+	if changeFlag then
+		role.activity:updateActData("ChallengeLevel", actData)
+	end
+
+	return true
+end
+
+function _M.endBattleRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	local key = msg.key
+	local isWin = msg.isWin
+	local heros = msg.heros
+	local support = msg.support
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	if not role.__actBattleCache then return 2 end
+	
+	if role.__actBattleCache.id ~= id or role.__actBattleCache.key ~= key and role.__actBattleCache.actid ~= actid then 
+		SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({errorCode = 1}))
+	end
+
+	local actCfg = csvdb["activity_battleCsv"][actid]
+	if not actCfg then return 3 end
+
+	local battleCfg = actCfg[id]
+	if not battleCfg then return 4 end
+
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+
+	local reward, change = {}, nil
+
+	local battleInfo = actData[id] or {}
+	local curStar = 0
+ 	if isWin then
+ 		local herosInfo = msg.heros
+
+ 		local check = {}
+ 		-- 1 通关
+		check[1] = function(_)
+			return true
+		end
+		-- 2 阵亡人数 <= N
+		check[2] = function(_, cond)
+			return msg.info.dead and msg.info.dead <= cond
+		end
+		-- 3 全员存活
+		check[3] = function(_)
+			return msg.info.dead and msg.info.dead == 0
+		end
+		-- 4 指定种族 >= N
+		check[4] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csvdb["unitCsv"][one.type]
+				if heroData.camp == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 5 指定职业 >= N
+		check[5] = function(_, cond)
+			local count = 0
+			for _, one in pairs(herosInfo) do
+				local heroData = csvdb["unitCsv"][one.type]
+				if heroData.job == cond then
+					count = count + 1
+				end
+			end
+			return count >= cond
+		end
+		-- 6 含有指定角色 
+		check[6] = function(_, cond)
+			for _, one in pairs(herosInfo) do
+				if one.type == cond then
+					return true
+				end
+			end
+			return false
+		end
+		-- 7 通关耗时 <= X 秒  msg.info.atime
+		check[7] = function(_, cond)
+			return msg.info.atime and msg.info.atime <= cond
+		end
+		curStar = 0
+		local sweepConds = battleCfg.sweep_condition:toTableArray(true)
+ 		for i, cond in ipairs(sweepConds) do
+ 			if check[cond[1]] and check[cond[1]](table.unpack(cond)) then
+ 				curStar = curStar + (1 << (i - 1))
+ 			end
+ 		end
+ 	else
+ 		curStar = 0
+	end
+	local oldStarNum = getStarCount(battleCfg, battleInfo["star"] or 0)
+	local newStarNum = getStarCount(battleCfg, curStar)
+	if  newStarNum > oldStarNum then
+		battleInfo["star"] = curStar
+	end
+
+	if battleCfg.rank ~= 0 then
+		-- 更新排行榜 最高伤害
+		local dmg = 0
+		for k, v in pairs(msg.info.damage) do
+			if k % 100 == 2 then
+				dmg = dmg + v
+			end
+		end
+		battleInfo["top"] = math.max(battleInfo["top"] or 0, dmg)
+		battleInfo["sum"] = (battleInfo["sum"] or 0) + dmg
+		local rankVal = 0
+		if battleCfg.rank == 1 then
+			rankVal = battleInfo["sum"]
+		elseif battleCfg.rank == 2 then
+			rankVal = battleInfo["top"]
+		end
+		if rankVal > 0 then
+			role:updateRankCommon(RANK_TYPE.ActBattleBoss, rankVal)
+		end
+	end
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	if oldStarNum == 0 or battleCfg.rank ~= 0 then
+		reward = battleCfg.item_clear:toNumMap()
+	end
+	if (oldStarNum < 3 and newStarNum == 3) or battleCfg.rank ~= 0 then
+		local aw = battleCfg.perfect_reward:toNumMap()
+		for k, v in pairs(aw) do
+			reward[k] = (reward[k] or 0) + v
+		end
+	end
+
+ 	role:checkBattle("act_battle", {
+		cfg = battleCfg,
+		star = newStarNum,
+		isWin = isWin,
+		info = msg.info,
+		reward = reward,
+		heros = heros,
+		supports = support,
+	})
+
+	reward, change  = role:award(reward, {log = {desc = "actBattle", int1 = actid, int2 = newStarNum}})
+
+	SendPacket(actionCodes.Activity_endBattleRpc, MsgPack.pack({
+		reward = reward,
+		change = change
+	}))
+
+	return true
+end
+
+function _M.battleRankRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	local rankInfo = role:getRankInfoCommon(RANK_TYPE.ActBattleBoss)
+
+	SendPacket(actionCodes.Activity_battleRankRpc, MsgPack.pack(rankInfo))
+	return true
+end
+
+function _M.battleMilestoneRpc(agent, data)
+	local role = agent.role
+	local msg = MsgPack.unpack(data)
+	local actid = msg.actid
+	local id = msg.id
+	local index = msg.index
+
+	if not role.activity:isOpenById(actid) then return 1 end
+
+	local actCfg = csvdb["activity_mileageCsv"][actid]
+	if not actCfg then return 3 end
+
+	local mileCfg = actCfg[index]
+	if not mileCfg then return 4 end
+
+	local actData = role.activity:getActData("ChallengeLevel") or {}
+	local battleInfo = actData[id] or {}
+	local val = 0
+	if mileCfg.type == 1 then
+		val = battleInfo["sum"] or 0
+	elseif mileCfg.type == 2 then
+		val = battleInfo["top"] or 0
+	end
+
+	local record = battleInfo["r"] or ""
+	local flag = string.char(string.getbit(record, index))
+	if flag == "1" then return 5 end
+	if mileCfg.condition > val then return 6 end
+
+	battleInfo["r"] = string.setbit(record, index)
+	actData[id] = battleInfo
+	role.activity:updateActData("ChallengeLevel", actData)
+
+	local award = mileCfg.reward:toNumMap()
+	local reward, change = role:award(award, {log = {desc = "actMilestone", int1 = actid, int2 = index}})
+	SendPacket(actionCodes.Activity_battleMilestoneRpc, MsgPack.pack(role:packReward(reward, change)))
+
+	return true
+end
+
 return _M
 \ No newline at end of file
@@ -535,6 +535,7 @@ function _M.test(role, pms)
 	--hero.unlockPoolRpc({role = role}, MsgPack.pack({type = id}))
 	--role:sendMail(13, nil, "1=2", {111})
+	dump(redisproxy:zrevrange("rank:tower", 0 , 10, "WITHSCORES"))
 	return "成功"
 end
@@ -632,7 +632,7 @@ function _M.endBonusBattleRpc(agent, data)
 		check[4] = function(_, cond)
 			local count = 0
 			for _, one in pairs(herosInfo) do
-				local heroData = csv["unitCsv"][one.type]
+				local heroData = csvdb["unitCsv"][one.type]
 				if heroData.camp == cond then
 					count = count + 1
 				end
@@ -643,7 +643,7 @@ function _M.endBonusBattleRpc(agent, data)
 		check[5] = function(_, cond)
 			local count = 0
 			for _, one in pairs(herosInfo) do
-				local heroData = csv["unitCsv"][one.type]
+				local heroData = csvdb["unitCsv"][one.type]
 				if heroData.job == cond then
 					count = count + 1
 				end
@@ -477,8 +477,6 @@ function _M.referEquipsRpc(agent, data)
 	-- 更新角色
 	hero:updateProperty({field = "equip", value = curEquip})
-	role:finishGuide(23)
-
 	local curAttr = hero:getTotalAttrs()
 	local attrChange = getChangeAttrJson(oldAttr, curAttr)
 	for typ, data in pairs(wear) do
@@ -490,6 +490,7 @@ function Buff:createAfter(layer)
 		self:_init()
 	end
 	self:pushBackEffect(1)
+	buglog("Buff", "who: %s create buffId: %s", self.owner.monsterId, self.id)
 end
 function Buff:initByDB(data)
@@ -632,6 +633,7 @@ function Buff:pushBackEffect(etype)
 end
 function Buff:effect()
+	buglog("Buff", "who: %s effect buffId: %s", self.owner.monsterId, self.id)
 	self:decCount()
 	self:pushBackEffect(2)
 	if self._effectValue then
@@ -655,6 +657,7 @@ function Buff:endBuff()
 	if self._endBuff then
 		self:_endBuff()
 	end
+	buglog("Buff", "who: %s endBuff buffId: %s", self.owner.monsterId, self.id)
 end
 function Buff:getType()
@@ -709,6 +712,7 @@ function Buff:overlay(releaser, data, layer)
 		end
 		self:pushBackEffect(1)
+		buglog("Buff", "who: %s overlay buffId: %s", self.owner.monsterId, self.id)
 	end
 end
@@ -354,6 +354,7 @@ function Passive:effect(triggerPms)
 	end
 	if hadEffect then
 		self.owner.battle.adv:pushBackEvent(AdvBackEventType.PassiveEffect, {id = self.id, level = self.level, roomId = self.owner.roomId, blockId = self.owner.blockId})
+		buglog("Passive", "who: %s effect id: %s", self.owner.monsterId, self.id)
 	end
 	if self.count > 0 then
 		self.count = self.count < 999 and self.count - 1 or self.count
@@ -404,6 +405,8 @@ function Passive:trigger(condType, params) --触发检查
 	params = params or {}
 	if self.isDel or self.owner.isDead then return end
 	if self:getCondType() ~= condType then return end
+
+	buglog("Passive", "who: %s trigger id: %s", self.owner.monsterId, self.id)
 	if not self:canTrigger() then return end
 	if self._trigger then
 		if not self:_trigger(params) then return end  --检查
@@ -600,5 +603,9 @@ function Passive:effect16(value, triggerPms, changeType)
 	self.owner.battle.adv:blockDropChange(changeType, blocks)
 end
+--17=玩家获得buff
+function Passive:effect17(value, triggerPms)
+	self.owner.battle.player:addBuff(value, self.owner)
+end
 return Passive
 \ No newline at end of file
-Subproject commit 295feade86593a4793972e2cd2d83135d8aee247
+Subproject commit f019454e533ec12642ab9d7518c80b73c1cc00bb
@@ -179,6 +179,7 @@ function Activity:checkActivityStatus(now, isCrossDay, notify)
 		if isOpen then
 			if actime[actId] and actime[actId] == startTime then -- 还是之前的状态 开放中
+				self:onLoginActivity(actId)
 			else  -- 重置
 				actime[actId] = startTime
 				self:closeActivity(actId, notify, true)
@@ -419,7 +420,8 @@ activityFunc[Activity.ActivityType.CalendaTask] = {
 		local towerInfo = role:getProperty("towerInfo")
 		role:checkTaskEnter("TowerPass", {level = towerInfo.l})
 		--"PvpWin"
-		role:checkTaskEnter("HangPass", {})
+		--role:checkTaskEnter("HangPass", {id = 0})
+		role:checkCalendaTask(true, 15, 3)
 		role:checkTaskEnter("HeroStarCollect", {})
 		role:checkTaskEnter("RuneQualityCollect", {})
@@ -475,7 +477,8 @@ activityFunc[Activity.ActivityType.Gachakon] = {
 activityFunc[Activity.ActivityType.HangDrop] = {
 	["init"] = function(self, actType, isCrossDay, notify, actId)
 		local actime = self:getProperty("actime")
-		local startTime = actime[actId]
+		local ctime = self.owner:getProperty("ctime")
+		local startTime = math.max(actime[actId], ctime)
 		local actData = self:getActData(actType) or 0
 		local cfg = csvdb["activity_putCsv"][actId]
 		if not cfg then return end
@@ -484,11 +487,30 @@ activityFunc[Activity.ActivityType.HangDrop] = {
 	end
 }
+--ChallengeLevel
+activityFunc[Activity.ActivityType.ChallengeLevel] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+		self:getBattleTicket(actId)
+	end,
+	["login"] = function(self, actType, actId)
+		self:getBattleTicket(actId)
+	end
+}
+
+function Activity:onLoginActivity(actId)
+	local actData = csvdb["activity_ctrlCsv"][actId]
+	if not actData then return end
+	local actType = actData.showType
+	if activityFunc[actType] and activityFunc[actType]['login'] then
+		activityFunc[actType]["login"](self, actType, actId)
+	end
+end
+
 function Activity:initActivity(actId, isCrossDay, notify)
 	local actData = csvdb["activity_ctrlCsv"][actId]
 	if not actData then return end
 	local actType = actData.showType
-	if activityFunc[actType] and activityFunc[actType]['close'] then
+	if activityFunc[actType] and activityFunc[actType]['init'] then
 		activityFunc[actType]["init"](self, actType, isCrossDay, notify, actId)
 	end
 end
@@ -633,5 +655,39 @@ function Activity:recycleActItem(actId)
 	end
 end
+-- 活动挑战关卡计算门票
+function Activity:getBattleTicket(actId)
+	local role = self.owner
+	local createTs = role:getProperty("ctime")
+	local actCfg = csvdb["activity_ctrlCsv"][actId]
+	if not actCfg then return 0 end
+
+	local actStartTime = 0
+	local openTimes = actCfg.time:toArray(false, "=")
+	actStartTime = toUnixtime(openTimes[1]..string_format("%02x", RESET_TIME))
+	local actData = self:getActData("ChallengeLevel") or {}
+	local startTs = actData["ts"] or math.max(actStartTime, createTs)
+	local timeNow = skynet.timex()
+	local modify = false
+	local arr = actCfg.condition2:toArray(true, "=")
+
+	local ticketId, init, limit, duration = arr[1] or 0, arr[2] or 0, arr[3] or 0, arr[4] or 10000
+
+	local count = actData["ticket"] or init
+	local add = math.max(math.floor((timeNow - startTs) / (duration * 60)), 0)
+
+	local newCount= math.min(count + add, limit)
+	if newCount ~= count or newCount >= limit then
+		modify = true
+	end
+	add = newCount - count
+
+	if modify or not next(actData) then
+		actData["ticket"] = newCount
+		actData["ts"] = newCount >= limit and timeNow or (startTs + add * duration * 60)
+		self:updateActData("ChallengeLevel", actData)
+	end
+end
+
 return Activity
@@ -16,6 +16,7 @@ local BattleType = {
 	bonus = 300,
 	pvpc = 500,
 	pvph = 501,
+	act_battle = 502,
 }
 RoleBattle.bind = function (Role)
@@ -86,6 +87,20 @@ function Role:checkBattle(battleType, params)
 				enemylist[#enemylist + 1] = one["unitType"]
 			end
 		end,
+		act_battle = function()
+			for slot, hero in pairs(self:getTeamHerosInfo(params.heros)) do
+				selflist[slot] = hero.type
+			end
+			heroscore = self:getTeamBattleValue(params.heros)
+			for slot , one in pairs(params.supports) do
+				teamskill[one[1]] = one[2]
+			end
+			local carbonData = params.cfg
+			local monsterData = csvdb[carbonData.monster:match("/([^/]*)$") .. "Csv"]
+			for slot, one in pairs(monsterData[1]) do
+				enemylist[#enemylist + 1] = one["unitType"]
+			end
+		end,
 		pvpc = function()
 			for slot, hero in pairs(self:getProperty("pvpTSC")) do
 				selflist[slot] = hero.type
@@ -163,7 +178,7 @@ function Role:checkBattle(battleType, params)
 		mission_starttime = clientInfo.start or 0, -- 战斗开始时间，格式 unixtime 秒级
 		mission_roundtime = clientInfo.atime or 0, -- 对局时长(秒)
 		mission_result = params.isWin and 1 or 2, -- 战斗结果(0-无效，1-胜利，2-失败)
-		mission_star = 0, -- 战斗完成星数，无星级的话填写0
+		mission_star = params.star or 0, -- 战斗完成星数，无星级的话填写0
 		mission_restriction = 0, -- 周期内参与限制(0表示没有上限)
 		mission_difficulty = 0, -- 关卡困难度，无难度区分的话填写0
 		mission_strength = 1, -- 消耗的体力或次数
@@ -47,6 +47,8 @@ local ItemReason = {
 	actGachakon = 132, 	-- 扭蛋活动
 	totalRecharge = 133, -- 累计充值奖励
 	actHangDrop = 134, -- 掉落活动奖励
+	actBattle = 135, -- 活动关卡
+	actMilestone = 136,	-- 活动关卡boss伤害里程碑
 	advHang = 301, -- 拾荒挂机
@@ -1929,6 +1929,53 @@ function RolePlugin.bind(Role)
 		end
 		deleteNotify({pattern = pattern})
 	end
+
+	local CommonRankTime = toUnixtime("2019010100")
+	local CommonCoef1 = 10000
+	local CommonCoef2 = 10000
+	function Role:updateRankCommon(rankType, rankVal, reserve)
+		if not rankType then return end
+		reserve = reserve or 0
+		local now = skynet.timex()
+		local ct = math.ceil((now - CommonRankTime) / 86400) --按天计算  365 * 27 < 10000  可以维持 27 年
+		ct = 10000 - ct  -- 越早的排名越靠前
+		local score = (rankVal * CommonCoef1 + ct) * CommonCoef2 + reserve
+
+		local roleId = self:getProperty("id")
+		redisproxy:pipelining(function (red)
+			red:zadd(RANK_COMMON..rankType, score, roleId)	--更新分数
+		end)
+	end
+
+	function Role:getRankInfoCommon(rankType)
+		if not rankType then return end
+		local list = {}
+		local rankKey = RANK_COMMON .. rankType
+		local ids = redisproxy:zrevrange(rankKey, 0 , 99, "WITHSCORES")
+		for i = 1, #ids, 2 do
+			local roleId = tonumber(ids[i])
+			local rankVal = tonumber(ids[i + 1])
+			rankVal = math.floor(math.floor(rankVal / CommonCoef2) / CommonCoef1)
+			table.insert(list, {roleId = roleId, player = rankVal})
+		end
+
+		for _, v in ipairs(list) do
+			local _, curInfo = rpcRole(v.roleId, "friendSInfo")
+			curInfo.ltime = nil
+			curInfo.rankVal = v.player
+			v.player = curInfo
+		end
+
+		local rank = redisproxy:ZREVRANK(rankKey, self:getProperty("id"))
+		if not rank then
+			rank = -1
+		else
+			rank = rank + 1
+		end
+		return {list = list, rank = rank}
+	end
+
+
 end
 return RolePlugin
 \ No newline at end of file
@@ -7,6 +7,7 @@ require &quot;shared.init&quot;
 require "utils.init"
 require "RedisKeys"
 require "skynet.manager"
+require "GlobalVar"
 local ipairs = ipairs
@@ -16,6 +17,7 @@ local string_format = string.format
 local CHECK_MAIL_STATUS_INTERVAL 	= 100 * 60
+local CHECK_BATTLE_ACT_CLOSE_INTERVAL = 100 * 1
 local function mailQuene()
 	local delayEmail = tonum(redisproxy:hget("autoincrement_set", "delay_email"))
 	if delayEmail == 0 then
@@ -91,6 +93,64 @@ local function check_mail_queue()
 	skynet.timeout(CHECK_MAIL_STATUS_INTERVAL, check_mail_queue)
 end
+-- @desc: 检测关卡活动结束 排行榜奖励发放
+local lastCheckBattleActTs = 0
+local function check_battle_act_close()
+	local csvdb = require "shared.csvdata"
+	local act = require "models.Activity"
+	local st = 0
+	local et = 0
+	local actId = 0
+	local timeNow = skynet.timex()
+	for k, v in pairs(csvdb["activity_ctrlCsv"]) do
+		if v.showType == act.ActivityType.ChallengeLevel then
+			local openTimes = v.time:toArray(false, "=")
+			if openTimes[1] ~= "0" then
+				st = toUnixtime(openTimes[1]..string_format("%02x", RESET_TIME))
+			end
+			if openTimes[2] ~= "0" then
+				et = toUnixtime(openTimes[2]..string_format("%02x", RESET_TIME))
+			end
+			actId = k
+			break
+		end
+	end
+	if st ~= 0 and et ~= 0 and actId ~= 0 then
+		-- close
+		if lastCheckBattleActTs < et and timeNow >= et then
+			-- check rank key exist
+			local rankKey = RANK_COMMON..RANK_TYPE.ActBattleBoss
+			local flag = redisproxy:exists(rankKey)
+			if flag then
+				local actData = csvdb["activity_groupCsv"][actId]
+				local lastRank = actData[#actData].rank
+
+				local ids = redisproxy:zrevrange(rankKey, 0 , lastRank - 1)
+				local rankIndex = 0
+				for roleId in pairs(ids) do
+					rankIndex = rankIndex + 1
+					for _, cfg in pairs(actData) do
+						if rankIndex <= cfg.rank then
+							redisproxy:insertEmail({
+								roleId = roleId,
+								emailId = cfg.email_1,
+								attachments = cfg.reward_1,
+								contentPms = {rankIndex},
+							})
+							break
+						end
+					end
+				end
+
+				redisproxy:del(rankKey..":bak")
+				redisproxy:rename(rankKey, rankKey..":bak")
+			end
+		end
+	end
+	lastCheckBattleActTs = skynet.timex()
+	skynet.timeout(CHECK_BATTLE_ACT_CLOSE_INTERVAL, check_battle_act_close)
+end
+
 local CMD = {}
@@ -115,6 +175,7 @@ end
 function CMD.start()
 	check_mail_queue()
+	check_battle_act_close()
 end
 local function __init__()