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

liuzhiwei

2020-12-26 56d95fa59a9f6dc12d0fc0723ea449e5b317f994

 Assets/Scripts/Common/ErrorLogOnGUIMyTools.cs

@@ -56,7 +56,7 @@

        private void OnGUI()
        {
            GUILayout.BeginArea(new Rect(5, 460, 150, 300));
            GUILayout.BeginArea(new Rect(5, 330, 150, 300));
            if (GUILayout.Button("Debug", GUILayout.Width(150), GUILayout.Height(70)))
                m_IsVisible = !m_IsVisible;
            GUILayout.EndArea();