5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码）

hxp

2018-12-26 3a3ad99a1761438e31bc6860e94b43cb4f165513

 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py

@@ -25,14 +25,11 @@
import ShareDefine

#import PlayerExam

import PlayerDBGSEvent

import MergeBroadcast

#import PlayerManorWar

#import GameWorldShopItem

#import GameWorldActionTeHui

import GameWorldAverageLv

#import GameWorldMergeBoss

#import GameWorldMergeKing

#import GameWorldMergePK

import CrossRealmPK

import GameWorldFamilyWar

import PlayerFamilyParty

import IpyGameDataPY

@@ -1069,7 +1066,7 @@
    #    #间隔未到

    #    return

    

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        return

    

    Dispose_ActionGoOnByDayKey()

@@ -1082,7 +1079,7 @@
def DoLogic_ServerLastOpenActionDay():

    

    #是跨服服务器

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        if not PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MergeServerOpenActionDay):

            return

        

@@ -1136,7 +1133,7 @@
#def __CheckIsProcessDictName(dictName):

#    

#    # 非跨服服务器不处理某些key

#    if dictName in [ShareDefine.Def_Notify_WorldKey_Merge_King] and not GameWorld.IsMergeServer():

#    if dictName in [ShareDefine.Def_Notify_WorldKey_Merge_King] and not GameWorld.IsCrossServer():

#        return False

#    

#    return True

@@ -1205,15 +1202,6 @@
    # #领地争夺战

    # if dictName == ShareDefine.Def_Notify_WorldKey_ManorWar:

    #    PlayerManorWar.ManorWar_ChangeState(isOpen)

    # #跨服boss

    # elif dictName == ShareDefine.Def_Notify_WorldKey_MergeBoss:

    #    GameWorldMergeBoss.MergeBoss_ChangeState(isOpen)

    # #跨服PK

    # elif dictName == ShareDefine.Def_Notify_WorldKey_Merge_PK:

    #    GameWorldMergePK.OnMergePKMatchStateChange(isOpen)

    # #跨服王者争霸

    # elif dictName == ShareDefine.Def_Notify_WorldKey_Merge_King:

    #    GameWorldMergeKing.OnMergeKingStateChange(isOpen)

    # #答题活动

    # elif dictName == ShareDefine.Def_Notify_WorldKey_Game_EXAM:

    #    PlayerExam.Exam_ChangeState(isOpen)

@@ -1240,6 +1228,9 @@
    #骑宠争夺

    elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyRobBoss:

        GameWorldBoss.OnHorsePetRobBossActionChange(isOpen)

    #跨服PK

    elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:

        CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)

    return



#------------------------------------------------------------------------------ 

@@ -1248,7 +1239,7 @@
#  @return: None

def SendBroadcastMergeOpenActionDay():

    mergeServerOpenActionDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MergeServerOpenActionDay)

    MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeServerOpenActionDay, 0, {"Day":mergeServerOpenActionDay})

    #.SendBroadcastMerge(ChConfig.Def_MergeServerOpenActionDay, 0, {"Day":mergeServerOpenActionDay})

    return



#-------------------------------------------------------------------------------

@@ -1355,7 +1346,7 @@
#  @param None

#  @return None

def Dispose_ActionGoOnByDayKey():

    if GameWorld.IsMergeServer():

    if GameWorld.IsCrossServer():

        return

    GameWorld.DebugLog("处理特惠状态信息...")

    openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay)