6457 缥缈仙域事件设置结束暂不做限制，防止异常导致无法结束

xdh

2019-05-05 e19b08127ac798154fab5f8f11f782e54aaa025b

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.py

@@ -53,14 +53,11 @@
import FunctionNPCCommon

import PlayerGoldGift

import PlayerActivity

import PlayerTeHui

import PlayerBindJadeWheel

import PlayerAction

import FBCommon

import PlayerSuccess

import PlayerFreeGoods

import PlayerMagicWeapon

import ShopItemManage

import ChItem

import PlayerGoldInvest

import PlayerNewGuyCard

@@ -72,6 +69,8 @@
import PlayerFamilyRedPacket

import GameLogic_FamilyInvade

import GameLogic_ElderBattlefield

import GameLogic_AllFamilyBoss

import GameLogic_HorsePetBoss

import GameLogic_FamilyBoss

import GameLogic_FamilyWar

import OpenServerCampaign

@@ -86,9 +85,11 @@
import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerFeastRedPacket

import PlayerLuckyTreasure

import PlayerRefineStove

import PlayerFlashSale

import PlayerWishingWell

import PlayerFairyDomain

import PlayerVip

import PlayerDiceEx

import IpyGameDataPY

@@ -545,6 +546,8 @@
        FBHelpBattle.DoPlayerOnDay(curPlayer)

        #跨服竞技场

        PlayerCrossRealmPK.DoPlayerOnDay(curPlayer)

        #缥缈仙域

        PlayerFairyDomain.OnDay(curPlayer)

        

    PlayerTJG.TJGOnDay(curPlayer, onEventType)

    # 以下为支持两种重置模式切换配置的

@@ -802,6 +805,8 @@
    

    #触发每小时任务重置脚本

    EventShell.EventResponse_OnHour(curPlayer)

    #缥缈仙域

    PlayerFairyDomain.OnHour(curPlayer)

    return

    

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

@@ -1276,6 +1281,14 @@
                PyGameData.g_familyPartyInfo = eval(msgValue)

            return

        

        if key == ShareDefine.Def_Notify_WorldKey_FairyDomainLimit:

            isAdd, limitList = eval(msgValue)

            if isAdd:

                PyGameData.g_fairyDomainLimit += limitList

            else:

                PyGameData.g_fairyDomainLimit = limitList

            return

        
        if key.startswith(ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]): 

            keyHead = ShareDefine.Def_Notify_WorldKey_OperationActionInfo[:-2]

            actionName = key[len(keyHead):]

@@ -1321,6 +1334,12 @@
            elif actionName == ShareDefine.OperationActionName_FeastRedPacket:

                PlayerFeastRedPacket.RefreshOperationAction_FeastRedPacket()

                

            elif actionName == ShareDefine.OperationActionName_LuckyTreasure:

                PlayerLuckyTreasure.RefreshLuckyTreasureAction()

            return

        
        if key == ShareDefine.Def_Notify_WorldKey_CrossZoneName:

            PyGameData.g_crossZoneName = msgValue

            return

        

        if msgValue.isdigit():

@@ -1350,14 +1369,6 @@
    #    ReloadModule.DoMapServerScriptReload(value, tick)

    #===============================================================================================

    

    #领地争夺战

    #elif key == ShareDefine.Def_Notify_WorldKey_ManorWar:

    #    GameLogic_ManorWar.OnManorWarStateChange(value, tick)



    #定时商店刷新

    elif key.startswith(ShareDefine.Def_Notify_WorldKey_TimeShopRefreshTime[:-2]):

        ShopItemManage.OnTimeShopRefresh(key, value, tick)

    
    # 跨服PK

    elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:

        PlayerCrossRealmPK.OnCrossRealmPKSeasonChange(value)

@@ -1374,6 +1385,15 @@
    elif key == ShareDefine.Def_Notify_WorldKey_FBFuncState % ChConfig.Def_FBMapID_ElderBattlefield:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_ElderBattlefield.OnElderBattlefieldStateChange(value, tick)

    # 多仙盟BOSS

    elif key in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1]:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_AllFamilyBoss.OnAllFamilyBossStateChange(value, tick)

    # 骑宠BOSS

    elif key == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_HorsePetBoss.OnHorsePetBossStateChange(value, tick)

    
    # OnDayEx

    elif key == ShareDefine.Def_Notify_WorldKey_OnDayEx:

        if value and gameWorldMgr.GetGameWorldDictByKey(key) != value:

@@ -1416,14 +1436,6 @@
    # 王者仙盟

    elif key == ShareDefine.Def_Notify_WorldKey_ChampionFamilyID:

        GameLogic_FamilyWar.OnChampionFamilyIDChange()

                
    # 特惠活动

    elif key in ShareDefine.TeHuiTypeKeyDict.values():

        PlayerTeHui.ChangeTeHuiActionState(key)



    # 活动buff状态变更

    elif key.startswith(ShareDefine.Def_Notify_WorldKey_ActionBuffState[:-2]):            
        PlayerAction.OnActionBuffStateChange(key, tick)

        

#===============================================================================

#    ---修改为上述的 统一字典处理