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

liuzhiwei

2020-12-15 dd651e6ced907e7856d31fee478db45c7d994ea4

 Assets/Scripts/Guide/GuidePanelNew.cs

@@ -605,7 +605,6 @@
        {
            colorCount++;
            warningImg.DOFade(colorCount % 2, 1.0f).OnComplete(SetWarningColor);
            CommonDebugHelper.Debug($"执行了{colorCount}次");
        }
        else
        {