From 84f8b05044e64036c5abb6b840bf0fd96f8c3bc2 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 21 十二月 2018 18:09:32 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（流程调通版，可匹配、PK、结算，其他功能没有）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.py
index 00f9a11..7a13142 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldMergeKing.py
+++ b/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:
--
Gitblit v1.8.0