Merge commit '323055bb1b4c9b5669676dd799238050279b7d7a' into master

chenxin

2020-11-05 d6161eec964b2eeb23bd93c84c29f8ffd3a2d06f

 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);