From a42db390015f089aacc732f807564b5142de3731 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 27 一月 2021 18:28:15 +0800 Subject: [PATCH] 8716 【主干】【后端】【BT2】H.活动-节日祈愿(增加节日充值领奖); --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.py | 71 +++++++++++++++-------------------- 1 files changed, 31 insertions(+), 40 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.py index e99d5fa..6fba88a 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActTotalRecharge.py @@ -35,7 +35,7 @@ if actNum == 1: ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge", cfgID) else: - ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge2", cfgID) + ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge%s" % actNum, cfgID) if not ipyData: return 0 templateIDList = ipyData.GetTemplateIDList() @@ -43,25 +43,16 @@ return templateID def OnPlayerLogin(curPlayer): - # 活动1 - actNum = 1 - isReset = __CheckPlayerTotalRechargeAction(curPlayer, actNum) - if not isReset: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge, {}) - # 活动中同步活动信息 - if actTotalRechargeInfo.get(ShareDefine.ActKey_State): - Sync_TotalRechargeActionInfo(curPlayer, actNum) - Sync_TotalRechargeInfo(curPlayer, actNum) - - # 活动2 - actNum = 2 - isReset = __CheckPlayerTotalRechargeAction(curPlayer, actNum) - if not isReset: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge2, {}) - # 活动中同步活动信息 - if actTotalRechargeInfo.get(ShareDefine.ActKey_State): - Sync_TotalRechargeActionInfo(curPlayer, actNum) - Sync_TotalRechargeInfo(curPlayer, actNum) + + for actNum, actName in ShareDefine.OperationActionName_TotalRechargeDict.items(): + isReset = __CheckPlayerTotalRechargeAction(curPlayer, actNum) + if not isReset: + actTotalRechargeInfo = PyGameData.g_operationActionDict.get(actName, {}) + # 活动中同步活动信息 + if actTotalRechargeInfo.get(ShareDefine.ActKey_State): + Sync_TotalRechargeActionInfo(curPlayer, actNum) + Sync_TotalRechargeInfo(curPlayer, actNum) + return def RefreshTotalRechargeActionInfo(actNum): @@ -78,11 +69,10 @@ ## 检查玩家累计充值活动数据信息 playerID = curPlayer.GetPlayerID() - - if actNum == 1: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge, {}) - else: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge2, {}) + if actNum not in ShareDefine.OperationActionName_TotalRechargeDict: + return + actName = ShareDefine.OperationActionName_TotalRechargeDict[actNum] + actTotalRechargeInfo = PyGameData.g_operationActionDict.get(actName, {}) TotalRechargeID = actTotalRechargeInfo.get(ShareDefine.ActKey_ID, 0) state = actTotalRechargeInfo.get(ShareDefine.ActKey_State, 0) @@ -166,11 +156,11 @@ if addGold <= 0: return - if actNum == 1: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge, {}) - else: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge2, {}) - + if actNum not in ShareDefine.OperationActionName_TotalRechargeDict: + return + actName = ShareDefine.OperationActionName_TotalRechargeDict[actNum] + actTotalRechargeInfo = PyGameData.g_operationActionDict.get(actName, {}) + if not actTotalRechargeInfo.get(ShareDefine.ActKey_State): GameWorld.DebugLog("累计充值活动当前未开启! actNum=%s" % actNum) return @@ -202,10 +192,10 @@ return playerID = curPlayer.GetPlayerID() - if actNum == 1: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge, {}) - else: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge2, {}) + if actNum not in ShareDefine.OperationActionName_TotalRechargeDict: + return + actName = ShareDefine.OperationActionName_TotalRechargeDict[actNum] + actTotalRechargeInfo = PyGameData.g_operationActionDict.get(actName, {}) TotalRechargeID = actTotalRechargeInfo.get(ShareDefine.ActKey_ID, 0) state = actTotalRechargeInfo.get(ShareDefine.ActKey_State, 0) @@ -279,11 +269,12 @@ def Sync_TotalRechargeActionInfo(curPlayer, actNum): ## 通知累计充值活动信息 - if actNum == 1: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge, {}) - else: - actTotalRechargeInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_TotalRecharge2, {}) - + + if actNum not in ShareDefine.OperationActionName_TotalRechargeDict: + return + actName = ShareDefine.OperationActionName_TotalRechargeDict[actNum] + actTotalRechargeInfo = PyGameData.g_operationActionDict.get(actName, {}) + if not actTotalRechargeInfo: return @@ -294,7 +285,7 @@ if actNum == 1: ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge", cfgID) else: - ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge2", cfgID) + ipyData = IpyGameDataPY.GetIpyGameData("ActTotalRecharge%s" % actNum, cfgID) if not ipyData: return -- Gitblit v1.8.0