From a49287c1591671d95952114f04db742c1507de13 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 20 八月 2024 15:01:53 +0800
Subject: [PATCH] 10223 10238 10241 【越南】【砍树】【主干】【港台】仙匣秘境、骑宠养成、古宝养成增加可配置是否关联跨服活动；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
index 647fb07..c24f3bd 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.py
@@ -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)
@@ -114,7 +119,7 @@
#通知玩家
if curTagPlayer.GetMapID() != ChConfig.Def_FBMapID_XMZZ:
if curNormalNPC.GetType() == ChConfig.ntRobot:
- PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetObjID(), curNormalNPC.GetNPCID()])
+ PlayerControl.NotifyCode(curTagPlayer, 'RobotKill_1', [curNormalNPC.GetID(), curNormalNPC.GetNPCID()])
else:
PlayerControl.NotifyCode(curTagPlayer, 'GeRen_chenxin_279029', [curNormalNPC.GetNPCID()])
#玩家已经死亡
--
Gitblit v1.8.0