From 8f9ba65c87a5f8cc0d59398638245ac1c788071e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 29 三月 2019 15:44:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
index b25ce9b..4d3572c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerViewCacheTube.py
@@ -32,7 +32,7 @@
import BossHurtMng
import time
-import cPickle
+import json
Def_Process_Tick = "ProcessPlayerCache"
##玩家下线同步
@@ -73,6 +73,7 @@
sendPack.PlusData = curPlayerPlusData
sendPack.PlusDataSize = len(curPlayerPlusData)
sendPack.IsLogouting = IsLogouting #通知本次同步是否下线前保存
+ sendPack.OffTime = int(time.time()) # 最后一次发送即当做离线时间
NetPackCommon.SendPyPackToGameServer(sendPack)
GameWorld.DebugLog('ViewCache### UpdateGameServerPlayerCache out')
return
@@ -88,7 +89,6 @@
curPlayerPropDict["LV"] = curPlayer.GetLV()
curPlayerPropDict["RealmLV"] = curPlayer.GetOfficialRank()
curPlayerPropDict["Job"] = curPlayer.GetJob()
- curPlayerPropDict["JobRank"] = PlayerControl.GetJobRank(curPlayer)
curPlayerPropDict["VIPLV"] = curPlayer.GetVIPLv()
curPlayerPropDict["Name"] = curPlayer.GetPlayerName()
curPlayerPropDict["FamilyID"] = curPlayer.GetFamilyID()
@@ -105,8 +105,6 @@
#推送提醒
curPlayerPropDict[ChConfig.Def_PDict_GeTuiSet] = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GeTuiSet)
curPlayerPropDict[ChConfig.Def_PDict_NoGeTuiTime] = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_NoGeTuiTime)
- curPlayerPropDict['GeTuiClientID'] = curPlayer.GetAccountData().GetGeTuiClientID()
- curPlayerPropDict['Time'] = int(time.time()) # 最后一次发送即当做离线时间
# 各类功能 BOSS次数, BOSS相关对应B.Boss信息.xlsx的CntMark
# 封魔坛剩余次数
@@ -169,9 +167,9 @@
curPlayerPlusDict["Fruit"] = PlayerAttrFruit.GetAttrFruitEatCntDict(curPlayer)
#-----------
- curPlayerPropData = cPickle.dumps(curPlayerPropDict, 2)
- curPlayerItemData = cPickle.dumps(curEquipItemList, 2)
- curPlayerPlusData = cPickle.dumps(__RemoveEmptyDataKey(curPlayerPlusDict), 2)
+ curPlayerPropData = json.dumps(curPlayerPropDict, ensure_ascii=False)
+ curPlayerItemData = json.dumps(curEquipItemList, ensure_ascii=False)
+ curPlayerPlusData = json.dumps(__RemoveEmptyDataKey(curPlayerPlusDict), ensure_ascii=False)
return (curPlayerPropData, curPlayerItemData, curPlayerPlusData)
def __RemoveEmptyDataKey(dataDict):
@@ -297,8 +295,8 @@
itemDict = {}
itemDict["ItemIndex"] = curEquip.GetItemPlaceIndex()
itemDict["ItemID"] = curEquip.GetItemTypeID()
- itemDict["IsBind"] = int(curEquip.GetIsBind())
- itemDict["IsSuite"] = int(curEquip.GetIsSuite())
+ itemDict["IsAuctionItem"] = int(ItemControler.GetIsAuctionItem(curEquip))
+ #itemDict["IsSuite"] = int(curEquip.GetIsSuite())
userData = curEquip.GetUserData()
if userData and userData != "{}":
itemDict["UserData"] = userData
--
Gitblit v1.8.0