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

chenxin

2020-12-04 a30d3a56838f504e6114273f216a1cb10c0ee6da

 Assets/Scripts/Guide/TestButton.cs

@@ -217,7 +217,7 @@
        GameObject a = Resources.Load<GameObject>("UI/Final/FinalPanel");
        GameObject go = Instantiate(a, transform);
        FinalPanel panelUI = go.GetComponent<FinalPanel>();
        panelUI.SetData("1关 1波", 401);
        panelUI.SetData("1关 1波", 101);
        //panelUI.SetPlayEffectAC(null);
    }