5722 【后端】【1.5】跨服BOSS开发（增加封包C1 06 跨服NPC对话 #tagCMCrossNPCTalk）

hxp

2019-01-14 2417ef936a8a12b8528a1216a6f9233e2beb8aa6

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

@@ -24,7 +24,7 @@
import SkillShell

import BuffSkill

import BaseAttack

import PlayerTruck

import ChNetSendPack

import SkillCommon

import AttackCommon

import ItemControler

@@ -47,11 +47,12 @@
import BossHurtMng

import PlayerSuperMarket

import GameLogic_FamilyInvade

#import GameLogic_MunekadoTrial

import GameLogic_GatherSoul

import FormulaControl

import PlayerMagicWeapon

import PlayerBossReborn

import PlayerFairyCeremony

import PlayerWeekParty

import FamilyRobBoss

import IpyGameDataPY

import PyGameData

@@ -159,6 +160,11 @@
    # 根据平均等级

    elif lvStrengthenType == 1:

        strengthenLV = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_NPCStrengthenAverageLV)

    # 根据按成长等级的上下限随机

    elif lvStrengthenType == 4:

        randMinLV = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_NPCStrengthenMinLV)

        randMaxLV = gameFB.GetGameFBDictByKey(ChConfig.Def_FB_NPCStrengthenMaxLV)

        strengthenLV = random.randint(randMinLV, randMaxLV)

        

    if strengthenIpyData.GetCmpNPCBaseLV():

        strengthenLV = max(strengthenLV, curNPC.GetLV())

@@ -209,6 +215,62 @@
            curNPC.Notify_HPEx()

            curNPC.Notify_MaxHPEx()

            #GameWorld.DebugLog("    aftHP=%s,aftMaxHP=%s" % (aftHP, aftMaxHP))

    
    # 机器人复活初始化给技能

    if isReborn and curNPC.GetType() == ChConfig.ntRobot:

        __OnFBRobotReborn(curNPC, strengthenLV)

        
    return



def __OnFBRobotReborn(curNPC, npcLV):

    tick = GameWorld.GetGameWorld().GetTick()

    lineID = GameWorld.GetGameWorld().GetLineID()

    objID = curNPC.GetID()

    jobSkillDict = IpyGameDataPY.GetFuncEvalCfg("FBRobotCfg", 1)

    robotJob = random.choice(jobSkillDict.keys())

    lineRobotJobDict = PyGameData.g_fbRobotJobDict.get(lineID, {})

    lineRobotJobDict[objID] = robotJob

    PyGameData.g_fbRobotJobDict[lineID] = lineRobotJobDict

    skillInfoDict = jobSkillDict[robotJob]

    skillIDList = []

    for skillInfo, needLV in skillInfoDict.items():

        if npcLV < needLV:

            continue

        if isinstance(skillInfo, int):

            skillIDList.append(skillInfo)

        else:

            skillIDList += list(skillInfo)

    GameWorld.DebugLog("给机器人NPC技能: objID=%s,robotJob=%s,npcLV=%s, %s" % (objID, robotJob, npcLV, skillIDList))

    skillManager = curNPC.GetSkillManager()

    for skillID in skillIDList:

        skillManager.LearnSkillByID(skillID)

    playerManager = GameWorld.GetMapCopyPlayerManager()

    for index in xrange(playerManager.GetPlayerCount()):

        curPlayer = playerManager.GetPlayerByIndex(index)

        if not curPlayer:

            continue

        FBLogic.DoFBHelp(curPlayer, tick)

    return





def __DoGiveVSPlayerNPCSkill(curNPC, job, npcLV):

    skillManager = curNPC.GetSkillManager()

    jobSkillDict = IpyGameDataPY.GetFuncEvalCfg("XMZZRobotSkill", 1)

    if job not in jobSkillDict:

        return

    skillInfoDict = jobSkillDict[job]

    #{1:{(100, 101, 102, 103):1, 50000:100, 50100:200, 50400:300}, 2:{(200, 201, 202, 203):1, 55000:100, 55100:200, 55200:300}}

    skillIDList = []

    for skillInfo, needLV in skillInfoDict.items():

        if npcLV < needLV:

            continue

        if isinstance(skillInfo, int):

            skillIDList.append(skillInfo)

        else:

            skillIDList += list(skillInfo)

    GameWorld.DebugLog("给NPC技能: job=%s,npcLV=%s, %s" % (job, npcLV, skillIDList))

    for skillID in skillIDList:

        skillManager.LearnSkillByID(skillID)

    return



def GetNPCStrengthenAttrDict(npcID, strengthenLV=0, strengthenPlayerCnt=0, strengthenIpyData=None):

@@ -224,7 +286,7 @@
    

    attrDict = {}

    paramDict = attrStrengthenInfo[NPCAttr_ParamDict] # 过程参数公式字典

    attrStrengthenList = attrStrengthenInfo[NPCAttr_AttrStrengthenList] # 属性成长公式字典

    attrStrengthenDict = attrStrengthenInfo[NPCAttr_AttrStrengthenList] # 属性成长公式字典

    playerCntCoefficient = attrStrengthenInfo[NPCAttr_PlayerCntCoefficient] # 人数系数

    npcIDPlayerCntCoefficient = attrStrengthenInfo[NPCAttr_NPCPlayerCntCoefficient] # 特殊NPC人数系数

    baseMaxHP = npcData.GetHPEx() * ShareDefine.Def_PerPointValue + npcData.GetHP()

@@ -287,9 +349,10 @@
                                                                    paramDict["AtkReplyCoefficient"])) # 怪物攻击回复调整值

        MonterHurt = eval(FormulaControl.GetCompileFormula("NPCParam_MonterHurt", paramDict["MonterHurt"])) # 怪物固定伤害

        LostHPPerSecond = eval(FormulaControl.GetCompileFormula("NPCParam_LostHPPerSecond", paramDict["LostHPPerSecond"])) # 玩家每秒掉血量

        
        LVStrengthenMark = strengthenIpyData.GetLVStrengthenMark()

        attrStrengthenList = attrStrengthenDict.get(LVStrengthenMark, [])

        for attrKey, strengthenFormat in attrStrengthenList:

            strengthenValue = int(eval(FormulaControl.GetCompileFormula("NPCStrengthen_%s" % attrKey, strengthenFormat)))

            strengthenValue = int(eval(FormulaControl.GetCompileFormula("NPCStrengthen_%s_%s" % (attrKey,LVStrengthenMark), strengthenFormat)))

            #GameWorld.DebugLog("    %s=%s" % (attrKey, strengthenValue))

            locals()[attrKey] = strengthenValue # 创建该属性局部变量作为参数提供给后面属性计算时用

            attrDict[attrKey] = strengthenValue

@@ -335,7 +398,7 @@
    return attrDict



def GiveKillNPCDropPrize(curPlayer, mapID, npcCountDict, exp_rate=None, mailTypeKey=None, isMail=False, 

                         extraItemList=[], prizeMultiple=1, dropItemMapInfo=[]):

                         extraItemList=[], prizeMultiple=1, dropItemMapInfo=[], curGrade=0):

    '''给玩家击杀NPC掉落奖励

    @param mapID: 击杀的NPC所在地图ID，注意次地图并不一定是玩家当前地图

    @param npcCountDict: 执行单次时所击杀的npc数量字典 {npcID:count, ...}

@@ -375,7 +438,7 @@
        # 掉落有概率因素，需多次执行

        for dCount in xrange(1, totalCount + 1):

            isKillCountDropEquipEx = dCount == 1 # 同一只NPC一次处理中多次击杀的情况，只算一次附加装备处理

            dropInfo = GetNPCDropInfo(curPlayer, mapID, npcID, isKillCountDropEquipEx=isKillCountDropEquipEx)

            dropInfo = GetNPCDropInfo(curPlayer, mapID, npcID, isKillCountDropEquipEx=isKillCountDropEquipEx, curGrade=curGrade)

            if not dropInfo:

                continue

            dropIDList, dropIDBindDict, dropMoneyCnt, moneyValue = dropInfo

@@ -690,7 +753,7 @@
                           % (npcID, killCount, dropIDCountDict, dropIDBindDict, dropMoney), playerID)

    return dropIDCountDict, dropIDBindDict, dropMoney



def GetNPCDropInfo(dropPlayer, mapID, npcID, ownerPlayerList=[], ipyDrop=None, isSingle=True, isKillCountDropEquipEx=True):

def GetNPCDropInfo(dropPlayer, mapID, npcID, ownerPlayerList=[], ipyDrop=None, isSingle=True, isKillCountDropEquipEx=True, curGrade=0):

    '''获取NPC掉落信息, 击杀及扫荡通用，调用该函数获得掉落信息，然后再看掉落地板上还是直接放入背包

        @param dropPlayer: 用于判断调用相关用的玩家示例，该玩家并不一定是击杀者，只是按一定规则设定的掉落判断依据的玩家

                            如队伍，取等级最大的玩家，该玩家并不一定是击杀者

@@ -782,7 +845,7 @@
    indepRateDoCnt = ipyDrop.GetIndepRateDoCnt()

    if indepRateDoCnt:

        indepRateDoCnt = __GetNPCDropDoCountChange(indepRateDoCnt, doCountRate + equipDropDoCountPlus, doCountAdd)

        dropEquipInfoList += __GetNPCIndepRateEquipDrop(ipyDrop, indepRateDoCnt, equipDropRatePlus)

        dropEquipInfoList += __GetNPCIndepRateEquipDrop(ipyDrop, indepRateDoCnt, equipDropRatePlus, curGrade)

        

    #GameWorld.DebugLog("阶,颜色,部位集合key,dropEquipInfoList=%s" % (dropEquipInfoList))

    placeDict = IpyGameDataPY.GetFuncCfg("EquipDropPartSets", 1)

@@ -878,7 +941,7 @@
    fbGradeColorStarRateDict = IpyGameDataPY.GetFuncEvalCfg("FBGradeEquipDropRate", 2) # 评级影响品质星级概率 {npcID:{(颜色,星级):[D级影响概率, ..., S级影响概率], ...}, ...}

    if npcID in fbGradeColorStarRateDict:

        gradeColorStarRateDict = fbGradeColorStarRateDict[npcID]

        curGrade = GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

        curGrade = curGrade if curGrade else GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

        

    colorDropCntDict = {} # 装备颜色已经掉落数 {颜色:数量, ...}

    colorMaxDropCntDict = ipyDrop.GetIndepRateMaxDropCount() # {颜色:上限数量,...}

@@ -953,7 +1016,7 @@
        fbGradePriItemIDDropDict = IpyGameDataPY.GetFuncEvalCfg("FBGradeEquipDropRate", 3)

        if npcID in fbGradePriItemIDDropDict:

            gradePriItemIDDropDict = fbGradePriItemIDDropDict[npcID]

            curGrade = GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

            curGrade = curGrade if curGrade else GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

            priDropInfoList = gradePriItemIDDropDict.get(curGrade, [])

            priDropIDList = []

            for priItemID, priItemCount in priDropInfoList:

@@ -1107,6 +1170,8 @@
    # 1. 职业物品ID集合

    job = curPlayer.GetJob()

    JobItemDropSets = IpyGameDataPY.GetFuncCfg("JobItemDropSets", 1) # {物品ID集合key:[职业顺序物品ID列表], ...}

    itemDropSets = IpyGameDataPY.GetFuncCfg("JobItemDropSets", 2) # {物品ID集合key:[随机物品ID列表], ...}

    itemDropRateSets = IpyGameDataPY.GetFuncCfg("JobItemDropSets", 3) # {物品ID集合key:[随机物品ID饼图列表], ...}

    ItemKeyMaxDropCountDict = ipyDrop.GetItemKeyMaxDropCount() # {物品ID集合key:随机次数,...}

    

    #     1.1 只掉本职业的

@@ -1137,20 +1202,14 @@
    #     1.2 随机掉落一个

    ItemKeyDropRateDict = ipyDrop.GetItemKeyDropRate() # {物品ID集合key:概率, ...}， 随机掉一个，优先级低

    if ItemKeyDropRateDict:

        for jobItemKey, dropRate in ItemKeyDropRateDict.items():

            if jobItemKey not in JobItemDropSets:

                continue

            jobItemList = JobItemDropSets[jobItemKey]

            if len(jobItemList) < job:

                GameWorld.ErrLog("职业物品集合key没有配置对应职业ID: npcID=%s,jobItemKey=%s,job=%s" % (npcID, jobItemKey, job))

                continue

        for itemKey, dropRate in ItemKeyDropRateDict.items():

            # 在只掉本职业里的不处理

            if jobItemKey in ItemKeyDropRateJobDict:

            if itemKey in ItemKeyDropRateJobDict:

                continue

            mustDropCount = dropRate / Def_NPCMaxDropRate

            dropRate = dropRate % Def_NPCMaxDropRate # 基础概率

            canDropCount = mustDropCount

            doCnt = ItemKeyMaxDropCountDict.get(jobItemKey, 1) # 默认1个

            doCnt = ItemKeyMaxDropCountDict.get(itemKey, 1) # 默认1个

            doCnt = __GetNPCDropDoCountChange(doCnt, doCountRate, doCountAdd)

            for _ in xrange(doCnt):

                if not GameWorld.CanHappen(dropRate, maxRate=Def_NPCMaxDropRate):

@@ -1158,9 +1217,20 @@
                canDropCount += 1

                

            for _ in xrange(canDropCount):

                randJobItemID = random.choice(jobItemList)

                dropItemIDList.append(randJobItemID)

                #GameWorld.DebugLog("掉落随机职业指定物品ID: jobItemKey=%s,randJobItemID=%s" % (jobItemKey, randJobItemID))

                if itemKey in itemDropRateSets:

                    randItemRateList = itemDropRateSets[itemKey]

                    randItemID = GameWorld.GetResultByRandomList(randItemRateList)

                    #GameWorld.DebugLog("掉落饼图物品ID: itemKey=%s,randItemRateList=%s,randItemID=%s" % (itemKey, randItemRateList, randItemID))

                elif itemKey in itemDropSets:

                    randItemList = itemDropSets[itemKey]

                    randItemID = random.choice(randItemList)

                    #GameWorld.DebugLog("掉落随机物品ID: itemKey=%s,randItemList=%s,randItemID=%s" % (itemKey, randItemList, randItemID))

                else:

                    continue

                if not randItemID:

                    continue

                dropItemIDList.append(randItemID)

                #GameWorld.DebugLog("掉落随机指定物品ID: itemKey=%s,randItemID=%s" % (itemKey, randItemID))

                

    # 2. 指定掉落ID处理, 受全局设定影响

    itemIDDropRateDict = ipyDrop.GetItemIDDropRate() # {物品ID:概率, ...}

@@ -1335,7 +1405,7 @@
    #GameWorld.DebugLog("饼图装备掉落结果: doCnt=%s, %s" % (doCnt, dropEquipInfoList))

    return dropEquipInfoList



def __GetNPCIndepRateEquipDrop(ipyDrop, doCnt, equipDropPlus):

def __GetNPCIndepRateEquipDrop(ipyDrop, doCnt, equipDropPlus, curGrade=0):

    ## 获取NPC独立掉率装备掉落信息

    npcID = ipyDrop.GetNPCID()

    indepRateDict = ipyDrop.GetIndepRateDrop() # {(阶,颜色,部位集合key):概率,...}

@@ -1346,7 +1416,7 @@
    fbGradeColorRateDict = IpyGameDataPY.GetFuncEvalCfg("FBGradeEquipDropRate", 1) #{npcID:{颜色:[D级影响概率, ..., S级影响概率], ...}, ...}

    if npcID in fbGradeColorRateDict:

        gradeColorRateDict = fbGradeColorRateDict[npcID]

        curGrade = GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

        curGrade = curGrade if curGrade else GameWorld.GetGameFB().GetGameFBDictByKey(ChConfig.Def_FB_Grade)

        

    #colorDropCntDict = {} # 装备颜色已经掉落数 {颜色:数量, ...}

    dropEquipInfoList = []

@@ -1986,9 +2056,8 @@
        # 设置npc死亡及自身处理

        SetDeadEx(summonNPC)

        

    if curNPC.GetGameObjType() == IPY_GameWorld.gotNPC and \

        curNPC.GetGameNPCObjType() == IPY_GameWorld.gnotSummon:

        FBLogic.DoFB_SummonNPCDead(curNPC)

    if curNPC.GetGameObjType() == IPY_GameWorld.gotNPC:

        FBLogic.DoFB_NPCDead(curNPC)

    

    summonPlayerID = curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_SummonMapNPCPlayerID)

    if summonPlayerID > 0:

@@ -1999,13 +2068,7 @@
        # 通知GameServer boss状态 封魔坛在副本里单独处理

        ipyData = IpyGameDataPY.GetIpyGameDataNotLog('BOSSInfo', npcid)

        if ipyData and ipyData.GetMapID() != ChConfig.Def_FBMapID_SealDemon:

            mapID = GameWorld.GetMap().GetMapID()

            lineID = GameWorld.GetGameWorld().GetLineID()

            msgList = [npcid, 0, mapID, lineID]

            GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GameWorldBossState',

                                                                '%s' % (msgList), len(str(msgList)))

            bosskey = ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % npcid

            GameWorld.GetGameWorld().SetGameWorldDict(bosskey, 0)

            GameServe_GameWorldBossState(npcid, 0)

            #GameWorld.GetGameWorld().SetGameWorldDict(ChConfig.Map_NPC_WorldBossDeadTick % npcid, GameWorld.GetGameWorld().GetTick())

            #因为存在boss分流，所以用gameFB字典，但是存活状态还是用GameWorld字典

            GameWorld.GetGameFB().SetGameFBDict(ChConfig.Map_NPC_WorldBossDeadTick % npcid, GameWorld.GetGameWorld().GetTick())

@@ -2019,20 +2082,87 @@
    AttackCommon.ClearTeamPlayerHurtValue(curNPC)

    # 清除自定义伤血列表

    #BossHurtMng.ClearHurtValueList(curNPC)



    if curNPC.GetType() == ChConfig.ntRobot:

        lineID = GameWorld.GetGameWorld().GetLineID()

        lineRobotJobDict = PyGameData.g_fbRobotJobDict.get(lineID, {})

        lineRobotJobDict.pop(curNPC.GetID(), 0)

        PyGameData.g_fbRobotJobDict[lineID] = lineRobotJobDict

        
    # C++设置npc死亡

    curNPC.SetDead(curNPC.GetDictByKey(ChConfig.Def_NPCDead_Reason),

                   curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerType),

                   curNPC.GetDictByKey(ChConfig.Def_NPCDead_KillerID))

    return



def GameServer_KillGameWorldBoss(bossID, killerName, hurtValue, isNotify=True):

    isAddKillCnt = 0 # 页游逻辑，手游暂写死不增

    mapID = GameWorld.GetMap().GetMapID()

    killMsg = str([bossID, killerName, hurtValue, isAddKillCnt, isNotify, mapID])

def GameServer_KillGameWorldBoss(bossID, killPlayerName, hurtValue, isNotify=True, killerIDList=[]):

    dataMapID = GameWorld.GetGameWorld().GetMapID()

    realMapID = GameWorld.GetGameWorld().GetRealMapID()

    copyMapID = GameWorld.GetGameWorld().GetCopyMapID()

    killMsg = str([bossID, killPlayerName, hurtValue, isNotify, realMapID, dataMapID, copyMapID, killerIDList])

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'KillGameWorldBoss', killMsg, len(killMsg))

    GameWorld.DebugLog("Boss被击杀: bossID=%s,dataMapID=%s,realMapID=%s,copyMapID=%s,killerIDList=%s" % (bossID, dataMapID, realMapID, copyMapID, killerIDList))

    return



def GameServe_GameWorldBossState(bossID, isAlive):

    dataMapID = GameWorld.GetGameWorld().GetMapID()

    realMapID = GameWorld.GetGameWorld().GetRealMapID()

    copyMapID = GameWorld.GetGameWorld().GetCopyMapID()

    stateMsg = str([bossID, isAlive, dataMapID, realMapID, copyMapID])

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GameWorldBossState', '%s' % stateMsg, len(stateMsg))

    GameWorld.DebugLog("Boss状态变更: bossID=%s,isAlive=%s,dataMapID=%s,realMapID=%s,copyMapID=%s" 
                       % (bossID, isAlive, dataMapID, realMapID, copyMapID))

    if not isAlive:

        if dataMapID in ChConfig.Def_CrossZoneTableName:

            tableName = ChConfig.Def_CrossZoneTableName[dataMapID]

            realMapID = GameWorld.GetGameWorld().GetRealMapID()

            copyMapID = GameWorld.GetGameWorld().GetCopyMapID()

            zoneIpyData = IpyGameDataPY.GetIpyGameData(tableName, realMapID, dataMapID, copyMapID)

            if not zoneIpyData:

                return

            zoneID = zoneIpyData.GetZoneID()

            GameWorld.GetGameWorld().SetGameWorldDict(ShareDefine.Def_Notify_WorldKey_GameWorldBossRebornCross % (zoneID, bossID), 0)

        else:

            GameWorld.GetGameWorld().SetGameWorldDict(ShareDefine.Def_Notify_WorldKey_GameWorldBossReborn % bossID, 0)

    return



def OnPlayerKillBoss(curPlayer, npcID, mapID, isCrossServer):                
    killBossCntLimitDict = IpyGameDataPY.GetFuncCfg('KillBossCntLimit', 1)

    limitIndex = GameWorld.GetDictValueByKey(killBossCntLimitDict, npcID)

    if limitIndex != None:

        #今日杀怪次数+1

        key = ChConfig.Def_PDict_Boss_KillCnt % limitIndex

        newCnt = curPlayer.NomalDictGetProperty(key, 0) + 1

        PlayerControl.NomalDictSetProperty(curPlayer, key, newCnt)

        BossHurtMng.NotifyAttackBossCnt(curPlayer, limitIndex)

        GameWorld.DebugLog("今日杀怪次数  playerID=%s, newCnt=%s" % (curPlayer.GetPlayerID(), newCnt))

        
        dataDict = {"objID":npcID, "bossID":npcID, "touchCnt":newCnt,

                    "AccID":curPlayer.GetAccID(), "PlayerID":curPlayer.GetPlayerID()}

        DataRecordPack.SendEventPack("AddKillBossCnt", dataDict, curPlayer)

        
    if isCrossServer:

        return

    
    if limitIndex == ShareDefine.Def_Boss_Func_World:

        # 世界BOSS击杀成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillWorldBoss, 1)

        # 每日活动

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_WorldBOSS)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_WorldBOSS, 1)

        PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)

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

        
    if mapID == ChConfig.Def_FBMapID_BossHome:

        #BOSS之家

        # BOSS之家BOSS击杀成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillBossHomeBoss, 1)

        # 每日活动

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_BOSSHome)

        PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_BOSSHome, 1)

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

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

    return

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

## NPC控制定义

#

@@ -2052,6 +2182,7 @@
        self.__Killer = None # 击杀者, 由各种规则得出, 一般也是物品归属的代表, 用于广播、记录等确保与归属一致

        self.__AllKillerDict = {} # 所有击杀的玩家ID对应字典, 非队伍, 一般也是归属的拥有者

        self.__FeelPlayerList = [] # 所有摸怪玩家列表，处理任务及某些逻辑用

        self.__ownerPlayerList = [] # 归属者列表

        

        self.__OwnerHurtType = 0

        self.__OwnerHurtID = 0

@@ -2382,7 +2513,7 @@
    def GetIsBossView(self):

        # 主动视野情况，GetIsBoss 0 1 4 为普通NPC视野（有视野范围配置，但去除视野刷新），其他为BOSS类视野有刷新

        curNPC = self.__Instance

        if not ChConfig.IsGameBoss(curNPC) and not GetFaction(curNPC):

        if not ChConfig.IsGameBoss(curNPC) and not GetFaction(curNPC) and curNPC.GetType() != ChConfig.ntRobot:

            return False

        

        return True

@@ -3305,7 +3436,12 @@
        #范围校验

        posMapX = posMap.GetPosX()

        posMapY = posMap.GetPosY()

        posMapArea = posMap.GetArea()

        
        if curNPC.GetType() == IPY_GameWorld.ntFunctionNPC: #功能NPC

            posMapArea = 0

        else:

            posMapArea = posMap.GetArea()

        
        #获取范围内一点可以移动的点

        posX, poxY = GameMap.GetNearbyPosByDis(posMapX, posMapY, posMapArea)

        

@@ -3429,12 +3565,7 @@
            # 通知GameServer boss刷新成功

            ipyData = IpyGameDataPY.GetIpyGameDataNotLog('BOSSInfo', curNPCID)

            if ipyData:

                mapID = GameWorld.GetMap().GetMapID()

                lineID = GameWorld.GetGameWorld().GetLineID()

                msgList = [curNPCID, 1, mapID, lineID]

                GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'GameWorldBossState',

                                                            '%s' % (msgList), len(str(msgList)))

                
                GameServe_GameWorldBossState(curNPCID, 1)

                if GetDropOwnerType(curNPC) == ChConfig.DropOwnerType_Family:

                    FamilyRobBoss.FamilyOwnerBossOnReborn(curNPC)

                    

@@ -3654,7 +3785,7 @@
    #  @remarks 刷新NPC属性

    def RefreshNPCAttrState(self, canSyncClient=True, isReborn=False):

        curNPC = self.__Instance

        curNPCMaxHP_Before = GameObj.GetMaxHP(curNPC)

        #curNPCMaxHP_Before = GameObj.GetMaxHP(curNPC)

        #清空NPC战斗属性

        curNPC.ClearBattleEffect()

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

@@ -3691,6 +3822,28 @@
            

        return

    

    def SetHelpBattleRobotRebornAttr(self, fightPower):

        '''助战机器人只设置血量属性

                        血量算法，（助战玩家=助战机器人）：每个副本配置伤害*（助战玩家战力/副本规定战力）*系数值  系数值暂定为50

        '''

        curNPC = self.__Instance

        mapID = FBCommon.GetRecordMapID(GameWorld.GetMap().GetMapID())

        funcLineID = FBCommon.GetFBPropertyMark()

        ipyData = IpyGameDataPY.GetIpyGameData("FBHelpBattle", mapID, funcLineID)

        if not ipyData:

            return

        
        SetSuppressFightPower(curNPC, fightPower)

        fbFightPower = ipyData.GetFightPowerMin()

        baseHurt = ipyData.GetRobotBaseHurt()

        hpCoefficient = ipyData.GetRobotHPCoefficient()

        maxHP = int(eval(IpyGameDataPY.GetFuncCompileCfg("HelpBattleRobot", 2)))

        GameWorld.DebugLog("设置助战机器人属性: objID=%s,fightPower=%s,maxHP=%s" % (curNPC.GetID(), fightPower, maxHP))

        GameObj.SetMaxHP(curNPC, maxHP)

        GameObj.SetHP(curNPC, maxHP)

        curNPC.Notify_HPEx()

        curNPC.Notify_MaxHPEx()

        return

    

    # NPC移动速度特殊处理，只处理百分比不能处理固定值 

    # 因为 ChConfig.TYPE_Calc_AttrSpeed 非服务端移动速度，偷懒处理法

@@ -3701,11 +3854,13 @@
        if not speedPer:

            if curNPC.GetDictByKey(ChConfig.Def_NPC_Dict_SpeedPer):

                curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, 0)

            return

        speed = int(curNPC.GetSpeed() * (ShareDefine.Def_MaxRateValue) / max(100.0, float(ShareDefine.Def_MaxRateValue + speedPer)))

        
        curNPC.SetSpeed(speed)

        curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, speedPer)

        else:

            speed = int(curNPC.GetSpeed() * (ShareDefine.Def_MaxRateValue) / max(100.0, float(ShareDefine.Def_MaxRateValue + speedPer)))

            curNPC.SetSpeed(speed)

            curNPC.SetDict(ChConfig.Def_NPC_Dict_SpeedPer, speedPer)

        if GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul:

            #目前只在聚魂副本里通知

            NPCSpeedChangeNotify(curNPC, curNPC.GetSpeed())

        return

    

    

@@ -3715,7 +3870,6 @@
    #  @remarks 刷新NPC行为属性

    def RefreshNPCActionState(self):

        curNPC = self.__Instance

        
        OperControlManager.ClearObjActionState(curNPC)

        

        #根据BUFF 加上状态

@@ -3834,7 +3988,8 @@
            if GetDropOwnerType(curNPC) == ChConfig.DropOwnerType_Family:

                killerName = FamilyRobBoss.FamilyOwnerBossOnKilled(curNPC, self.__OwnerHurtID)

            #KillerJob = 0 if not self.__Killer else self.__Killer.GetJob()

            GameServer_KillGameWorldBoss(curNPC.GetNPCID(), killerName, 0)

            killerIDList = [player.GetPlayerID() for player in self.__ownerPlayerList]

            GameServer_KillGameWorldBoss(curNPC.GetNPCID(), killerName, 0, True, killerIDList)

        #===========================================================================================

        # # 暗金boss

        # if curNPC.GetIsBoss() == ChConfig.Def_NPCType_Boss_Dark:

@@ -4098,9 +4253,16 @@
                ownerType, ownerID = hurtType, hurtID

                itemCnt = moneyValue if itemID == moneyID else 1

                isBind = dropIDBindDict.get(itemID, 1)

                
            
            curItem = self.__CreateDropItem(curNPC, itemID, itemCnt, isBind)

            if not curItem:

                continue

            
            if mapID == ChConfig.Def_FBMapID_GatherSoul:#聚魂副本特殊处理

                GameLogic_GatherSoul.KillGatherSoulNPCDropAward(itemID, itemCnt, isBind)

                dropItemDataStr = ChItem.GetMapDropItemDataStr(curItem)

                self.SendVirtualItemDrop(ownerPlayer, itemID, resultX, resultY, dropItemDataStr)

                curItem.Clear()

                continue

            

            if isDropInItemPack:

@@ -4110,17 +4272,22 @@
                if ItemControler.DoLogic_PutItemInPack(ownerPlayer, curItem, True, True,

                                                       event=["NPCDrop", False, {"npcID":npcID}]):

                    #通知客户端

                    vItemDrop = ChPyNetSendPack.tagMCVirtualItemDrop()

                    vItemDrop.ItemTypeID = itemID

                    vItemDrop.PosX = resultX

                    vItemDrop.PosY = resultY

                    vItemDrop.UserData = dropItemDataStr

                    vItemDrop.UserDataLen = len(vItemDrop.UserData)

                    NetPackCommon.SendFakePack(ownerPlayer, vItemDrop)

                    self.SendVirtualItemDrop(ownerPlayer, itemID, resultX, resultY, dropItemDataStr)

                    
            else:

                self.__MapCreateItem(curItem, resultX, resultY, ownerType, ownerID)

        return

    

    def SendVirtualItemDrop(self, player, itemID, posX, posY, userDataStr):

        #通知客户端

        vItemDrop = ChPyNetSendPack.tagMCVirtualItemDrop()

        vItemDrop.ItemTypeID = itemID

        vItemDrop.PosX = posX

        vItemDrop.PosY = posY

        vItemDrop.UserData = userDataStr

        vItemDrop.UserDataLen = len(vItemDrop.UserData)

        NetPackCommon.SendFakePack(player, vItemDrop)

        return

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

    ## NPC被杀死逻辑处理

    #  @param self 类实例

@@ -4320,7 +4487,8 @@
                    dropPlayer = curPlayer

                self.__KilledByPlayerSetPrize(curPlayer)

                ownerPlayerList.append(curPlayer)

                
            self.__ownerPlayerList = ownerPlayerList

            
            #调用物品掉落

            self.__NPCDropItem(dropPlayer, hurtType, hurtID, ownerPlayerList)



@@ -4521,6 +4689,13 @@
                hurtID = killerDict.keys()[0]

                if isGameBoss:

                    GameWorld.Log("    归属默认玩家, npcID=%s,playerID=%s" % (npcID, hurtID))

            elif GameWorld.GetMap().GetMapID() == ChConfig.Def_FBMapID_GatherSoul:

                player = FBCommon.GetCurSingleFBPlayer()

                if player:

                    hurtID = player.GetPlayerID()

                    killerDict[hurtID] = player

                    hurtType = ChConfig.Def_NPCHurtTypePlayer

                    #GameWorld.Log("    聚魂副本归属默认玩家, npcID=%s,playerID=%s" % (npcID, hurtID))

                

        return killerDict, killTeam, hurtType, hurtID

    

@@ -4755,6 +4930,7 @@
            

            self.__DoNormalTeamExp(curPlayer)

            self.__KillNPCFuncEx(curPlayer, curNPC, maxHurtID, True)

        self.__ownerPlayerList = ownerPlayerList

            

        #调用物品掉落

        self.__NPCDropItem(dropPlayer, hurtType, hurtID, ownerPlayerList)

@@ -4783,6 +4959,7 @@
                maxLV = curPlayerLV

                dropPlayer = player

            ownerPlayerList.append(player)

        self.__ownerPlayerList = ownerPlayerList

            

        if not ownerPlayerList:

            GameWorld.Log("奖励归属仙盟，但是不存在可获得该奖励的成员!npcID=%s,hurtType=%s,hurtID=%s" 

@@ -4823,47 +5000,31 @@
        defObjType = curNPC.GetGameObjType() 

        mapFBType = GameWorld.GetMap().GetMapFBType()

        mapID = FBCommon.GetRecordMapID(GameWorld.GetMap().GetMapID())

        playerID = curPlayer.GetPlayerID()

        #playerID = curPlayer.GetPlayerID()

        

        # 如果是NPC

        if defObjType == IPY_GameWorld.gotNPC:

        if defObjType != IPY_GameWorld.gotNPC:

            return

        
        # 跨服服务器处理

        if GameWorld.IsCrossServer():

            #掉落归属

            if mapFBType != IPY_GameWorld.fbtNull:

                FBLogic.DoFB_DropOwner(curPlayer , curNPC)

            else:

                if curNPC.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):

                    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC)

                

            killBossCntLimitDict = IpyGameDataPY.GetFuncCfg('KillBossCntLimit', 1)

            limitIndex = GameWorld.GetDictValueByKey(killBossCntLimitDict, npcID)

            if limitIndex != None:

                #今日杀怪次数+1

                key = ChConfig.Def_PDict_Boss_KillCnt % limitIndex

                newCnt = curPlayer.NomalDictGetProperty(key, 0) + 1

                PlayerControl.NomalDictSetProperty(curPlayer, key, newCnt)

                BossHurtMng.NotifyAttackBossCnt(curPlayer, limitIndex)

                GameWorld.DebugLog("今日杀怪次数  playerID=%s, newCnt=%s" % (curPlayer.GetPlayerID(), newCnt))

                
                dataDict = {"objID":curNPC.GetID(), "bossID":npcID, "touchCnt":newCnt,

                            "AccID":curPlayer.GetAccID(), "PlayerID":curPlayer.GetPlayerID()}

                DataRecordPack.SendEventPack("AddKillBossCnt", dataDict, curPlayer)

                if limitIndex == 0:

                    # 世界BOSS击杀成就

                    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillWorldBoss, 1)

                    # 每日活动

                    PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_WorldBOSS)

                    PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_WorldBOSS, 1)

                    PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_WorldBoss, 1)

            if ChConfig.IsGameBoss(curNPC) and mapID == ChConfig.Def_FBMapID_BossHome:

                #BOSS之家

                # BOSS之家BOSS击杀成就

                PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillBossHomeBoss, 1)

                # 每日活动

                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_BOSSHome)

                PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_BOSSHome, 1)

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

            if ChConfig.IsGameBoss(curNPC):

                OnPlayerKillBoss(curPlayer, npcID, mapID, True)

            return

        
        #掉落归属

        if mapFBType != IPY_GameWorld.fbtNull:

            FBLogic.DoFB_DropOwner(curPlayer , curNPC)

        else:

            if curNPC.GetLV()>=curPlayer.GetLV() - IpyGameDataPY.GetFuncCfg('DailyQuestKillMonster'):

                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC)

            

            
        if ChConfig.IsGameBoss(curNPC):

            OnPlayerKillBoss(curPlayer, npcID, mapID, False)

        return

        

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

@@ -4889,7 +5050,7 @@
        #GameWorld.DebugLog("__MissionOnKillNPC isFeel=%s" % (isFeel), curPlayer.GetPlayerID())

        killBossCntLimitDict = IpyGameDataPY.GetFuncCfg('KillBossCntLimit', 1)

        limitIndex = GameWorld.GetDictValueByKey(killBossCntLimitDict, npcID)

        isWorldBoos = limitIndex == 0

        isWorldBoos = limitIndex == ShareDefine.Def_Boss_Func_World

        if isFeel:

            #击杀NPC触发摸怪任务事件

            EventShell.EventRespons_OnKillByFeel(curPlayer, curNPC)

@@ -5140,21 +5301,9 @@
    

    # 采集次数判断

    limitMaxTime, todayCollTime = 0, 0

    npcFuncType = curNPC.GetFunctionType()

    npcFuncCollectCntLimitDict = ReadChConfig.GetEvalChConfig('CollectNPCFuncTimeLimit')

    if npcFuncType in npcFuncCollectCntLimitDict:

        vipLV = curPlayer.GetVIPLv()

        limitMaxTime = eval(npcFuncCollectCntLimitDict[npcFuncType])

        todayBuyTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcBuyTime % npcFuncType)

        todayCollTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcCollTime % npcFuncType)

        limitMaxTime += todayBuyTime

        GameWorld.DebugLog("    vipLV=%s,maxTime=%s,todayTime=%s,todayBuyTime=%s" % (vipLV, limitMaxTime, todayCollTime, todayBuyTime))

        
    npcIDCollectCntLimitDict = ReadChConfig.GetEvalChConfig("CollectNPCIDTimeLimit")

    if npcID in npcIDCollectCntLimitDict:

        limitMaxTime = npcIDCollectCntLimitDict[npcID][0]

        todayCollTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcIDCollTime % npcID)

        GameWorld.DebugLog("    maxTime=%s,todayTime=%s" % (limitMaxTime, todayCollTime))

    collLimitInfo = GetCollTimeLimitInfo(curPlayer, npcID)

    if collLimitInfo:

        limitMaxTime, todayCollTime = collLimitInfo

        

    if limitMaxTime > 0 and todayCollTime >= limitMaxTime:

        

@@ -5203,6 +5352,19 @@
    AttackCommon.AddHurtValue(curNPC, curPlayer.GetPlayerID(), ChConfig.Def_NPCHurtTypePlayer, 1)

    return



def GetCollTimeLimitInfo(curPlayer, npcID):

    ## 获取采集次数限制信息

    npcIDCollectCntLimitDict = ReadChConfig.GetEvalChConfig("CollectNPCIDTimeLimit")

    for npcIDTuple in npcIDCollectCntLimitDict.keys():

        if npcID not in npcIDTuple:

            continue

        limitMaxTime = npcIDCollectCntLimitDict[npcIDTuple][0]

        todayCollTime = 0

        for collNPCID in npcIDTuple:

            todayCollTime += curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcIDCollTime % collNPCID)

        GameWorld.DebugLog("    limitMaxTime=%s,todayCollTime=%s" % (limitMaxTime, todayCollTime))

        return limitMaxTime, todayCollTime

    return



## 设置玩家采集该NPC

#  @param curPlayer：玩家实例

@@ -5287,11 +5449,11 @@
    openCnt = clientData.OpenCnt

    isAutoBuy = clientData.IsAutoBuy

    isOnlyGold = clientData.IsOnlyGold

    npcIDCollectCntLimitDict = ReadChConfig.GetEvalChConfig("CollectNPCIDTimeLimit")

    if npcID not in npcIDCollectCntLimitDict:

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    collLimitInfo = GetCollTimeLimitInfo(curPlayer, npcID)

    if not collLimitInfo:

        GameWorld.DebugLog("该NPC不是自定义采集NPC箱子, 不可开启! npcID=%s" % npcID)

        return

    curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)

    GameWorld.DebugLog("OnOpenCollNPCBox...npcID=%s,openCnt=%s,isAutoBuy=%s" % (npcID, openCnt, isAutoBuy))

    DoGetCollectionNPCAwardLogic(curPlayer, npcID, isAutoBuy, openCnt, mapID, isOnlyGold)

    return

@@ -5321,22 +5483,14 @@
    curNPC = GameWorld.GetGameData().FindNPCDataByID(npcID)

    if not curNPC:

        return True



    # 根据NPC功能号

    npcFuncType = curNPC.GetFunctionType()

    npcFuncCollectCntLimitDict = ReadChConfig.GetEvalChConfig('CollectNPCFuncTimeLimit')

    
    limitMaxTime = 0 # 0表示不限制次数

    todayCollTime = 0

    if npcFuncType in npcFuncCollectCntLimitDict:

        vipLV = curPlayer.GetVIPLv()

        todayCollTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcCollTime % npcFuncType)

        limitMaxTime = eval(npcFuncCollectCntLimitDict[npcFuncType])

    

    # 根据NPCID

    npcIDCollectCntLimitDict = ReadChConfig.GetEvalChConfig("CollectNPCIDTimeLimit")

    if npcID in npcIDCollectCntLimitDict:

        limitMaxTime = npcIDCollectCntLimitDict[npcID][0]

        todayCollTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcIDCollTime % npcID)

    collLimitInfo = GetCollTimeLimitInfo(curPlayer, npcID)

    if collLimitInfo:

        limitMaxTime, todayCollTime = collLimitInfo

        

    if limitMaxTime > 0:

        canCollectCnt = max(0, limitMaxTime - todayCollTime)

@@ -5438,20 +5592,13 @@
                               % (unCostCnt, itemGold, reduceGold), curPlayer.GetPlayerID())

        

    # 增加当日采集次数

    if limitMaxTime > 0:

    if collLimitInfo:

        updCollTime = todayCollTime + successCnt

        npcFuncType = curNPC.GetFunctionType()

        npcFuncCollectCntLimitDict = ReadChConfig.GetEvalChConfig('CollectNPCFuncTimeLimit')

        if npcFuncType in npcFuncCollectCntLimitDict:

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcCollTime % npcFuncType, updCollTime)

            SyncCollNPCTime(curPlayer, [npcFuncType])

                    
        if npcID in npcIDCollectCntLimitDict:

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcIDCollTime % npcID, updCollTime)

            SyncCollNPCTime(curPlayer, npcIDList=[npcID])

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcIDCollTime % npcID, updCollTime)

        SyncCollNPCTime(curPlayer, npcIDList=[npcID])

        GameWorld.DebugLog("        增加当日采集次数: todayCollTime=%s,updCollTime=%s" % (todayCollTime, updCollTime))

        #采集成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Collect, successCnt, [npcID])

    #采集成就

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_Collect, successCnt, [npcID])

    SyncCollectionItemInfo(curPlayer, addExp, addMoney, addZhenQi, giveItemInfoList, npcID)

    #DataRecordPack.DR_CollectNPCOK(curPlayer, npcID, addMoney, addExp, addZhenQi, giveItemInfoList)

    return True

@@ -5628,24 +5775,11 @@
#  @param funcType：功能号，默认为0，即同步配表中全部

#  @return None

def SyncCollNPCTime(curPlayer, funcTypeList=[], npcIDList=[]):

    if not funcTypeList:

        npcFuncCollectCntLimitDict = ReadChConfig.GetEvalChConfig('CollectNPCFuncTimeLimit')

        funcTypeList = npcFuncCollectCntLimitDict.keys()

        
    if not npcIDList:

        collectNPCIDTimeLimit = ReadChConfig.GetEvalChConfig('CollectNPCIDTimeLimit')

        npcIDList = collectNPCIDTimeLimit.keys()

    
#    if funcTypeList:

#        collection = ChPyNetSendPack.tagMCFuncNPCCollectionCnt()

#        for fType in funcTypeList:

#            todayCollTime = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcCollTime % fType)

#            collection.Clear()

#            collection.FuncType = fType

#            collection.CollectionCnt = todayCollTime

#            collection.BuyCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_CollNpcBuyTime % fType)

#            NetPackCommon.SendFakePack(curPlayer, collection)

        
        for npcIDTuple in collectNPCIDTimeLimit.keys():

            npcIDList += list(npcIDTuple)

            
    if npcIDList:

        npcIDCollInfo = ChPyNetSendPack.tagMCNPCIDCollectionCntInfo()

        npcIDCollInfo.Clear()

@@ -5665,18 +5799,13 @@
#  @param curPlayer：玩家实例

#  @return None

def CollNPCTimeOnDay(curPlayer, funcTypeList=[]):

    npcFuncCollectCntLimitDict = ReadChConfig.GetEvalChConfig('CollectNPCFuncTimeLimit')

    funcTypeList = npcFuncCollectCntLimitDict.keys() if not funcTypeList else funcTypeList

    for funcType in funcTypeList:

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcCollTime % funcType, 0)

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcBuyTime % funcType, 0)

    
    collectNPCIDTimeLimit = ReadChConfig.GetEvalChConfig('CollectNPCIDTimeLimit')

    for npcID, collCntInfo in collectNPCIDTimeLimit.items():

    for npcIDTuple, collCntInfo in collectNPCIDTimeLimit.items():

        isResetOnDay = collCntInfo[1]

        if not isResetOnDay:

            continue

        PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcIDCollTime % npcID, 0)        
        for npcID in npcIDTuple:

            PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_CollNpcIDCollTime % npcID, 0)        
    

    SyncCollNPCTime(curPlayer)

    return

@@ -5764,28 +5893,43 @@
#  @param queryNPCIDList：查询的NPCID列表

#  @param tick

#  @return {NPCID:cnt}

def GetNPCCntInfo(queryNPCIDList, tick):

def GetNPCCntInfo(queryNPCIDList, tick, copyMapID=None):

    npcCntDict = {}



    if not queryNPCIDList:

        return npcCntDict

    #if not queryNPCIDList:

    #    return npcCntDict

    

    gameNPCManager = GameWorld.GetNPCManager()

    GameWorld.DebugLog("GetNPCCntInfo...queryNPCIDList=%s" % (str(queryNPCIDList)))



    for index in xrange(gameNPCManager.GetNPCCount()):

        curNPC = gameNPCManager.GetNPCByIndex(index)

        curID = curNPC.GetID()

        if curID == 0:

            continue

        
        curNPCID = curNPC.GetNPCID()

        
        if curNPCID not in queryNPCIDList:

            continue

        if curNPC.GetCurAction() == IPY_GameWorld.laNPCDie or not curNPC.IsAlive():

            continue

        npcCntDict[curNPCID] = npcCntDict.get(curNPCID, 0) + 1

    
    if isinstance(copyMapID, int):

        for index in xrange(gameNPCManager.GetNPCCountByGWIndex(copyMapID)):

            curNPC = gameNPCManager.GetNPCByIndexByGWIndex(copyMapID, index)

            curID = curNPC.GetID()

            if curID == 0:

                continue

            
            curNPCID = curNPC.GetNPCID()

            
            if queryNPCIDList and curNPCID not in queryNPCIDList:

                continue

            if curNPC.GetCurAction() == IPY_GameWorld.laNPCDie or not curNPC.IsAlive():

                continue

            npcCntDict[curNPCID] = npcCntDict.get(curNPCID, 0) + 1

    else:

        for index in xrange(gameNPCManager.GetNPCCount()):

            curNPC = gameNPCManager.GetNPCByIndex(index)

            curID = curNPC.GetID()

            if curID == 0:

                continue

            
            curNPCID = curNPC.GetNPCID()

            
            if queryNPCIDList and curNPCID not in queryNPCIDList:

                continue

            if curNPC.GetCurAction() == IPY_GameWorld.laNPCDie or not curNPC.IsAlive():

                continue

            npcCntDict[curNPCID] = npcCntDict.get(curNPCID, 0) + 1

                

    GameWorld.DebugLog("    npcCntDict=%s" % (str(npcCntDict)))

    return npcCntDict

@@ -5812,7 +5956,7 @@
    NetPackCommon.SendFakePack(curPlayer, npcInfoPack)

    return



def SendGameServerGoodItemRecord(mapID, npcID, playerName, playerID, itemID, equipInfo=[]):

def SendGameServerGoodItemRecord(mapID, npcID, playerName, playerID, itemID, equipInfo=[], serverGroupID=0):

    # @param equipInfo: [equipPlace, itemClassLV, itemColor, itemQuality, itemUserData]

#    GameWorld.DebugLog("检查物品是否发送GameServer: mapID=%s, npcID=%s, playerName=%s, itemID=%s" 

#                       % (mapID, npcID, playerName, itemID))

@@ -5843,13 +5987,9 @@
    if not needRecord:

        return

    

    dropEquipMsg = str([playerID, playerName, mapID, npcID, itemID, itemUserData, weightValue])

    dropEquipMsg = str([playerID, playerName, mapID, npcID, itemID, itemUserData, weightValue, serverGroupID])

    GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'BossDropGoodItem', dropEquipMsg, len(dropEquipMsg))

    GameWorld.DebugLog("发送GameServer记录拾取掉落好物品: %s" % dropEquipMsg, playerID)

    
    msgList = [playerName, playerID, mapID, npcID, itemID, itemUserData]

    
    PlayerControl.WorldNotify(0, 'DropRecord' , msgList)

    return



#// A5 52 购买功能NPC采集次数 #tagCMBuyCollectionCnt

@@ -5981,3 +6121,13 @@
    GameWorld.DebugLog("通知GameServer地图Boss分流信息: mapID=%s,lineID=%s,shuntPlayerDict=%s" % (mapID, lineID, shuntPlayerDict), lineID)

    return



def NPCSpeedChangeNotify(curNPC, speed):

    ##通知NPC速度

    sendPack = ChNetSendPack.tagObjInfoRefresh()

    sendPack.Clear()

    sendPack.ObjID = curNPC.GetID()

    sendPack.ObjType = curNPC.GetGameObjType()

    sendPack.RefreshType = IPY_GameWorld.CDBPlayerRefresh_Speed

    sendPack.Value = speed

    curNPC.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength())

    return