From 79af0ddc0c8b3e2a09418284677c6a9517854a29 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 21 九月 2018 14:14:57 +0800
Subject: [PATCH] 3740 【后端】大小宝箱刷新逻辑
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py | 61 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 26 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
index dd67884..92242fe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashGiftbag.py
@@ -40,14 +40,7 @@
return todayGiftbag
def OnPlayerLogin(curPlayer):
- isReset = __CheckPlayerFlashGiftbagAction(curPlayer)
- if not isReset:
- actInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_FlashGiftbag, {})
- # 活动中同步活动信息
- if actInfo.get(ShareDefine.ActKey_State):
- giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
- SyncFlashGiftbagBuyCount(curPlayer, giftbagTypeList=giftbagTypeList)
- Sync_FlashGiftbagActionInfo(curPlayer)
+ __CheckPlayerFlashGiftbagAction(curPlayer)
return
def RefreshFlashGiftbagActionInfo():
@@ -68,24 +61,36 @@
actInfo = PyGameData.g_operationActionDict.get(ShareDefine.OperationActionName_FlashGiftbag, {})
actID = actInfo.get(ShareDefine.ActKey_ID, 0)
state = actInfo.get(ShareDefine.ActKey_State, 0)
+ cfgID = actInfo.get(ShareDefine.ActKey_CfgID, 0)
playerActID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashGiftbagID) # 玩家身上的活动ID
-
- # 活动ID 相同的话不处理
- if actID == playerActID:
+ giftbagTypeList = [] if not cfgID else GetGiftbagTypeList(cfgID, actInfo.get(ShareDefine.ActKey_DayIndex, 0))
+ isReset = False
+ if actID != playerActID:
+ isReset = True
+ __ResetGiftbagItemBuyCount(curPlayer, giftbagTypeList)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagID, actID)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagMailState, 0)
+ GameWorld.DebugLog("限时礼包重置! actID=%s,playerActID=%s,state=%s,giftbagTypeList=%s" % (actID, playerActID, state, giftbagTypeList), playerID)
+ Sync_FlashGiftbagActionInfo(curPlayer)
+ else:
GameWorld.DebugLog("限时礼包活动ID不变，不处理！", curPlayer.GetPlayerID())
- return
-
- giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagID, actID)
- ResetGiftbagItemBuyCount(curPlayer, giftbagTypeList)
-
- GameWorld.DebugLog("限时礼包重置! actID=%s,playerActID=%s,state=%s,giftbagTypeList=%s" % (actID, playerActID, state, giftbagTypeList), playerID)
-
- Sync_FlashGiftbagActionInfo(curPlayer)
- return True
+
+ playerMailState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FlashGiftbagMailState) # 玩家身上的活动提醒邮件状态
+ if actID and state and state != playerMailState:
+ flashGiftbagIpyData = IpyGameDataPY.GetIpyGameData("ActFlashGiftbag", cfgID)
+ if flashGiftbagIpyData and flashGiftbagIpyData.GetMailKey() and curPlayer.GetLV() >= flashGiftbagIpyData.GetLVLimit():
+ PlayerControl.SendMailByKey(flashGiftbagIpyData.GetMailKey(), [playerID], flashGiftbagIpyData.GetMailItemPrize())
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FlashGiftbagMailState, state)
+ GameWorld.DebugLog(" 发送新限时礼包邮件提醒! state=%s,playerMailState=%s" % (state, playerMailState), playerID)
+
+ if not isReset and cfgID:
+ if giftbagTypeList:
+ SyncFlashGiftbagBuyCount(curPlayer, giftbagTypeList=giftbagTypeList)
+ Sync_FlashGiftbagActionInfo(curPlayer)
+ return isReset
-def ResetGiftbagItemBuyCount(curPlayer, giftbagTypeList):
+def __ResetGiftbagItemBuyCount(curPlayer, giftbagTypeList):
##重置限时礼包限购物品次数
syncIDList = []
ipyDataMgr = IpyGameDataPY.IPY_Data()
@@ -207,13 +212,16 @@
if not actInfo:
return
- if not actInfo.get(ShareDefine.ActKey_State):
- return
+ #需要提前通知，所以去掉此限制
+ #if not actInfo.get(ShareDefine.ActKey_State):
+ # return
cfgID = actInfo.get(ShareDefine.ActKey_CfgID, 0)
- giftbagTypeList = GetGiftbagTypeList(actInfo.get(ShareDefine.ActKey_CfgID, 0), actInfo.get(ShareDefine.ActKey_DayIndex, 0))
+ if not cfgID:
+ return
+ giftbagTypeList = GetGiftbagTypeList(cfgID, actInfo.get(ShareDefine.ActKey_DayIndex, 0))
- if not cfgID or not giftbagTypeList:
+ if not giftbagTypeList:
return
flashGiftbagIpyData = IpyGameDataPY.GetIpyGameData("ActFlashGiftbag", cfgID)
@@ -232,6 +240,7 @@
packInfo = ChPyNetSendPack.tagMCFlashGiftbagInfo()
packInfo.StartDate = flashGiftbagIpyData.GetStartDate()
packInfo.EndtDate = flashGiftbagIpyData.GetEndDate()
+ packInfo.AdvanceMinutes = flashGiftbagIpyData.GetAdvanceMinutes()
packInfo.ActivityTime = []
for i, startTime in enumerate(startTimeList):
timeInfo = ChPyNetSendPack.tagMCFlashGiftbagTime()
--
Gitblit v1.8.0