From 249cacb2f0656ef08c2d9293e1a931d26078347c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 28 十二月 2018 22:03:52 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发 -- 命名规则修改

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index c8d42a2..4950357 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,16 +28,31 @@
 import PyGameData
 
 # 获取玩家跨服服务器上的名字
+#===============================================================================
+# def GetCrossPlayerName(curPlayer):
+#    # 通过游戏账号中的平台标志获取名称,目前为spid
+#    playerName = curPlayer.GetPlayerName()
+#    nameFormat = ReadChConfig.GetPyMongoConfig("Merge", "NameFormat", True)
+#    if not nameFormat:
+#        return playerName
+#    
+#    opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s" % GameWorld.GetPlayerPlatform(curPlayer))
+# 
+#    return (nameFormat%{"opname":opName, "sid":GameWorld.GetPlayerServerID(curPlayer)}).decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
+#===============================================================================
+
+# 获取玩家跨服服务器上的名字
 def GetCrossPlayerName(curPlayer):
     # 通过游戏账号中的平台标志获取名称,目前为spid
     playerName = curPlayer.GetPlayerName()
-    nameFormat = ReadChConfig.GetPyMongoConfig("Merge", "NameFormat", True)
-    if not nameFormat:
+    
+    opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer)), 
+                                           GameWorld.GetPlayerServerSID(curPlayer))
+    
+    if not opName:
         return playerName
     
-    opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s" % GameWorld.GetPlayerPlatform(curPlayer))
-
-    return (nameFormat%{"opname":opName, "sid":GameWorld.GetPlayerServerID(curPlayer)}).decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
+    return opName.decode('gbk').encode(GameWorld.GetCharacterEncoding()) + playerName
 
 def PlayerExitCrossServer(curPlayer):
     ## 玩家退出跨服服务器

--
Gitblit v1.8.0