Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master

weixudong

2020-12-09 17c6e8b6f2aee4ed9a15c886f54a73f0cb61b125

 Assets/Scripts/Guide/GuideBox.cs

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