xdh
2018-12-24 6feb3406bd4edf15e443f5d58f06229d5ee8733c
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.py
@@ -14,7 +14,7 @@
# 详细描述: 王者争霸(跨服PK赛周积分排名前32可获得争霸资格)
#
#---------------------------------------------------------------------
"""Version = 2015-11-19 14:00"""
#"""Version = 2015-11-19 14:00"""
#---------------------------------------------------------------------
import ReadChConfig
import PlayerControl
@@ -23,6 +23,7 @@
import PlayerCompensation
import PlayerUniversalGameRec
import PlayerMergeRegister
import CrossRealmPlayer
import GameWorldMergePK
import PlayerDBGSEvent
import MergeBroadcast
@@ -644,7 +645,7 @@
        lastNotifyTime = gameWorld.GetDictByKey(notifyTimeKey)
        if tick - lastNotifyTime >= notifyCD * 1000:
            mark = loginNotifyDict[playerRecRank]
            mergeName = PlayerControl.GetMergePlayerName(accID, curPlayer.GetName())
            mergeName = CrossRealmPlayer.GetCrossPlayerName(curPlayer)
            PlayerControl.MergeWorldNotify(0, mark, [mergeName])
            gameWorld.SetDict(notifyTimeKey, tick)
        else: