From 9631243d61ac32d2e4f89e321f30241cfd040689 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 16 三月 2019 17:42:50 +0800
Subject: [PATCH] 6332 【后端】【2.0】主要是拍品相关规则调整及背包优化（使用拍品数据同步优化）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 1e12485..5504b4a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
@@ -34,9 +34,7 @@
import PlayerUniversalGameRec
import random
-import json
import math
-import cPickle
RecType = ShareDefine.Def_UniversalGameRecType_XMZZStageRecord
RecType1 = ShareDefine.Def_UniversalGameRecType_XMZZPKInfoRecord
@@ -270,9 +268,9 @@
packData = ChPyNetSendPack.tagGCXMZZFightInfo()
packData.Clear()
packData.PlayerID = pkPlayerID
- packData.PropData = json.dumps(cPickle.loads(curCache.GetPropData()), ensure_ascii=False)
+ packData.PropData = curCache.GetPropData()
packData.PropDataSize = len(packData.PropData)
- packData.ItemData = json.dumps(cPickle.loads(PlayerViewCache.GetItemData(curCache)), ensure_ascii=False)
+ packData.ItemData = PlayerViewCache.GetItemData(curCache)
packData.ItemDataSize = len(packData.ItemData)
NetPackCommon.SendFakePack(curPlayer, packData)
return
@@ -674,15 +672,14 @@
#已匹配过的跳过
continue
- propDataDict = cPickle.loads(curCache.GetPropData())
- itemDataDict = cPickle.loads(itemData)
if playerID in g_playerPowerDict:
power = g_playerPowerDict[playerID]
else:
+ propDataDict = eval(curCache.GetPropData())
power = propDataDict.get('FightPower', 0)
g_playerPowerDict[playerID] = power
- pkDataDict[playerID] = [propDataDict, itemDataDict]
+ pkDataDict[playerID] = [curCache.GetPropData(), itemData]
#GameWorld.DebugLog(' 筛选对手 playerID=%s,power=%s' % (playerID, power))
if minPower1 < power < myPower:
underList1.append(playerID)
@@ -716,15 +713,15 @@
if isRobotNPC:
#机器人, 职业随机
openJob = IpyGameDataPY.GetFuncEvalCfg("OpenJob")
- PropData = {"Job":random.choice(openJob), "LV":curPlayer.GetLV()}
- ItemData = {} # 前端自己根据职业及NPC等级处理
+ PropData = str({"Job":random.choice(openJob), "LV":curPlayer.GetLV()})
+ ItemData = "" # 前端自己根据职业及NPC等级处理
else:
if myPlayerID in g_historyPKDict:
g_historyPKDict[myPlayerID].append(pkPlayerID)
else:
g_historyPKDict[myPlayerID] = [pkPlayerID]
- PropData, ItemData = pkDataDict.get(pkPlayerID, [{}, {}])
+ PropData, ItemData = pkDataDict.get(pkPlayerID, ["", ""])
XMZZManager.vsPlayerIDDict[myPlayerID] = pkPlayerID
GameWorld.DebugLog(' 仙魔之争匹配对手信息 pkPlayerID=%s, PropData=%s, overInfo=%s' % (pkPlayerID, PropData, overInfo), myPlayerID)
@@ -733,16 +730,16 @@
packData = ChPyNetSendPack.tagGCXMZZFightInfo()
packData.Clear()
packData.PlayerID = pkPlayerID
- packData.PropData = json.dumps(PropData, ensure_ascii=False)
+ packData.PropData = PropData
packData.PropDataSize = len(packData.PropData)
- packData.ItemData = json.dumps(ItemData, ensure_ascii=False)
+ packData.ItemData = ItemData
packData.ItemDataSize = len(packData.ItemData)
NetPackCommon.SendFakePack(curPlayer, packData)
#通知地图
pkPlayerPropData = {}
if PropData:
- pkPlayerPropData = PropData
+ pkPlayerPropData = eval(PropData)
else:
GameWorld.ErrLog("仙魔之争没有匹配到对手信息！fightPower=%s" % curPlayer.GetFightPower(), myPlayerID)
vsPlayerInfo = [pkPlayerID, pkPlayerPropData]
--
Gitblit v1.8.0