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 | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 75f7fc5..5504b4a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
@@ -34,7 +34,6 @@
import PlayerUniversalGameRec
import random
-import json
import math
RecType = ShareDefine.Def_UniversalGameRecType_XMZZStageRecord
@@ -265,14 +264,13 @@
curCache = PlayerViewCache.ViewCacheMgr.FindCache(pkPlayerID)
if not curCache:
return
- PropData, ItemData = curCache.GetPropData(), curCache.GetItemData()
packData = ChPyNetSendPack.tagGCXMZZFightInfo()
packData.Clear()
packData.PlayerID = pkPlayerID
- packData.PropData = PropData
+ packData.PropData = curCache.GetPropData()
packData.PropDataSize = len(packData.PropData)
- packData.ItemData = ItemData
+ packData.ItemData = PlayerViewCache.GetItemData(curCache)
packData.ItemDataSize = len(packData.ItemData)
NetPackCommon.SendFakePack(curPlayer, packData)
return
@@ -483,7 +481,7 @@
#阵营奖励
winAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 3)
LoseAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 4)
- dogfallAward = IpyGameDataPY.GetFuncEvalCfg('XMZZAward', 5)
+ dogfallAward = IpyGameDataPY.GetFuncCfg('XMZZAward', 5)
result = self.GetXMZZCurResult()
if result == Faction_1:
SavePKRecord('XMZZ_Victory', [result], True)
@@ -501,7 +499,6 @@
SavePKRecord('XMZZ_Draw', [], True)
PlayerCompensation.SendMailByKey('XMZZDogfall', Faction_2_IDList + Faction_1_IDList, [], goldPaper=dogfallAward)
- #PlayerControl.MergeWorldNotify(0, '', [])
PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_XMZZIsOver, 1)
self.NotifyXMZZInfo()
@@ -682,7 +679,7 @@
power = propDataDict.get('FightPower', 0)
g_playerPowerDict[playerID] = power
- pkDataDict[playerID] = [curCache.GetPropData(), curCache.GetItemData()]
+ pkDataDict[playerID] = [curCache.GetPropData(), itemData]
#GameWorld.DebugLog(' 筛选对手 playerID=%s,power=%s' % (playerID, power))
if minPower1 < power < myPower:
underList1.append(playerID)
@@ -694,7 +691,7 @@
aboveList2.append(playerID)
GameWorld.DebugLog(' 筛选对手 myPower=%s,underList1=%s, aboveList1=%s,underList2=%s, aboveList2=%s' % (myPower, underList1, aboveList1, underList2, aboveList2), myPlayerID)
- if conWinCnt % 5 == 0: #每5个匹配战力低的对手
+ if conWinCnt % 5 == 0 or conWinCnt <= IpyGameDataPY.GetFuncCfg('XMZZPKPowerRange', 3): #每5个匹配战力低的对手
if underList1:
pkPlayerID = underList1[0]
elif underList2:
--
Gitblit v1.8.0