ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.py
@@ -606,7 +606,7 @@
                              dropNPCID=npcID, isOnlySelfSee=isOnlySelfSee)
    return
def DoGiveItemByVirtualDrop(curPlayer, giveItemList, npcID, dropPosX=0, dropPosY=0, isDropDisperse=True, mailTypeKey="ItemNoPickUp"):
def DoGiveItemByVirtualDrop(curPlayer, giveItemList, npcID, dropPosX=0, dropPosY=0, isDropDisperse=True, mailTypeKey="ItemNoPickUp", extraVirtualItemList=[]):
    ## 给物品并且做假掉落表现,直接先堆叠给物品,再拆开做虚假掉落表现
    
    mapID = PlayerControl.GetCustomMapID(curPlayer)
@@ -640,6 +640,21 @@
            virtualItemDropList.append([itemID, dropItemDataStr])
        
    # 先通知掉落,再给物品,因为前端表现弹框需要这个顺序需求
    if extraVirtualItemList: #只显示假掉落
        for itemInfo in extraVirtualItemList:
            itemID, itemCount, isAuctionItem = itemInfo
            curItem = ItemControler.GetOutPutItemObj(itemID, itemCount, isAuctionItem, curPlayer=curPlayer)
            if not curItem:
                continue
            dropItemDataStr = ChItem.GetMapDropItemDataStr(curItem)
            # 散开掉落
            if isDropDisperse:
                for _ in xrange(itemCount):
                    virtualItemDropList.append([itemID, dropItemDataStr])
            else:
                virtualItemDropList.append([itemID, dropItemDataStr])
            curItem.Clear()
    gameMap = GameWorld.GetMap()
    index = 0
    for posX, posY in ChConfig.Def_DropItemAreaMatrix:
@@ -778,7 +793,6 @@
            dropEquipInfoList.append([classLV, color, dropCount])
        GameWorld.DebugLog("    装备掉落结果: killCount=%s,[阶,颜色,件数]=%s" % (killCount, dropEquipInfoList), playerID)
        
    placeKeyListDict = IpyGameDataPY.GetFuncCfg("EquipDropPartSets", 1)
    colorSuitRateDict = ipyDrop.GetEquipColorSuitInfo() # 装备颜色对应套装概率 {颜色:套装概率, ...}
    colorSuitPlaceKeyInfoDict = ipyDrop.GetEquipPartKeyRateInfo() # 装备部位集合信息 {(颜色,是否套装):部位集合key, ...}
    dropEquipIDDict = {}
@@ -798,10 +812,10 @@
                GameWorld.ErrLog("未配置颜色是否套装对应部位集合key! npcID=%s,color=%s,isSuit=%s" % (npcID, color, isSuit))
                continue
            placeKey = colorSuitPlaceKeyInfoDict[colorSuitKey]
            if placeKey not in placeKeyListDict:
            placeList = GetEquipPlaceByPlaceKey(placeKey)
            if not placeList:
                GameWorld.ErrLog("部位集合key不存在!npcID=%s,placeKey=%s" % (npcID, placeKey))
                continue
            placeList = placeKeyListDict[placeKey]
            randEquipIDList = __GetEquipIDList(npcID, classLV, color, isSuit, placeList, itemJobList)
            if not randEquipIDList:
                continue
@@ -1008,7 +1022,6 @@
        gradeColorSuitRateDict = fbGradeColorSuitRateDict[npcID]
        curGrade = curGrade if curGrade else GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)
        
    placeKeyListDict = IpyGameDataPY.GetFuncCfg("EquipDropPartSets", 1)
    colorDropCntDict = {} # 装备颜色已经掉落数 {颜色:数量, ...}
    colorMaxDropCntDict = ipyDrop.GetEquipColorMaxDropCount() # {颜色:上限数量,...}
    colorSuitRateDict = ipyDrop.GetEquipColorSuitInfo() # 装备颜色对应套装概率 {颜色:套装概率, ...}
@@ -1045,19 +1058,22 @@
                continue
            placeKey = colorSuitPlaceKeyInfoDict[colorSuitKey]
            # 掉落优选部位处理
            if color == optColor and isSuit == optIsSuit and placeKey in placeKeyListDict and optPlace == None:
                optPlace = __GetOptimizationEquipPlace(dropPlayer, classLV, optColor, optIsSuit, placeKeyListDict[placeKey])
            if color == optColor and isSuit == optIsSuit and optPlace == None:
                allEquipPlaceList = GetAllEquipPlaceByPlaceKey(placeKey)
                #GameWorld.DebugLog("    所有可优选部位: %s" % allEquipPlaceList)
                if allEquipPlaceList:
                    optPlace = __GetOptimizationEquipPlace(dropPlayer, classLV, optColor, optIsSuit, allEquipPlaceList)
            jobList = itemJobList
        if placeKey not in placeKeyListDict:
            GameWorld.ErrLog("部位集合key不存在!npcID=%s,placeKey=%s" % (npcID, placeKey))
            continue
        if optPlace > 0:
            GameWorld.DebugLog("    最终优选部位: %s" % optPlace)
            placeList = [optPlace]
            jobList = [dropPlayer.GetJob()]
            optPlace = 0 # 只有一次性的,置为0
        else:
            placeList = placeKeyListDict[placeKey]
            placeList = GetEquipPlaceByPlaceKey(placeKey)
            if not placeList:
                GameWorld.ErrLog("部位集合key不存在!npcID=%s,placeKey=%s" % (npcID, placeKey))
                continue
        randEquipIDList = __GetEquipIDList(npcID, classLV, color, isSuit, placeList, jobList)
        if not randEquipIDList:
            continue
@@ -1126,6 +1142,34 @@
    elif ChConfig.IsGameBoss(npcData):
        GameWorld.ErrLog("Boss没有掉落物品,NPCID=%s" % (npcID), dropPlayer.GetPlayerID())
    return dropIDList, auctionIDList, dropMoneyCnt, moneyValue
def GetAllEquipPlaceByPlaceKey(placeKey):
    placeKeyRateListDict = IpyGameDataPY.GetFuncEvalCfg("EquipDropPartSets", 2, {}) # {集合数字key1:[[概率1,部位1],...],...}
    if placeKey in placeKeyRateListDict:
        return [rateInfo[1] for rateInfo in placeKeyRateListDict[placeKey]]
    placeKeyListDict = IpyGameDataPY.GetFuncEvalCfg("EquipDropPartSets", 1, {}) # {集合数字key1:[部位1,部位2,...],...}
    if placeKey in placeKeyListDict:
        return placeKeyListDict[placeKey]
    return []
def GetEquipPlaceByPlaceKey(placeKey):
    ## 获取装备位集合对应的部位信息,集合ID重复时,优先饼图
    placeList = []
    placeKeyRateListDict = IpyGameDataPY.GetFuncEvalCfg("EquipDropPartSets", 2, {}) # {集合数字key1:[[概率1,部位1],...],...}
    if placeKey in placeKeyRateListDict:
        placeRateList = placeKeyRateListDict[placeKey]
        place = GameWorld.GetResultByRandomList(placeRateList)
        if place:
            placeList = [place]
            #GameWorld.DebugLog("    掉落部位概率集合: placeKey=%s,placeRateList=%s,place=%s,placeList=%s" % (placeKey, placeRateList, place, placeList))
    if not placeList:
        placeKeyListDict = IpyGameDataPY.GetFuncEvalCfg("EquipDropPartSets", 1, {}) # {集合数字key1:[部位1,部位2,...],...}
        if placeKey in placeKeyListDict:
            placeList = placeKeyListDict[placeKey]
            #GameWorld.DebugLog("    掉落部位均衡集合: placeKey=%s,placeList=%s" % (placeKey, placeList))
    return placeList
def __GetOptimizationEquipPlace(dropPlayer, classLV, optColor, optIsSuit, optPlaceList):
    ''' 获取掉落优选部位
@@ -2295,7 +2339,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 +2350,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
    
#################################################
@@ -3158,7 +3206,8 @@
        #    GameWorld.DebugLog("伤血玩家血量为0,清除该伤血!playerID=%s" % hurtID)
        #    return True
        
        if hurtPlayer.GetInitOK() and not hurtPlayer.GetVisible():
        curNPC = self.__Instance
        if hurtPlayer.GetInitOK() and (not hurtPlayer.GetVisible() or hurtPlayer.GetSightLevel() != curNPC.GetSightLevel()):
            GameWorld.DebugLog("伤血玩家不可见,清除该伤血!playerID=%s" % hurtID)
            return True
        
@@ -3195,7 +3244,7 @@
                    #GameWorld.DebugLog("队员不在本线路,不计!playerID=%s" % playerID)
                    continue
                
                if curTeamPlayer.GetInitOK() and not curTeamPlayer.GetVisible():
                if curTeamPlayer.GetInitOK() and (not curTeamPlayer.GetVisible() or curTeamPlayer.GetSightLevel() != curNPC.GetSightLevel()):
                    #GameWorld.DebugLog("队员不可见,不计!playerID=%s" % playerID)
                    continue
                
@@ -5930,7 +5979,7 @@
        GameWorld.ErrLog("自定义场景地图不允许采集! mapID=%s,lineID=%s,npcID=%s" % (mapID, lineID, npcID), playerID)
        return
    
    collectNPCIpyData = IpyGameDataPY.GetIpyGameData("CollectNPC", npcID)
    collectNPCIpyData = IpyGameDataPY.GetIpyGameDataNotLog("CollectNPC", npcID)
    if collectNPCIpyData:
        DoGiveCollectNPCAward(curPlayer, npcID, collectNPCIpyData)
    return
@@ -6295,34 +6344,35 @@
#};
## 购买BOSS可击杀次数
def OnBuyKillBossCnt(index, clientData, tick):
#    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
#    killBossMark = clientData.KillBossMark
#    killBossCntLimitDict = ReadChConfig.GetEvalChConfig("KillBossCntLimit")
#    curBossLimitInfo = []
#    for limitInfo in killBossCntLimitDict.values():
#        if killBossMark == limitInfo[0]:
#            curBossLimitInfo = limitInfo
#            break
#    if not curBossLimitInfo:
#        return
#
#    killBossMark, limitCnt, canBuyCnt, buyCost, sysMark1, sysMark2= curBossLimitInfo
#    hasKillCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Boss_KillCnt%killBossMark, 0)
#    hasBuyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, 0)
#    playerID = curPlayer.GetPlayerID()
#    if hasBuyCnt >= canBuyCnt:
#        GameWorld.Log('购买BOSS可击杀次数, 已达到今日最大可购买次数,hasBuyCnt=%s, canBuyCnt=%s'%(hasBuyCnt, canBuyCnt), playerID)
#        return
#    costGold = eval(buyCost)
#    infoDict = {"index":index, ChConfig.Def_Cost_Reason_SonKey:index}
#    isOK = PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costGold,
#                                  ChConfig.Def_Cost_BuyKillBossCnt, infoDict)
#
#    if not isOK:
#        return
#    # 增加购买次数
#    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, hasBuyCnt + 1)
#    BossHurtMng.NotifyAttackBossCnt(curPlayer)
    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
    killBossMark = clientData.KillBossMark
    buyTimesVIPPriID = IpyGameDataPY.GetFuncEvalCfg("KillBossCntLimit1", 1, {}).get(killBossMark)
    if not buyTimesVIPPriID:
        return
    canBuyCnt = PlayerVip.GetPrivilegeValue(curPlayer, buyTimesVIPPriID)
    hasBuyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, 0)
    playerID = curPlayer.GetPlayerID()
    if hasBuyCnt >= canBuyCnt:
        GameWorld.DebugLog('购买BOSS可击杀次数, 已达到今日最大可购买次数,hasBuyCnt=%s, canBuyCnt=%s'%(hasBuyCnt, canBuyCnt), playerID)
        return
    canKillCnt, dayTimesLimit = BossHurtMng.GetCanKillBossCnt(curPlayer, killBossMark)
    if canKillCnt >= dayTimesLimit:
        GameWorld.DebugLog('购买BOSS可击杀次数, 剩余次数已满!,canKillCnt=%s'%(canKillCnt), playerID)
        return
    costGold = IpyGameDataPY.GetFuncEvalCfg("KillBossCntLimit1", 2, {}).get(killBossMark)
    if not costGold:
        return
    infoDict = {"index":killBossMark, ChConfig.Def_Cost_Reason_SonKey:killBossMark}
    isOK = PlayerControl.PayMoney(curPlayer, IPY_GameWorld.TYPE_Price_Gold_Money, costGold,
                                  ChConfig.Def_Cost_BuyKillBossCnt, infoDict)
    if not isOK:
        return
    # 增加购买次数
    PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Boss_KillCntBuyCnt%killBossMark, hasBuyCnt + 1)
    BossHurtMng.NotifyAttackBossCnt(curPlayer, killBossMark)
    return
#// A2 23 NPC秀结束 #tagCMNPCShowEnd