From ce7efae14eb31bcdfa0d540da6a1ef1457e046ab Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 04 Nov 2020 21:27:39 +0800
Subject: [PATCH] Merge commit '80b4237334a773b29bf69f38532a90ca659b3bfe' into master
---
Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
index f2aa107..28cdbb7 100644
--- a/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
+++ b/Assets/Scripts/TowerDefense/Affectors/AttackAffector.cs
@@ -176,8 +176,8 @@
towerTargetter.ResetTargetter();
towerTargetter.alignment = affectorAlignment;
towerTargetter.acquiredTarget += OnAcquiredTarget;
- towerTargetter.lostTarget += OnLostTarget;
- GetAudioEnum();
+ // towerTargetter.lostTarget += OnLostTarget;
+ GetAudioEnum();
}
private AudioEnum audioEnum;//当前音乐的种类
@@ -203,17 +203,12 @@
void OnDestroy()
{
towerTargetter.acquiredTarget -= OnAcquiredTarget;
- towerTargetter.lostTarget -= OnLostTarget;
- }
-
- void OnLostTarget()
- {
- m_TrackingEnemy = null;
+ // towerTargetter.lostTarget -= OnLostTarget;
}
void OnAcquiredTarget(Targetable acquiredTarget)
{
- m_TrackingEnemy = acquiredTarget;
+ // m_TrackingEnemy = acquiredTarget;
}
public Damager damagerProjectile
@@ -320,6 +315,8 @@
/// </summary>
protected virtual void Update()
{
+ if (m_Launcher == null) return;
+
// 处理当前Affector所在Tower对应的技能
updateTowerSkillData();
@@ -330,7 +327,6 @@
{
OnFireTimer();
m_FireTimer = 1 / fireRate;
-
// 多倍攻速：
if (fInEnergy > 0.0f)
m_FireTimer = m_FireTimer / 3.0f;
@@ -385,6 +381,11 @@
fillBulletTime = 2.0f;
}
}
+ else
+ {
+ if (this.towerPtr)
+ towerPtr.setTowerState(true);
+ }
if (isMultiAttack)
{
--
Gitblit v1.9.1