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

liuzhiwei

2020-11-26 1ff48547fc130428f3013cc1049d54acbb8db568

 Assets/Scripts/TowerDefense/Level/EndlessWave.cs

@@ -117,10 +117,11 @@

        public void RestartWave()
        {
            StartTimer(spawnTimer);
            if (spawnTimer != null)
                StartTimer(spawnTimer);
            isWavePaused = false;

            if (spawnedEnemies == 0)
            if (spawnedEnemies == 0 && waveData != null)
                SpawnCurrent();
        }