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/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 21447fc..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)
--
Gitblit v1.8.0