From 51fab14cee367849d673ccf9a0809c68cac843fc Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 30 八月 2018 23:49:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/Actor/HeroBehaviour.cs | 62 ++----------------------------
1 files changed, 5 insertions(+), 57 deletions(-)
diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index b5340f3..618c007 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -116,61 +116,6 @@
m_WillUsedSkillID = skillID;
- GActorFight _fightTarget = m_Hero.LockTarget as GActorFight;
-
- if (_fightTarget != null)
- {
- m_Hero.SelectTarget = _fightTarget;
- }
- else
- {
- _fightTarget = m_Hero.SelectTarget as GActorFight;
-
- if (_fightTarget != null && _fightTarget.CanAtked())
- {
- m_Hero.LockTarget = m_Hero.SelectTarget;
- }
- else
- {
- float _range = m_Hero.JobSetup.SearchEnemyDist * Constants.F_DELTA;
- m_Hero.LockTarget = m_Hero.SelectTarget = GAMgr.Instance.FindAtkTarget(m_Hero.Pos, _range, 360);
- }
- }
-
- _fightTarget = m_Hero.SelectTarget as GActorFight;
-
- // 鎵句笉鍒板彲浠ユ敾鍑荤殑鐩爣, 杩欓噷鐩存帴閲婃斁鎶�鑳�
- if (_fightTarget == null
- || !_fightTarget.CanAtked()
- || (_skill.skillInfo.config.Skillactmark == GAStaticDefine.Act_Roll
- && !m_Hero.IsRushing))
- {
- bool _canCast = true;
-
- if (m_Hero.SkillMgr.CurCastSkill != null)
- {
- if (m_Hero.SkillMgr.CurCastSkill.SkillCompelete == false)
- {
- _canCast = false;
- }
- }
-
- if (_canCast)
- {
- if (skillID >= 0 && !IsComAtk(skillID))
- {
- DoAttack(_skill);
- }
- else
- {
- DoCommonAttack();
- }
- }
-
- m_WillUsedSkillID = -1;
- return;
- }
-
if (_skill.skillInfo.config.CastTime > 0)
{
_skill.CSkillPrepareEnd = false;
@@ -180,12 +125,15 @@
{
byte _type = (byte)E_HeroAIType.KillUntilDie;
KillUntilDieData _data = m_Hero.aiHandler.aiData[_type] as KillUntilDieData;
- _data.targetServerInstID = m_Hero.SelectTarget.ServerInstID;
+ if (m_Hero.SelectTarget != null)
+ {
+ _data.targetServerInstID = m_Hero.SelectTarget.ServerInstID;
+ }
_data.defaultSkillID = m_WillUsedSkillID;
m_Hero.aiHandler.currentType = E_HeroAIType.KillUntilDie;
}
- if(OnUserClickSkill != null)
+ if (OnUserClickSkill != null)
{
OnUserClickSkill(m_WillUsedSkillID);
}
--
Gitblit v1.8.0