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/Level/EndlessWaveManager.cs | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs index 43d7d9b..05d2c6f 100644 --- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs +++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs @@ -144,9 +144,18 @@ /// <param name="level"></param> public void InitPort(int level) { + EndlessPortData.InitPortList(); InitPortData(level); InitWaveData(); RefreshBoss(); + + if (!GameConfig.IsNewbie) + { + endless_boss bossData = EndlessBossData.GetDataById(waveData[0].Config.resource); + + if (bossData != null) + EndlessBossSkillManager.instance.Init(bossData.skill); + } } /// <summary> @@ -291,7 +300,11 @@ } if (TotalWaveLines != 0) + { isWaveStarted = true; + EndlessBossSkillManager.instance.Restart(); + EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessBeginWave); + } } /// <summary> @@ -366,6 +379,7 @@ // 更新波索引 ++CurrentWaveIndex; EndlessBuffManager.instance.UpdateBuffList(); + EndlessBossSkillManager.instance.Reset(); EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.EndlessCompletedPort, Level, CurrentWaveIndex); if (CurrentWaveIndex >= TotalWaves) -- Gitblit v1.9.1