From 78b01d7924cd2fbccdbcea874816820641883d7c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 18 二月 2019 17:43:25 +0800
Subject: [PATCH] 6209 【后端】【1.6】合服开发单 - 合（混）服后支持发单服邮件
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
index b824568..7f5901b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
@@ -330,7 +330,7 @@
# @param addItemDictList, LimitTime, mailInfo, PlayerJob, Text
# @return None
def AddEntireItem(GUID, addItemDictList, LimitTime, mailInfo, PlayerJob, Text,
- gold = 0, goldPaper = 0, silver = 0, detail=""):
+ gold = 0, goldPaper = 0, silver = 0, detail="", serverID=0):
'''
@param mailInfo: GetEntireCompensationInfo 的返回值, 目前暂存字段 PlayerLV 中
'''
@@ -344,9 +344,10 @@
GameWorld.GetCompensationMgr().AddCompensationItem(GUID, curItemData)
createTime = GameWorld.GetCurrentDataTimeStr()
+
#添加全服领取补偿条件
GameWorld.GetCompensationMgr().AddEntireCompensationItem(GUID, createTime, LimitTime, mailInfo,
- PlayerJob, Text, gold, goldPaper, silver)
+ PlayerJob, Text, gold, goldPaper, silver, serverID)
checkState, limitLVType, limitLV = ParseEntireCompensationInfo(mailInfo)
addDict = {"LimitTime":LimitTime, "LimitLV":limitLV, "LimitLVType":limitLVType, "CheckState":checkState, "PlayerJob":PlayerJob, "Text":Text,
"Gold":gold, "GoldPaper":goldPaper, "Silver":silver, "ItemList":addItemDictList, "Detail":detail}
@@ -751,7 +752,12 @@
if (curEntireRequire.PlayerJob&pow(2,curJob)) == 0:
SetPrizeState(curPlayerID, GUID, Disable_State, readState)
return Unknow_CompensationType, None
-
+
+ if curEntireRequire.ServerID and curEntireRequire.ServerID != GameWorld.GetPlayerServerID(curPlayer):
+ # 指定服务器邮件
+ SetPrizeState(curPlayerID, GUID, Disable_State, readState)
+ return Unknow_CompensationType, None
+
#可以用的奖励
SetPrizeState(curPlayerID, GUID, Enable_State, readState)
#返回物品信息
--
Gitblit v1.8.0