From 09053388ef6d58a7de59fab450c11ee0affbceb2 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 20 Nov 2020 11:50:55 +0800
Subject: [PATCH] Merge commit 'fafc11ad74601a1c4e4b2e28165af25bd19bb5a9' into master
---
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
index b4ac36b..506d919 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
@@ -206,13 +206,15 @@
{
if (isPaused) return;
+ cdList.Clear();
+ waitList.Clear();
+
for (int i = 0; i < skillList.Count; ++i)
{
skillList[i].Reset();
+ waitList.Add(skillList[i]);
}
- cdList.Clear();
- waitList.Clear();
isPaused = true;
ChangeState(EndlessBossSkillState.Init);
ClearEvent();
--
Gitblit v1.9.1