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

River Jiang

2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782

 Assets/Scripts/TowerDefense/Towers/Placement/TowerPlacementGridEndless.cs

@@ -289,7 +289,7 @@

        void Update()
        {
            if (m_arrCoinGenTime == null) return;
            if (m_arrCoinGenTime == null || !EndlessUIStart.instance.IsGameRunning) return;

            float delta = Time.deltaTime;
            float timePe = JsonDataCenter.GOLD_TIME / 1000.0f;