修改首充活动，月卡活动事件注册

meta/userapi/lua/ActFirstRecharge.lua

@@ -3,7 +3,7 @@ ActFirstRecharge = {}
 ActFirstRecharge.__index = ActFirstRecharge
 
 local function _rechargeType()
-    return "0"
+    return "21"
 end
 
 local function _playerDbKey()
@@ -107,6 +107,6 @@ end
 --TODO 一定要放到文件最后
 EventListerTable.registerType("首充活动", _rechargeType(), _playerDbKey())
 --注册充值事件
-RechargeEventListerTable:eventLister(_rechargeType(), "首充活动", ActFirstRecharge.rechargeEvent)
+RechargeEventListerTable:eventLister("0", "首充活动", ActFirstRecharge.rechargeEvent)
 -- 注册请求消息监听
 RechargeMessageEventListerTable:eventLister(_rechargeType(), "首充活动", ActFirstRecharge.reqAction)

meta/userapi/lua/ActMonthlyGrow.lua

@@ -3,7 +3,7 @@ ActMonthlyGrow = {}
 ActMonthlyGrow.__index = ActMonthlyGrow
 
 local function _rechargeType()
-    return "2"
+    return "22"
 end
 
 local function _playerDbKey()

meta/userapi/lua/ActivityManager.lua

@@ -6,9 +6,11 @@ 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, -- 首充活动
+    MONTHLY_GROW = 5 -- 月卡活动
 }
 
 -- 活动配置
@@ -30,13 +32,25 @@ local ACTIVITY_CONFIG = {
         description = "每周三、周五晚上7点开启，抵御怪物入侵",
         module = MonsterLegion,
         enabled = true
+    },
+    [ACTIVITY_TYPE.FIRST_RECHARGE] = {
+        name = "首充活动",
+        description = "首充送体验天使",
+        module = ActFirstRecharge,
+        enabled = true
+    },
+    [ACTIVITY_TYPE.MONTHLY_GROW] = {
+        name = "月卡活动",
+        description = "购买送经验，金币，挂机加成",
+        module = ActMonthlyGrow,
+        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 +62,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 +96,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 +107,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 +143,7 @@ function this.GetAllActivitiesInfo()
             end
         end
     end
-    
+
     return activities
 end
 
@@ -136,7 +153,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 +175,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 +197,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 +214,7 @@ function this.PlayerJoinActivity(actor, activityType)
             return module.PlayerRegister(actor)
         end
     end
-    
+
     return false, "活动不支持报名功能"
 end
 
@@ -207,13 +224,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 +240,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 +256,7 @@ function this.GetActivityRanking(activityType, rankingType)
             return module.GetAllianceDamageRanking()
         end
     end
-    
+
     return {}
 end
 
@@ -249,34 +266,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 +314,7 @@ function this.GetActivityDetailedStatus(activityType)
             status.stats = module.GetActivityStats()
         end
     end
-    
+
     return status
 end
 
@@ -307,13 +324,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 +340,7 @@ function this.GetActivityConfig(activityType)
     if not config then
         return nil
     end
-    
+
     return {
         type = activityType,
         name = config.name,
@@ -335,11 +352,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 +366,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 +384,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 +403,7 @@ function this.RestartActivitySystem(activityType)
             return false, "活动系统重启失败：" .. err
         end
     end
-    
+
     return false, "活动模块不支持重启功能"
 end
 
@@ -398,26 +415,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 +447,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 +459,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 +476,9 @@ function this.CleanupAllActivityData()
             }
         end
     end
-    
+
     return results
 end
 
 -- 导出模块
 return this
-

meta/userapi/lua/QFunction-0.lua

@@ -700,6 +700,7 @@ function login(play)
     gameDebug.debug(Player.onLoginEnd, play)
     gameDebug.debug(Transaction.onLoginEnd, play)
     -- gameDebug.debug( OperationalActivities.openActive, play)
+    gameDebug.debug(ActMonthlyGrow.login, play)
 end
 
 function exit(actor)
@@ -1806,6 +1807,7 @@ function rolehourheart(actor)
     end
     -- 连击试炼增加副本次数
     ComboTest.roleHourHeart(actor)
+    ActMonthlyGrow.midNightUpdate(actor)
 end
 
 --- 活动次数重置后触发