From 84f9abc7067dde4e6b504a1ba2e9f0600a6de46b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 三月 2019 20:58:56 +0800
Subject: [PATCH] 4042 【后端】【2.0】邮件包含附件时不能删除邮件 - 服务端添加防范
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
index 7159004..f0e4de5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py
@@ -22,6 +22,10 @@
import ItemControler
import ItemCommon
import ChConfig
+import ShareDefine
+import ChItem
+
+import time
#// B5 13 拍卖行上架拍品 #tagCMSellAuctionItem
#
@@ -46,6 +50,15 @@
itemID = curItem.GetItemTypeID()
ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
if not ipyData:
+ return
+ auctionItemCreateTime = curItem.GetUserAttr(ShareDefine.Def_IudetAuctionItemCreateTime)
+ if not auctionItemCreateTime:
+ GameWorld.DebugLog("没有拍品创建时间，无法上架!", playerID)
+ return
+ curTime = int(time.time())
+ if curTime - auctionItemCreateTime > IpyGameDataPY.GetFuncCfg("AuctionItem", 1) * 3600:
+ GameWorld.DebugLog("拍品已过期，无法上架!auctionItemCreateTime=%s" % (GameWorld.ChangeTimeNumToStr(auctionItemCreateTime)), playerID)
+ ChItem.DoLogic_PlayerUseAuctionItem(curPlayer, curItem)
return
QueryGameServer_AuctionHouse(playerID, "AddAuctionItemQuery", [itemIndex, itemGUID, itemID])
@@ -128,25 +141,25 @@
def DoAddFamilyAuctionItem(familyAuctionItemDict):
''' 上架仙盟拍品，因为仙盟拍品默认上架，所以使用批量上架
- @param familyAuctionItemDict: {仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,总个数,拍品组数], ...]], ...}
+ @param familyAuctionItemDict: {仙盟ID:[[享受收益的成员ID, ...], [[拍品ID,个数], [拍品ID,个数,是否拍品], ...]], ...}
'''
- isBind = False
+ GameWorld.Log("上架仙盟拍品: %s" % familyAuctionItemDict)
+ isAuctionItem = True
auctionItemList = []
for familyID, auctionInfo in familyAuctionItemDict.items():
familyPlayerIDList, familyAuctionItemList = auctionInfo
- for itemID, itemCount, auctionGroup in familyAuctionItemList:
+ for itemInfo in familyAuctionItemList:
+ if len(itemInfo) < 2:
+ continue
+ itemID, itemCount = itemInfo[:2]
ipyData = IpyGameDataPY.GetIpyGameData("AuctionItem", itemID)
if not ipyData:
GameWorld.ErrLog("非拍卖物品，无法上架仙盟拍品! familyID=%s,itemID=%s,itemCount=%s" % (familyID, itemID, itemCount))
continue
- groupItemCount = itemCount / auctionGroup
- for i in xrange(auctionGroup):
- if i == auctionGroup - 1:
- groupItemCount += itemCount % auctionGroup
- curItem = ItemControler.GetOutPutItemObj(itemID, groupItemCount, isBind)
- if not curItem:
- continue
- auctionItemList.append([curItem, familyID, familyPlayerIDList])
+ curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem)
+ if not curItem:
+ continue
+ auctionItemList.append([curItem, familyID, familyPlayerIDList])
__DoAddAuctionItem(None, auctionItemList)
return
--
Gitblit v1.8.0