From ae9f73d422020a792b2615d7f094d629d81c5123 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 15 三月 2019 19:54:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 52e3fc7..f564c1e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -43,7 +43,6 @@
from types import IntType
import time
-import cPickle
#---------------------------------------------------------------------
#年月日时间格式
@@ -1122,20 +1121,20 @@
recMapID = universalRecData.GetValue1()
if recMapID == mapID:
findRecData = universalRecData
- fbOpenRecord[recMapID] = cPickle.loads(universalRecData.GetStrValue1())
+ fbOpenRecord[recMapID] = eval(universalRecData.GetStrValue1())
if not findRecData:
findRecData = recTypeListData.AddRec()
findRecData.SetValue1(mapID)
- findRecData.SetStrValue1(cPickle.dumps([curDayStr], 2))
+ findRecData.SetStrValue1(str([curDayStr]))
fbOpenRecord[mapID] = [curDayStr]
else:
- recordList = cPickle.loads(findRecData.GetStrValue1())
+ recordList = eval(findRecData.GetStrValue1())
if curDayStr not in recordList:
recordList.append(curDayStr)
if len(recordList) > 3: #只存最近3次
del recordList[0]
- findRecData.SetStrValue1(cPickle.dumps(recordList, 2))
+ findRecData.SetStrValue1(str(recordList))
fbOpenRecord[mapID] = recordList
else:
return
@@ -1151,7 +1150,7 @@
for index in range(recTypeListData.Count()):
universalRecData = recTypeListData.At(index)
recMapID = universalRecData.GetValue1()
- recordList = cPickle.loads(universalRecData.GetStrValue1())
+ recordList = eval(universalRecData.GetStrValue1())
fbOpenRecord[recMapID] = recordList
return fbOpenRecord
--
Gitblit v1.8.0