Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

hch

2019-06-20 4ea8fcf48ca7e7d0476be948e0d018920592099d

Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

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

@@ -257,7 +257,7 @@
        FBLogic.OnFBPickUpItem(curPlayer, singItem, tick)

        

        equipInfo = [singItem.GetEquipPlace(), ItemCommon.GetItemClassLV(singItem), singItem.GetItemColor(), 

                     singItem.GetItemQuality(), singItem.GetUserData()]

                     singItem.GetSuiteID(), singItem.GetUserData()]

        if not itemControl.PutInItem(packIndex, singItem, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":dropItemNPCID}]):

            #物品不能放入

            #PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [packIndex])


 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py

@@ -663,7 +663,7 @@
        itemID = itemObj.GetItemTypeID()

        mailItem = ItemCommon.GetMailItemDict(itemObj)

        equipInfo = [itemObj.GetEquipPlace(), ItemCommon.GetItemClassLV(itemObj), itemObj.GetItemColor(), 

                     itemObj.GetItemQuality(), itemObj.GetUserData()]

                     itemObj.GetSuiteID(), itemObj.GetUserData()]

        packIndex = ChConfig.GetItemPackType(itemObj.GetType())

        if not itemControl.PutInItem(packIndex, itemObj, event=[ChConfig.ItemGive_Pickup, False, {"NPCID":npcID}]):

            mailItemList.append(mailItem)

@@ -6252,13 +6252,14 @@
        needRecord = True

        weightValue = recSpecialItemIDList.index(itemID) + 10000

    else:

        equipPlace, itemClassLV, itemColor, itemQuality, itemUserData = equipInfo

        weightValue = itemColor*1000+itemQuality*100+itemClassLV

        equipPlace, itemClassLV, itemColor, suiteID, itemUserData = equipInfo

        isSuit = 1 if suiteID else 0

        weightValue = itemColor*1000+isSuit*100+itemClassLV

        

        recordCondition = GameWorld.GetDictValueByKey(recDropEquipInfoDict, equipPlace)

        if recordCondition:

            needClassLV, needItemColor, needItemQuality = recordCondition

            if itemClassLV >= needClassLV and itemColor >= needItemColor and itemQuality >= needItemQuality:

            needClassLV, needItemColor, needItemSuite = recordCondition

            if itemClassLV >= needClassLV and itemColor >= needItemColor and isSuit >= needItemSuite:

                needRecord = True

    if not needRecord:

        return