From fb4cdd5b8029f67c4857347a3eda8d7252e051e9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 26 三月 2019 20:18:36 +0800
Subject: [PATCH] 6374 新版无绑玉,原先绑玉再仙玉的扣法改成 扣仙玉

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index 11cd5dd..5438e00 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -28,8 +28,6 @@
 import NetPackCommon
 import IpyGameDataPY
 import PyGameData
-import cPickle
-import json
 # 获取玩家跨服服务器上的名字
 #===============================================================================
 # def GetCrossPlayerName(curPlayer):
@@ -286,11 +284,11 @@
         GameWorld.DebugLog("查看跨服玩家,是本服玩家,直接回复!tagPlayerID=%s" % (tagPlayerID), playerID)
         sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
         sendPack.PlayerID = tagPlayerID
-        sendPack.PropData = json.dumps(cPickle.loads(curCache.GetPropData()), ensure_ascii=False)
+        sendPack.PropData = curCache.GetPropData()
         sendPack.PropDataSize = len(sendPack.PropData)
-        sendPack.ItemData = json.dumps(cPickle.loads(PlayerViewCache.GetItemData(curCache)), ensure_ascii=False)
+        sendPack.ItemData = PlayerViewCache.GetItemData(curCache)
         sendPack.ItemDataSize = len(sendPack.ItemData)
-        sendPack.PlusData = json.dumps(cPickle.loads(PlayerViewCache.GetPlusData(curCache)), ensure_ascii=False)
+        sendPack.PlusData = PlayerViewCache.GetPlusData(curCache)
         sendPack.PlusDataSize = len(sendPack.PlusData)
         NetPackCommon.SendFakePack(curPlayer, sendPack)
         return
@@ -347,11 +345,11 @@
     PropData, ItemData, PlusData = cacheInfo
     sendPack = ChPyNetSendPack.tagSCQueryPlayerCacheResult()
     sendPack.PlayerID = tagPlayerID
-    sendPack.PropData = json.dumps(cPickle.loads(PropData), ensure_ascii=False)
+    sendPack.PropData = PropData
     sendPack.PropDataSize = len(sendPack.PropData)
-    sendPack.ItemData = json.dumps(cPickle.loads(ItemData), ensure_ascii=False)
+    sendPack.ItemData = ItemData
     sendPack.ItemDataSize = len(sendPack.ItemData)
-    sendPack.PlusData = json.dumps(cPickle.loads(PlusData), ensure_ascii=False)
+    sendPack.PlusData = PlusData
     sendPack.PlusDataSize = len(sendPack.PlusData)
     NetPackCommon.SendFakePack(curPlayer, sendPack)
     return

--
Gitblit v1.8.0