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

wangguan

2020-12-25 b35c810d34558ac4bcdbe382fae6db4cb3e3b545

 Assets/Scripts/Guide/GuideBox.cs

@@ -96,6 +96,7 @@
            {
                Water();
            }
            AudioSourceManager.Ins.Play(AudioEnum.GuideOpenBox);
        }
    }

@@ -149,7 +150,7 @@
    {
        if (callBack != null)
        {
            bgBtn.interactable=false;
            bgBtn.interactable = false;
            if (tmpPS != null) tmpPS.SetActive(false);
            //if (tmpObj != null) tmpObj.SetActive(false);
            images.SetActive(false);