From 3c7dbda9ee0ece6c530b1d36ec3c615ebc78e2f5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 01 九月 2021 17:06:06 +0800
Subject: [PATCH] 8585 【主干】【gt_1.101.1】【BT3】【bt3_1.100.1】【后端】竞技场（排行榜、匹配列表，对战记录战斗力支持超20亿；对战记录挑战支持查询最新数据；守护者支持积分加减并同步名次对应等级； 增加对战流向记录； 主干冲突）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 122ab4c..283e6b7 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
@@ -225,7 +225,7 @@
class XMZZManager(object):
def __init__(self):
- self.XMZZPlayerDict = {} # {playerid:data, ...} PyGameDataStruct.tagDBPySealDemonRecord
+ self.XMZZPlayerDict = {} # {playerid:data, ...} PyGameDataStruct.tagDBPyXMZZ
self.XMZZFactionDict = {Faction_1:[0, 0], Faction_2:[0, 0]} # {faction:[积分, 人数]}
self.XMZZTopScore = 0 #积分王积分
self.XMZZTopPlayerName = '' #积分王名
@@ -493,8 +493,8 @@
faction_2_Score = self.XMZZFactionDict.get(Faction_2, [0, 0])[0]
if faction_1_Score + faction_2_Score >= XMZZDogFallLimit:
SavePKRecord('XMZZ_Draw', [], True)
-
- PlayerCompensation.SendMailByKey('XMZZDogfall', Faction_2_IDList + Faction_1_IDList, [], goldPaper=dogfallAward)
+ if dogfallAward:
+ PlayerCompensation.SendMailByKey('XMZZDogfall', Faction_2_IDList + Faction_1_IDList, [], goldPaper=dogfallAward)
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_XMZZIsOver, 1)
self.NotifyXMZZInfo()
@@ -574,7 +574,7 @@
cnt += 1
savaData += XMZZData.getBuffer()
- GameWorld.Log("SaveXMZZ cnt :%s" % cnt)
+ GameWorld.Log("SaveXMZZ cnt :%s len=%s" % (cnt, len(savaData)))
return CommFunc.WriteDWORD(cntData, cnt) + savaData
# 从数据库载入数据
@@ -638,9 +638,9 @@
if isByLVPower:
worldLv = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv)
ipyData = IpyGameDataPY.GetIpyGameData('PlayerLV', worldLv)
- myPower = ipyData.GetReFightPower() if ipyData else curPlayer.GetFightPower()
+ myPower = ipyData.GetReFightPower() if ipyData else PlayerControl.GetFightPower(curPlayer)
else:
- myPower = curPlayer.GetFightPower()
+ myPower = PlayerControl.GetFightPower(curPlayer)
XMZZPKPowerRange = IpyGameDataPY.GetFuncEvalCfg('XMZZPKPowerRange')
minPower1, maxPower1 = myPower * (100 - XMZZPKPowerRange[0][0]) / 100, myPower * (100 + XMZZPKPowerRange[0][1]) / 100
minPower2, maxPower2 = myPower * (100 - XMZZPKPowerRange[1][0]) / 100, myPower * (100 + XMZZPKPowerRange[1][1]) / 100
@@ -713,13 +713,13 @@
packData = ChPyNetSendPack.tagGCXMZZFightInfo()
packData.Clear()
packData.PlayerID = pkPlayerID
- packData.PropData = str(pkPlayerPropData)
+ packData.PropData = json.dumps(pkPlayerPropData, ensure_ascii=False)
packData.PropDataSize = len(packData.PropData)
NetPackCommon.SendFakePack(curPlayer, packData)
#通知地图
if not pkPlayerPropData:
- GameWorld.ErrLog("仙魔之争没有匹配到对手信息！fightPower=%s" % curPlayer.GetFightPower(), myPlayerID)
+ GameWorld.ErrLog("仙魔之争没有匹配到对手信息！fightPower=%s" % PlayerControl.GetFightPower(curPlayer), myPlayerID)
vsPlayerInfo = [pkPlayerID, pkPlayerPropData]
XMZZManager.MapServer_XMZZPKInfo(curPlayer, overInfo, vsPlayerInfo)
return True
--
Gitblit v1.8.0