8255 【后端】【主干】拍品可使用及上下架优化（拍品可直接使用）

hxp

2019-09-09 efd8fc71a66437c413b0c8770541ef9ca5ed5960

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

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

#  @remarks 函数详细说明.

def CheckItemByEffectID(curPlayer, curItem, effectList):

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

    if not CheckItemCanUse(curItem):

        return False

    

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

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

        curItem = backPack.GetAt(i)

        

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

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

        findItem = curItemPack.GetAt(i)

        

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

        if not CheckItemCanUse(findItem):

            continue

        

        #不使用绑定的材料

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

        curItem = curItemPack.GetAt(i)

        

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

        if not CheckItemCanUse(curItem):

            continue

        

        #不使用绑定的材料

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

        curItem = curItemPack.GetAt(i)

        

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

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

        curItem = itemPack.GetAt(i)

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

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

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

        curItem = itemPack.GetAt(i)

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

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

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

        curItem = itemPack.GetAt(i)

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

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != findItemID:

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

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

        curItem = curPack.GetAt(i)

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

        if not CheckItemCanUse(curItem):

            continue

        

        if curItem.GetItemTypeID() != itemID:

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

        curItem = itemPack.GetAt(i)

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

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

        if not CheckItemCanUse(curItem):

            continue

        curItemID = curItem.GetItemTypeID()

        if curItemID not in costItemDict:

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

        item = itemPack.GetAt(index)

        

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

        if not CheckItemCanUse(item):

            continue

        

        itemTypeID = item.GetItemTypeID()

@@ -1618,6 +1618,14 @@
    if putInPackIndex in [IPY_GameWorld.rptHorseEquip]:

        DoLogic_ItemBindType(curPlayer, curItem, ChConfig.Def_BindType_DoEquipBind)

    

    if putInPackIndex not in [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse]:

        if ItemControler.GetIsAuctionItem(curItem):

            ItemControler.SetIsAuctionItem(curItem, False, curPlayer)

            GameWorld.DebugLog("SwitchItem 拍品设置为非拍品!curItemID=%s" % curItem.GetItemTypeID())

        if ItemControler.GetIsAuctionItem(switchItem):

            ItemControler.SetIsAuctionItem(switchItem, False, curPlayer)

            GameWorld.DebugLog("SwitchItem 拍品设置为非拍品!switchItemID=%s" % switchItem.GetItemTypeID())

            
    #交换装备

    curItem.Switch(switchItem)

    return True

@@ -1642,6 +1650,11 @@
    # 装备技能书、坐骑装备绑定

    if putInPackIndex in [IPY_GameWorld.rptHorseEquip]:

        DoLogic_ItemBindType(curPlayer, emptyItem, ChConfig.Def_BindType_DoEquipBind)

        
    if putInPackIndex not in [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse]:

        if ItemControler.GetIsAuctionItem(switchItem):

            ItemControler.SetIsAuctionItem(switchItem, False, curPlayer)

            GameWorld.DebugLog("PutIn 拍品设置为非拍品!switchItemID=%s" % switchItem.GetItemTypeID())



    if switchItem.GetGameWorldItemType() == IPY_GameWorld.gwitRoleItem:

        emptyItem.PutIn(switchItem)

@@ -1709,7 +1722,7 @@
        curItem = curItemPack.GetAt(i)

        

        #检查物品

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

        if not CheckItemCanUse(curItem):

            continue

        

        effect = curItem.GetEffectByIndex(0)