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/PlayerActCollectWords.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActCollectWords.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActCollectWords.py
index 522eaae..f75919a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActCollectWords.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActCollectWords.py
@@ -146,8 +146,7 @@
     
     lastDayOnlyExchange = ipyData.GetLastDayOnlyExchange()
     if lastDayOnlyExchange:
-        openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
-        endDateStr = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
+        _, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
         curDate = GameWorld.GetCurrentTime()
         curDateStr = "%d-%s-%s" % (curDate.year, curDate.month, curDate.day)
         if curDateStr == endDateStr:
@@ -306,11 +305,11 @@
     if not templateID:
         return
     
-    openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
+    startDateStr, endDateStr = GameWorld.GetOperationActionDateStr(ipyData)
     clientPack = ChPyNetSendPack.tagMCActCollectWordsInfo()
     clientPack.ActNum = actNum
-    clientPack.StartDate = GameWorld.GetOperationActionDateStr(ipyData.GetStartDate(), openServerDay)
-    clientPack.EndtDate = GameWorld.GetOperationActionDateStr(ipyData.GetEndDate(), openServerDay)
+    clientPack.StartDate = startDateStr
+    clientPack.EndtDate = endDateStr
     clientPack.LimitLV = ipyData.GetLVLimit()
     clientPack.LastDayOnlyExchange = ipyData.GetLastDayOnlyExchange()
     clientPack.ExchangeItemList = []

--
Gitblit v1.8.0