From f44ad64eff5c66b711e2b8d28c44c85a92cbc393 Mon Sep 17 00:00:00 2001 From: liuzhiwei <liuzhiwei@qq.com> Date: Fri, 06 Nov 2020 10:08:42 +0800 Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master --- Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs index b372b26..b851240 100644 --- a/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs +++ b/Assets/Scripts/TowerDefense/Level/EndlessLevelManager.cs @@ -361,6 +361,8 @@ /// </summary> protected virtual void Update() { + if (EndlessGameUI.instance.state == EndlessGameUI.State.GameOver) return; + if (alwaysGainCurrency || !alwaysGainCurrency && EndlessLeveltate != LevelState.Building && EndlessLeveltate != LevelState.Intro) { CurrencyGainer.Tick(Time.deltaTime); @@ -456,7 +458,7 @@ /// <returns></returns> private IEnumerator DelayToNextLevel() { - yield return new WaitForSeconds(5f); + yield return new WaitForSeconds(2f); BeginLevel(); } -- Gitblit v1.9.1