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

River Jiang

2020-10-27 d64f29d6565417d62222144203c97d98b67f4fb3

 Assets/Scripts/Guide/GuidePanel.cs

@@ -259,6 +259,7 @@
            GameObject go = transform.Find("Image_TowerPos2").gameObject;

            Image btnImg = go.GetComponent<Image>();
            btnImg.raycastTarget=false;
            InitRectGuidance(btnImg, 75, 80);
            SetRimPos(go);
            maskObj.ShowImmediately();
@@ -284,6 +285,7 @@
    {
        if (currentIndex == 0)
        {

            SetRimActive(true);
            //设置位置
            AddButtonListener(towerBuyBtn, ac);
@@ -297,6 +299,7 @@
        {
            GameObject go = transform.Find("Image_TowerPos2").gameObject;
            Image btnImg = go.GetComponent<Image>();
            btnImg.raycastTarget=true;
            InitRectGuidance(btnImg, 75, 80);
            SetRimPos(go);
            maskObj.ShowImmediately();