diff --git a/LogicServer/data/config/activity/Activity10014Config.config b/LogicServer/data/config/activity/Activity10014Config.config deleted file mode 100755 index 5e264bd..0000000 --- a/LogicServer/data/config/activity/Activity10014Config.config +++ /dev/null @@ -1,9 +0,0 @@ ---AB-活动付费.xlsx 10014-YY微信礼包 -Activity10014Config={ -[10027] = { - Id = 10027, - OpenDays = 1, - cdktype = 1015, - NormalRewards = {{type=0,id=492,count=1},}, -}, -} \ No newline at end of file diff --git a/LogicServer/data/functions/Activity/ActivityType10014.lua b/LogicServer/data/functions/Activity/ActivityType10014.lua deleted file mode 100755 index fd73caa..0000000 --- a/LogicServer/data/functions/Activity/ActivityType10014.lua +++ /dev/null @@ -1,101 +0,0 @@ -module("ActivityType10014", package.seeall) ---[[ - - 微信礼包 - - 个人数据:ActorData[AtvId] - { - } - - 全局缓存:Cache[AtvId] - { - - } - - 全局数据:GlobalData[AtvId] - { - - } -]]-- - ---活动类型 -ActivityType = 10014 ---对应的活动配置 -ActivityConfig = Activity10014Config -if ActivityConfig == nil then - assert(false) -end - - ---------------------------我是分界线---------------------------- --- 初始化玩家数据 -function OnInit(atvId, pActor) - -- local Cfg = ActivityConfig[atvId]; - -- if Cfg == nil then - -- return; - -- end - -- local data = getActorCdkData(pActor) - -- if data then - -- if data.codeTypeTimes then - -- if data.codeTypeTimes[Cfg.cdktype] then - -- Actor.closeOneActivity(pActor,atvId) - -- end - -- end - -- end -end - ---活动开始 -function OnStart(atvId, pActor) - -- local Cfg = ActivityConfig[atvId]; - -- if Cfg == nil then - -- return; - -- end - -- local data =getActorCdkData(pActor) - -- if data then - -- if data.codeTypeTimes then - -- if data.codeTypeTimes[Cfg.cdktype] then - -- Actor.closeOneActivity(pActor,atvId) - -- end - -- end - -- end -end - - --- 获取活动数据 -function OnReqData(atvId, pActor, outPack) - -- local Cfg = ActivityConfig[atvId]; - -- if Cfg == nil then - -- return; - -- end - -- local data = getActorCdkData(pActor) - -- if data then - -- if data.codeTypeTimes then - -- if data.codeTypeTimes[Cfg.cdktype] then - -- Actor.closeOneActivity(pActor,atvId) - -- end - -- end - -- end -end - --- 活动结束 -function OnUpdate(atvId, curTime, pActor) - local Cfg = ActivityConfig[atvId]; - if Cfg == nil then - return; - end - local data = getActorCdkData(pActor) - if data then - if data.codeTypeTimes then - if data.codeTypeTimes[Cfg.cdktype] then - Actor.closeOneActivity(pActor,atvId) - end - end - end -end - - -ActivityDispatcher.Reg(ActivityEvent.OnStart, ActivityType, OnStart, "ActivityType10014.lua") -ActivityDispatcher.Reg(ActivityEvent.OnInit, ActivityType, OnInit, "ActivityType10014.lua") - -ActivityDispatcher.Reg(ActivityEvent.OnReqData, ActivityType, OnReqData, "ActivityType10014.lua") -ActivityDispatcher.Reg(ActivityEvent.OnUpdate, ActivityType, OnUpdate, "ActivityType10014.lua") \ No newline at end of file diff --git a/LogicServer/data/functions/Activity/Activitys.txt b/LogicServer/data/functions/Activity/Activitys.txt index 5f6f160..48d6c3f 100755 --- a/LogicServer/data/functions/Activity/Activitys.txt +++ b/LogicServer/data/functions/Activity/Activitys.txt @@ -35,7 +35,6 @@ require("Activity.ActivityType10005") --个人活动:月份签到 require("Activity.ActivityType10006") --个人活动:登录基金 require("Activity.ActivityType10009") --个人活动:达标活动 require("Activity.ActivityType10010") --个人活动:寻宝活动 -require("Activity.ActivityType10014") --玩法:微信礼包 require("Activity.ActivityType10015") --全局个人活动:每周固定时间的礼包活动 require("Activity.ActivityType10017") --兑换活动 require("Activity.ActivityType10019") -- diff --git a/LogicServer/data/functions/GameConfigs.txt b/LogicServer/data/functions/GameConfigs.txt index 85a82aa..9b70189 100755 --- a/LogicServer/data/functions/GameConfigs.txt +++ b/LogicServer/data/functions/GameConfigs.txt @@ -51,7 +51,6 @@ --#include "data/config/activity/Activity10006Config.config" once --#include "data/config/activity/Activity10009Config.config" once --#include "data/config/activity/Activity10010Config.config" once ---#include "data/config/activity/Activity10014Config.config" once --#include "data/config/activity/Activity10015Config.config" once --#include "data/config/activity/Activity10017Config.config" once --#include "data/config/activity/Activity10019Config.config" once