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

chenxin

2020-12-17 df8c6633500f6c1c752f8a60025cda0e9909644c

 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);
    }