ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.py
@@ -369,6 +369,14 @@
    DataRecordPack.DR_OnLinePlayerCount(activePlayerCount) # 总在线
    return
def OnGM_CrossCenterEvent(gmEvent):
    if not GameWorld.IsCrossCenter():
        return
    serverEventValue = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_CrossCenterEvent)
    if DoLogic_CrossCenterEvent(serverEventValue, gmEvent=gmEvent):
        CrossMgr.SendCrossServerEvent(gmEvent=gmEvent)
    return
def DoLogic_GameWorldEvenByTime(tick):
    '''跨服事件由跨服中心服务器驱动,游戏服使用原方式
    跨服中心OnEvent -> 其他服务器OnEvent (包含个常规跨服服务器及游戏服,不保证谁先执行)
@@ -459,22 +467,22 @@
    PlayerEventCounter.DoLogic_OnYear(tick)
    return
def DoLogic_CrossCenterEvent(centerEventValue, centerServerID=0):
def DoLogic_CrossCenterEvent(centerEventValue, centerServerID=0, gmEvent=""):
    ## 收到跨服中心事件同步,如OnDay等
    serverEventValue = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_CrossCenterEvent)
    if not serverEventValue:
        serverEventValue = centerEventValue
        DBDataMgr.GetEventTrigMgr().SetValue(ShareDefine.Def_CrossCenterEvent, centerEventValue)
        
    if serverEventValue == centerEventValue:
    if serverEventValue == centerEventValue and not gmEvent:
        if centerServerID:
            GameWorld.Log("本服与跨服中心事件值相同不处理! serverEventValue=%s,centerEventValue=%s,centerServerID=%s" % (serverEventValue, centerEventValue, centerServerID))
        return
    
    if centerServerID:
        GameWorld.Log("本服与跨服中心事件值变化! serverEventValue=%s,centerEventValue=%s,centerServerID=%s" % (serverEventValue, centerEventValue, centerServerID))
        GameWorld.Log("本服与跨服中心事件值变化! serverEventValue=%s,centerEventValue=%s,centerServerID=%s,gmEvent=%s" % (serverEventValue, centerEventValue, centerServerID, gmEvent))
    else:
        GameWorld.Log("跨服中心服务器事件值变化! serverEventValue=%s,centerEventValue=%s" % (serverEventValue, centerEventValue))
        GameWorld.Log("跨服中心服务器事件值变化! serverEventValue=%s,centerEventValue=%s,gmEvent=%s" % (serverEventValue, centerEventValue, gmEvent))
        
    serverEventTime = GameWorld.ChangeStrToDatetime("%s" % serverEventValue, ChConfig.TYPE_Time_Format_YmdH)
    centerEventTime = GameWorld.ChangeStrToDatetime("%s" % centerEventValue, ChConfig.TYPE_Time_Format_YmdH)
@@ -496,12 +504,12 @@
    isEvent = False
    
    #OnHour事件
    if (serverHour != centerHour or serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear):
    if (serverHour != centerHour or serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear or gmEvent == "GMOnHour"):
        isEvent = True
        PlayerEventCounter.DoLogic_CrossCenterOnHour(centerEventValue)
        
    #OnDay事件
    if (serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear):
    if (serverDay != centerDay or serverMonth != centerMonth or serverYear != centerYear or gmEvent == "GMOnDay"):
        isEvent = True
        PlayerEventCounter.DoLogic_CrossCenterOnDay(centerEventValue)
        
@@ -517,6 +525,15 @@
    #if serverYear != curTimeYear:
    #    OnYear(tick)
    
    # 游戏服额外处理玩家
    if GameWorld.IsMainServer():
        playerManager = GameWorld.GetPlayerManager()
        for i in xrange(playerManager.OnlineCount()):
            curPlayer = playerManager.OnlineAt(i)
            if not GameWorld.IsNormalPlayer(curPlayer):
                continue
            PlayerEventCounter.PlayerOnCrossCenterEvent(curPlayer, centerEventValue, gmEvent=gmEvent)
    return isEvent
def __CheckIpyDataRecycle(timeNow):