hxp
2019-06-22 d0f5f9922f17f5bff4288173f18a9ed827d95db8
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)
@@ -5022,9 +5022,10 @@
        addSkillID = 0
        if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
            addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
        #设定人物获得经验
        playerControl = PlayerControl.PlayerControl(curPlayer)
        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID)
        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
        
        
        self.__KillNPCFuncEx(curPlayer, curNPC, curPlayer.GetPlayerID(), False)
@@ -5239,7 +5240,7 @@
        if curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID) == curPlayer.GetID():
            addSkillID = curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason)
        playerControl = PlayerControl.PlayerControl(curPlayer)
        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID)
        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)
        return
    
    #---------------------------------------------------------------------
@@ -6252,13 +6253,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