From 4ea8fcf48ca7e7d0476be948e0d018920592099d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 六月 2019 17:23:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyAction.py | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyAction.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyAction.py
index 31c9cff..0cf2590 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyAction.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamilyAction.py
@@ -34,6 +34,7 @@
import PlayerControl
import IPY_GameServer
import DataRecordPack
+import cPickle
#---------------------------------------------------------------------
## 设置玩家家族行为
@@ -44,7 +45,7 @@
# @return None
def MapServer_PlayerFamilyActionNote(curPlayer, actionType, actionData, tick):
- actionDataList = eval(actionData)
+ actionDataList = cPickle.loads(actionData)
familyId = curPlayer.GetFamilyID()
@@ -582,7 +583,8 @@
#GameWorld.DebugLog("普通成员不记录家族官员模型装备信息！")
return
- modelEquipInfoList = PlayerViewCache.GetPlayerCacheEquipView(playerID)
+ modelEquipInfoList = []
+ #modelEquipInfoList = PlayerViewCache.GetPlayerCacheEquipView(playerID)
if not modelEquipInfoList:
#GameWorld.DebugLog("找不到家族官员模型装备信息, 不记录！familyID=%s,playerID=%s" % (familyID, playerID))
return
--
Gitblit v1.8.0