From 68dd06e06c1a4a155884c31403da1155be6f10e8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 四月 2019 17:11:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
index e65872c..4070bbf 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFriend.py
@@ -28,7 +28,6 @@
import copy
import PlayerViewCache
import PlayerTeam
-import cPickle
#---------------------------------------------------------------------
@@ -82,8 +81,7 @@
#玩家的数据没有缓存过
PlayerControl.NotifyCode(curPlayer, 'Friend_OffLine')
return
- cacheDict = cPickle.loads(curCache.GetPropData())
- tagLV = cacheDict["LV"]
+ tagLV = curCache.GetPlayerLV()
else:
tagLV = tagPlayer.GetLV()
@@ -324,7 +322,7 @@
PlayerControl.NotifyCode(srcPlayer, 'Friend_MakeFriend', [curPlayer.GetName()])
#srcPlayer.MapServer_QueryPlayerResult(0, 0, 'AddFriendSucceed', "", 0)
else:
- cacheDict = cPickle.loads(curCache.GetPropData())
+ cacheDict = eval(curCache.GetPropData())
PlayerControl.NotifyCode(curPlayer, 'Friend_MakeFriend', [cacheDict['Name']])
# 记录等对方上线通知地图，任务等会用到触发逻辑，通用记录次数即可， MapServer_SyncFriendInfo为具体的好友数量，根据策划需求制作
pass
@@ -396,7 +394,7 @@
curCache = PlayerViewCache.ViewCacheMgr.FindCache(tagID)
if not curCache:
return
- cacheDict = cPickle.loads(curCache.GetPropData())
+ cacheDict = eval(curCache.GetPropData())
playerName = cacheDict['Name']
else:
playerName = tagPlayer.GetName()
--
Gitblit v1.8.0