From 505624324cbcd11b44f0db3036fca1ffa562f3b7 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 16 六月 2021 18:29:53 +0800
Subject: [PATCH] 8983 【港台】【BT2】【港台-1.100.7】【BT2-1.100.1】循环相关的活动配置优化(周循环支持配置开始循环日期及结束循环日期,格式: W1|开启日期  或 W7|结束日期)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
index 5bb9ca0..c5d3178 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFlashSale.py
@@ -127,8 +127,7 @@
         isReset = True
         if cfgID:
             flashSaleIpyData = IpyGameDataPY.GetIpyGameData("ActFlashSale", cfgID)
-            openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
-            startDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData.GetStartDate(), openServerDay)
+            startDate, _ = GameWorld.GetOperationActionDateStr(flashSaleIpyData)
             startTimeNum = GameWorld.ChangeTimeStrToNum(startDate, timeFormat=ChConfig.TYPE_Time_Format_Day)
         else:
             startTimeNum = 0
@@ -191,9 +190,7 @@
         LVLimit = flashSaleIpyData.GetLVLimit()
         if not mailKey or curPlayer.GetLV() < LVLimit:
             continue
-        openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
-        startDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData.GetStartDate(), openServerDay)
-        endDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData.GetEndDate(), openServerDay)
+        startDate, endDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData)
         startTimeList = flashSaleIpyData.GetStartTimeList()
         endTimeList = flashSaleIpyData.GetEndTimeList()
         if not startTimeList or not endTimeList:
@@ -238,11 +235,11 @@
         GameWorld.ErrLog("限时抢购开关时间时分配置错误!cfgID=%s" % cfgID)
         return
     job = curPlayer.GetJob()
-    openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
+    startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(flashSaleIpyData)
     packInfo = ChPyNetSendPack.tagMCFlashSaleInfo()
     packInfo.ActNum = actNum
-    packInfo.StartDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData.GetStartDate(), openServerDay)
-    packInfo.EndtDate = GameWorld.GetOperationActionDateStr(flashSaleIpyData.GetEndDate(), openServerDay)
+    packInfo.StartDate = startDateStr
+    packInfo.EndtDate = endDateStr
     packInfo.AdvanceMinutes = flashSaleIpyData.GetAdvanceMinutes()
     packInfo.ActivityTime = []
     for i, startTime in enumerate(startTimeList):

--
Gitblit v1.8.0