ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
@@ -22,7 +22,7 @@
import ChEquip
import GameWorld
import EventShell
import SkillShell
import FBLogic
import GameObj
import NPCCommon
import ChNPC
@@ -62,8 +62,13 @@
        return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
    
    defenderCampType = NPCCommon.GetFaction(curNormalNPC)
    tagFaction = curTagPlayer.GetFaction()
    if tagFaction and defenderCampType:
        if tagFaction == defenderCampType:
            return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
        return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
    #正义的 不攻击玩家 宠物以及玩家的召唤兽
    if defenderCampType == ChConfig.CampType_Justice:
    elif defenderCampType == ChConfig.CampType_Justice:
        return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_None
    
    return ChConfig.Type_Relation_Enemy , ChConfig.Def_PASysMessage_None
@@ -87,7 +92,7 @@
    lastHP = curNPCBeHP - GameObj.GetHP(curNormalNPC)
    if lastHP > 0 :
        #添加伤血列表
        AttackCommon.NPCAddObjInHurtList(curTagPlayer, curNormalNPC, curNPCBeHP, lastHP)
        AttackCommon.NPCAddObjInHurtList(curTagPlayer, curNormalNPC, curNPCBeHP, lastHP, True)
    #给这个玩家的召唤兽增加仇恨
    AttackCommon.SummonAddAngryByOwner(curNormalNPC, curTagPlayer, hurtHP)
    #添加技能伤害通知列表,(用于攻击结束,统一通知客户端)
@@ -104,7 +109,7 @@
def AttackResult(curNormalNPC, curTagPlayer, skill, tick):
    #玩家活着
    if curTagPlayer.GetHP() > 0:
    if GameObj.GetHP(curTagPlayer) > 0:
        #被攻击玩家进入战斗状态
        AttackCommon.OnNPCHitPlayer(curNormalNPC, curTagPlayer, tick)
        AttackCommon.SetPlayerBattleState(curTagPlayer, tick)
@@ -113,11 +118,14 @@
    else:
        #通知玩家
        if curTagPlayer.GetMapID() != ChConfig.Def_FBMapID_XMZZ:
            PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
            if curNormalNPC.GetType() == ChConfig.ntRobot:
                PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetID(), curNormalNPC.GetNPCID()])
            else:
                PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
        #玩家已经死亡
        playerControl = PlayerControl.PlayerControl(curTagPlayer)
        playerControl.SetDead()
        FBLogic.DoFBOnNPCKill_Player(curNormalNPC, curTagPlayer, tick)
        #触发玩家死亡事件
        EventShell.EventRespons_PlayerEvent(curTagPlayer, "player_dead")
    return True