4742 【BT】在跨服购买跨服boss次数后没有生效（购买boss次数立马同步；onday时立马同步）

hxp

2020-09-24 6834282d0466dc61064a0a08296b239dc266cf71

4742 【BT】在跨服购买跨服boss次数后没有生效（购买boss次数立马同步；onday时立马同步）

# Conflicts:
#	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py

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

@@ -320,18 +320,26 @@
    #GameWorld.DebugLog("标记需要同步跨服玩家战力变更相关数据! tick=%s" % tick, curPlayer.GetPlayerID())

    return



def SendMergePlayerDataNow(curPlayer):

    ## 马上同步一次玩家数据到跨服 MergeData_Player

    GameWorld.DebugLog("SendMergePlayerDataNow")

    ProcessCrossPlayer(curPlayer, 0)

    return



def ProcessCrossPlayer(curPlayer, tick):

    ## 跨服状态的本服玩家处理

    if not IsNeedProcessCrossPlayer(curPlayer):

        return

    

    playerID = curPlayer.GetPlayerID()

    # tick 传0时不检查CD，立即同步

    if tick:

    if playerID not in PyGameData.g_crossSyncTickDict:

        return

    setTick = PyGameData.g_crossSyncTickDict[playerID]

    if tick - setTick < IpyGameDataPY.GetFuncCfg("CrossSyncPlayerData", 1) * 1000:

        return

    PyGameData.g_crossSyncTickDict.pop(playerID)

    PyGameData.g_crossSyncTickDict.pop(playerID, None)

    GameWorld.DebugLog("开始同步本服变更的属性...", playerID)

    

    try:


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

@@ -100,6 +100,7 @@
import PlayerFlashSale

import PlayerWishingWell

import PlayerFairyDomain

import CrossPlayerData

import PlayerVip

import PlayerDiceEx

import IpyGameDataPY

@@ -568,6 +569,8 @@
        PlayerArena.OnDayEx(curPlayer)

        #协助

        PlayerAssist.DoPlayerOnDay(curPlayer)

        #特殊时间点过天的，一般是游戏功能，此时立即同步一次跨服玩家数据

        CrossPlayerData.SendMergePlayerDataNow(curPlayer)

        

    PlayerTJG.TJGOnDay(curPlayer, onEventType)

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