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

chenxin

2020-12-25 914b0ab6ff4b86a809fb0b6b206504e90612a92a

 Assets/Scripts/Guide/GuideCtrl.cs

@@ -227,7 +227,7 @@
    private void KillDone()
    {
        string[] s2 = new string[] { allGuideDic[currentStep][2] };

        panel.CloseSkillImage();
        panel.Step3(s2, OpenBoxFire);
    }