Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

River Jiang

2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782

 Assets/Scripts/TowerDefense/Level/EndlessWave.cs

@@ -86,7 +86,7 @@
            spawnedEnemies = 0;

            SpawnCurrent();
            spawnTimer = new RepeatingTimer(data.Config.interval / 3000f, SpawnCurrent);
            spawnTimer = new RepeatingTimer(data.Config.interval / 1000f, SpawnCurrent);
            StartTimer(spawnTimer);
        }

@@ -105,8 +105,7 @@
        /// </summary>
        protected virtual void SpawnCurrent()
        {
            if (isWaveStoped)
                return;
            if (isWaveStoped) return;

            if (!TrySetupNextSpawn())
            {