From e1dbd84e697445ea0c5f73075f56f97e5849ae53 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 08 三月 2019 14:58:15 +0800
Subject: [PATCH] 6328 【后端】优化代码eval - json只适合字符串序列化,并且尽量用于非中文;建议使用cPickle 的dumps 和loads,协议用2,可支持所有类型,缺点为序列化后不可阅读

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

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

--
Gitblit v1.8.0