From f47ea60f59e0b2b8601583351e269151237c6708 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 28 一月 2019 11:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into SpringFestival
---
Fight/Actor/HeroBehaviour.cs | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index 7020d67..a1e9c22 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -150,15 +150,10 @@
}
_data.defaultSkillID = m_WillUsedSkillID;
m_Hero.aiHandler.currentType = E_HeroAIType.KillUntilDie;
- if (AI_BossDSX.GetStep() == 1)
+
+ if (OnUserClickSkill != null)
{
- if (m_WillUsedSkillID == 190)
- {
- if (OnUserClickSkill != null)
- {
- OnUserClickSkill(m_WillUsedSkillID);
- }
- }
+ OnUserClickSkill(m_WillUsedSkillID);
}
}
else
@@ -423,7 +418,8 @@
{
if (m_Hero.aiHandler.IsAuto())
{
- if (m_Hero.LockTarget != null)
+ GActorFight _fight = m_Hero.LockTarget as GActorFight;
+ if (_fight != null && _fight.CanAtked())
{
_realDir = m_Hero.Forward = MathUtility.ForwardXZ(m_Hero.LockTarget.Pos, m_Hero.Pos);
}
@@ -451,7 +447,8 @@
if (skill.skillInfo.config.Skillactmark != GAStaticDefine.Act_Roll
&& skill.skillInfo.config.AtkType != (int)E_AtkType.FlashMove)
{
- if (m_Hero.LockTarget != null)
+ GActorFight _fight = m_Hero.LockTarget as GActorFight;
+ if (_fight != null && _fight.CanAtked())
{
skill.targetPosition = m_Hero.LockTarget.Pos;
}
@@ -465,7 +462,8 @@
{
Vector3 _dir;
float _radius = 0.5f;
- if (m_Hero.LockTarget != null)
+ GActorFight _fight = m_Hero.LockTarget as GActorFight;
+ if (_fight != null && _fight.CanAtked())
{
GActorNpcFight _npcFight = m_Hero.LockTarget as GActorNpcFight;
if (_npcFight != null)
@@ -479,7 +477,7 @@
else if (m_Hero.SelectTarget != null)
{
GActorNpcFight _npcFight = m_Hero.SelectTarget as GActorNpcFight;
- if (_npcFight != null)
+ if (_npcFight != null && _fight.CanAtked())
{
_radius = _npcFight.NpcConfig.ModelRadius;
}
--
Gitblit v1.8.0