Merge commit '894e974d944190fb2e10e14827f0d878626bd048' into master

chenxin

2020-11-09 172d8ffbf5fe3bdd60b3d71a3a60feeed1cb1762

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs

@@ -80,7 +80,6 @@

            RefreshFinalWave();
            RefreshPropList();
            EndlessMaskUI.instance.Show();
            SettlementUI.SetActive(true);
            PlayEffect();
        }
@@ -126,8 +125,8 @@
        private void ShowPanel()
        {
            OpenEndGameScreen(true);
            if (VictoryAudio != null && AudioSource != null)
                AudioSource.PlayOneShot(VictoryAudio);
            // if (VictoryAudio != null && AudioSource != null)
            //     AudioSource.PlayOneShot(VictoryAudio);
        }

        /// <summary>