5819 【后端】【1.6】运营活动支持对应不同的职业和世界等级(消费返利报错修改)

xdh

2019-02-13 e3171a52706f5863bf9a14c7588db3b2dca9ab5f

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

@@ -74,14 +74,18 @@
import GameLogic_ElderBattlefield

import GameLogic_FamilyBoss

import GameLogic_FamilyWar

import GameLogic_Dogz

import OpenServerCampaign

import PlayerCostRebate

import PlayerActTotalRecharge

import PlayerSpringSale

import PlayerBossReborn

import PlayerWeekParty

import PlayerFeastWeekParty

import PlayerActLogin

import PlayerFlashGiftbag

import PlayerFairyCeremony

import PlayerNewFairyCeremony

import PlayerFeastRedPacket

import PlayerRefineStove

import PlayerFlashSale

import PlayerWishingWell

@@ -153,9 +157,6 @@
    

    #副本OnDay事件响应

    FBLogic.OnDay(tick)

    
    #重置跨服活动副本人数分配情况信息

    PlayerControl.ResetMergeFBPlayerCntInfo(0)

    

    #删除所有的任务发布

    missionPubManager = GameWorld.GetGameWorld().GetDBMissionPubManager()

@@ -470,6 +471,9 @@
    

def __DoPlayerOnDay(curPlayer, onEventType):

    

    if GameWorld.IsCrossServer():

        return

    
    # 常规过天

    if onEventType == ShareDefine.Def_OnEventType:

        

@@ -643,6 +647,9 @@


def __DoPlayerOnWeek(curPlayer, onEventType):

    

    if GameWorld.IsCrossServer():

        return

    
    if onEventType == ShareDefine.Def_OnEventType:

        #记录上周工资相关流向

        lastWeekOnlineTime = curPlayer.GetLastWeekOnlineTime()

@@ -720,6 +727,8 @@


def __DoPlayerOnMonth(curPlayer, onEventType):

    

    if GameWorld.IsCrossServer():

        return

    

    if onEventType == ShareDefine.Def_OnEventType:

        pass

@@ -1216,7 +1225,7 @@
    pack = IPY_GameWorld.IPY_MBroadcastMsg()

    msg = pack.GetMsg()

    

    if not msg.startswith(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn[:-2]):

    if not msg.startswith(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn[:-3]):

        GameWorld.Log('GameServer_BroadcastMsg msg = %s'%(msg))

    #---接收世界服务器发来的消息---



@@ -1290,13 +1299,32 @@
            

            elif actionName == ShareDefine.OperationActionName_FairyCeremony:

                PlayerFairyCeremony.RefreshOperationAction_FairyCeremony()

            
                
            elif actionName == ShareDefine.OperationActionName_NewFairyCeremony:

                PlayerNewFairyCeremony.RefreshOperationAction_NewFairyCeremony()

                
            elif actionName == ShareDefine.OperationActionName_FlashSale:

                PlayerFlashSale.RefreshflashSaleActionInfo()

                

            elif actionName == ShareDefine.OperationActionName_WishingWell:

                PlayerWishingWell.RefreshWishingWellAction()

                

            elif actionName == ShareDefine.OperationActionName_WeekParty:

                PlayerWeekParty.RefreshOperationAction_WeekParty()

                
            elif actionName == ShareDefine.OperationActionName_LoginAward:

                PlayerActLogin.RefreshOperationAction_LoginAward()

                
            elif actionName == ShareDefine.OperationActionName_FeastWeekParty:

                PlayerFeastWeekParty.RefreshOperationAction_FeastWeekParty()

                
            elif actionName == ShareDefine.OperationActionName_FeastRedPacket:

                PlayerFeastRedPacket.RefreshOperationAction_FeastRedPacket()

                
            return

        
        if key == ShareDefine.Def_Notify_WorldKey_CrossZoneName:

            PyGameData.g_crossZoneName = msgValue

            return

        

        if msgValue.isdigit():

@@ -1333,18 +1361,6 @@
    #定时商店刷新

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

        ShopItemManage.OnTimeShopRefresh(key, value, tick)

        
    #跨服boss

    #elif key == ShareDefine.Def_Notify_WorldKey_MergeBoss:

    #    GameLogic_MergeBoss.OnMergeBossStateChange(value, tick)

        
    # 跨服PK, 赛季开始时间不用处理，仅存储即可

    #elif key in [ShareDefine.Def_Notify_WorldKey_MergePKDayID, ShareDefine.Def_Notify_WorldKey_MergePKSeasonID]:

    #    PlayerMergePK.OnMergePKActionChange(key, value)

        
    # 跨服王者争霸

    #elif key in [ShareDefine.Def_Notify_WorldKey_Merge_KingStartID, ShareDefine.Def_Notify_WorldKey_Merge_KingOverID]:

    #    PlayerMergeKing.OnMergeKingActionChange(key, value)

    

    # 跨服PK

    elif key == ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID:

@@ -1412,9 +1428,7 @@
    # 活动buff状态变更

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

        PlayerAction.OnActionBuffStateChange(key, tick)

    #boss刷新时间参数

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

        GameLogic_Dogz.OnOnlineCntChange(key, tick)

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

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

#    if msg == ChConfig.Def_Notify_Key_PurTalk: