From f27986d2eb32e3d2598d15b91c88479797ce5c72 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 13 三月 2019 17:48:37 +0800
Subject: [PATCH] 6328 【后端】优化代码eval - 二进制流 不能直接输出
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 70206b0..f564c1e 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -35,6 +35,7 @@
import PlayerNewFairyCeremony
import PlayerUniversalGameRec
import GameWorldAverageLv
+import PlayerFamilyBoss
import GameWorldProcess
import ChPyNetSendPack
import NetPackCommon
@@ -42,7 +43,6 @@
from types import IntType
import time
-import cPickle
#---------------------------------------------------------------------
#年月日时间格式
@@ -1121,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
@@ -1150,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
@@ -1265,6 +1265,11 @@
#跨服PK
elif dictName == ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_CrossReamPK:
CrossRealmPK.OnCrossRealmPKDailyActionStateChange(isOpen)
+ #仙盟BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1,
+ ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]:
+ PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)
+
return
#-------------------------------------------------------------------------------
--
Gitblit v1.8.0