129 【战斗】战斗系统-服务端（NPC、技能使用新表N.NPC表卡牌、J.技能表卡牌；重构战斗系统；优化战利品掉落；）

hxp

2025-08-06 efc4f490488935020d1b58a451a396ee420de9da

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py

@@ -454,7 +454,7 @@
            return heroIpyData.GetAtkDistType()

        

    npcID = curObj.GetNPCID()

    npcDataEx = NPCCommon.GetNPCDataEx(npcID)

    npcDataEx = NPCCommon.GetNPCDataPy(npcID)

    if npcDataEx:

        return npcDataEx.GetAtkDistType()

    

@@ -872,14 +872,14 @@
                PlayerControl.NotifyCode(atkPlayer, sysMark)

        return False

    

    npcDataEx = NPCCommon.GetNPCDataEx(npcID)

    if npcDataEx and npcDataEx.GetFightPowerLackAtkLimit():

        if npcDataEx.GetSuppressFightPower() > PlayerControl.GetFightPower(atkPlayer):

            if isNotify:

                PlayerControl.NotifyCode(atkPlayer, "BossFightPowerHint") 
            #GameWorld.DebugLog("战力不足，无法攻击boss! npcID=%s,SuppressFightPower=%s > playerFightPower=%s" 
            #                   % (npcID, npcDataEx.GetSuppressFightPower(), PlayerControl.GetFightPower(atkPlayer)))               
            return False

    #npcDataEx = NPCCommon.GetNPCDataPy(npcID)

    #if npcDataEx and npcDataEx.GetFightPowerLackAtkLimit():

    #    if npcDataEx.GetSuppressFightPower() > PlayerControl.GetFightPower(atkPlayer):

    #        if isNotify:

    #            PlayerControl.NotifyCode(atkPlayer, "BossFightPowerHint") 
    #        #GameWorld.DebugLog("战力不足，无法攻击boss! npcID=%s,SuppressFightPower=%s > playerFightPower=%s" 
    #        #                   % (npcID, npcDataEx.GetSuppressFightPower(), PlayerControl.GetFightPower(atkPlayer)))               
    #        return False

        

    return True



@@ -2150,9 +2150,6 @@
        aBurnValue = atkwargs.get('burnValue', 0)

        aBurnPer = atkwargs.get('burnPer', 0)

        hurtFormulaKey = atkwargs.get('hurtFormulaKey', None)

        #if hurtFormulaKey == "Burn":

        #    pass

        #else:

        hurtValue = eval(IpyGameDataPY.GetFuncCompileCfg("DOTFormula", 1))

    elif not curSkill:

        hurtValue = eval(IpyGameDataPY.GetFuncCompileCfg("HurtFormula", 3))

@@ -2240,7 +2237,7 @@
        else:

            defObj.SetDict(ChConfig.Def_PlayerKey_LastAttackerObjID, atkObj.GetID())

            

    TurnAttack.AddTurnObjHurtValue(atkObj, defObj, resultHurtType.HurtType, resultHurtType.RealHurtHP, resultHurtType.LostHP, curSkill)

    #TurnAttack.AddTurnObjHurtValue(atkObj, defObj, resultHurtType.HurtType, resultHurtType.RealHurtHP, resultHurtType.LostHP, curSkill)

    

    #if resultHurtType.RealHurtHP:

    #    PassiveBuffEffMng.OnPassiveSkillTrigger(defObj, atkObj, None, ChConfig.TriggerType_BeHurt, tick)

@@ -2708,8 +2705,8 @@
    if GameObj.GetHP(curObjDetel) > 0:

        return

    

    if TurnAttack.SetTurnObjKilled(curObjDetel, atkObj):

        return

    #if TurnAttack.SetTurnObjKilled(curObjDetel, atkObj):

    #    return

        

    #---玩家处理---

    if curObjDetel.GetGameObjType() == IPY_GameWorld.gotPlayer:

@@ -2787,7 +2784,7 @@
    srcID, srcType = 0, 0

    if srcObj:

        srcID, srcType = srcObj.GetID(), srcObj.GetGameObjType()

    turnFight = TurnAttack.GetTurnFightMgr().getNPCTurnFight(curObj.GetID())

    turnFight = TurnAttack.GetTurnFightMgr().getTurnFight(curObj.GetTFGUID())

    if turnFight:

        clientPack = ChNetSendPack.tagObjPropertyRefreshView()

        clientPack.ObjID = curObj.GetID()