SnxxServerCode.git

			@@ -25,6 +25,7 @@
			import NetPackCommon
			import PlayerBourse
			import PlayerFamily
			import ShareDefine
			import ChConfig

			import operator
			@@ -463,20 +464,23 @@
			# 拍卖成功收益，都以玩家收益向上取整
			if familyID and auctionItem.FamilyPlayerIDInfo:
			familyPlayerIDList = json.loads(auctionItem.FamilyPlayerIDInfo)
			taxRate = IpyGameDataPY.GetFuncCfg("AuctionTaxrate", 2) # 仙盟拍品税率百分比
			personMaxRate = IpyGameDataPY.GetFuncCfg("AuctionTaxrate", 3) # 仙盟拍品个人最大收益百分比
			taxGold = max(1, int(bidderPrice * taxRate / 100.0)) # 最少收税1
			giveTotalGold = max(0, bidderPrice - taxGold)
			giveMaxGold = int(math.ceil(giveTotalGold * personMaxRate / 100.0))
			memCount = len(familyPlayerIDList)
			giveGoldAverage = min(giveMaxGold, int(math.ceil(giveTotalGold * 1.0 / memCount))) # 有收益的人平分

			# 仙盟拍品收益邮件
			detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice, "FamilyPlayerIDList":familyPlayerIDList}
			paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, giveGoldAverage, personMaxRate]
			PlayerCompensation.SendMailByKey("PaimaiMail6", familyPlayerIDList, [], paramList, gold=giveGoldAverage,
			detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)

			if familyPlayerIDList:
			taxRate = IpyGameDataPY.GetFuncCfg("AuctionTaxrate", 2) # 仙盟拍品税率百分比
			personMaxRate = IpyGameDataPY.GetFuncCfg("AuctionTaxrate", 3) # 仙盟拍品个人最大收益百分比
			taxGold = max(1, int(bidderPrice * taxRate / 100.0)) # 最少收税1
			giveTotalGold = max(0, bidderPrice - taxGold)
			giveMaxGold = int(math.ceil(giveTotalGold * personMaxRate / 100.0))
			memCount = len(familyPlayerIDList)
			giveGoldAverage = min(giveMaxGold, int(math.ceil(giveTotalGold * 1.0 / memCount))) # 有收益的人平分

			# 仙盟拍品收益邮件
			detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice, "FamilyPlayerIDList":familyPlayerIDList}
			paramList = [itemID, itemID, bidderPrice, taxRate, giveGoldAverage, personMaxRate]
			PlayerCompensation.SendMailByKey("PaimaiMail8", familyPlayerIDList, [], paramList, gold=giveGoldAverage,
			detail=detail, moneySource=ChConfig.Def_GiveMoney_AuctionGain)
			else:
			GameWorld.ErrLog("仙盟拍品没有人获得收益!familyID=%s,itemID=%s,itemGUID=%s" % (familyID, itemID, itemGUID))

			elif playerID:
			taxRate = IpyGameDataPY.GetFuncCfg("AuctionTaxrate", 1) # 全服拍品税率百分比
			taxGold = max(1, int(bidderPrice * taxRate / 100.0)) # 最少收税1
			@@ -484,15 +488,16 @@

			# 个人拍卖收益邮件
			detail = {"ItemGUID":itemGUID, "ItemID":itemID, "Count":itemCount, "BidderPrice":bidderPrice}
			paramList = [itemID, itemID, auctionItem.BidderName, bidderPrice, taxRate, givePlayerGold]
			PlayerCompensation.SendMailByKey("PaimaiMail5", [playerID], [], paramList, gold=givePlayerGold,
			paramList = [itemID, itemID, bidderPrice, taxRate, givePlayerGold]
			PlayerCompensation.SendMailByKey("PaimaiMail7", [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])
			#策划需求屏蔽掉成交广播
			#ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
			#if ipyData and ipyData.GetNeedWorldNotify():
			# PlayerControl.WorldNotify(0, "Paimai6", [auctionItem.BidderName, bidderID, auctionItem.AuctionType, bidderPrice, itemID])
			else:
			# 仙盟拍品回收
			if familyID:
			@@ -505,7 +510,7 @@
			# 流拍返还物品邮件
			paramList = []
			detail = {"ItemGUID":itemGUID}
			addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":False, "UserData":auctionItem.UserData}]
			addItemList = [{"ItemID":itemID, "Count":itemCount, "IsAuctionItem":True, "UserData":auctionItem.UserData}]
			PlayerCompensation.SendMailByKey("PaimaiMail4", [playerID], addItemList, paramList, detail=detail)

			AddAuctionRecord(auctionItem, AuctionRecordResult_SellFail)
			@@ -706,7 +711,9 @@
			auctionItem.UserDataLen = len(auctionItem.UserData)
			auctionItem.FamilyPlayerIDInfo = str(familyPlayerIDList)
			auctionItem.FamilyPlayerIDLen = len(auctionItem.FamilyPlayerIDInfo)

			auctionItem.AuctionType = AuctionType_Family if familyID else AuctionType_World
			GameWorld.Log("上架拍品: playerID=%s,familyID=%s,itemID=%s,auctionType=%s" % (playerID, familyID, itemID, auctionItem.AuctionType))

			if not __InitAuctionItemAttrEx(auctionItem):
			return

			@@ -715,12 +722,10 @@
			auctionItemMgr.allAuctionItemByEndTimeList.append(auctionItem)

			if familyID:
			auctionItem.AuctionType = AuctionType_Family
			familyItemList = auctionItemMgr.familyAuctionItemDict.get(familyID, [])
			familyItemList.append(auctionItem)
			auctionItemMgr.familyAuctionItemDict[familyID] = familyItemList
			else:
			auctionItem.AuctionType = AuctionType_World
			auctionItemMgr.worldAuctionItemList.append(auctionItem)

			# 添加进我的拍卖
			@@ -1080,7 +1085,7 @@
			# 载入对应查询条件拍品缓存
			auctionItemQueryList = []
			for worldAuctionItem in auctionItemMgr.worldAuctionItemList:
			if job and worldAuctionItem.ItemJobLimit != job:
			if job and worldAuctionItem.ItemJobLimit != job and worldAuctionItem.ItemJobLimit:
			continue
			if itemTypeList and worldAuctionItem.ItemType not in itemTypeList:
			continue
			@@ -1381,3 +1386,11 @@
			DataRecordPack.SendEventPack("AuctionHouse", dataDict, curPlayer)
			return

			def DoAddFamilyAuctionItem(mapID, familyAuctionItemDict):
			''' 上架仙盟拍品，因为仙盟拍品默认上架，所以使用批量上架
			@param familyAuctionItemDict: {仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,个数], [拍品ID,个数,是否拍品], ...]], ...}
			'''
			GameWorld.Log("发送地图上架仙盟拍品: mapID=%s, %s" % (mapID, familyAuctionItemDict))
			GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_AddFamilyAuctionItem, [mapID, familyAuctionItemDict])
			return