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

wangguan

2020-11-27 6c547fcd89adf90eb67a2d077934eca97ecd1959

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs

@@ -62,7 +62,7 @@
            EndlessUIStart.bFirstLoaded = false;
            EndlessUIStart.bGameStart = false;

            TowerPlacementGridEndless.GRID_OPENCASH = 100;
            TowerPlacementGridEndless.GRID_OPENCASH = 200;

            SafelyUnsubscribe();
            SceneManager.LoadScene(menuSceneName);
@@ -88,10 +88,10 @@
            canvasGroup.interactable = false;
            return;

            RefreshFinalWave();
            RefreshPropList();
            SettlementUI.SetActive(true);
            PlayEffect();
            // RefreshFinalWave();
            // RefreshPropList();
            // SettlementUI.SetActive(true);
            // PlayEffect();
        }

        private void PlayEffect()