7661 【后端】【2.0.200】屏蔽多余日志输出 7632 【后端】【2.0.200】缥缈仙域的boss和宝藏产出的妖丹开出等级配置

xdh

2019-06-28 c9cfdf6387d727672825e36a8d2d55554f13693e

 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)

@@ -1371,7 +1371,7 @@
                

    return dropItemIDList



def __GetEquipIDList(npcID, classLV, color, isSuit, placeList, itemJobList):

def __GetEquipIDList(findID, classLV, color, isSuit, placeList, itemJobList, findType="NPC"):

    #存一个满足要求的所有的物品的列表 然后从当中随机选一个

    #注： 阶、颜色、套装ID、职业、部位，这5个条件可确认唯一一件装备

    key = "%s_%s" % (classLV, color)

@@ -1404,7 +1404,7 @@
                    placeItemList = filterItemIDDict[itemPlace]

                    placeItemList.append([itemJob, suiteID, itemID])

        PyGameData.g_filterEquipDict[key] = filterItemIDDict

        GameWorld.Log("缓存掉落装备ID: classLV_color=%s, %s, %s" % (key, filterItemIDDict, PyGameData.g_filterEquipDict))

        GameWorld.Log("缓存产出装备ID: classLV_color=%s, %s, %s" % (key, filterItemIDDict, PyGameData.g_filterEquipDict))

        

    itemIDList = []

    for itemPlace, placeItemList in filterItemIDDict.items():

@@ -1420,8 +1420,8 @@
            itemIDList.append(itemID)

            

    if not itemIDList:

        GameWorld.ErrLog("找不到可掉落的装备ID: npcID=%s,classLV=%s,color=%s,isSuit=%s,placeList=%s,itemJobList=%s" 
                         % (npcID, classLV, color, isSuit, placeList, itemJobList))

        GameWorld.ErrLog("找不到可产出的装备ID: %sID=%s,classLV=%s,color=%s,isSuit=%s,placeList=%s,itemJobList=%s" 
                         % (findType, findID, classLV, color, isSuit, placeList, itemJobList))

    return itemIDList



def __GetNPCPieRateEquipDrop(ipyDrop, doCnt, equipDropPlus):

@@ -2295,7 +2295,7 @@
        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_WorldBOSS, 1)

        PlayerActLogin.AddLoginAwardActionCnt(curPlayer, ChConfig.Def_LoginAct_WorldBOSS, 1)

        


    if mapID == ChConfig.Def_FBMapID_BossHome:

        #BOSS之家

        # BOSS之家BOSS击杀成就

@@ -2306,6 +2306,10 @@
        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_BossHome, 1)

        PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_BossHome, 1)

        PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_BOSSHome, 1)

        
    elif mapID == ChConfig.Def_FBMapID_CrossPenglai:

        #跨服蓬莱仙境

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossPenglai)

    return

    

#################################################

@@ -5019,10 +5023,13 @@
        

        #if self.__GetIsLog():

        #    GameWorld.Log("玩家增加个人经验,npcID=%s,addExp=%s" % (curNPC.GetNPCID(), add_Exp), curPlayer.GetPlayerID())

            
        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)

        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)

        

        

        self.__KillNPCFuncEx(curPlayer, curNPC, curPlayer.GetPlayerID(), False)

@@ -5233,8 +5240,11 @@
            return

        #GameWorld.Log("普通队伍杀死怪物,队伍分享人数 = %s,个人经验增加 玩家 = %s, 增加 = %s"%(playerCount, curPlayer.GetPlayerID(), add_Exp))

        #设定人物获得经验

        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)

        playerControl.AddExp(add_Exp, ShareDefine.Def_ViewExpType_KillNPC, addSkillID=addSkillID)

        return

    

    #---------------------------------------------------------------------

@@ -6247,13 +6257,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