From 02a9f1326fd99fc60ee14c70bb55d714803607f0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 08 七月 2019 15:25:56 +0800
Subject: [PATCH] 4438 【主干】【2.0.200】打boss状态下发起匹配可以进入跨服，回来后归属不会清，boss不会回血
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
index 0e5358c..4cc3984 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/AuctionHouse.py
@@ -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:
@@ -652,7 +657,8 @@
@param curPlayer: 可能为None
'''
- notifyWorldAddItemList = [] # 新增全服拍品通知 [[itemGUID, itemID, playerID], ...]
+ isSortWorldItem = False
+ notifyAddItemList = [] # 新增拍品通知 [[itemGUID, itemID, playerID], ...]
notifyFamilyAddItemDict = {} # 新增仙盟拍品通知 {familyID:[auctionItem, ...], ...}
for playerID, familyID, familyPlayerIDList, itemData in addAuctionItemList:
if not playerID and not familyID:
@@ -662,25 +668,25 @@
if not auctionItem:
continue
+ itemGUID = auctionItem.ItemGUID
+ itemID = auctionItem.ItemID
+ notifyAddItemList.append([itemGUID, itemID, playerID])
if familyID:
familyAddItemList = notifyFamilyAddItemDict.get(familyID, [])
familyAddItemList.append(auctionItem)
notifyFamilyAddItemDict[familyID] = familyAddItemList
else:
- itemGUID = auctionItem.ItemGUID
- itemID = auctionItem.ItemID
- notifyWorldAddItemList.append([itemGUID, itemID, playerID])
+ isSortWorldItem = True
- if notifyFamilyAddItemDict or notifyWorldAddItemList:
- isSortWorldItem = notifyWorldAddItemList != []
+ if notifyAddItemList:
__SortAuctionitem(isSortWorldItem=isSortWorldItem)
# 通知新增仙盟拍品
for familyID, familyAddItemList in notifyFamilyAddItemDict.items():
Sync_FamilyAuctionItemInfo(None, familyID, familyAddItemList)
- # 通知全服拍品关注玩家
- __NotifyAuctionPlayerAddItem(notifyWorldAddItemList)
+ # 通知拍品关注玩家
+ __NotifyAuctionPlayerAddItem(notifyAddItemList)
return
def __DoAddAuctionItem(curPlayer, playerID, familyID, familyPlayerIDList, itemData):
@@ -747,9 +753,9 @@
GameWorld.DebugLog("更新拍品数: %s" % len(auctionItemMgr.allAuctionItemDict))
return auctionItem
-def __NotifyAuctionPlayerAddItem(notifyWorldAddItemList):
+def __NotifyAuctionPlayerAddItem(notifyAddItemList):
## 通知关注物品的玩家新上架物品了
- if not notifyWorldAddItemList:
+ if not notifyAddItemList:
return
attentionMgr = PyDataManager.GetAuctionAttentionManager()
playerManager = GameWorld.GetPlayerManager()
@@ -763,8 +769,8 @@
if not playerAttentionIDList:
continue
infoPack = None
- for itemGUID, itemID, playerID in notifyWorldAddItemList:
- if playerID == player.GetPlayerID():
+ for itemGUID, itemID, playerID in notifyAddItemList:
+ if playerID and playerID == player.GetPlayerID():
# 自己上架的物品不通知
continue
if itemID not in playerAttentionIDList:
@@ -1056,10 +1062,10 @@
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
tagItemGUID = clientData.ItemGUID
queryDir = 3
- __Sync_WorldAuctionItemQueryResult(curPlayer, fromItemGUID=tagItemGUID, queryDir=queryDir)
+ __Sync_WorldAuctionItemQueryResult(curPlayer, fromItemGUID=tagItemGUID, queryDir=queryDir, isNotify=True)
return
-def __Sync_WorldAuctionItemQueryResult(curPlayer, job=0, itemTypeList=[], classLV=0, specItemIDList=[], fromItemGUID="", queryDir=1, queryCount=10):
+def __Sync_WorldAuctionItemQueryResult(curPlayer, job=0, itemTypeList=[], classLV=0, specItemIDList=[], fromItemGUID="", queryDir=1, queryCount=10, isNotify=False):
## 根据过滤条件同步全服拍品列表，目前仅全服拍品需要通过查询服务器获得，个人拍品及仙盟拍品由于个数较少直接由上线或变更时主动同步
fromAuctionItem = None
@@ -1067,7 +1073,8 @@
fromAuctionItem = GetAuctionItem(fromItemGUID)
if not fromAuctionItem:
GameWorld.DebugLog("查询的目标拍品不存在! fromItemGUID=%s" % fromItemGUID)
- PlayerControl.NotifyCode(curPlayer, "Paimai5")
+ if isNotify:
+ PlayerControl.NotifyCode(curPlayer, "Paimai5")
return
# {(job, (itemType, ...), itemClassLV, (itemID, ...)):[tagDBAuctionItem, ...], ...}
@@ -1078,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
@@ -1096,7 +1103,8 @@
if fromAuctionItem:
if fromAuctionItem not in auctionItemQueryList:
GameWorld.ErrLog("查询的目标拍品不在所在的过滤的条件里! fromItemGUID=%s" % fromItemGUID)
- PlayerControl.NotifyCode(curPlayer, "Paimai5")
+ if isNotify:
+ PlayerControl.NotifyCode(curPlayer, "Paimai5")
return
fromIndex = auctionItemQueryList.index(fromAuctionItem)
@@ -1378,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
+
--
Gitblit v1.8.0