From 7090e3f4e6d9d386fd1fdd681889db6c921c9941 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 28 三月 2019 17:54:01 +0800
Subject: [PATCH] 6373 【后端】【2.0】删除无用功能代码、封包、配置（摆摊系统）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 52e3fc7..3f3c8f7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -36,6 +36,7 @@
import PlayerUniversalGameRec
import GameWorldAverageLv
import PlayerFamilyBoss
+import PlayerHorsePetBoss
import GameWorldProcess
import ChPyNetSendPack
import NetPackCommon
@@ -43,7 +44,6 @@
from types import IntType
import time
-import cPickle
#---------------------------------------------------------------------
#年月日时间格式
@@ -1122,20 +1122,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 +1151,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
@@ -1270,6 +1270,9 @@
elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss1,
ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_FamilyBoss2,]:
PlayerFamilyBoss.OnAllFamilyBossStateChange(isOpen)
+ #骑宠BOSS
+ elif dictName in [ShareDefine.Def_Notify_WorldKey_DailyActionState % ShareDefine.DailyActionID_HorsePetBoss]:
+ PlayerHorsePetBoss.OnHorsePetBossStateChange(isOpen)
return
--
Gitblit v1.8.0