Revert "sefs"

hxp

2018-10-19 6bb604a064530782efec7afd865ee919a4bc6616

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.py

@@ -344,7 +344,7 @@
        mapID = curPlayer.GetMapID()

        fbIpyData = FBCommon.GetFBIpyData(mapID)

        if fbIpyData and not fbIpyData.GetGuardPick():

            GameWorld.Log("该地图守护无法拾取物品! mapID=%s" % mapID, curPlayer.GetPlayerID())

            GameWorld.DebugLog("该地图守护无法拾取物品! mapID=%s" % mapID, curPlayer.GetPlayerID())

            return

        

#    #单人副本一键拾取

@@ -352,18 +352,15 @@
#        SingleFBTPickUP(curPlayer, mapItemID, tick)

#        return

    

    if not mapItemIDList:

        GameWorld.ErrLog("没有指定要拾取的地图物品ID!", curPlayer.GetPlayerID())

        return

    GameWorld.DebugLog("请求拾取物品, isGuard=%s,mapItemIDList=%s" % (isGuard, mapItemIDList), curPlayer.GetPlayerID())

    

    succMapItemIDList = [] # 成功拾取的地图物品

    for mapItemID in mapItemIDList:

        if __DoPickup(curPlayer, mapItemID, tick, isGuard):

            succMapItemIDList.append(mapItemID)

            

    if succMapItemIDList:

        GameWorld.Log("成功拾取地图物品, succMapItemIDList=%s" % (succMapItemIDList), curPlayer.GetPlayerID())

        
    GameWorld.DebugLog("    成功拾取物品, succMapItemIDList=%s" % (succMapItemIDList), curPlayer.GetPlayerID())

    
    # 守护拾取的，附加同步守护拾取结果

    if isGuard and succMapItemIDList:

        guradPickupSucc = ChPyNetSendPack.tagMCGuradPickupItemSucc()

@@ -1785,10 +1782,8 @@
        curMapItem.SetOwnerType(ownerType)

        curMapItem.SetOwnerID(ownerID)

        

    if dropNPCID:

        itemNoteDict = ItemCommon.GetItemNoteDict(curItem, curItem.GetCount())

        GameWorld.Log("AddMapDropItem mapItemID=%s,ownerType=%s,ownerID=%s,mapItemDataStr=%s,itemNoteDict=%s" 
                      % (curMapItem.GetID(), curMapItem.GetOwnerType(), curMapItem.GetOwnerID(), itemDataStr, itemNoteDict))

    #GameWorld.DebugLog("AddMapDropItem ID=%s,ownerType=%s,ownerID=%s,GetDropTick=%s,isBind=%s" 
    #                   % (curMapItem.GetID(), ownerType, ownerID, curMapItem.GetDropTick(), curItem.GetIsBind()))

    return curMapItem



def GetMapDropItemDataStr(curItem, effIndex=0, ownerInfo=[], dropNPCID=0, isOnlySelfSee=False):