From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 4e9df57..00398dc 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -352,7 +352,8 @@
     GameWorldActionControl.Dispose_OperationActionState()
     GameWorldActionControl.Dispose_DailyActionState()
     GameWorldActionControl.Dispose_FBStateTime()
-    
+    #跨服PK
+    CrossRealmPK.OnMinuteProcess()
     #处理重开服务器后, 活动继续开启逻辑根据天数
     #GameWorldActionControl.Dispose_Action_GoOn_ByDay(tick)
     #触发世界等级
@@ -1252,11 +1253,6 @@
     #GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化
     #子服启动成功告知跨服主服
     serverGroupID = GameWorld.GetServerGroupID()
-    if GameWorld.IsCrossRealmOpen() and not GameWorld.IsCrossServer():
-        GameWorld.Log("通知跨服主服务器启动成功, 可接收最新跨服活动状态及数据...")
-        dataMsg = {"ServerGroupID":serverGroupID}
-        CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_ServerInitOK, dataMsg)
-        
     GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
     return
 
@@ -1418,7 +1414,7 @@
     #GameWorldShopItem.OnMapServerInitOK()
     
     # 跨服PK
-    #GameWorldMergePK.OnMapServerInitOK()
+    CrossRealmPK.OnMapServerInitOK()
     #GameWorldMergeKing.OnMapServerInitOK()
     
     SendAllMapGlobalDropInfo() # 全局掉落控制

--
Gitblit v1.8.0