From df178fec76b6f6fed0326ff9f07bef2206dd75f9 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Fri, 04 Dec 2020 18:11:17 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
index 83117e5..9cf4812 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBossSkill/EndlessBossSkillManager.cs
@@ -1,4 +1,3 @@
-using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Core.Utilities;
@@ -69,7 +68,7 @@
// Update is called once per frame
private void Update()
{
- if (isPaused || EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return;
+ if (isPaused || EndlessGameUI.instance.state == EndlessGameUI.State.GameOver || !EndlessUIStart.instance.IsGameRunning) return;
for (int i = 0; i < skillList.Count; ++i)
{
@@ -131,7 +130,7 @@
{
currentSkill = cdList[i];
EventCenter.Ins.Add((int)KTGMGemClient.EventType.EndlessBossSkillGlintTitleCompleted, OnGlintTitleCompleted);
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBossSkillGlintTitle);
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBossSkillGlintTitle, (int)cdList[i].SkillType);
isFloatWordCompleted = false;
ChangeState(EndlessBossSkillState.FloatWord);
break;
@@ -206,13 +205,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();
@@ -262,6 +263,8 @@
return new BossSkillBubbleBomb(data);
case EndlessBossSkillType.WoodPile:
return new BossSkillWoodPile(data);
+ case EndlessBossSkillType.BondageBubble:
+ return new BossSkillBondageBubble(data);
}
return null;
--
Gitblit v1.9.1