From bbe2fbfada9e2b2c53b0101c72dd6f040c87c8af Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 23 五月 2019 17:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/HazyRegion_1'
---
Fight/Actor/Skill/AttackHandler.cs | 16 ++++++++--------
Fight/Actor/HeroBehaviour.cs | 5 +++++
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index a5e8f0a..cbb6967 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -898,6 +898,11 @@
{
_target = GAMgr.Instance.GetByCID(skill.hitClientBattleTargetList[i]) as GActorFight;
+ if (PersonalEnemy.m_CBinSdDict.ContainsKey(_target.ServerInstID))
+ {
+ continue;
+ }
+
AttackHandler.HurtObjs _hurtObject = new AttackHandler.HurtObjs
{
ObjID = (uint)_target.ServerInstID,
diff --git a/Fight/Actor/Skill/AttackHandler.cs b/Fight/Actor/Skill/AttackHandler.cs
index 082d15c..1793e9c 100644
--- a/Fight/Actor/Skill/AttackHandler.cs
+++ b/Fight/Actor/Skill/AttackHandler.cs
@@ -237,14 +237,14 @@
if (_doReduceHp)
{
- if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)
- {
- target.ActorInfo.ReduceHp((uint)hurtValue);
- }
- else
- {
- target.ActorInfo.ReduceHp((uint)realHurtValue);
- }
+ // if (attacker is GA_NpcClientFightNorm || target is GA_NpcClientFightNorm)
+ // {
+ // target.ActorInfo.ReduceHp((uint)hurtValue);
+ // }
+ // else
+ // {
+ target.ActorInfo.ReduceHp((uint)realHurtValue);
+ // }
}
if (target.ServerInstID == PlayerDatas.Instance.baseData.PlayerID)
--
Gitblit v1.8.0