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/GameWorldLogic/GameWorldBoss.py | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index f9af576..400fcdd 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -50,7 +50,6 @@
import CrossBoss
import time
-import cPickle
'''
ShareDefine.Def_UniversalGameRecType_BossInfo
@@ -483,9 +482,8 @@
isAlive = __GetIsAlive(bossID)
if not isAlive:
continue
- mapID = ipyData.GetMapID()
- if mapID not in ChConfig.WorldBossFBMapIDList:
- GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 1)
+ #if mapID not in ChConfig.WorldBossFBMapIDList:
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 1)
return
## 玩家登录通知
@@ -718,10 +716,9 @@
# RecordData改json记录 bossid存为字符串
def UpdateBossAttention(self, playerid, bossid, isAdd):
- bossid = str(bossid)
if playerid in self.bossAttentionDict:
bossAttentionData = self.bossAttentionDict[playerid]
- recordDict = cPickle.loads(bossAttentionData.RecordData)
+ recordDict = eval(bossAttentionData.RecordData)
if isAdd:
recordDict[bossid] = isAdd
else:
@@ -732,7 +729,7 @@
self.bossAttentionDict.pop(playerid)
else:
- bossAttentionData.RecordData = cPickle.dumps(recordDict, 2)
+ bossAttentionData.RecordData = str(recordDict)
bossAttentionData.DataLen = len(bossAttentionData.RecordData)
else:
if not isAdd:
@@ -740,7 +737,7 @@
bossAttention = PyGameDataStruct.tagDBPyBossAttention()
bossAttention.clear()
bossAttention.PlayerID = playerid
- bossAttention.RecordData = cPickle.dumps({bossid:isAdd}, 2)
+ bossAttention.RecordData = str({bossid:isAdd})
bossAttention.DataLen = len(bossAttention.RecordData)
self.bossAttentionDict[playerid] = bossAttention
@@ -754,7 +751,7 @@
attentionData = self.bossAttentionDict.get(curPlayer.GetPlayerID())
if not attentionData:
return
- bttentionDict = cPickle.loads(attentionData.RecordData)
+ bttentionDict = eval(attentionData.RecordData)
packData = ChPyNetSendPack.tagGCBossAttentionInfo()
packData.BossList = []
for bossid, addState in bttentionDict.items():
--
Gitblit v1.8.0