129 【战斗】战斗系统-服务端（修复无法取非主线阵容进行战斗bug）

hxp

2025-10-21 6e0663eac07558bf0e680ef3470e7bc45e2d8c28

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

@@ -40,8 +40,6 @@
import DataRecordPack

import NetPackCommon

import FBCommon

import PlayerActivity

import PlayerSuccess

import PlayerPrestigeSys

import GY_Query_BossFirstKill

import FormulaControl

@@ -57,9 +55,8 @@
import NPCRealmRefresh

import PlayerActLogin

import PlayerActTask

import PlayerZhanling

#import PlayerZhanling

import IpyGameDataPY

import PlayerGubao

import PlayerState

import TurnAttack

import PyGameData

@@ -825,12 +822,12 @@
    # 暗金boss

    if ChConfig.IsGameBoss(curNPC): 

        # 通知GameServer boss状态 封魔坛在副本里单独处理

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

        if ipyData and ipyData.GetMapID() not in [ChConfig.Def_FBMapID_SealDemon, ChConfig.Def_FBMapID_ZhuXianBoss]:

            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())

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

        #if ipyData and ipyData.GetMapID() not in [ChConfig.Def_FBMapID_SealDemon, ChConfig.Def_FBMapID_ZhuXianBoss]:

        #    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())

            

        ChNPC.OnNPCSetDead(curNPC)

        

@@ -906,77 +903,6 @@
    return



def OnPlayerKillBoss(curPlayer, npcID, mapID, isCrossServer):

    npcData = GameWorld.GetGameData().FindNPCDataByID(npcID)

    if not npcData:

        return

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

    limitIndex = GameWorld.GetDictValueByKey(killBossCntLimitDict, npcID)

    if limitIndex != None:

        totalKey = ChConfig.Def_PDict_Boss_KillCntTotal % limitIndex

        totalCnt = min(curPlayer.NomalDictGetProperty(totalKey, 0) + 1, ChConfig.Def_UpperLimit_DWord)

        PlayerControl.NomalDictSetProperty(curPlayer, totalKey, totalCnt)

        #今日杀怪次数+1

        key = ChConfig.Def_PDict_Boss_KillCnt % limitIndex

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

        PlayerControl.NomalDictSetProperty(curPlayer, key, newCnt)

        GameWorld.DebugLog("更新击杀Boss次数: index=%s, todayCnt=%s, totalCnt=%s" % (limitIndex, newCnt, totalCnt), curPlayer.GetPlayerID())

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

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

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

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_KillBoss, 1, [limitIndex])

        PlayerState.SetBossStateExit(curPlayer)

        
    if isCrossServer:

        return

    
    if limitIndex == ShareDefine.Def_Boss_Func_World:

        # 世界BOSS击杀成就

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

        PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillWorldBoss, 1)

        # 每日活动

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_WorldBOSS)

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

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

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_WorldBoss, 1)

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

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_WorldBoss, 1)

        PlayerZhanling.AddZhanlingValue(curPlayer, PlayerZhanling.ZhanlingType_Huanjingge, 1)

        PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_WorldBoss, 1)

        
    elif limitIndex == ShareDefine.Def_Boss_Func_Home:

        #BOSS之家

        # BOSS之家BOSS击杀成就

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

        PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillBossHome, 1)

        # 每日活动

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_BOSSHome)

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

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

        PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_BossHome, 1)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_BossHome, 1)

        
    if mapID == ChConfig.Def_FBMapID_CrossPenglai:

        #跨服蓬莱仙境

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossPenglai)

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

        PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillCrossPenglaiBoss, 1)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_CrossPenglaiBoss, 1)

    elif mapID == ChConfig.Def_FBMapID_CrossDemonLand:

        #跨服魔化之地

        PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_CrossDemonLand)

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

        PlayerGubao.AddGubaoItemEffValue(curPlayer, PlayerGubao.GubaoEffType_KillCrossDemonLandBoss, 1)

        PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_CrossDemonLandBoss, 1)

    if mapID in [ChConfig.Def_FBMapID_CrossPenglai, ChConfig.Def_FBMapID_CrossDemonLand]:

        PlayerTongTianLing.AddTongTianTaskValue(curPlayer, ChConfig.TTLTaskType_CrossBoss, 1)

        
    # 个人首杀记录

    ipyData = IpyGameDataPY.GetIpyGameDataNotLog("BOSSFirstKill", npcID)

    if ipyData:

        GY_Query_BossFirstKill.SetPlayerFirstKillBoss(curPlayer, npcID)

    #Boss投资

    PlayerGoldInvest.OnKillBoss(curPlayer, npcID)

    return

    

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

@@ -2490,13 +2416,13 @@
        #杀死NPC, 触发任务

        self.__EventKillNpc()

            

        mapID = GameWorld.GetMap().GetMapID()

        killerName = "" if not self.__Killer else self.__Killer.GetPlayerName()

        # 记录boss击杀信息的NPC

        bossIpyData = IpyGameDataPY.GetIpyGameDataListNotLog('BOSSInfo', npcID)

        if bossIpyData and mapID not in [ChConfig.Def_FBMapID_ZhuXianBoss, ChConfig.Def_FBMapID_SealDemon]:

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

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

        #mapID = GameWorld.GetMap().GetMapID()

        #killerName = "" if not self.__Killer else self.__Killer.GetPlayerName()

        ## 记录boss击杀信息的NPC

        #bossIpyData = IpyGameDataPY.GetIpyGameDataListNotLog('BOSSInfo', npcID)

        #if bossIpyData and mapID not in [ChConfig.Def_FBMapID_ZhuXianBoss, ChConfig.Def_FBMapID_SealDemon]:

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

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

            

        if npcID == IpyGameDataPY.GetFuncCfg("BossRebornServerBoss", 3):

            PlayerControl.WorldNotify(0, "BossRebornBossKilled", [curNPC.GetNPCID()])

@@ -3205,9 +3131,7 @@
            FBLogic.DoFB_DropOwner(curPlayer , curNPC)

        else:

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

                PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_KillNPC)

                PlayerActTask.AddActTaskValue(curPlayer, ChConfig.ActTaskType_KillNPC)

            PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_FeastRedPack_KillSpecificNPC, 1, [npcID])

        #PlayerPrestigeSys.AddRealmTaskValue(curPlayer, PlayerPrestigeSys.RealmTaskType_KillNPC, 1)

        

        if ChConfig.IsGameBoss(curNPC):

@@ -3233,10 +3157,6 @@
        #不是普通NPC    

        elif npcObjType != IPY_GameWorld.gnotNormal:

            return

        npcID = curNPC.GetNPCID()

        #GameWorld.DebugLog("__MissionOnKillNPC isFeel=%s" % (isFeel), curPlayer.GetPlayerID())

        #击杀特定NPC成就

        PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_KillSpecificNPC, 1, [npcID])

        return

        

    def __GetIsLog(self):