From 71ea04a0d2f445b3b3947175bacc6829a5996af9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 三月 2019 21:26:48 +0800
Subject: [PATCH] 6385 【后端】【2.0】五行灵根开发（修复洗点报错 ）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
index b12c766..f4972cb 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
@@ -429,7 +429,7 @@
# 竞拍成功邮件，发放物品
paramList = [bidderPrice]
detail = {"ItemGUID":itemGUID}
- addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":True, "UserData":auctionItem.UserData}]
+ addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":False, "UserData":auctionItem.UserData}]
PlayerCompensation.SendMailByKey("PaimaiMail3", [bidderID], addItemList, paramList, detail=detail)
AddAuctionRecord(auctionItem, AuctionRecordResult_BidOK)
@@ -445,7 +445,7 @@
# 仙盟拍品收益邮件
detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice, "FamilyPlayerIDList":familyPlayerIDList}
- paramList = [itemID, auctionItem.BidderName, bidderPrice, taxRate, giveGoldAverage, personMaxRate]
+ paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, giveGoldAverage, personMaxRate]
PlayerCompensation.SendMailByKey("PaimaiMail6", familyPlayerIDList, [], paramList, gold=giveGoldAverage,
detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)
@@ -455,11 +455,15 @@
# 个人拍卖收益邮件
detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice}
- paramList = [itemID, auctionItem.BidderName, bidderPrice, taxRate, givePlayerGold]
+ paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, givePlayerGold]
PlayerCompensation.SendMailByKey("PaimaiMail5", [playerID], [], paramList, gold=givePlayerGold,
detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)
AddAuctionRecord(auctionItem, AuctionRecordResult_SellOK)
+
+ ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
+ if ipyData and ipyData.GetNeedWorldNotify():
+ PlayerControl.WorldNotify(0, "Paimai6", [auctionItem.BidderName, bidderID, auctionItem.AuctionType, bidderPrice, itemID])
else:
# 仙盟拍品回收
if familyID:
@@ -472,7 +476,7 @@
# 流拍返还物品邮件
paramList = []
detail = {"ItemGUID":itemGUID}
- addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":True, "UserData":auctionItem.UserData}]
+ addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":False, "UserData":auctionItem.UserData}]
PlayerCompensation.SendMailByKey("PaimaiMail4", [playerID], addItemList, paramList, detail=detail)
AddAuctionRecord(auctionItem, AuctionRecordResult_SellFail)
@@ -834,12 +838,12 @@
detail = {"ItemID":itemID, "ItemGUID":itemGUID, "Count":itemCount}
if isBuyout:
# 竞拍失败，仅通知
- paramList = [itemID, lastBidderPrice]
+ paramList = [itemID, itemID, lastBidderPrice]
PlayerCompensation.SendMailByKey("PaimaiMail2", [lastBidderID], [], paramList, gold=lastBidderPrice,
detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionBidReturn)
else:
# 竞拍失败，可继续竞价邮件
- paramList = [itemID, lastBidderPrice, itemGUID]
+ paramList = [itemID, itemID, lastBidderPrice, itemGUID]
PlayerCompensation.SendMailByKey("PaimaiMail1", [lastBidderID], [], paramList, gold=lastBidderPrice,
detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionBidReturn)
AddAuctionRecord(auctionItem, AuctionRecordResult_BidFail)
--
Gitblit v1.8.0