From 66741b9971e49d7c99f998c3ea65945d55a81c63 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 23 十二月 2020 17:02:32 +0800 Subject: [PATCH] 8668 【主干】可拍卖道具取消拍卖时间限制并可以叠加后,上架时可选择拍卖的数量 --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py index 472748a..ab5bef3 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCompensationTube.py @@ -98,25 +98,26 @@ auctionItemTimeout = False auctionItemCreateTime = 0 - if hasAuctionItem: - auctionItemValidTimesMax = IpyGameDataPY.GetFuncCfg("AuctionItem", 1) * 3600 # 拍品有效时长 - auctionItemValidTimesMail = IpyGameDataPY.GetFuncCfg("AuctionItem", 2) * 3600 # 邮件拍品附加有效时长 - auctionItemValidTimesTotal = auctionItemValidTimesMail + auctionItemValidTimesMax - mailCreateTimeStr = curPackData.CreateTime - mailCreateTime = GameWorld.ChangeTimeStrToNum(mailCreateTimeStr) - curTime = int(time.time()) - passTime = curTime - mailCreateTime - if passTime <= auctionItemValidTimesMail: - GameWorld.DebugLog("邮件拍品领取时间在附加保护时长内,拍品创建时间即领取邮件时间开始算!passTime(%s) <= auctionItemValidTimesMail(%s)" % (passTime, auctionItemValidTimesMail)) - pass - elif auctionItemValidTimesMail < passTime < auctionItemValidTimesTotal: - auctionItemCreateTime = curTime - (passTime - auctionItemValidTimesMail) - GameWorld.DebugLog("邮件拍品领取时间超过邮件保护时间,拍品创建时间需扣除领取时的溢出时间!auctionItemValidTimesMail(%s) < passTime(%s) < auctionItemValidTimesTotal(%s), auctionItemCreateTime=%s" - % (auctionItemValidTimesMail, passTime, auctionItemValidTimesTotal, GameWorld.ChangeTimeNumToStr(auctionItemCreateTime))) - elif passTime >= auctionItemValidTimesMax: - auctionItemTimeout = True - GameWorld.DebugLog("邮件中的拍品已过期,将自动转为非拍品!passTime(%s) >= auctionItemValidTimesMax(%s)" - % (passTime, auctionItemValidTimesMax)) + # 20201223 主干取消拍品有效时长设定 +# if hasAuctionItem: +# auctionItemValidTimesMax = IpyGameDataPY.GetFuncCfg("AuctionItem", 1) * 3600 # 拍品有效时长 +# auctionItemValidTimesMail = IpyGameDataPY.GetFuncCfg("AuctionItem", 2) * 3600 # 邮件拍品附加有效时长 +# auctionItemValidTimesTotal = auctionItemValidTimesMail + auctionItemValidTimesMax +# mailCreateTimeStr = curPackData.CreateTime +# mailCreateTime = GameWorld.ChangeTimeStrToNum(mailCreateTimeStr) +# curTime = int(time.time()) +# passTime = curTime - mailCreateTime +# if passTime <= auctionItemValidTimesMail: +# GameWorld.DebugLog("邮件拍品领取时间在附加保护时长内,拍品创建时间即领取邮件时间开始算!passTime(%s) <= auctionItemValidTimesMail(%s)" % (passTime, auctionItemValidTimesMail)) +# pass +# elif auctionItemValidTimesMail < passTime < auctionItemValidTimesTotal: +# auctionItemCreateTime = curTime - (passTime - auctionItemValidTimesMail) +# GameWorld.DebugLog("邮件拍品领取时间超过邮件保护时间,拍品创建时间需扣除领取时的溢出时间!auctionItemValidTimesMail(%s) < passTime(%s) < auctionItemValidTimesTotal(%s), auctionItemCreateTime=%s" +# % (auctionItemValidTimesMail, passTime, auctionItemValidTimesTotal, GameWorld.ChangeTimeNumToStr(auctionItemCreateTime))) +# elif passTime >= auctionItemValidTimesMax: +# auctionItemTimeout = True +# GameWorld.DebugLog("邮件中的拍品已过期,将自动转为非拍品!passTime(%s) >= auctionItemValidTimesMax(%s)" +# % (passTime, auctionItemValidTimesMax)) #背包空间不足 if not isPackSpaceEnough: -- Gitblit v1.8.0