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

wangguan

2020-12-03 7f9f5fa4440c237c7116ad0ada6b72d0e7cc8781

 Assets/Scripts/TowerDefense/Towers/TowerFireTrigger.cs

@@ -18,7 +18,6 @@

        public void OnFire()
        {
            // cx test
            // if (!isStart)
            // {
            //     isStart = true;