From 79a23de6692781dfe4b18fdb57bc4b3e69f34014 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期二, 05 三月 2019 16:44:26 +0800 Subject: [PATCH] 6250 【后端】【2.0】拍卖行开发单(邮件记录货币来源) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py index a5cbd7d..41e41ba 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py @@ -325,7 +325,7 @@ return #--------------------------------------------------------------------- -def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[], batchDetail=[]): +def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[], batchDetail=[], moneySource=ChConfig.Def_GiveMoney_Mail): '''批量发送邮件, 用于瞬间需要发送多封(大量)邮件的,比如一些公共副本活动等结算时 @param mailTypeKey: 邮件模板key @param batchPlayerIDList: [playerIDList, playerIDList, ...] @@ -335,14 +335,15 @@ @param batchGoldPaper: [batchGoldPaper, batchGoldPaper, ...] @param batchSilver: [batchSilver, batchSilver, ...] @param batchDetail: [记录邮件流向用, ...] + @param moneySource: 货币来源 ''' - msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail]) + msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail, moneySource]) GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMailBatch", msgInfo, len(msgInfo)) GameWorld.Log("SendMailBatch %s, batchPlayerIDList=%s, batchAddItemList=%s, batchParamList=%s, batchGold=%s, batchGoldPaper=%s, batchSilver=%s" % (mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver)) return -def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail=""): +def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail="", moneySource=ChConfig.Def_GiveMoney_Mail): ''' @param detail: 记录邮件流向用 ''' @@ -350,13 +351,13 @@ mailTypeKey = ShareDefine.DefaultLackSpaceMailType content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, json.dumps(paramList, ensure_ascii=False)) - SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail) + SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource) return ## 功能发放物品补偿/奖励邮件 # @param addItemList [(itemID, itemCnt, isBind), {或物品信息字典}, ...] # @return -def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0, detail=""): +def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0, detail="", moneySource=ChConfig.Def_GiveMoney_Mail): if not playerIDList: return @@ -398,7 +399,7 @@ for key, itemCnt in itemCountDict.items(): itemID, isBind = key combineItemList.append((itemID, itemCnt, isBind)) - cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail] + cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail, moneySource] GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMail", '%s' % (cmdList), len(str(cmdList))) return True -- Gitblit v1.8.0