新增首充活动

csv/cfg_Activity_firstRecharge.csv

@@ -0,0 +1,3 @@
+int#c#s,int#c#s,intListList#c#s,string#c#s
+id,mainTaskId,reward,text
+1,10,50030002#3|50030004#1|21400002#1|21500002#1,Ê׳ä³Æºô¼Ó³É

meta/userapi/lua/ActFirstRecharge.lua

@@ -0,0 +1,112 @@
+-- 活动 - 首充
+ActFirstRecharge = {}
+ActFirstRecharge.__index = ActFirstRecharge
+
+local function _rechargeType()
+    return "0"
+end
+
+local function _playerDbKey()
+    return "T$act_recharge_first_data"
+end
+
+function ActFirstRecharge.getData(actor)
+    local var = getplaydef(actor, _playerDbKey())
+    local data = setmetatable(var or {}, ActFirstRecharge)
+    -- 充值事件
+    if not data.payTime then
+        data.payTime = 0
+    end
+    -- 领奖状态
+    if not data.rewardStatus then
+        data.rewardStatus = 0
+    end
+    return data
+end
+
+function ActFirstRecharge:saveData(actor)
+    setplaydef(actor, _playerDbKey(), self)
+end
+
+---充值回调触发事件
+function ActFirstRecharge.rechargeEvent(actor, cfg_recharge, count, amount, ext, outRewards)
+    local data = ActFirstRecharge.getData(actor)
+    -- 已充值
+    if data.payTime > 0 then
+        return
+    end
+    data.payTime = getbaseinfo("nowsec")
+    data.rewardStatus = 1
+    ActFirstRecharge.saveData(data, actor)
+    ActFirstRecharge.sendPanel(actor, data)
+    -- jprint("更新豪礼数据",data,config)
+    sendluamsg(
+        actor,
+        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
+        {payTime = data.payTime, rewardStatus = data.rewardStatus}
+    )
+end
+
+---统一的请求消息处理
+function ActFirstRecharge.reqAction(actor, type, action, reqParameter)
+    if action == "panel" then
+        local data = ActFirstRecharge.getData(actor)
+        ActFirstRecharge.sendPanel(actor, data)
+    elseif action == "reward" then
+        ActFirstRecharge.gainReward(actor, reqParameter)
+    end
+end
+
+function ActFirstRecharge.gainReward(actor, reqParameter)
+    local data = ActFirstRecharge.getData(actor)
+    -- 未充值
+    if data.payTime == 0 then
+        tipinfo(actor, "未充值")
+        return
+    end
+    -- 已领取
+    if data.rewardStatus > 0 then
+        tipinfo(actor, "已领取")
+        return
+    end
+    -- 发放奖励
+    local reward = ConfigDataManager.getTableValue("cfg_Activity_firstRecharge", "reward", "id", 1)
+    local tmp = string.toIntIntMap(reward, "#", "|")
+    if table.notNullOrEmpty(tmp) then
+        --奖励进入背包
+        Bag.sendRewards(actor, tmp, "充值奖励")
+    end
+
+    -- 改变状态
+    data.rewardStatus = 2
+    ActFirstRecharge.saveData(data, actor)
+    -- 发送奖励
+    ActFirstRecharge.sendPanel(actor, data)
+    -- jprint("领奖豪礼数据",data)
+    sendluamsg(
+        actor,
+        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
+        {payTime = data.payTime, rewardStatus = data.rewardStatus}
+    )
+end
+
+function ActFirstRecharge.sendPanel(actor, data)
+    Recharge.resAction(actor, _rechargeType(), "panel", data)
+end
+
+-- 获取活动信息
+function ActFirstRecharge.getInfo(actor, msgData)
+    local data = ActFirstRecharge.getData(actor)
+    sendluamsg(
+        actor,
+        LuaMessageIdToClient.RES_ACT_FIRST_CHARGE_INFO,
+        {payTime = data.payTime, rewardStatus = data.rewardStatus}
+    )
+end
+
+--TODO 一定要放到文件最后
+EventListerTable.registerType("首充活动", _rechargeType(), _playerDbKey())
+--注册充值事件
+RechargeEventListerTable:eventLister(_rechargeType(), "首充活动", ActFirstRecharge.rechargeEvent)
+-- 注册请求消息监听
+RechargeMessageEventListerTable:eventLister(_rechargeType(), "首充活动", ActFirstRecharge.reqAction)

meta/userapi/lua/ActivityManager.lua

@@ -6,9 +6,10 @@ local this = {}
 
 -- 活动类型
 local ACTIVITY_TYPE = {
-    WORLD_BOSS = 1,    -- 世界BOSS争夺战
-    SIEGE_WAR = 2,     -- 攻城战
-    MONSTER_LEGION = 3 -- 怪物军团
+    WORLD_BOSS = 1, -- 世界BOSS争夺战
+    SIEGE_WAR = 2, -- 攻城战
+    MONSTER_LEGION = 3, -- 怪物军团
+    FIRST_RECHARGE = 4 -- 首充活动
 }
 
 -- 活动配置
@@ -30,13 +31,19 @@ local ACTIVITY_CONFIG = {
         description = "每周三、周五晚上7点开启，抵御怪物入侵",
         module = MonsterLegion,
         enabled = true
+    },
+    [ACTIVITY_TYPE.FIRST_RECHARGE] = {
+        name = "首充活动",
+        description = "完成主线特定任务开启",
+        module = ActFirstRecharge,
+        enabled = true
     }
 }
 
 -- 初始化所有活动系统
 function this.Init()
     info("活动管理器初始化开始")
-    
+
     -- 初始化各个活动系统
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         if config.enabled and config.module and config.module.Init then
@@ -48,27 +55,30 @@ function this.Init()
             end
         end
     end
-    
+
     -- 启动活动检查定时器
     this.StartActivityCheckTimer()
-    
+
     info("活动管理器初始化完成")
 end
 
 -- 启动活动检查定时器
 function this.StartActivityCheckTimer()
     -- 每30秒检查一次活动状态
-    setTimer(30000, function()
-        this.CheckAllActivities()
-    end)
+    setTimer(
+        30000,
+        function()
+            this.CheckAllActivities()
+        end
+    )
 end
 
 -- 检查所有活动状态
 function this.CheckAllActivities()
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         if config.enabled and config.module then
-            -- 这里可以添加活动状态检查逻辑
-            -- 例如：检查活动是否异常、是否需要重启等
+        -- 这里可以添加活动状态检查逻辑
+        -- 例如：检查活动是否异常、是否需要重启等
         end
     end
 end
@@ -79,7 +89,7 @@ function this.GetActivityInfo(activityType)
     if not config or not config.enabled then
         return nil
     end
-    
+
     local module = config.module
     local info = {
         type = activityType,
@@ -90,34 +100,34 @@ function this.GetActivityInfo(activityType)
         timeRemaining = 0,
         participants = 0
     }
-    
+
     -- 获取活动状态
     if module.GetActivityStatus then
         info.status = module.GetActivityStatus()
     end
-    
+
     -- 获取当前阶段
     if module.GetCurrentPhase then
         info.phase = module.GetCurrentPhase()
     end
-    
+
     -- 获取剩余时间
     if module.GetActivityRemainingTime then
         info.timeRemaining = module.GetActivityRemainingTime()
     end
-    
+
     -- 获取参与人数
     if module.GetParticipantCount then
         info.participants = module.GetParticipantCount()
     end
-    
+
     return info
 end
 
 -- 获取所有活动信息
 function this.GetAllActivitiesInfo()
     local activities = {}
-    
+
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         if config.enabled then
             local info = this.GetActivityInfo(activityType)
@@ -126,7 +136,7 @@ function this.GetAllActivitiesInfo()
             end
         end
     end
-    
+
     return activities
 end
 
@@ -136,7 +146,7 @@ function this.StartActivity(activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
     if module.StartActivity then
         local success, err = pcall(module.StartActivity)
@@ -158,7 +168,7 @@ function this.StopActivity(activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
     if module.EndActivity then
         local success, err = pcall(module.EndActivity)
@@ -180,9 +190,9 @@ function this.PlayerJoinActivity(actor, activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
-    
+
     -- 根据活动类型调用相应的报名函数
     if activityType == ACTIVITY_TYPE.WORLD_BOSS then
         if module.PlayerRegister then
@@ -197,7 +207,7 @@ function this.PlayerJoinActivity(actor, activityType)
             return module.PlayerRegister(actor)
         end
     end
-    
+
     return false, "活动不支持报名功能"
 end
 
@@ -207,13 +217,13 @@ function this.CanPlayerJoinActivity(actor, activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
-    
+
     if module.CanPlayerParticipate then
         return module.CanPlayerParticipate(actor)
     end
-    
+
     return false, "活动不支持参与检查"
 end
 
@@ -223,9 +233,9 @@ function this.GetActivityRanking(activityType, rankingType)
     if not config or not config.enabled then
         return {}
     end
-    
+
     local module = config.module
-    
+
     if rankingType == "player" then
         if module.GetPlayerScoreRanking then
             return module.GetPlayerScoreRanking()
@@ -239,7 +249,7 @@ function this.GetActivityRanking(activityType, rankingType)
             return module.GetAllianceDamageRanking()
         end
     end
-    
+
     return {}
 end
 
@@ -249,34 +259,34 @@ function this.GetActivityDetailedStatus(activityType)
     if not config or not config.enabled then
         return nil
     end
-    
+
     local module = config.module
     local status = {
         type = activityType,
         name = config.name,
         enabled = config.enabled
     }
-    
+
     -- 获取活动状态
     if module.GetActivityStatus then
         status.status = module.GetActivityStatus()
     end
-    
+
     -- 获取当前阶段
     if module.GetCurrentPhase then
         status.phase = module.GetCurrentPhase()
     end
-    
+
     -- 获取剩余时间
     if module.GetActivityRemainingTime then
         status.timeRemaining = module.GetActivityRemainingTime()
     end
-    
+
     -- 获取参与人数
     if module.GetParticipantCount then
         status.participants = module.GetParticipantCount()
     end
-    
+
     -- 根据活动类型获取特定信息
     if activityType == ACTIVITY_TYPE.WORLD_BOSS then
         if module.GetBossHPInfo then
@@ -297,7 +307,7 @@ function this.GetActivityDetailedStatus(activityType)
             status.stats = module.GetActivityStats()
         end
     end
-    
+
     return status
 end
 
@@ -307,13 +317,13 @@ function this.SendActivityNotice(activityType, message)
     if not config or not config.enabled then
         return false
     end
-    
+
     local module = config.module
     if module.SendWorldNotice then
         module.SendWorldNotice(message)
         return true
     end
-    
+
     return false
 end
 
@@ -323,7 +333,7 @@ function this.GetActivityConfig(activityType)
     if not config then
         return nil
     end
-    
+
     return {
         type = activityType,
         name = config.name,
@@ -335,11 +345,11 @@ end
 -- 获取所有活动配置
 function this.GetAllActivityConfigs()
     local configs = {}
-    
+
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         table.insert(configs, this.GetActivityConfig(activityType))
     end
-    
+
     return configs
 end
 
@@ -349,15 +359,15 @@ function this.SetActivityEnabled(activityType, enabled)
     if not config then
         return false, "活动不存在"
     end
-    
+
     config.enabled = enabled
-    
+
     if enabled then
         info("活动已启用：", config.name)
     else
         info("活动已禁用：", config.name)
     end
-    
+
     return true
 end
 
@@ -367,14 +377,14 @@ function this.RestartActivitySystem(activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
-    
+
     -- 停止当前活动
     if module.EndActivity then
         pcall(module.EndActivity)
     end
-    
+
     -- 重新初始化
     if module.Init then
         local success, err = pcall(module.Init)
@@ -386,7 +396,7 @@ function this.RestartActivitySystem(activityType)
             return false, "活动系统重启失败：" .. err
         end
     end
-    
+
     return false, "活动模块不支持重启功能"
 end
 
@@ -398,26 +408,29 @@ function this.GetActivityStatistics()
         activeActivities = 0,
         activities = {}
     }
-    
+
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         stats.totalActivities = stats.totalActivities + 1
-        
+
         if config.enabled then
             stats.enabledActivities = stats.enabledActivities + 1
-            
+
             local status = this.GetActivityDetailedStatus(activityType)
             if status and status.status and status.status > 0 then
                 stats.activeActivities = stats.activeActivities + 1
             end
-            
-            table.insert(stats.activities, {
-                type = activityType,
-                name = config.name,
-                status = status
-            })
+
+            table.insert(
+                stats.activities,
+                {
+                    type = activityType,
+                    name = config.name,
+                    status = status
+                }
+            )
         end
     end
-    
+
     return stats
 end
 
@@ -427,7 +440,7 @@ function this.CleanupActivityData(activityType)
     if not config or not config.enabled then
         return false, "活动不存在或已禁用"
     end
-    
+
     local module = config.module
     if module.CleanupActivityData then
         local success, err = pcall(module.CleanupActivityData)
@@ -439,14 +452,14 @@ function this.CleanupActivityData(activityType)
             return false, "活动数据清理失败：" .. err
         end
     end
-    
+
     return false, "活动模块不支持数据清理功能"
 end
 
 -- 清理所有活动数据
 function this.CleanupAllActivityData()
     local results = {}
-    
+
     for activityType, config in pairs(ACTIVITY_CONFIG) do
         if config.enabled then
             local success, message = this.CleanupActivityData(activityType)
@@ -456,10 +469,9 @@ function this.CleanupAllActivityData()
             }
         end
     end
-    
+
     return results
 end
 
 -- 导出模块
 return this
-

meta/userapi/lua/QFunction-0.lua

@@ -7,8 +7,8 @@ function handlerequest(actor, uid, msgID, msgData)
     envDebug = envDebug or getenv("debug")
     if envDebug then
         local last_lua_message = {
-            ["uid"]     = uid,
-            ["msgID"]   = msgID,
+            ["uid"] = uid,
+            ["msgID"] = msgID,
             ["msgData"] = msgData
         }
         setplaydef(actor, "J$gm_last_lua", last_lua_message)
@@ -25,62 +25,62 @@ function handlerequest(actor, uid, msgID, msgData)
         -- print(result)
         -- 装备相关
     elseif msgID == LuaMessageIdToSever.SETTING_EQUIP_APPEAR then
-        EquipAndAppear.settingequipappear(actor, msgData)        -- 保存装备外观|幻化
+        EquipAndAppear.settingequipappear(actor, msgData) -- 保存装备外观|幻化
     elseif msgID == LuaMessageIdToSever.GET_EQUIP_APPEAR then
-        EquipAndAppear.getequipappear(actor, msgID)              -- 获取装备外观
+        EquipAndAppear.getequipappear(actor, msgID) -- 获取装备外观
     elseif msgID == LuaMessageIdToSever.EQUIP_FASHION then
-        EquipAndAppear.equipfashion(actor, msgData)              -- 装备幻化
+        EquipAndAppear.equipfashion(actor, msgData) -- 装备幻化
     elseif msgID == LuaMessageIdToSever.ACT_EQUIP_COLOR then
-        EquipAndAppear.actquipcolor(actor, msgData)              -- 装备染色
+        EquipAndAppear.actquipcolor(actor, msgData) -- 装备染色
     elseif msgID == LuaMessageIdToSever.GET_EQUIP_COLOR then
-        EquipAndAppear.getequipcolor(actor, msgID)               -- 获取装备染色信息
+        EquipAndAppear.getequipcolor(actor, msgID) -- 获取装备染色信息
     elseif msgID == LuaMessageIdToSever.SETTING_EQUIP_COLOR then
-        EquipAndAppear.settingequipcolor(actor, msgData)         -- 保存装备染色
+        EquipAndAppear.settingequipcolor(actor, msgData) -- 保存装备染色
     elseif msgID == LuaMessageIdToSever.REQ_ITEM_DECOMPOSITION then
-        ItemRecycling.decompositionlua(actor, msgID, msgData)    -- 装备分解
+        ItemRecycling.decompositionlua(actor, msgID, msgData) -- 装备分解
     elseif msgID == LuaMessageIdToSever.GET_TITLE then
-        EquipAndAppear.gettitleinfo(actor, msgID)                -- 获取称号信息
+        EquipAndAppear.gettitleinfo(actor, msgID) -- 获取称号信息
     elseif msgID == LuaMessageIdToSever.SET_TITLE then
         EquipAndAppear.settingtitleappear(actor, msgID, msgData) -- 设置当前称号
     elseif msgID == LuaMessageIdToSever.GET_SHAPE_RING then
-        EquipAndAppear.getshapering(actor, msgID)                -- 获取变身戒指信息
+        EquipAndAppear.getshapering(actor, msgID) -- 获取变身戒指信息
     elseif msgID == LuaMessageIdToSever.GET_GUARD_APPEAR then
-        EquipAndAppear.getguardappear(actor, msgID)              -- 获取守护皮肤信息
+        EquipAndAppear.getguardappear(actor, msgID) -- 获取守护皮肤信息
     elseif msgID == LuaMessageIdToSever.SET_SHAPE_RING then
-        EquipAndAppear.wearshapering(actor, msgData)             -- 穿戴变身戒指
+        EquipAndAppear.wearshapering(actor, msgData) -- 穿戴变身戒指
     elseif msgID == LuaMessageIdToSever.REQ_STRENGTH_EQUIP then
-        EquipAndAppear.luastrengthequip(actor, msgData)          -- 请求装备强化
+        EquipAndAppear.luastrengthequip(actor, msgData) -- 请求装备强化
     elseif msgID == LuaMessageIdToSever.REQ_APPEND_EQUIP then
-        EquipAndAppear.luaappendequip(actor, msgData)            -- 请求装备追加
+        EquipAndAppear.luaappendequip(actor, msgData) -- 请求装备追加
     elseif msgID == LuaMessageIdToSever.REQ_EQUIP_FASHION then
-        EquipAndAppear.getallequipfashion(actor)                 -- 请求已激活幻化外观
+        EquipAndAppear.getallequipfashion(actor) -- 请求已激活幻化外观
     elseif msgID == LuaMessageIdToSever.REQ_UPDATE_EQUIP_ORNAMENTS then
-        EquipAndAppear.ssupdate(actor, msgData)                  -- 请求首饰升级
+        EquipAndAppear.ssupdate(actor, msgData) -- 请求首饰升级
     elseif msgID == LuaMessageIdToSever.REQ_EQUIP_REGENERATION then
-        EquipAndAppear.regeneration(actor, msgData)              -- 请求装备再生
+        EquipAndAppear.regeneration(actor, msgData) -- 请求装备再生
     elseif msgID == LuaMessageIdToSever.REQ_UP_EQUIP_REGENERATION then
-        EquipAndAppear.getupregenerationattr(actor, msgData)     -- 请求装备上次洗练数据
+        EquipAndAppear.getupregenerationattr(actor, msgData) -- 请求装备上次洗练数据
     elseif msgID == LuaMessageIdToSever.REQ_REPLACE_REGENERATION_ATTR then
-        EquipAndAppear.confirmreplaceentry(actor, msgData)       -- 请求替换装备再生属性
+        EquipAndAppear.confirmreplaceentry(actor, msgData) -- 请求替换装备再生属性
     elseif msgID == LuaMessageIdToSever.REQ_STRENGTH_REGENERATION_ATTR then
-        EquipAndAppear.strengthregenerationattr(actor, msgData)  -- 请求强化装备再生属性
+        EquipAndAppear.strengthregenerationattr(actor, msgData) -- 请求强化装备再生属性
     elseif msgID == LuaMessageIdToSever.REQ_ACT_EQUIP_ORNAMENTS then
-        EquipAndAppear.actssattr(actor, msgData)                 -- 请求首饰属性激活
+        EquipAndAppear.actssattr(actor, msgData) -- 请求首饰属性激活
     elseif msgID == LuaMessageIdToSever.REQ_TRANSFER_EQUIP then
         -- 装备相关结束
-        EquipAndAppear.luatransferequip(actor, msgData)      -- 请求装备属性转移
+        EquipAndAppear.luatransferequip(actor, msgData) -- 请求装备属性转移
     elseif msgID == LuaMessageIdToSever.GET_TEAM_RECRUIT then
-        Team.getteamrecruitlua(actor, msgID)                 -- 获取组队喊话信息
+        Team.getteamrecruitlua(actor, msgID) -- 获取组队喊话信息
     elseif msgID == LuaMessageIdToSever.LEADER_AGREE_APPLY then
-        Team.leaderAgreeApply(actor, msgID)                  -- 队长一键同意申请记录
+        Team.leaderAgreeApply(actor, msgID) -- 队长一键同意申请记录
     elseif msgID == LuaMessageIdToSever.GET_RESET_FRUIT_COUNT then
-        FruitScript.toGetResetCount(actor)                   -- 获取重置果实次数
+        FruitScript.toGetResetCount(actor) -- 获取重置果实次数
     elseif msgID == LuaMessageIdToSever.S_RESET_FRUIT then
-        FruitScript.resetFruit(actor, msgData)               -- 重置果实
+        FruitScript.resetFruit(actor, msgData) -- 重置果实
     elseif msgID == LuaMessageIdToSever.GET_MOUNSTER_COUNT_BY_MAP then
         DuplicateCommon.getmonstercountbymap(actor, msgData) -- 根据地图信息获取怪物数量
     elseif msgID == LuaMessageIdToSever.SET_FRIEND_DEGREE then
-        Friend.sendflower(actor, msgID, msgData)             -- 好友送花
+        Friend.sendflower(actor, msgID, msgData) -- 好友送花
     elseif msgID == LuaMessageIdToSever.GET_DEVIL_SQUARE_PANEL then
         DevilSquare.ReqGetPanelInfo(actor, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_RECIVE_DEVIL_SQUARE_REWARD then
@@ -100,15 +100,15 @@ function handlerequest(actor, uid, msgID, msgData)
     elseif msgID == LuaMessageIdToSever.OPEN_OR_CLOSE_AUTO_BUY_POTION then
         AutoBuyPotionScript.openOrCloseAutoBuyPotion(actor) -- 开启或关闭自动购买药水
     elseif msgID == LuaMessageIdToSever.GET_CURRENT_AUTO_BUY_POTION then
-        AutoBuyPotionScript.getCurrentOpenState(actor)      -- 当前自动购买药水状态
+        AutoBuyPotionScript.getCurrentOpenState(actor) -- 当前自动购买药水状态
     elseif msgID == LuaMessageIdToSever.LOAD_RANK_DATA then
-        RankScript.loadRankData(actor, msgData)             -- 请求排行榜数据
+        RankScript.loadRankData(actor, msgData) -- 请求排行榜数据
     elseif msgID == LuaMessageIdToSever.STOP_REFRESH_RANK_DATA then
-        RankScript.stopRefreshData(actor)                   -- 停止自动刷新排行榜数据
+        RankScript.stopRefreshData(actor) -- 停止自动刷新排行榜数据
     elseif msgID == LuaMessageIdToSever.PLAYER_IS_ON_LINE_REQ then
-        Chat.playerIsOnLineReq(actor, msgData)              -- 玩家是否在线
+        Chat.playerIsOnLineReq(actor, msgData) -- 玩家是否在线
     elseif msgID == LuaMessageIdToSever.RECRUIT_INFO_REQ then
-        Chat.reqRecruitInfo(actor, msgData)                 -- 发送招募信息
+        Chat.reqRecruitInfo(actor, msgData) -- 发送招募信息
     elseif msgID == LuaMessageIdToSever.GET_GOLD_TASK_INFO then
         GoldTask.SendTaskInfo(actor)
     elseif msgID == LuaMessageIdToSever.FLUSH_GOLD_TASK_POOL then
@@ -134,15 +134,15 @@ function handlerequest(actor, uid, msgID, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_ENTER_SECRET_REALM then
         SecretRealm.reqEnterSecretRealm(actor, msgData) -- 请求进入秘境副本
     elseif msgID == LuaMessageIdToSever.REQ_EXIT_SECRET_REALM then
-        SecretRealm.reqExitSecretRealm(actor)           -- 请求退出秘境副本
+        SecretRealm.reqExitSecretRealm(actor) -- 请求退出秘境副本
     elseif msgID == LuaMessageIdToSever.REQ_GET_SECRET_REALM_COUNT then
-        SecretRealm.sendRemainingChallenges(actor)      -- 发送秘境副本挑战次数
+        SecretRealm.sendRemainingChallenges(actor) -- 发送秘境副本挑战次数
     elseif msgID == LuaMessageIdToSever.GET_SECRET_REALM_MONSTER_COUNT then
-        SecretRealm.getMonsterCount(actor, msgData)     -- 获取秘境副本怪物数量
+        SecretRealm.getMonsterCount(actor, msgData) -- 获取秘境副本怪物数量
     elseif msgID == LuaMessageIdToSever.GET_ALREADY_USE_POINTS then
-        FruitScript.toGetAlreadyUsePoints(actor)        -- 获取已经使用的点数
+        FruitScript.toGetAlreadyUsePoints(actor) -- 获取已经使用的点数
     elseif msgID == LuaMessageIdToSever.REQ_BLOODY_CASTLE_GIVE_NPC then
-        BloodyCastle.ReqGive2NPC(actor)                 -- 给武器给NPC
+        BloodyCastle.ReqGive2NPC(actor) -- 给武器给NPC
     elseif msgID == LuaMessageIdToSever.REQ_GET_UNION_INFO then
         UnionChangeLeader.sendUnionInfo(actor)
     elseif msgID == LuaMessageIdToSever.REQ_UNION_ACTIVITY_DATA then
@@ -160,51 +160,51 @@ function handlerequest(actor, uid, msgID, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_PLAYER_RUN_FOR_LEADER_VOTE then
         UnionChangeLeader.RunForLeader.actorVoteRunForLeader(actor, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_DUPLICATE_TEAM_ENTER then
-        DuplicateCommon.DoTeamEnterDup(actor)     -- 组队进入副本
+        DuplicateCommon.DoTeamEnterDup(actor) -- 组队进入副本
     elseif msgID == LuaMessageIdToSever.REQ_SET_ROLE_ATT_ADD_WAY then
         RoleAttr.setRoleAttAddWay(actor, msgData) -- 设置角色属性加成方式
     elseif msgID == LuaMessageIdToSever.REQ_GET_ROLE_ATT_ADD_WAY then
-        RoleAttr.getRoleAttAddWay(actor)          -- 获取角色属性加成方式
+        RoleAttr.getRoleAttAddWay(actor) -- 获取角色属性加成方式
     elseif msgID == LuaMessageIdToSever.BRAVE_TEST_STAGE_REWARD then
         BraveTest.ReqBraveTestStageReward(actor)
     elseif msgID == LuaMessageIdToSever.GET_SECRET_REALM_MONSTER_LIST then
-        SecretRealm.ReqBossList(actor, msgData)                    -- 请求秘境副本中boss列表信息
+        SecretRealm.ReqBossList(actor, msgData) -- 请求秘境副本中boss列表信息
     elseif msgID == LuaMessageIdToSever.REQ_ITEM_SYNTHESIS then
-        ItemSynthesis.synthesis(actor, msgData)                    -- 装备合成
+        ItemSynthesis.synthesis(actor, msgData) -- 装备合成
     elseif msgID == LuaMessageIdToSever.REQ_SECRET_REALM_HURT_TOP1 then
-        SecretRealm.getTop1HurtInfo(actor, msgData)                -- 装备合成
+        SecretRealm.getTop1HurtInfo(actor, msgData) -- 装备合成
     elseif msgID == LuaMessageIdToSever.REQ_GET_UNION_ARMBAND_INFO then
-        UnionArmbands.sendArmbandInfo(actor)                       -- 获取ArmBand信息
+        UnionArmbands.sendArmbandInfo(actor) -- 获取ArmBand信息
     elseif msgID == LuaMessageIdToSever.REQ_UNION_ARMBAND_LEVEL_UP then
-        UnionArmbands.levelupUnionArmband(actor)                   -- 升级ArmBand
+        UnionArmbands.levelupUnionArmband(actor) -- 升级ArmBand
     elseif msgID == LuaMessageIdToSever.REQ_UNION_ARMBAND_STRONG then
-        UnionArmbands.strongArmband(actor)                         -- 强化ArmBand
+        UnionArmbands.strongArmband(actor) -- 强化ArmBand
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_LISTING_GOODS then
-        Trade.worldTradeListing(actor, msgData)                    -- 交易行上架商品
+        Trade.worldTradeListing(actor, msgData) -- 交易行上架商品
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_OFF_GOODS then
-        Trade.worldOffShelfGoods(actor, msgData)                   -- 交易行下架商品
+        Trade.worldOffShelfGoods(actor, msgData) -- 交易行下架商品
     elseif msgID == LuaMessageIdToSever.REQ_GET_TRADE_GOODS then
-        Trade.getTradeWorldGoods(actor, msgData)                   -- 交易行搜索商品信息
+        Trade.getTradeWorldGoods(actor, msgData) -- 交易行搜索商品信息
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_PUBLICITY_GOODS then
-        Trade.getPublicityGoods(actor, msgData)                    -- 交易行获取公示区域商品
+        Trade.getPublicityGoods(actor, msgData) -- 交易行获取公示区域商品
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_MY_PRE_GOODS then
-        Trade.getPreBuyGoods(actor, msgData)                       -- 交易行获取预购
+        Trade.getPreBuyGoods(actor, msgData) -- 交易行获取预购
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_BUY_GOODS then
-        Trade.bugWorldGoods(actor, msgData)                        -- 交易行购买商品
+        Trade.bugWorldGoods(actor, msgData) -- 交易行购买商品
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_RECORD then
-        Trade.getWorldTradeRecord(actor)                           -- 交易行交易记录
+        Trade.getWorldTradeRecord(actor) -- 交易行交易记录
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_MY_SHELVES then
-        Trade.getWorldMyListing(actor)                             -- 交易行上架商品信息
+        Trade.getWorldMyListing(actor) -- 交易行上架商品信息
     elseif msgID == LuaMessageIdToSever.REQ_TRADE_PRE_ORDER then
-        Trade.preWorldGoods(actor, msgData)                        -- 交易行预购商品
+        Trade.preWorldGoods(actor, msgData) -- 交易行预购商品
     elseif msgID == LuaMessageIdToSever.REQ_GET_UNION_IMPEACH_INFO then
-        UnionChangeLeader.Impeach.sendImpeachInfo(actor)           -- 获取弹劾信息
+        UnionChangeLeader.Impeach.sendImpeachInfo(actor) -- 获取弹劾信息
     elseif msgID == LuaMessageIdToSever.REQ_UNION_IMPEACH_LEADER then
-        UnionChangeLeader.Impeach.actorImpeach(actor)              -- 弹劾盟主
+        UnionChangeLeader.Impeach.actorImpeach(actor) -- 弹劾盟主
     elseif msgID == LuaMessageIdToSever.REQ_UNION_IMPEACH_VOTE then
         UnionChangeLeader.Impeach.actorVoteImpeach(actor, msgData) -- 弹劾投票
     elseif msgID == LuaMessageIdToSever.TRIPLE_INCOME_PANEL then
-        TripleIncome.PanelInfo(actor)                              --三倍收益时间信息
+        TripleIncome.PanelInfo(actor) --三倍收益时间信息
     elseif msgID == LuaMessageIdToSever.TRIPLE_INCOME_RECEIVE then
         TripleIncome.ReceiveTime(actor, msgData)
     elseif msgID == LuaMessageIdToSever.TRIPLE_INCOME_RETURN then
@@ -247,33 +247,33 @@ function handlerequest(actor, uid, msgID, msgData)
         -- 请求特权BOSS信息
         PrivilegeBoss.ReqPrivilegeBossPanel(actor, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_MOUNT_PUT_ON_ITEM then
-        Mount.putOnItem(actor, msgData)                 -- 坐骑穿戴装备
+        Mount.putOnItem(actor, msgData) -- 坐骑穿戴装备
     elseif msgID == LuaMessageIdToSever.REQ_MOUNT_TAKE_OFF_ITEM then
-        Mount.takeOffItem(actor, msgData)               -- 坐骑脱下装备
+        Mount.takeOffItem(actor, msgData) -- 坐骑脱下装备
     elseif msgID == LuaMessageIdToSever.REQ_MOUNT_DETAIL_INFO then
-        Mount.mountDetail(actor, msgData)               -- 获取坐骑详细信息
+        Mount.mountDetail(actor, msgData) -- 获取坐骑详细信息
     elseif msgID == LuaMessageIdToSever.REQ_OFFLINE_ON_HOOK_INFO then
-        onHook.getOffLineOnHookInfo(actor)              -- 请求获取离线挂机信息
+        onHook.getOffLineOnHookInfo(actor) -- 请求获取离线挂机信息
     elseif msgID == LuaMessageIdToSever.REQ_RECEIVE_OFFLINE_ON_HOOK_EXP then
-        onHook.reqReceiveOfflineOnHookExp(actor)        -- 请求领取离线挂机经验
+        onHook.reqReceiveOfflineOnHookExp(actor) -- 请求领取离线挂机经验
     elseif msgID == LuaMessageIdToSever.REQ_MASTER_INFO then
-        Master.reqMasterInfo(actor, msgData)            -- 请求：大师信息
+        Master.reqMasterInfo(actor, msgData) -- 请求：大师信息
     elseif msgID == LuaMessageIdToSever.REQ_OPEN_MASTER_TYPE then
-        Master.reqOpenMasterType(actor, msgData)        -- -- 请求：启用大师系列
+        Master.reqOpenMasterType(actor, msgData) -- -- 请求：启用大师系列
     elseif msgID == LuaMessageIdToSever.REQ_EXCHANGE_MASTER_EXP then
-        Master.reqExchangeMasterExp(actor, msgData)     -- 请求：兑换大师经验
+        Master.reqExchangeMasterExp(actor, msgData) -- 请求：兑换大师经验
     elseif msgID == LuaMessageIdToSever.REQ_RESET_MASTER then
-        Master.reqResetMaster(actor, msgData)           -- 请求：重置大师天赋
+        Master.reqResetMaster(actor, msgData) -- 请求：重置大师天赋
     elseif msgID == LuaMessageIdToSever.REQ_UPGRADE_MASTER_TALENT then
-        Master.reqUpgradeMasterTalent(actor, msgData)   -- 请求：升级大师天赋
+        Master.reqUpgradeMasterTalent(actor, msgData) -- 请求：升级大师天赋
     elseif msgID == LuaMessageIdToSever.REQ_ENTER_WAR_ALLIANCE then
         WarAlliance.ReqEnterWarAlliance(actor, msgData) -- 请求进入战盟boss副本
     elseif msgID == LuaMessageIdToSever.REQ_GET_MONTHCARD_INFO then
-        MonthCard.getmonthcardinfo(actor)               -- 请求获取月卡信息
+        MonthCard.getmonthcardinfo(actor) -- 请求获取月卡信息
     elseif msgID == LuaMessageIdToSever.REQ_RECEIVE_MONTHCARD_THREETIME then
-        MonthCard.receivemonthcardthreetime(actor)      -- 请求领取月卡三倍收益时间
+        MonthCard.receivemonthcardthreetime(actor) -- 请求领取月卡三倍收益时间
     elseif msgID == LuaMessageIdToSever.REQ_UP_SHELF_MONTHCARD then
-        MonthCard.upshelfmonthcard(actor, msgData)      -- 请求上架月卡
+        MonthCard.upshelfmonthcard(actor, msgData) -- 请求上架月卡
     elseif msgID == LuaMessageIdToSever.REQ_GET_MONTH_PRIVILEGE_DATA then
         PrivilegeMonth.sendPrivilegeData(actor)
     elseif msgID == LuaMessageIdToSever.REQ_CHECK_MONTH_PRIVILEGE_IS_OPEN then
@@ -337,35 +337,35 @@ function handlerequest(actor, uid, msgID, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_WOLF_SOUL_SUMMON then
         WolfSoul.ReqSummonWarder(actor, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_STALL_POSITION then
-        Stall.stallPosition(actor, msgData)                    -- 获取摆摊信息
+        Stall.stallPosition(actor, msgData) -- 获取摆摊信息
     elseif msgID == LuaMessageIdToSever.REQ_START_STALL then
-        Stall.startStall(actor, msgData)                       -- 开始摆摊
+        Stall.startStall(actor, msgData) -- 开始摆摊
     elseif msgID == LuaMessageIdToSever.REQ_END_STALL then
-        Stall.endStall(actor, msgData)                         -- 结束摆摊
+        Stall.endStall(actor, msgData) -- 结束摆摊
     elseif msgID == LuaMessageIdToSever.REQ_STALL_GOODS then
-        Stall.getStallGoods(actor, msgData)                    -- 获取摊位商品信息
+        Stall.getStallGoods(actor, msgData) -- 获取摊位商品信息
     elseif msgID == LuaMessageIdToSever.REQ_DELETE_BAG_ITEM then
-        Stall.deleteItem(actor, msgData)                       -- 减少背包内道具的数量
+        Stall.deleteItem(actor, msgData) -- 减少背包内道具的数量
     elseif msgID == LuaMessageIdToSever.REQ_SET_PATROL then
-        onHook.setOfflineState(actor, msgData)                 -- 设置离线挂机状态
+        onHook.setOfflineState(actor, msgData) -- 设置离线挂机状态
     elseif msgID == LuaMessageIdToSever.REQ_ITEM_RECOVERY then
-        ItemRecycling.recovery(actor, msgData)                 -- 装备回收
+        ItemRecycling.recovery(actor, msgData) -- 装备回收
     elseif msgID == LuaMessageIdToSever.REQ_CANCEL_FSPREVIEW then
         FaceShootPreview.ReqCancelTodayPreview(actor, msgData) -- 拍照预告取消今日提醒
     elseif msgID == LuaMessageIdToSever.REQ_RECHARGE then
-        Recharge.request(actor, msgData)                       -- 充值请求
+        Recharge.request(actor, msgData) -- 充值请求
     elseif msgID == LuaMessageIdToSever.REQ_CHANGE_ROLE_NAME then
-        Player.changeRoleName(actor, msgData)                  -- 修改角色名字
+        Player.changeRoleName(actor, msgData) -- 修改角色名字
     elseif msgID == LuaMessageIdToSever.REQ_CHANGE_UNION_NAME then
-        Union.changeUnionName(actor, msgData)                  -- 修改战盟名字
+        Union.changeUnionName(actor, msgData) -- 修改战盟名字
     elseif msgID == LuaMessageIdToSever.REQ_ROLE_IS_FIRST_CHANGE_NAME then
-        Player.getRoleChangeNameInfo(actor)                    -- 获取角色是否为首次改名
+        Player.getRoleChangeNameInfo(actor) -- 获取角色是否为首次改名
     elseif msgID == LuaMessageIdToSever.REQ_RECHARGE_TRADE_INFO then
-        Trade.sendRecharge(actor)                              -- 发送月卡充值信息
+        Trade.sendRecharge(actor) -- 发送月卡充值信息
     elseif msgID == LuaMessageIdToSever.REQ_COMBO_SKILL_UP then
-        Skill.ComboSkillUp(actor)                              -- 升级连击技能
+        Skill.ComboSkillUp(actor) -- 升级连击技能
     elseif msgID == LuaMessageIdToSever.REQ_TRANSFER_CARD_PART_INFO then
-        TransferCard.ReqGetHoleInfo(actor, msgData)            --变身卡牌请求部位信息
+        TransferCard.ReqGetHoleInfo(actor, msgData) --变身卡牌请求部位信息
     elseif msgID == LuaMessageIdToSever.REQ_TRANSFER_CARD_UNLOCK then
         local part = msgData[1]
         local idx = msgData[2]
@@ -569,6 +569,10 @@ function handlerequest(actor, uid, msgID, msgData)
         PlayerCareerTransfer.careerTransfer(actor, msgData)
     elseif msgID == LuaMessageIdToSever.REQ_WEEKEN_ACTIVE_INFO then
         WeekActives.openSubActive(actor, msgData)
+    elseif msgID == LuaMessageIdToSever.REQ_ACT_FIRST_RECHARGE_INFO then
+        ActFirstRecharge.getInfo(actor, msgData)
+    elseif msgID == LuaMessageIdToSever.REQ_ACT_FIRST_RECHARGE_REWARD then
+        ActFirstRecharge.gainReward(actor, msgData)
     else
         --请放到最后，其余消息在上面追加
         error(actor, "收到无法处理的消息", "玩家", actor, "消息ID", msgID, "params", msgData)
@@ -640,18 +644,15 @@ function logout(actor)
 end
 
 function run(actor)
-
 end
 
 function walk(actor)
 end
 
 function jump(actor)
-
 end
 
 function removeskillevent(actor, removeSkillList)
-
 end
 
 function releaseskill(actor, skillid, skilllevel, targetlist)
@@ -663,7 +664,7 @@ function releaseskill(actor, skillid, skilllevel, targetlist)
     --    -- finalTargetList: 伤害目标结果列表，包含了未产生伤害的对象，也就是被powersource=0过滤掉的目标
     --    -- targetHurt: 总伤害值
     --    -- targetTotal: 受到伤害目标的数量，等于size(targetlist)
-    Skill.releaseSkill(actor,skillid)
+    Skill.releaseSkill(actor, skillid)
 end
 
 function triggertaskrefresh(actor, type, param)
@@ -771,7 +772,7 @@ end
 ---@param activityId number 活动id
 ---@param monsterLevel number 怪物等级
 function killmon(actor, monsterId, monsterCfgId, monsterName, pointX, pointY, activityId, monsterLevel, mongenCfgId)
-    gameDebug.debug(LogManager.KillMonster,actor,monsterCfgId)
+    gameDebug.debug(LogManager.KillMonster, actor, monsterCfgId)
     pk.killmonsterpkvaluehandle(actor, monsterCfgId, monsterLevel) -- 击杀怪物PK值处理
     UnionTask.killMonsterEvent(actor, monsterCfgId)
 end
@@ -782,13 +783,13 @@ end
 ---@param count number 使用数量
 function useitemtrigger(actor, itemConfigId, count)
     gameDebug.debug(CareerChange.useItemChangeCareer, actor, itemConfigId)
-    pk.exonerationcharmpkvaluehnadle(actor, itemConfigId, count)           -- 免罪符使用减少PK值处理
+    pk.exonerationcharmpkvaluehnadle(actor, itemConfigId, count) -- 免罪符使用减少PK值处理
     --PrivilegeCardScript.setPrivilegeCardInfos(actor, itemConfigId, count) -- 特权卡使用后处理
-    FruitScript.handleUseFruit(actor, itemConfigId, count)                 -- 果实使用后处理
-    MonthCard.usemonthcard(actor, itemConfigId, count)                     -- 使用月卡后处理
-    RandomChest.generateChestItem(actor, itemConfigId, count)              -- 随机宝箱生成道具
-    ExpBoost.useExperienceBoostItem(actor, itemConfigId, count)            -- 经验加成道具处理
-    PrivilegeMonth.usePrivilegeCard(actor, itemConfigId, count)            -- 特权卡使用处理
+    FruitScript.handleUseFruit(actor, itemConfigId, count) -- 果实使用后处理
+    MonthCard.usemonthcard(actor, itemConfigId, count) -- 使用月卡后处理
+    RandomChest.generateChestItem(actor, itemConfigId, count) -- 随机宝箱生成道具
+    ExpBoost.useExperienceBoostItem(actor, itemConfigId, count) -- 经验加成道具处理
+    PrivilegeMonth.usePrivilegeCard(actor, itemConfigId, count) -- 特权卡使用处理
     AngelMajorEquipment.useExperienceBoostItem(actor, itemConfigId, count) -- 大天使经验药水使用处理
 end
 
@@ -808,7 +809,7 @@ end
 ---@param actor any 玩家对象
 ---@param targetPlayer any 进入视野的玩家对象
 function playerenterview(actor, targetPlayer)
-    pk.sendenterviewpkvalue(actor, targetPlayer)         -- 进入视野发送PK值
+    pk.sendenterviewpkvalue(actor, targetPlayer) -- 进入视野发送PK值
     DuplicateCommon.PlayerEnterView(actor, targetPlayer) -- 副本中玩家进入视野
     EquipAndAppear.playerequipview(actor, targetPlayer)
     CrossMap.EnterView(actor, targetPlayer)
@@ -834,7 +835,7 @@ function takeonequip(actor, pos, oldItemId, itemId, itemCfgId)
     EquipAndAppear.checkCanTransfer(actor, oldItemId, itemId)
     EquipMaster.triggerEquipMaster(actor)
     EquipAndAppear.updateluaextattr(actor)
-    EquipGem.schemeEffectByBoolean(actor, { pos }, true)
+    EquipGem.schemeEffectByBoolean(actor, {pos}, true)
     -- EquipAndAppear.playerequipstrength(actor, 0) --发送玩家装备强化信息
 
     -- 刷新装备任务进度
@@ -851,7 +852,7 @@ function takeoffequip(actor, pos, itemId, itemCfgId)
     EquipGuard.takeOffGuardEquip(actor, itemCfgId)
     EquipMaster.triggerEquipMaster(actor)
     EquipAndAppear.updateluaextattr(actor)
-    EquipGem.schemeEffectByBoolean(actor, { pos }, false)
+    EquipGem.schemeEffectByBoolean(actor, {pos}, false)
     -- EquipAndAppear.playerequipstrength(actor, 0) --发送玩家装备强化信息
 
     -- 刷新装备任务进度
@@ -863,7 +864,7 @@ function takeoffequip(actor, pos, itemId, itemCfgId)
 end
 
 function weaponchange(actor, oldIndex, newIndex, itemId)
-    local res = { oldIndex = oldIndex, newIndex = newIndex, itemId = itemId }
+    local res = {oldIndex = oldIndex, newIndex = newIndex, itemId = itemId}
     sendluamsg(actor, LuaMessageIdToClient.RES_WEAPON_CHANGE_AUTO, res)
 end
 
@@ -898,7 +899,7 @@ function itemchange(actor, ids, cfgId, oldCount, newCount, change)
     -- 任务进度刷新
     if tonumber(oldCount) < tonumber(newCount) then
         local count = tonumber(newCount) - tonumber(oldCount)
-        TaskHandler.TriggerTaskGoal(actor, TaskTargetType.RE_GET_ITEM, { cfgId, count })
+        TaskHandler.TriggerTaskGoal(actor, TaskTargetType.RE_GET_ITEM, {cfgId, count})
     end
     AutoBuyPotionScript.coinChange(actor, cfgId)
 end
@@ -1281,7 +1282,7 @@ end
 function revival(actor, type)
     RedFortress.PlayerRelive(actor)
     PrivilegeBoss.playerRelive(actor)
-    WarAlliance.playerRelive(actor,type)
+    WarAlliance.playerRelive(actor, type)
     RolandSeige.PlayerRelive(actor)
 end
 
@@ -1667,9 +1668,7 @@ function outversionchatevent(actor, param)
 end
 
 --- 技能升级事件
-function levelupskillevent(actor,skillInfo)
+function levelupskillevent(actor, skillInfo)
     info(skillInfo)
-    Skill.levelUp(actor,skillInfo)
+    Skill.levelUp(actor, skillInfo)
 end
-
-