From 19e0109ec1e936204cb85362d2e3f705b8b9554c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 十二月 2020 11:19:38 +0800
Subject: [PATCH] 8585 【主干】【BT】【长尾】【后端】竞技场(封包)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py |   62 +++++++++++++++++++++++++------
 1 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index b6faf6a..e8956af 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -59,6 +59,10 @@
 
 def OnPlayerLogin(curPlayer):
     
+    if GameWorld.IsCrossServer():
+        # 跨服不处理运营活动
+        return
+    
     isReload, OperationActionInfo = __GetOperationActionInfo()
     operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
     
@@ -99,6 +103,10 @@
 def SendMapServerOperationActionState():
     # 地图启动成功时通知本日运行活动相关状态
     
+    if GameWorld.IsCrossServer():
+        # 跨服不处理运营活动
+        return
+    
     isReload, OperationActionInfo = __GetOperationActionInfo()
     mapServerInfoDict = OperationActionInfo[OperationAction_MapServerInfo]
     
@@ -137,6 +145,7 @@
     curDateTimeStr = "%d-%d-%d %02d:%02d:00" % (serverTime.year, serverTime.month, serverTime.day, serverTime.hour, serverTime.minute)
     curDateTime = datetime.datetime.strptime(curDateTimeStr, ChConfig.TYPE_Time_Format)
     
+    startDateInCustomCanOpenList = IpyGameDataPY.GetFuncEvalCfg("OperationAction", 2) # 开始天在定制天内在定制天结束后可继续开启的活动列表
     customMaxServerDay = IpyGameDataPY.GetFuncCfg("OperationAction", 1) # 定制运营活动最大开服天
     maxCustomServerDayMix = IpyGameDataPY.GetFuncCfg("MixServer", 1) # 定制运营活动最大合服天
     operationActionDict = {}
@@ -227,8 +236,9 @@
                     curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, 
                                                                                          customMaxServerDateTime.second), ChConfig.TYPE_Time_Format)
                     if curServerOpenDateTime <= curStartDateTime <= customMaxServerDateTime:
-                        GameWorld.Log("        按日期/周开的开始日期在开服定制限制天内,不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime))
-                        continue
+                        if actName not in startDateInCustomCanOpenList:
+                            GameWorld.Log("        按日期/周开的开始日期在开服定制限制天内,不处理! cfgID=%s,curServerOpenDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, curServerOpenDateTime, curStartDateTime, customMaxServerDateTime))
+                            continue
                     
                     if isMixServer:
                         if mixServerDay <= maxCustomServerDayMix:
@@ -239,8 +249,9 @@
                         curStartDateTime = datetime.datetime.strptime("%s %02d:%02d:%02d" % (startDateStr, customMaxServerDateTime.hour, customMaxServerDateTime.minute, 
                                                                                              customMaxServerDateTime.second), ChConfig.TYPE_Time_Format)
                         if mixStartServerDateTime <= curStartDateTime <= customMaxServerDateTime:
-                            GameWorld.Log("        按日期/周开的开始日期在合服定制限制天内,不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime))
-                            continue
+                            if actName not in startDateInCustomCanOpenList:
+                                GameWorld.Log("        按日期/周开的开始日期在合服定制限制天内,不处理! cfgID=%s,mixStartServerDateTime=%s<=curStartDateTime=%s<=customMaxServerDateTime=%s" % (cfgID, mixStartServerDateTime, curStartDateTime, customMaxServerDateTime))
+                                continue
                     
             if hasattr(ipyData, "GetStartTimeList") and hasattr(ipyData, "GetEndTimeList"):
                 startHMStrList = ipyData.GetStartTimeList()
@@ -488,6 +499,10 @@
 def Dispose_OperationActionState(reloadRefresh=False):
     # 运营活动状态处理, 每天0点会强制同步当天的运营活动详情到地图服务器
     
+    if GameWorld.IsCrossServer():
+        # 跨服不处理运营活动
+        return
+    
     isReload, OperationActionInfo = __GetOperationActionInfo(False) # 这里必须传False
     isReload = isReload or reloadRefresh
     operationActionDict = OperationActionInfo[OperationAction_TodayInfo]
@@ -499,6 +514,8 @@
     curDateTime = GameWorld.GetServerTime()
     curDateTime = datetime.datetime.strptime("%d-%d-%d %d:%d:00" % (curDateTime.year, curDateTime.month, curDateTime.day,
                                                                     curDateTime.hour, curDateTime.minute), ChConfig.TYPE_Time_Format)
+    
+    startDateInCustomCanOpenList = IpyGameDataPY.GetFuncEvalCfg("OperationAction", 2) # 开始天在定制天内在定制天结束后可继续开启的活动列表
     
     for actName in ShareDefine.OperationActionNameList:
         
@@ -512,20 +529,41 @@
             #notifyDict = {} # {notifyDateTime:[notifyKey, [参数]], ...}
             #ipyData 可能为 None
             ipyData, startList, endList, notifyDict = operationActionDict[actName]
-            # 精确匹配开启
-            if curDateTime in startList:
-                state = startList.index(curDateTime) + 1 # 也是代表第几个时间段
-            # 精确匹配关闭
-            elif curDateTime in endList:
-                state = 0
-            # goon 状态
-            else:
+            
+            if actName in startDateInCustomCanOpenList:
+                # 由于某些活动的开始天允许和前定制X天有交叉的情况出现(实际不开,会等定制结束后才接下去开)
+                # 所以会有时间交叉的情况出现,这种活动goon单独判断
+                # 为防止动到其他活动,允许交叉的活动另外处理,理论上可以统一逻辑,为保险起见分开处理
+                
+                # 精确匹配开启
+                if curDateTime in startList:
+                    state = startList.index(curDateTime) + 1 # 也是代表第几个时间段
+                # 精确匹配关闭
+                elif curDateTime in endList:
+                    state = 0
+                    
+                # goon 状态
                 for dIndex, startDateTime in enumerate(startList):
                     endDateTime = endList[dIndex]
                     if startDateTime < curDateTime < endDateTime:
                         state = dIndex + 1
                         break
                     
+            else:
+                # 精确匹配开启
+                if curDateTime in startList:
+                    state = startList.index(curDateTime) + 1 # 也是代表第几个时间段
+                # 精确匹配关闭
+                elif curDateTime in endList:
+                    state = 0
+                # goon 状态
+                else:
+                    for dIndex, startDateTime in enumerate(startList):
+                        endDateTime = endList[dIndex]
+                        if startDateTime < curDateTime < endDateTime:
+                            state = dIndex + 1
+                            break
+                    
             # 全服广播提示信息
             if curDateTime in notifyDict:
                 notifyKey, paramList = notifyDict[curDateTime]

--
Gitblit v1.8.0