From 835c5fad7ad4e723c34be7f5fc073eeb7104e3f4 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 27 四月 2019 11:14:44 +0800
Subject: [PATCH] 6628 【2.0】【后端】查看玩家装备和查看玩家战力功能

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
index e52e73f..18599de 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
@@ -130,6 +130,15 @@
     content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, json.dumps(paramList, ensure_ascii=False))
     return SendPersonalItemMailEx(title, content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource)
 
+def CrossServerMsg_SendMail(msgData):
+    ## 收到跨服服务器同步的发送邮件
+    mailTypeKey = msgData["MailTypeKey"]
+    playerIDList = msgData["Player"]
+    addItemList = msgData.get("Item", [])
+    paramList = msgData.get("Param", [])
+    SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList)
+    return
+
 #  此处货币playerIDList发放统一,如根据玩家不同而变,则应需修改
 ## 功能发放物品补偿/奖励邮件
 #  @param addItemList [(itemID, itemCnt, 是否拍品), {或物品信息字典}, ...]
@@ -760,8 +769,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