From 724c3574fa7b9637feaa5c20120c967df287e120 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 十一月 2022 20:06:24 +0800
Subject: [PATCH] 9748 【BT7】【主干】【越南】跨服BOSS定时活动(修复跨服boss日常引起的跨服日常PK匹配状态处理bug)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 789654d..ae845c1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -1072,7 +1072,6 @@
     
     if GameWorld.IsCrossServer():
         CrossActionControl.Dispose_CrossDailyActionState()
-        return
     
     todayDailyActionInfo = __GetTodayDailyActionInfo()
     if not todayDailyActionInfo:
@@ -1139,16 +1138,15 @@
 def SendMapServerDailyActionState():
     # 地图启动成功时通知本日进行中的日常活动状态
     
+    gameWorld = GameWorld.GetGameWorld()
     if GameWorld.IsCrossServer():
         CrossActionControl.SendMapServerCrossDailyActionState()
-        return
-    
-    gameWorld = GameWorld.GetGameWorld()
-    for dailyActionID in ShareDefine.CrossDailyActionIDList:
-        dictName = ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % dailyActionID 
-        state = gameWorld.GetDictByKey(dictName)
-        if state:
-            GameWorld.SendMapServerMsgEx(dictName, state)
+    else:
+        for dailyActionID in ShareDefine.CrossDailyActionIDList:
+            dictName = ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % dailyActionID 
+            state = gameWorld.GetDictByKey(dictName)
+            if state:
+                GameWorld.SendMapServerMsgEx(dictName, state)
             
     todayDailyActionInfo = __GetTodayDailyActionInfo()
     if not todayDailyActionInfo:

--
Gitblit v1.8.0