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

liuzhiwei

2020-11-06 f44ad64eff5c66b711e2b8d28c44c85a92cbc393

 Assets/Scripts/TowerDefense/UI/MainMenuScene.cs

@@ -70,7 +70,8 @@
    /// </summary>
    public void cooperateBtnClick()
    {
        AudioSourceManager.Ins.Play(AudioEnum.UI);

        AudioSourceManager.Ins?.Play(AudioEnum.UI);

        combatBtn.transform.DOKill();
        combatBtn.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
@@ -85,7 +86,7 @@
    /// </summary>
    public void StartGame()
    {
        AudioSourceManager.Ins.Play(AudioEnum.UI);
        AudioSourceManager.Ins?.Play(AudioEnum.UI);

        combatBtn.transform.DOKill();
        combatBtn.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);