3167 【BUG】【2.0】拍卖，消耗了仙玉没获得拍品

hxp

2019-03-27 93367a2607db214ec6dda86bd796c1291bc06a49

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.py

@@ -562,7 +562,7 @@
#  @return True or False

#  @remarks 函数详细说明.

def CheckItemByEffectID(curPlayer, curItem, effectList):

    if not CheckItemCanUse(curItem):

    if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

        return False

    

    if not ItemControler.CheckItemUseLV(curPlayer, curItem, False):

@@ -623,7 +623,7 @@
    for i in range(backPack.GetCount()):

        curItem = backPack.GetAt(i)

        

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

@@ -988,22 +988,6 @@
    

    return isExpireItem, remainingTime



##检查该物品是否合法，类型验证

# @param curItem 物品实例

# @param checkType 物品类型 
# @return 布尔值（物品是否合法）

# @remarks 检查该物品是否合法，类型验证

def CheckItemByType(curItem, checkType):

    #验证材料

    if not CheckItemCanUse(curItem):

        return False

    
    #类型不符合

    if curItem.GetType() != checkType:

        return False

    
    return True



## 检查装备是否有镶嵌宝石

#  @param curItem 装备对象

#  @return True-有 

@@ -1180,7 +1164,7 @@
    for i in range(curItemPack.GetCount()):

        findItem = curItemPack.GetAt(i)

        

        if not CheckItemCanUse(findItem):

        if not CheckItemCanUse(findItem) or ItemControler.GetIsAuctionItem(findItem):

            continue

        

        #不使用绑定的材料

@@ -1223,7 +1207,7 @@
    for i in range(curItemPack.GetCount()):

        curItem = curItemPack.GetAt(i)

        

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        #不使用绑定的材料

@@ -1262,7 +1246,7 @@
    for i in range(curItemPack.GetCount()):

        curItem = curItemPack.GetAt(i)

        

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

@@ -1304,7 +1288,7 @@
    for i in range(itemPack.GetCount()):

        curItem = itemPack.GetAt(i)

        #过滤不符合其他条件的物品

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

@@ -1346,7 +1330,7 @@
    for i in range(itemPack.GetCount()):

        curItem = itemPack.GetAt(i)

        #过滤不符合其他条件的物品

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

@@ -1392,7 +1376,7 @@
    for i in range(itemPack.GetCount()):

        curItem = itemPack.GetAt(i)

        #过滤不符合其他条件的物品

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

@@ -1436,7 +1420,7 @@
    curPack = curPlayer.GetItemManager().GetPack(packType)

    for i in range(0, curPack.GetCount()):

        curItem = curPack.GetAt(i)

        if not curItem:

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        if curItem.GetItemTypeID() != itemID:

@@ -1539,7 +1523,7 @@
    for i in xrange(itemPack.GetCount()):

        curItem = itemPack.GetAt(i)

        #过滤不符合其他条件的物品

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        curItemID = curItem.GetItemTypeID()

        if curItemID not in costItemDict:

@@ -1643,7 +1627,7 @@
    for index in range(0, itemPack.GetCount()):

        item = itemPack.GetAt(index)

        

        if not CheckItemCanUse(item):

        if not CheckItemCanUse(item) or ItemControler.GetIsAuctionItem(item):

            continue

        

        itemTypeID = item.GetItemTypeID()

@@ -1844,7 +1828,7 @@
        curItem = curItemPack.GetAt(i)

        

        #检查物品

        if not CheckItemCanUse(curItem):

        if not CheckItemCanUse(curItem) or ItemControler.GetIsAuctionItem(curItem):

            continue

        

        effect = curItem.GetEffectByIndex(0)

@@ -2011,13 +1995,14 @@
    if not curItem or curItem.IsEmpty():

        return {}

    

    isAuctionItem = ItemControler.GetIsAuctionItem(curItem)

    if not CheckItemIsEquip(curItem):

        return [curItem.GetItemTypeID(), curItem.GetCount(), curItem.GetIsBind()]

        return [curItem.GetItemTypeID(), curItem.GetCount(), isAuctionItem]

    

    addItemDict = {}

    addItemDict['ItemID'] = curItem.GetItemTypeID()

    addItemDict['Count'] = curItem.GetCount()

    addItemDict['IsAuctionItem'] = curItem.GetIsBind()

    addItemDict['IsAuctionItem'] = isAuctionItem

    #addItemDict['IsBind'] = int(curItem.GetIsBind())

    #addItemDict['EquipGS'] = GetEquipGearScore(curItem)

    #addItemDict['ItemStarLV'] = curItem.GetItemStarLV()

@@ -2078,8 +2063,8 @@
        itemDict["ItemID"] = itemInfo.GetItemTypeID()

        if itemInfo.GetCount() > 1:

            itemDict["Count"] = itemInfo.GetCount()

        if itemInfo.GetIsBind():

            itemDict["IsAuctionItem"] = int(itemInfo.GetIsBind())

        if ItemControler.GetIsAuctionItem(itemInfo):

            itemDict["IsAuctionItem"] = 1

        if itemInfo.GetUserData():

            itemDict["UserData"] = itemInfo.GetUserData()

    return itemDict