From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 七月 2019 15:25:56 +0800
Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
index 122ab4c..6ee43d2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerXMZZ.py
@@ -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()
@@ -713,7 +713,7 @@
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)
--
Gitblit v1.8.0