提交周活动-排行榜

script/Main.lua

@@ -374,6 +374,7 @@ local function initAfterStart()
     require("present.OpenServerRankDB").initAfterStart()
     require("absAct.AbsActBillboardMiddleLogic").initAfterStart()
     require("mozhu.MoZhuDB").initAfterStart()
+    require("common.CommonRankDB").initAfterStart()
     math.randomseed(os.time())
 end 
 

script/common/CommonDefine.lua

@@ -29,3 +29,11 @@ DISCONNECT_MSG[DISCONNECT_BANUSER] = Lang.DISCONNECT_BANUSER
 DISCONNECT_MSG[DISCONNECT_BANIP] = Lang.DISCONNECT_IP
 DISCONNECT_MSG[DISCONNECT_FCM_CHILD] = ""
 DISCONNECT_MSG[DISCONNECT_FCM_HEALTH] = ""
+
+
+------------------ 通用排行榜类型定义开始 ---------------------------
+COMMONRANK_TYPE_MIN = 1             -- 最小类型
+COMMONRANK_TYPE_WEEKRANK = 1        -- 周活动排行榜类型
+
+COMMONRANK_TYPE_MAX = COMMONRANK_TYPE_WEEKRANK            -- 最大类型
+------------------ 通用排行榜类型定义结束 ---------------------------

script/common/CommonRankDB.lua

@@ -0,0 +1,628 @@
+--------------------------------
+-- 文件名       ：  CommonRankDB.lua
+-- 文件说明     ：  通用排行榜DB数据
+-- 创建时间     :   2024/12/09
+-- 创建人       :   FC
+--------------------------------
+
+local Msg = require("core.Msg")
+local Timer = require("core.Timer")
+local DB = require("common.DB")
+local CommonDB = require("common.CommonDB")
+local CommonDefine = require("common.CommonDefine")
+local Log = require("common.Log")
+local LuaMongo = _G.lua_mongo
+local Util = require("common.Util")
+local Grid = require("bag.Grid")
+local OpenAct = require("present.OpenAct")
+local RoleDBLogic = require("role.RoleDBLogic")
+local YunYingLogic = require("yunying.YunYingLogic")
+local MailManager = require("mail.MailManager")
+local MailExcel = require("excel.mail")
+local OpenActExcel = require("excel.openAct")
+local WeekLoopActCof = require("excel.WeekLoopAct")
+local WeekLoopActDef = require("WeekendLoopActivity.WeekendLoopActDefine")
+
+--[[
+	开服活动排行DB操作,封装了一些公共处理方法
+    db字段只是缓存排名好的数据(只是内存数据)
+    Coomondb = {
+        [rankType] = {                  -- 排名类型
+            rankType = xxx,             -- 排名类型
+            uuid2rank = {               -- 根据UUID获取名次   
+                [uuid] = rank,          -- 玩家uuid = 排行名次
+                ...
+            },        
+            sendUuid2rank = {           -- 根据UUID获取发送名次
+                [uuid] = rank,          -- 玩家uuid = 真实发送的排行名次
+                ...
+            },
+            rank2data = {               -- 根据名次获取DATA
+                [rank] = {              -- 排行名次 = 玩家排名数据
+                   uuid = xxx,          -- 玩家uuid
+                   rankType = xxx,      -- 排名类型
+                   value = xxx,         -- 排名值
+                   time = xxx,          -- 排名值更新时间
+                   _id = xxx,           -- db记录中的uuid
+                },      
+                ...
+            },
+            sendRank2data = {           -- 根据名次获取发送DATA
+                [rank] = {              -- 排行名次 = 真实发送玩家排名数据
+                   uuid = xxx,          -- 玩家uuid
+                   rankType = xxx,      -- 排名类型
+                   value = xxx,         -- 排名值
+                   time = xxx,          -- 排名值更新时间
+                   _id = xxx,           -- db记录中的uuid
+                },      
+                ...
+            }
+        },
+        ...
+    }
+
+	DB:
+        db_common_rank = {     -- 开服排行类活动
+            [uuid] = {
+                uuid = xxx,             -- 玩家uuid
+                rankType= xxx,          -- 排名类型
+                value = xxx,            -- 排行值
+                time = xxx,             -- 排行值更新时间
+            }
+        }
+	local:
+        CommonDB_GetConfig()              -- 得到指定排名类型的活动配置
+        getMinRankValue()				-- 得到排行榜中最低上榜条件数
+        getMaxRank()				    -- 得到活动最多排名名次
+        getRankNeedValue()			    -- 得到排行榜中名次对应需要达到的条件数
+        getRankInfo()					-- 得到指定排行榜指定名次的配置信息
+        getRewardInfoByRank()           -- 获取奖励信息
+        getBoard()                      -- 获取指定排名类型DB数据
+        getRank()                       -- 获取指定排名类型、指定用户的排名
+        getSendRank()                   -- 获取指定排名类型、指定用户的发送排名
+        cmpRank()                       -- 排名算法
+        updateRank()                    -- 更新排名
+        updateData()                    -- 更新数据
+        loadBoard()                     -- 加载排行榜
+        resertBoard()                   -- 重置排行数据
+        initBoard()                     -- 初始排行榜
+        getDBData()                     -- 根据类型+uuid从db中取data
+        updateDBData()                  -- 更新DB数据
+        billboardSet()                  -- 设置排名数据
+        getMailID()                     -- 获取发送奖励的邮件ID
+        getRewardInfoByInfo()			-- 得到指定排行榜指定配置信息的奖励信息
+        rewardSend()					-- 奖励发送
+        wrapOpenServerRankRewardList    -- 包装档位奖励详情数据
+	public:
+		initAfterStart()			    -- 启动就初始化	
+		getMaxSendRank()				-- 得到最大发送排行名次数据
+		wrapOpenServerRankList()		-- 包装档位名次数据
+		wrapOwnerData()					-- 包装自己名次数据
+        rewardQuery()                   -- 发送奖励详情
+		onValueAdd()					-- 排行值增加回调
+        onValueSet()                    -- 排行值设置回调
+		onRewardSend()					-- 奖励发送回调
+--]]
+
+
+WeekAct_RankName = "WeekAct_ChargeRank"
+
+MAX_SEND_RANK = 10						-- 最大发送排名数
+MAX_SEND_WEEKACTRANK = 21               -- 周活动排行榜发送排名数
+
+Coomondb = Coomondb or {}                  			-- [rankType] = board
+CoomonQueryForData = {rankType = 1, uuid = 1} -- 通过排名类型和玩家uuid查找DB数据
+CoomonQueryByUuid = {_id = 1}                 -- 通过DB的uuid更新DB数据
+CoomonQueryByRankType = {rankType = 1}        -- 通过排名类型查找DB数据
+
+
+local function CommonDB_GetConfig(rankType)
+    if CommonDefine.COMMONRANK_TYPE_WEEKRANK == rankType  then
+        return WeekLoopActCof.Rank
+    end
+
+    return nil
+end
+
+-- 得到排行榜中最低上榜条件数
+local MIN_RANK_VALUES
+local function getMinRankValue(rankType)
+	MIN_RANK_VALUES = MIN_RANK_VALUES or {}
+	if MIN_RANK_VALUES[rankType] then return MIN_RANK_VALUES[rankType] end
+
+    local tWeekRankConfig = CommonDB_GetConfig(rankType)
+    if not tWeekRankConfig then return end
+
+    -- 这里后续有排行榜类型，保持命名一致
+    local minRankValue
+    for _,info in ipairs(tWeekRankConfig) do
+        if not minRankValue or minRankValue > info.nMoney then 
+            minRankValue = info.nMoney
+        end
+    end
+
+	MIN_RANK_VALUES[rankType] = minRankValue
+	return MIN_RANK_VALUES[rankType]
+end
+
+--local MAX_RANKS
+local function getMaxRank(rankType)
+    return 200
+end
+
+ -- 得到排行榜中名次对应需要达到的条件数
+local RANK_NEED_VALUES
+local function getRankNeedValue(rankType, rank)
+	RANK_NEED_VALUES = RANK_NEED_VALUES or {}
+
+	local minRankValue = getMinRankValue(rankType)
+	if RANK_NEED_VALUES[rankType] then 
+		local nValue = nil
+        for _, tData in ipairs(RANK_NEED_VALUES[rankType]) do
+            if tData.nMinRank <= rank and tData.nMaxRank >= rank then
+                nValue = tData.nValue
+                break
+            end
+        end
+
+        return nValue or minRankValue
+	end
+
+    local tWeekRankConfig = CommonDB_GetConfig(rankType)
+    if not tWeekRankConfig then return end
+
+	RANK_NEED_VALUES[rankType] = {}
+
+    local nValue = nil
+    for _, info in pairs(tWeekRankConfig) do
+        local nMinRank = info.ranks[1]
+        local nMaxRank = info.ranks[2]
+        table.insert(RANK_NEED_VALUES[rankType], {nMinRank = nMinRank, nMaxRank = nMaxRank, nValue = info.nMoney})
+
+        if nMinRank <= rank and nMaxRank >= rank then
+            nValue = info.nMoney
+        end
+    end
+ 
+	return nValue or minRankValue
+end
+
+-- 得到指定排行榜指定名次的配置信息
+local function getRankInfo(rankType, rank)
+    local tWeekRankConfig = CommonDB_GetConfig(rankType)
+    if not tWeekRankConfig then return end
+
+    local rankInfo
+    for _,info in pairs(tWeekRankConfig) do
+		if rank >= info.ranks[1] and rank <= info.ranks[2] then
+			rankInfo = info
+			break
+		end
+    end
+ 
+	return rankInfo
+end
+
+-- 获取奖励信息
+local function getRewardInfoByRank(rankType, rank)
+    local tWeekRankConfig = CommonDB_GetConfig(rankType)
+    if not tWeekRankConfig then return end
+
+	local rewardInfo
+    for _,info in pairs(tWeekRankConfig) do
+        if rank >= info.ranks[1] and rank <= info.ranks[2] then
+            rewardInfo = info.prize
+            break
+        end
+    end
+
+	return rewardInfo
+end
+
+-- 获取指定排名类型DB数据
+local function getBoard(rankType)
+    return Coomondb[rankType]
+end
+
+-- -- 获取指定排名类型、指定用户的排名
+local function getRank(rankType, uuid)
+    local board = getBoard(rankType)
+    if not board then return end
+
+    return board.uuid2rank[uuid]
+end
+
+-- 获取指定排名类型、指定用户的发送排名
+local function getSendRank(rankType, uuid)
+    local board = getBoard(rankType)
+    if not board then return end
+
+    return board.sendUuid2rank[uuid]
+end
+
+-- 排名算法
+local function cmpRank(rankType, data1, data2)
+    if data1.value ~= data2.value then
+        return data1.value > data2.value
+    end
+
+    return data1.time < data2.time
+end
+
+-- 更新排名
+local function updateRank(board)
+    if not board then return end
+
+    -- 清空普通排名和发送排名玩家数据
+    for uuid in pairs(board.uuid2rank) do
+        board.uuid2rank[uuid] = nil
+        board.sendUuid2rank[uuid] = nil
+    end
+
+    -- 设置普通排名
+    for rank, data in ipairs(board.rank2data) do
+		board.uuid2rank[data.uuid] = rank
+	end
+
+    -- 清空发送排名
+    for rank in ipairs(board.sendRank2data) do
+        board.sendRank2data[rank] = nil
+    end
+
+    local minRankValue = getMinRankValue(board.rankType)                -- 排名最小需要的排名值
+    local aleadyRankCnt = 0                                             -- 已经排好的玩家数
+    local maxRank = getMaxRank(board.rankType)                          -- 最多排名玩家数量
+    for rank = 1, maxRank do
+        local rankNeedValue = getRankNeedValue(board.rankType, rank)    -- 取当前排名需要的排名值
+
+        local rank2data = board.rank2data[aleadyRankCnt + 1]            -- 当前排的玩家
+        if rank2data then                                               -- 还有玩家需要排
+            if rank2data.value >= rankNeedValue then                    -- 达到排名值,可以排名
+    		    board.sendUuid2rank[rank2data.uuid] = rank              -- 设置玩家发送排名
+    		    board.sendRank2data[rank] = rank2data                   -- 设置发送排名数据
+    		    aleadyRankCnt = aleadyRankCnt + 1                       -- 排名玩家数量+1
+            elseif rankNeedValue <= minRankValue then                   -- 未达到排名值 且 当前排名值 小于等于 最小需要的排名值了,则后面的玩家都不需要排了
+                    break
+             else                                                       -- 未到达最低排名值,当前名次未有玩家达到
+                board.sendRank2data[rank] = -1
+            end
+        else                                                            -- 没玩家排了直接停止
+            break
+        end
+    end
+end
+
+-- 更新数据
+local function updateData(rankType, data)
+    local board = getBoard(rankType)
+    if not board then return end
+
+    local uuid = data.uuid
+    local oldRank = getRank(rankType, uuid) or (#board.rank2data + 1)
+    board.rank2data[oldRank] = data
+
+    -- 向后比较(data.value 减少时),往排名低方向->
+    for i = oldRank + 1, #board.rank2data do
+        local data1 = board.rank2data[i - 1]
+        local data2 = board.rank2data[i]
+        if cmpRank(rankType, data1, data2) then
+            break
+        end
+        board.rank2data[i - 1] = data2
+        board.rank2data[i] = data1
+    end
+
+    -- 向前比较(data.value 增加时),往排名高方向<-
+    for i = oldRank - 1, 1, -1 do
+        local data1 = board.rank2data[i]
+        local data2 = board.rank2data[i + 1]
+        if cmpRank(rankType, data1, data2) then
+            break
+        end
+        board.rank2data[i] = data2
+        board.rank2data[i + 1] = data1
+    end  
+
+    local maxRank = getMaxRank(rankType)
+    board.rank2data[maxRank + 1] = nil  
+    return true
+end
+
+-- 加载排行榜
+local function loadBoard()
+    local cnt = 0
+    LuaMongo.find(DB.db_common_rank, nil)
+    while true do
+        local data = {}
+        if not LuaMongo.next(data) then
+            break
+        end
+
+        cnt = cnt + 1
+        if cnt % 1000 == 0 then
+            _G.collectgarbage("step", 100000)
+        end
+        updateData(data.rankType, data)
+    end
+
+    for _, board in pairs(Coomondb) do
+        updateRank(board)
+    end
+end
+
+-- 重置排行数据
+local function resertBoard(board)
+    board.uuid2rank = {}        -- 根据UUID获取名次   
+    board.sendUuid2rank = {}    -- 根据UUID获取发送名次   
+    board.rank2data = {}        -- 根据名次获取DATA
+    board.sendRank2data = {}    -- 根据名次获取发送DATA
+end
+
+-- 初始排行榜
+local function initBoard(rankType)
+    local board = {}
+    resertBoard(board)
+    board.rankType = rankType
+    Coomondb[rankType] = board
+end
+
+-- 根据类型+uuid从db中取data
+local function getDBData(rankType, uuid)
+    CoomonQueryForData.rankType = rankType
+    CoomonQueryForData.uuid = uuid
+
+    local data = {}
+    LuaMongo.find(DB.db_common_rank, CoomonQueryForData)
+    return LuaMongo.next(data) and data
+end
+
+-- 更新DB数据
+local function updateDBData(data)
+    local oldData = getDBData(data.rankType, data.uuid)
+    if oldData then
+        CoomonQueryByUuid._id = oldData._id
+        LuaMongo.update(DB.db_common_rank, CoomonQueryByUuid, data)
+    else
+        LuaMongo.insert(DB.db_common_rank, data)
+    end
+end
+
+-- 设置排名数据
+local function billboardSet(data)
+    local board = getBoard(data.rankType)
+    if not board then return end
+
+    updateData(data.rankType, data)
+    updateRank(board)
+    updateDBData(data)
+end
+
+-- 获取发送奖励的邮件ID
+local function getMailID(rankType, rankInfo)
+    if CommonDefine.COMMONRANK_TYPE_WEEKRANK == rankType then
+        return WeekLoopActDef.WEEKACT_RANK_MAILID
+    end
+
+	return WeekLoopActDef.WEEKACT_RANK_MAILID
+end
+
+-- 得到指定排行榜指定配置信息的奖励信息
+local function getRewardInfoByInfo(rankType, rankInfo)
+    if CommonDefine.COMMONRANK_TYPE_WEEKRANK == rankType then
+        return rankInfo.prize
+    end
+
+	return rankInfo.prize
+end
+
+-- 奖励发送
+MAIL_SEND_CACHE = MAIL_SEND_CACHE or nil
+local function rewardSend(rankType)
+	local board = getBoard(rankType)
+    if not board then return end
+
+    MAIL_SEND_CACHE = MAIL_SEND_CACHE or {}
+    MAIL_SEND_CACHE[rankType] = {}  
+
+    local mailID = getMailID()
+
+    for rank, rankData in ipairs(board.sendRank2data) do
+        if rankData and rankData ~= -1 then
+            local rankInfo = getRankInfo(rankType, rank)
+            if rankInfo then
+                MAIL_SEND_CACHE[rankType][rank] = rankData.uuid
+                --mailID = getMailID(rankType, rankInfo)
+            --[[
+	        local mailID = getMailID(rankType, rankInfo)
+		    local rewardInfo = getRewardInfoByInfo(rankType, rankInfo)
+			        
+		    local mailConfig = MailExcel.mail[mailID]
+		    local title = mailConfig.title
+		    local senderName = mailConfig.senderName
+		    local content = mailConfig.content		
+			        			
+		    MailManager.add(MailManager.SYSTEM, rankData.uuid, 
+						title, Util.format(content, rank), rewardInfo, senderName)   --]]
+            end                      	
+        end
+    end
+
+    Timer.addLater(10, CommonDB_SendPrize, mailID, rankType)
+
+    -- 把内存中的数据重置,并移除DB中数据
+    resertBoard(board)
+    CoomonQueryByRankType.rankType = rankType
+    LuaMongo.remove(DB.db_common_rank, CoomonQueryByRankType)
+end
+
+-- 包装档位奖励详情数据
+local function wrapOpenServerRankRewardList(rankType, net, info)
+    net.minRank = info.ranks[1]
+    net.maxRank = info.ranks[2]
+
+    local rewardInfo = info.prize
+
+ 	local len = 0
+	for index,itemInfo in ipairs(rewardInfo) do
+		len = len + 1
+		Grid.makeItem(net.items[index], itemInfo[1], itemInfo[2])
+	end
+
+	net.items[0] = len
+end
+
+-- 启动就初始化
+function initAfterStart()
+    if _G.is_middle == true then return end
+
+    for nType = CommonDefine.COMMONRANK_TYPE_MIN, CommonDefine.COMMONRANK_TYPE_MAX do
+        initBoard(nType)
+        print("[initAfterStart] 初始化排行榜 nType = "..nType)
+    end
+
+    loadBoard()
+end
+ 
+-- 得到最大发送排行名次数据
+function getMaxSendRank(rankType)
+    if CommonDefine.COMMONRANK_TYPE_WEEKRANK == rankType then
+        return MAX_SEND_WEEKACTRANK
+    end
+
+    return MAX_SEND_RANK
+end
+
+-- 包装档位名次数据
+function wrapOpenServerRankList(rankType, net, rank)
+	local board = getBoard(rankType)
+	local sendRankData = board.sendRank2data[rank]
+
+	net.rank = rank
+	net.rankNeedValue = getRankNeedValue(rankType, rank)
+	if sendRankData and sendRankData ~= -1 then
+		local userDB = RoleDBLogic.getDb(sendRankData.uuid)
+		net.uid = sendRankData.uuid
+		net.name = userDB.name
+		net.head = userDB.head
+		net.rankValue = sendRankData.value
+		net.headFrame = userDB.headFrame
+	else
+		net.uid = "-1"
+		net.name = ""
+		net.head = -1
+		net.rankValue = 0
+		net.headFrame = -1
+	end
+ 	
+ 	local rewardInfo = getRewardInfoByRank(rankType, rank)
+ 	local len = 0
+ 	if rewardInfo then
+		for index,itemInfo in ipairs(rewardInfo) do
+			len = len + 1
+			Grid.makeItem(net.items[index], itemInfo[1], itemInfo[2])
+		end
+ 	end
+	net.items[0] = len
+end
+
+-- 包装自己名次数据
+function wrapOwnerData(rankType, net, uuid)
+	local maxRank = getMaxRank(rankType)
+	local sendRank = getSendRank(rankType, uuid)
+	local board = getBoard(rankType)
+	local rankData
+    if sendRank then
+        rankData = board.sendRank2data[sendRank]
+    else
+        local rank = getRank(rankType, uuid)
+        rankData = rank and board.rank2data[rank]
+    end
+
+	net.rank = sendRank or -1
+	net.rankValue = rankData and rankData.value or 0
+
+ 	local len = 0
+ 	if sendRank then
+ 		local rewardInfo = getRewardInfoByRank(rankType, sendRank)
+		for index,itemInfo in ipairs(rewardInfo) do
+			len = len + 1
+			Grid.makeItem(net.items[index], itemInfo[1], itemInfo[2])
+		end
+ 	end
+	net.items[0] = len
+end
+
+-- 发送奖励详情
+function rewardQuery(human, rankType)
+    local tWeekRankConfig = CommonDB_GetConfig(rankType)
+ 
+	local msgRet = Msg.gc.GC_OPEN_SERVER_RANK_REWARD_QUERY
+	msgRet.type = rankType
+
+    local len = 0
+    for _,info in ipairs(tWeekRankConfig) do
+        len = len + 1
+        wrapOpenServerRankRewardList(rankType, msgRet.list[len], info)
+    end
+    msgRet.list[0] = len
+
+    Msg.send(msgRet, human.fd)
+end
+
+-- 排行值增加回调
+function onValueAdd(human, rankType, value)
+ 	local dbData = getDBData(rankType, human.db._id) or {}
+    local tValue = (dbData.value or 0) + value
+    onValueSet(human, rankType, tValue)
+end
+
+-- 排行值设置回调
+function onValueSet(human, rankType, tValue)
+ 	local dbData = getDBData(rankType, human.db._id) or {}
+	dbData.value = tValue
+	dbData.time = os.time()
+	dbData.rankType = rankType
+	dbData.uuid = human.db._id
+	billboardSet(dbData)
+end
+
+-- 奖励发送回调
+function onRewardSend(nRankType)
+    local openDay = CommonDB.getServerOpenDay()
+    if not openDay then return end
+
+    rewardSend(nRankType)
+end
+
+-- 定时器 邮件分开发，预防崩溃
+function CommonDB_SendPrize(mailID, rankType)
+    if mailID and MAIL_SEND_CACHE and MAIL_SEND_CACHE[rankType] then
+        local mailConfig = MailExcel.mail[mailID]   
+	    local title = mailConfig.title
+	    local senderName = mailConfig.senderName
+	    local content = mailConfig.content	    
+        local mailSends = MAIL_SEND_CACHE[rankType] 
+
+        for rank,uuid in pairs(mailSends) do
+            local rankInfo = getRankInfo(rankType, rank)
+            if rankInfo then
+                local rewardInfo = getRewardInfoByInfo(rankType, rankInfo)
+			    if rewardInfo then	
+		            MailManager.add(MailManager.SYSTEM, uuid, 
+						        title, Util.format(content, rank), rewardInfo, senderName)           
+                end        
+            end
+        end
+
+        MAIL_SEND_CACHE[rankType] = nil
+    end
+
+    --[[
+    -- 发完奖励后,把内存中的数据重置,并移除DB中数据
+    local board = getBoard(rankType)
+    if board then 
+        resertBoard(board)
+        CoomonQueryByRankType.rankType = rankType
+        LuaMongo.remove(DB.db_common_rank, CoomonQueryByRankType)  
+    end--]]
+end

script/common/DB.lua

@@ -32,6 +32,7 @@ db_valley_record =			Config.DB_NAME .. ".valley_record"   	-- 荣耀峡谷/龙
 db_war_report =			    Config.DB_NAME .. ".war_report"   	    -- 战报[跨服记录 冠军联赛 王者争霸 天梯 切磋 系列排名存储记录]
 db_openServer_billboard =   Config.DB_NAME .. ".openServer_billboard"-- 开服排行类活动
 db_lost_temple          =   Config.DB_NAME .. ".lost_temple"         -- 神庙
+db_common_rank			= 	Config.DB_NAME .. ".common_rank"         -- 通用排行榜
 -- 加db第一步 请先确认是否要建对应字段的索引 第二步请确认合服逻辑是否要修改 
 
 function init()

script/module/WeekendLoopActivity/Handler.lua

@@ -2,6 +2,8 @@ local WeekendLoopActManger = require("WeekendLoopActivity.WeekendLoopActManager"
 local WeekLoopActHeroStar = require("WeekendLoopActivity.WeekendLoopActHeroStar")
 local WeekLoopActGuYu = require("WeekendLoopActivity.WeekendLoopActUseGuYu")
 local WeekLoopActCard = require("WeekendLoopActivity.WeekendLoopActCard")
+local WeekLoopActRank = require("WeekendLoopActivity.WeekendLoopActRank")
+
 
 -- 请求英雄升星活动信息
 function CG_WEEKLOOP_ACT_HEROQUERY(human, msg)
@@ -44,7 +46,7 @@ function CG_WEEKLOOP_ACT_CARDGETPRIZE(human, msg)
     WeekLoopActCard.WeekActCard_GetPrize(human)
 end
 
-
+----------------------------------------- 排行榜协议请求开始 -------------------------------------
 function CG_WEEKLOOP_ACT_RANK_QUERY(human, msg)
-   
+    WeekLoopActRank.WeekActRank_Query(human)
 end

script/module/WeekendLoopActivity/WeekendLoopActDefine.lua

@@ -13,6 +13,7 @@ WEEKACT_STATE_NONE    =   0       -- 不可领取
 WEEKACT_STATE_CANGET  =   1       -- 可领取
 WEEKACT_STATE_FINISH  =   2       -- 已领取
 
+-- 升星邮件ID
 WEEKACT_HEROSTAR_MAILID = 7009
 WEEKACT_HEROSTAR_HREOLEN = 30
 
@@ -45,4 +46,6 @@ TWEEKACT_CARD_PANELID_NAME = {
     [1] = "限时高级召唤",
     [2] = "限时寻星",
     [3] = "限时天命召唤",
-}
+}
+
+WEEKACT_RANK_MAILID = 7010

script/module/WeekendLoopActivity/WeekendLoopActManager.lua

@@ -25,6 +25,7 @@ local WeekLoopActHeroStar = require("WeekendLoopActivity.WeekendLoopActHeroStar"
 local YunYingLogic = require("yunying.YunYingLogic")
 local WeekLoopActGuYu = require("WeekendLoopActivity.WeekendLoopActUseGuYu")
 local weekLoopActCard = require("WeekendLoopActivity.WeekendLoopActCard")
+local weekLoopActRank = require("WeekendLoopActivity.WeekendLoopActRank")
 
 -- 活动信息
 tWeekActInfo = nil
@@ -69,7 +70,6 @@ function WeekLoopACT_SendActInfo(human)
         local bRed = false
         if tWeekActModuel[id] and tWeekActModuel[id].isRed then
             bRed = tWeekActModuel[id].isRed(human)
-
         end
         
         -- 特殊处理的命名
@@ -195,6 +195,9 @@ local function WeekLoopACT_Begin()
     for uuid, human in pairs(ObjHuman.onlineUuid) do
         WeekLoopACT_BeginAllAct(human)
     end
+
+    -- 清理排行榜数据
+    weekLoopActRank.WeekActRank_ResetData()
 end
 
 -- 活动结束
@@ -203,6 +206,9 @@ local function WeekLoopACT_End()
     for uuid, human in pairs(ObjHuman.onlineUuid) do
         WeekLoopACT_EndAllAct(human)
     end
+
+    -- 排行榜直接处理
+    weekLoopActRank.WeekActRank_End()
 end
 
 ----------------------------------------- 外部调用开始 -------------------------------------
@@ -245,6 +251,7 @@ function onZeroAll(funcID)
     elseif WeekLoopActDef.WEEKACT_ENDDAY == tDate.wday then
         print("[WeekLoopACT_onZeroAll] 周末活动结束打印")
  
+        -- 活动结束
         WeekLoopACT_End()
 
         tWeekActInfo = nil
@@ -300,6 +307,7 @@ function WeekLoopACT_Init()
                     print("[WeekLoopACT_Init] 初始化模块数据失败 nID ".. nID)
                 end
             end
+            print("[WeekLoopACT_Init] 加载模块成功 name = "..v.name)
         else
             print("[WeekLoopACT_Init] 加载模块失败 nID ".. nID)
         end
@@ -472,4 +480,18 @@ function GMResetWeekAct(human)
 
         WeekLoopACT_BeginAllAct(human)
     end
+end
+
+function onCharge(human, price, funcID, buyID)
+    if not human then
+        return
+    end
+
+    if false == WeekLoopACT_IsRun() then
+        return
+    end
+
+    print("[onCharge] 玩家充值回调开始 name = "..human.db.name.." price = "..price)
+
+    weekLoopActRank.onCharge(human, price, funcID, buyID)
 end

script/module/WeekendLoopActivity/WeekendLoopActRank.lua

@@ -0,0 +1,108 @@
+--------------------------------
+-- 文件名       ：  WeekendLoopActRank.lua
+-- 文件说明     ：  周末冲刺-排行榜
+-- 创建时间     :   2024/12/09
+-- 创建人       :   FC
+--------------------------------
+
+local Msg = require("core.Msg")
+local Util = require("common.Util")
+local Lang = require("common.Lang")
+local CommonRankDB = require("common.CommonRankDB")
+local OpenServerRankDB = require("present.OpenServerRankDB")
+local Broadcast = require("broadcast.Broadcast")
+local OpenAct = require("present.OpenAct")
+local YunYingLogic = require("yunying.YunYingLogic")
+local DrawCardLogic = require("drawCard.DrawCardLogic")
+local CommonDefine = require("common.CommonDefine")
+
+--[[
+    local:
+
+	public:
+    	query()					            -- 发送活动信息
+        onCharge()			                -- 充值回调
+        WeekActRank_ResetData(human)        -- 重置玩家身上的充值
+        WeekActRank_ResetDBData()           -- 重置排行榜数据
+--]]
+
+----------------------------------------- 内部处理开始 -------------------------------------
+-- 重置
+function WeekActRank_ResetCharge(human)
+    -- if not human then
+    --     return
+    -- end
+
+    -- human.db.nWeekCharge = 0
+end
+
+-- 获取充值额度
+function WeekActRank_GetCharge(human)
+    -- if not human then
+    --     return 0
+    -- end
+
+    -- if not human.db.nWeekCharge then
+    --     WeekActRank_ResetCharge(human)
+    -- end
+
+    -- return human.db.nWeekCharge
+end
+
+-- 设置充值额度
+function WeekActRank_GetCharge(human, nVal)
+    -- if not human or 0 >= nVal then
+    --     return
+    -- end
+
+    -- if not human.db.nWeekCharge then
+    --     WeekActRank_ResetCharge(human)
+    -- end
+
+    -- human.db.nWeekCharge = human.db.nWeekCharge + nVal
+end
+
+
+----------------------------------------- 外部调用 -------------------------------------
+function WeekActRank_ResetData(human)
+    if not human then
+        return
+    end
+    
+    --WeekActRank_ResetCharge(human)
+end
+
+function WeekActRank_ResetDBData()
+    -- CommonRankDB.ResetData() 
+end
+
+-- 活动结束
+function WeekActRank_End()
+    CommonRankDB.onRewardSend(CommonDefine.COMMONRANK_TYPE_WEEKRANK)
+end
+
+-- 充值回调
+function onCharge(human, price, funcID, buyID)
+    CommonRankDB.onValueAdd(human, CommonDefine.COMMONRANK_TYPE_WEEKRANK, price)
+end
+
+----------------------------------------- 外部调用 -------------------------------------
+
+-- 客户端请求
+function WeekActRank_Query(human)
+    local nRankType = CommonDefine.COMMONRANK_TYPE_WEEKRANK
+	local maxSendRank = CommonRankDB.getMaxSendRank(nRankType)
+
+	local msgRet = Msg.gc.GC_WEEKLOOP_ACT_RANK_QUERY
+	
+	CommonRankDB.wrapOwnerData(nRankType, msgRet.ownerData, human.db._id)
+	
+    for rank = 1,maxSendRank do
+		CommonRankDB.wrapOpenServerRankList(nRankType, msgRet.list[rank], rank)
+	end
+    
+	msgRet.list[0] = maxSendRank
+
+	Msg.send(msgRet, human.fd)
+end
+