8668 【主干】可拍卖道具取消拍卖时间限制并可以叠加后，上架时可选择拍卖的数量

hxp

2020-12-23 66741b9971e49d7c99f998c3ea65945d55a81c63

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAuctionHouse.py

@@ -30,6 +30,7 @@


import random

import time

import uuid



#// B5 13 拍卖行上架拍品 #tagCMSellAuctionItem

#

@@ -37,11 +38,13 @@
#{

#    tagHead Head;

#    BYTE        ItemIndex;    //物品在背包中索引

#    WORD        SellCount;    //上架个数，0代表全部上架

#};

def OnSellAuctionItem(index, clientData, tick):

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    playerID = curPlayer.GetPlayerID()

    itemIndex = clientData.ItemIndex

    sellCount = clientData.SellCount if hasattr(clientData, "SellCount") else 0 # 后面加的，仅为测试时做下兼容

    GameWorld.DebugLog("玩家上架拍品: itemIndex=%s" % (itemIndex), playerID)

    playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)

    curItem = playerPack.GetAt(itemIndex)

@@ -55,17 +58,18 @@
    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)

        ItemControler.SetIsAuctionItem(curItem, False, curPlayer)

        return

    # 20201223 主干取消拍品有效时长设定

#    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)

#        ItemControler.SetIsAuctionItem(curItem, False, curPlayer)

#        return

    

    QueryGameServer_AuctionHouse(playerID, "AddAuctionItemQuery", [itemIndex, itemGUID, itemID])

    QueryGameServer_AuctionHouse(playerID, "AddAuctionItemQuery", [itemIndex, itemGUID, itemID, sellCount])

    return



#// B5 14 拍卖行竞价物品 #tagCMBiddingAuctionItem

@@ -98,10 +102,10 @@
        return

    queryType, queryData, result = resultList

    if queryType == "AddAuctionItemQuery":

        itemIndex, itemGUID, itemID = queryData

        itemIndex, itemGUID, itemID, sellCount = queryData

        if not result or not result[0]:

            return

        __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID)

        __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID, sellCount)

        

    elif queryType == "BidAuctionItemQuery":

        itemGUID, biddingPrice = queryData

@@ -130,7 +134,7 @@
    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_AuctionItem, 1)

    return



def __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID):

def __DoPlayerSellAuctionItem(curPlayer, itemIndex, itemGUID, itemID, sellCount):

    ## 玩家上架拍品

    playerID = curPlayer.GetPlayerID()

    playerPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)

@@ -145,7 +149,7 @@
    if itemGUID != curItemGUID or itemID != curItemID:

        GameWorld.Log("请求上架的拍品已变化，无法上架!", playerID)

        return

    __DoAddAuctionItem(curPlayer, [[curItem]])

    __DoAddAuctionItem(curPlayer, [[curItem, sellCount]])

    return



def DoAddFamilyAuctionItem(familyAuctionItemDict):

@@ -175,7 +179,7 @@
def __DoAddAuctionItem(curPlayer, auctionItemList):

    ''' 上架拍品，支持批量上架

    @param curPlayer: 非个人拍品时为None

    @param auctionItemList: [[curItem], [curItem, familyID, familyPlayerIDList], ...]

    @param auctionItemList: [[curItem], [curItem, sellCount], [curItem, familyID, familyPlayerIDList], ...]

    '''

    playerID = 0 if not curPlayer else curPlayer.GetPlayerID()

    addAuctionItemList = []

@@ -194,7 +198,16 @@
        if curPlayer and not familyID:

            if ItemCommon.CheckItemIsEquip(curItem):

                EventShell.EventRespons_AddAuctionEquip(curPlayer, curItem.GetItemColor())

            ItemCommon.DelItem(curPlayer, curItem, curItem.GetCount())

            sellCount = itemInfo[1] if len(itemInfo) == 2 else 0

            if sellCount <= 0:

                sellCount = curItem.GetCount()

            else:

                sellCount = min(sellCount, curItem.GetCount())

            itemData["ItemCount"] = sellCount

            if sellCount != curItem.GetCount():

                itemData["GUIDSrc"] = curItem.GetGUID()

                itemData["GUID"] = str(uuid.uuid1()).upper() # 不是全部卖掉的，生成新的GUID

            ItemCommon.DelItem(curPlayer, curItem, sellCount)

        else:

            if not ItemControler.GetIsAuctionItem(curItem):

                GameWorld.Log("非拍品，绑定无法上架!", playerID)