From 426a62eeb41dd04a29d4b6afe566c9bbdfa74226 Mon Sep 17 00:00:00 2001 From: kubbo <390378816@qq.com> Date: Sun, 23 Feb 2025 15:03:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(LogicServer):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E7=88=B1=E5=A5=87=E8=89=BA=E5=B9=B3=E5=8F=B0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 Platformaiqiyi 相关配置文件 - 移除了 ActivityType10029 模块的全部代码 - 从 Activitys.txt 中移除了 ActivityType10029 的引用 - 从 GameConfigs.txt 中移除了 Platformaiqiyi.config 的引用 --- .../Platformaiqiyi/Platformaiqiyi.config | 9 - .../functions/Activity/ActivityType10029.lua | 270 ------------------ .../data/functions/Activity/Activitys.txt | 1 - LogicServer/data/functions/GameConfigs.txt | 1 - 4 files changed, 281 deletions(-) delete mode 100755 LogicServer/data/config/Platformaiqiyi/Platformaiqiyi.config delete mode 100755 LogicServer/data/functions/Activity/ActivityType10029.lua diff --git a/LogicServer/data/config/Platformaiqiyi/Platformaiqiyi.config b/LogicServer/data/config/Platformaiqiyi/Platformaiqiyi.config deleted file mode 100755 index df41dae..0000000 --- a/LogicServer/data/config/Platformaiqiyi/Platformaiqiyi.config +++ /dev/null @@ -1,9 +0,0 @@ ---P-平台福利爱奇艺.xlsx 爱奇艺 -PlatformaiqiyiConfig={ - SPID = "18", - rewardClient = {{type=0,id=247,count=10},{type=7,id=7,count=5},{type=0,id=261,count=10},{type=2,id=2,count=20000}}, - wechat = 5, - QQ = 3, - limit = 50000, - SVIP = 6, -} \ No newline at end of file diff --git a/LogicServer/data/functions/Activity/ActivityType10029.lua b/LogicServer/data/functions/Activity/ActivityType10029.lua deleted file mode 100755 index 41a55e7..0000000 --- a/LogicServer/data/functions/Activity/ActivityType10029.lua +++ /dev/null @@ -1,270 +0,0 @@ -module("ActivityType10029", package.seeall) - - ---[[ - 个人数据：userData - { - LoginType = 0 or 1 爱奇艺 登录类型(1：游戏盒子登录) - ReqMainGiftType 爱奇艺 请求奖励主类型：1：领取盒子下载 礼包领取；2：检查 微信礼包码 领取；3：检查 SVIP礼包码 领取；4：检查 QQ群礼包码 领取 - DownLoadBoxGiftFlag = 0 or 1 爱奇艺 盒子下载 礼包领取标志 - WeChatGiftFlag = 0 or 1 爱奇艺 微信礼包码 礼包领取标志 - SVIPGiftFlag = 0 or 1 爱奇艺 SVIP礼包码 礼包领取标志 - QQGroupGiftFlag = 0 or 1 爱奇艺 QQ群礼包码 礼包领取标志 - } -]]-- - - ---活动类型 -ActivityType = 10029 ---对应的活动配置 -ActivityConfig = PlatformaiqiyiConfig - - -local PfId = System.getPfId() - - -function GetAiQiYiUserData(pActor) - local var = Actor.getStaticVar(pActor) - if nil == var.AiQiYiUserData then - var.AiQiYiUserData = {} - end - return var.AiQiYiUserData -end - -function SendAiQiYiUserData(pActor) - print("[Tip] ActivityType10029 SendAiQiYiUserData") - local userData = GetAiQiYiUserData(pActor) - local npack = DataPack.allocPacket(pActor, enPlatforMwelfareID, sSendAiQiYiUserData) - if npack then - DataPack.writeByte(npack, userData.DownLoadBoxGiftFlag) - DataPack.writeByte(npack, userData.WeChatGiftFlag) - DataPack.writeByte(npack, userData.SVIPGiftFlag) - DataPack.writeByte(npack, userData.QQGroupGiftFlag) - DataPack.flush(npack) - end -end - - --------------------------------------------------------------------- --- 客户端请求协议回调 --------------------------------------------------------------------- - - --- 发送 爱奇艺微端下载奖励 -function SendDownLoadBoxGift(pActor) - print("[Tip] ActivityType10029 SendDownLoadBoxGift") - - local userData = GetAiQiYiUserData(pActor) - if not userData.LoginType then - print("[Tip] ActivityType10029 SendDownLoadBoxGift not userData.LoginType") - return - end - - if 1 == userData.DownLoadBoxGiftFlag then - print("[Tip] ActivityType10029 SendDownLoadBoxGift already get DownLoadBoxGift") - return - end - - if not ActivityConfig or not ActivityConfig.rewardClient then - print("[Tip] ActivityType10029 SendDownLoadBoxGift not ActivityConfig or not ActivityConfig.rewardClient") - return - end - - --检测格子 16 : 活动通用 - if true ~= CommonFunc.Awards.CheckBagIsEnough(pActor,16,tmDefNoBagNum,tstUI) then - print("[Tip] ActivityType10029 SendDownLoadBoxGift not CheckBagIsEnough") - return - end - - -- 设置标志 - userData.DownLoadBoxGiftFlag = 1 - - CommonFunc.Awards.Give(pActor, ActivityConfig.rewardClient, GameLog.Log_Activity10029) - - SendAiQiYiUserData(pActor) -end - --- 检查玩家 微信礼包码 领取状态 -function CheckWeChatGift(pActor) - print("[Tip] ActivityType10029 CheckWeChatGift") - - if not ActivityConfig or not ActivityConfig.wechat then - print("[Tip] ActivityType10029 CheckWeChatGift") - return - end - - local userData = GetAiQiYiUserData(pActor) - local cdkdata = getActorCdkData(pActor) - if cdkdata then - -- 超级vip奖励 - if cdkdata.codeTypeTimes then - if cdkdata.codeTypeTimes[ActivityConfig.wechat] then - userData.WeChatGiftFlag = 1 - else - print("[Tip] ActivityType10029 CheckWeChatGift not cdkdata.codeTypeTimes[ActivityConfig.wechat]") - end - else - print("[Tip] ActivityType10029 CheckWeChatGift not cdkdata.codeTypeTimes") - end - else - print("[Tip] ActivityType10029 CheckWeChatGift not cdkdata") - end - - SendAiQiYiUserData(pActor) -end - --- 检查玩家 SVIP礼包码 领取状态 -function CheckSVIPGift(pActor) - print("[Tip] ActivityType10029 CheckSVIPGift") - - if not ActivityConfig or not ActivityConfig.SVIP then - print("[Tip] ActivityType10029 CheckSVIPGift") - return - end - - local userData = GetAiQiYiUserData(pActor) - local cdkdata = getActorCdkData(pActor) - if cdkdata then - -- 超级vip奖励 - if cdkdata.codeTypeTimes then - if cdkdata.codeTypeTimes[ActivityConfig.SVIP] then - userData.SVIPGiftFlag = 1 - else - print("[Tip] ActivityType10029 CheckSVIPGift not cdkdata.codeTypeTimes[ActivityConfig.SVIP]") - end - else - print("[Tip] ActivityType10029 CheckSVIPGift not cdkdata.codeTypeTimes") - end - else - print("[Tip] ActivityType10029 CheckSVIPGift not cdkdata") - end - - SendAiQiYiUserData(pActor) -end - --- 检查玩家 QQ群礼包码 领取状态 -function CheckQQGroupGift(pActor) - print("[Tip] ActivityType10029 CheckQQGroupGift") - - if not ActivityConfig or not ActivityConfig.QQ then - print("[Tip] ActivityType10029 CheckQQGroupGift") - return - end - - local userData = GetAiQiYiUserData(pActor) - local cdkdata = getActorCdkData(pActor) - if cdkdata then - -- 超级vip奖励 - if cdkdata.codeTypeTimes then - if cdkdata.codeTypeTimes[ActivityConfig.QQ] then - userData.QQGroupGiftFlag = 1 - else - print("[Tip] ActivityType10029 CheckQQGroupGift not cdkdata.codeTypeTimes[ActivityConfig.QQ]") - end - else - print("[Tip] ActivityType10029 CheckQQGroupGift not cdkdata.codeTypeTimes") - end - else - print("[Tip] ActivityType10029 CheckQQGroupGift not cdkdata") - end - - SendAiQiYiUserData(pActor) -end - --- 爱奇艺玩家登录 -function OnReqAiQiYiLogin(pActor, packet) - print("[Tip] ActivityType10029 OnReqAiQiYiLogin") - - -- 平台验证 - if not PfId then - print("[Tip] ActivityType10029 OnReqAiQiYiLogin not PfId") - return - end - if not ActivityConfig then - print("[Tip] ActivityType10029 OnReqAiQiYiLogin not ActivityConfig") - return - end - if not ActivityConfig.SPID then - print("[Tip] ActivityType10029 OnReqAiQiYiLogin not ActivityConfig.SPID") - return - end - if tostring(PfId) ~= tostring(ActivityConfig.SPID) then - print("[Tip] ActivityType10029 OnReqAiQiYiLogin [非本平台活动]") - return --非本平台活动 - end - - local userData = GetAiQiYiUserData(pActor) - - -- 初始化 登录类型 - userData.LoginType = DataPack.readByte(packet) - - if not userData.LoginType then - userData.LoginType = 0 - end - if not userData.ReqMainGiftType then - userData.ReqMainGiftType = 0 - end - if nil == userData.DownLoadBoxGiftFlag then - userData.DownLoadBoxGiftFlag = 0 - end - if nil == userData.WeChatGiftFlag then - userData.WeChatGiftFlag = 0 - end - if nil == userData.SVIPGiftFlag then - userData.SVIPGiftFlag = 0 - end - if nil == userData.QQGroupGiftFlag then - userData.QQGroupGiftFlag = 0 - end - - SendAiQiYiUserData(pActor) -end - --- 请求爱奇艺礼包 -function OnReqAiQiYiGift(pActor, packet) - print("[Tip] ActivityType10029 OnReqAiQiYiGift") - - -- 平台验证 - if not PfId then - print("[Tip] ActivityType10029 OnReqAiQiYiGift not PfId") - return - end - if not ActivityConfig then - print("[Tip] ActivityType10029 OnReqAiQiYiGift not ActivityConfig") - return - end - if not ActivityConfig.SPID then - print("[Tip] ActivityType10029 OnReqAiQiYiGift not ActivityConfig.SPID") - return - end - if tostring(PfId) ~= tostring(ActivityConfig.SPID) then - print("[Tip] ActivityType10029 OnReqAiQiYiGift [非本平台活动]") - return --非本平台活动 - end - - local userData = GetAiQiYiUserData(pActor) - - -- 初始化 请求奖励类型 - userData.ReqMainGiftType = DataPack.readByte(packet) - - if not userData.ReqMainGiftType or userData.ReqMainGiftType < 1 or userData.ReqMainGiftType > 4 then - print("[Tip] ActivityType10029 OnReqAiQiYiGift not userData.ReqMainGiftType or userData.ReqMainGiftType < 1 or userData.ReqMainGiftType > 4") - return - end - - if 1 == userData.ReqMainGiftType then -- 请求 盒子下载 奖励 - SendDownLoadBoxGift(pActor) - elseif 2 == userData.ReqMainGiftType then -- 检查 微信礼包码 领取 - CheckWeChatGift(pActor) - elseif 3 == userData.ReqMainGiftType then -- 检查 SVIP礼包码 领取 - CheckSVIPGift(pActor) - elseif 4 == userData.ReqMainGiftType then -- 检查 QQ群礼包码 领取 - CheckQQGroupGift(pActor) - end - -end - -NetmsgDispatcher.Reg(enPlatforMwelfareID, cReqAiQiYiLogin, OnReqAiQiYiLogin) -NetmsgDispatcher.Reg(enPlatforMwelfareID, cReqAiQiYiGift, OnReqAiQiYiGift) - - diff --git a/LogicServer/data/functions/Activity/Activitys.txt b/LogicServer/data/functions/Activity/Activitys.txt index 9de693c..68f39c2 100755 --- a/LogicServer/data/functions/Activity/Activitys.txt +++ b/LogicServer/data/functions/Activity/Activitys.txt @@ -51,7 +51,6 @@ require("Activity.ActivityType10021") --个人活动：二充 require("Activity.ActivityType10022") --玩法：360大玩家特权 require("Activity.ActivityType10024") --鲁大师 require("Activity.ActivityType10027") --ku25 -require("Activity.ActivityType10029") --aiqiyi require("Activity.ActivityType10030") --yaodou require("Activity.ActivityType10031") --贪玩 require("Activity.ActivityType10032") --哥们 diff --git a/LogicServer/data/functions/GameConfigs.txt b/LogicServer/data/functions/GameConfigs.txt index 348fb5b..960908c 100755 --- a/LogicServer/data/functions/GameConfigs.txt +++ b/LogicServer/data/functions/GameConfigs.txt @@ -70,7 +70,6 @@ --#include "data/config/Platformludashi/Ludashimember.config" once --鲁大师 会员 --#include "data/config/Platformludashi/Ludashivip.config" once --鲁大师 vip --#include "data/config/Platformludashi/Platformludashi.config" once --鲁大师 ---#include "data/config/Platformaiqiyi/Platformaiqiyi.config" once --AiQiYi --#include "data/config/PlatformYaodou/PlatformYaodou.config" once --YaoDou --#include "data/config/PlatformTanwan/PlatformTanwan.config" once --贪玩 --#include "data/config/PlatformGame2/PlatformGame2.config" once --哥们