9748 【BT7】跨服BOSS定时活动（同步冲突）

hxp

2022-11-15 4ac0947077dbda1c32c1b19bef9899b654619e51

9748 【BT7】跨服BOSS定时活动（同步冲突）

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

@@ -28,6 +28,7 @@
import CrossChampionship

import CrossBattlefield

import CrossBillboard

import CrossYaomoBoss

import GameWorldBoss

import CrossRealmPK

import PlayerQuery

@@ -163,6 +164,9 @@
        elif msgType == ShareDefine.ClientServerMsg_ActAllRechargeValue:

            CrossActAllRecharge.ClientServerMsg_ActAllRechargeValue(serverGroupID, msgData)

            

        elif msgType == ShareDefine.ClientServerMsg_CrossYaomoBossHurtAward:

            CrossYaomoBoss.ClientServerMsg_CrossYaomoBossHurtAward(serverGroupID, msgData)

            
        # 需要发送到地图服务器处理的

        elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:

            MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID)

@@ -198,6 +202,7 @@
    CrossActionControl.Sync_CrossActInfoToClientServer(serverGroupID)

    CrossLuckyCloudBuy.Sync_LuckyCloudBuyDataToClientServer(tick, serverGroupID)

    CrossActAllRecharge.Sync_AllRechargeDataToClientServer(serverGroupID)

    CrossYaomoBoss.Sync_CrossYaomoBossDataToClientServer(serverGroupID)

    PlayerCompensation.Sync_CrossMailPlayerIDToClientServer(serverGroupID)

    return



@@ -367,6 +372,12 @@
        elif msgType == ShareDefine.CrossServerMsg_ActAllRechargeInfo:

            CrossActAllRecharge.CrossServerMsg_ActAllRechargeInfo(msgData)

            

        elif msgType == ShareDefine.CrossServerMsg_CrossDailyActionState:

            CrossActionControl.CrossServerMsg_CrossDailyActionState(msgData)

            
        elif msgType == ShareDefine.CrossServerMsg_CrossYaomoBossHurtInfo:

            CrossYaomoBoss.CrossServerMsg_CrossYaomoBossHurtInfo(msgData)

            
        elif msgType == ShareDefine.CrossServerMsg_SyncBillboard:

            CrossBillboard.CrossServerMsg_SyncBillboard(msgData, tick)

            


 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py

@@ -73,6 +73,7 @@
import CrossRealmPlayer

import CrossBattlefield

import CrossActAllRecharge

import CrossYaomoBoss

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



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

@@ -237,6 +238,8 @@
        CrossChampionship.OnPlayerLogin(curPlayer, tick)

        #跨服全民充值

        CrossActAllRecharge.OnPlayerLogin(curPlayer)

        #跨服妖魔boss

        CrossYaomoBoss.OnPlayerLogin(curPlayer)

        

    if isMixServerFirstLogin:

        PlayerCharm.OnMixServerFirstLogin(curPlayer)


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

@@ -103,6 +103,7 @@
import PlayerNewFairyCeremony

import PlayerActHorsePetFeast

import PlayerFeastRedPacket

import PlayerCrossYaomoBoss

import PlayerLuckyCloudBuy

import PlayerLuckyTreasure

import PlayerAuctionHouse

@@ -1565,7 +1566,12 @@
    elif key == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            GameLogic_HorsePetBoss.OnHorsePetBossStateChange(value, tick)

    
                
    # 跨服妖魔boss

    elif key == ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.CrossDailyActionID_YaomoBoss:

        if gameWorldMgr.GetGameWorldDictByKey(key) != value:

            PlayerCrossYaomoBoss.OnYaomoBossStateChange(value, tick)

            
    # OnDayEx

    elif key == ShareDefine.Def_Notify_WorldKey_OnDayEx:

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