From 953bd094847c309b46030593d120e56d30a4544e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Tue, 10 Nov 2020 09:54:29 +0800
Subject: [PATCH] Merge commit '820e4f5728b5ec6ec6d7d9395b86c54e210c116c' into master
---
Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
index 61e32c0..792ca26 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossCtrl.cs
@@ -84,6 +84,11 @@
// 召唤动作结束后自动切换到站立状态
ChangeState(EndlessBossActionState.Standing);
}
+ else if (frameName == "death")
+ {
+ BossAnimator.speed = 0;
+ EventCenter.Ins.BroadCast((int)EventType.EndlessBossDeathActionEnd);
+ }
}
/// <summary>
@@ -92,9 +97,10 @@
/// <param name="newState"></param>
public void ChangeState(EndlessBossActionState newState)
{
- if (newState == ActionState) return;
-
ActionState = newState;
+
+ if (newState == EndlessBossActionState.Standing || newState == EndlessBossActionState.Summon)
+ BossAnimator.speed = 1;
BossAnimator.SetInteger("State", (int)newState);
}
}
--
Gitblit v1.9.1