From a54fba3894b5d528bed16147f096b6a706a1fc0c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 六月 2019 15:58:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
index 9eb8675..d67cf3f 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
@@ -273,7 +273,7 @@
compensationDict = {"GUID":GUID, "CheckState":checkState, "LimitLVType":limitLVType, "LimitLV":limitLV,
"Gold":compensation.Gold, "GoldPaper":compensation.GoldPaper, "Silver":compensation.Silver,
- "PlayerJob":compensation.PlayerJob, "Sender":sender, "Title":title, "Content":content,
+ "PlayerJob":compensation.PlayerJob, "Sender":sender, "Title":title, "Content":content, "OnlyServerID":compensation.ServerID,
"CreateTime":compensation.CreateTime, "LimitTime":compensation.LimitTime, "ItemList":itemList}
return compensationDict
@@ -617,6 +617,11 @@
SetPrizeState(curPlayerID, curRequire.GUID, Disable_State, readState)
continue
+ if curRequire.ServerID and curRequire.ServerID != GameWorld.GetPlayerServerID(curPlayer):
+ # 指定服务器邮件
+ SetPrizeState(curPlayerID, curRequire.GUID, Disable_State, readState)
+ continue
+
#可以用的奖励
if Enable_State != curState:
SetPrizeState(curPlayerID, curRequire.GUID, Enable_State, readState)
@@ -769,8 +774,11 @@
# @return None
def SendGMRequestCompensationResult(routeIndex, mapID, curPlayer, GUID, compensationType, curEntireRequire):
- Text, gold, goldPaper, silver, moneySource, createTime = curEntireRequire.Text, curEntireRequire.Gold, \
- curEntireRequire.GoldPaper, curEntireRequire.Silver, curEntireRequire.Type, curEntireRequire.CreateTime
+ Text, gold, goldPaper, silver, createTime = curEntireRequire.Text, curEntireRequire.Gold, \
+ curEntireRequire.GoldPaper, curEntireRequire.Silver, curEntireRequire.CreateTime
+ # 全服邮件没有 Type 字段
+ moneySource = curEntireRequire.Type if compensationType == Personal_CompensationType else 0
+
sendPack = ChGameToMapPyPack.tagGMRequestCompensationResult()
sendPack.PlayerID = curPlayer.GetID()
sendPack.CompensationType = compensationType
--
Gitblit v1.8.0