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

liuzhiwei

2020-12-24 45f7442afa3b25cc79c76898224e48d6aed1a2ee

 Assets/Scripts/Common/ErrorLogOnGUIMyTools.cs

@@ -19,7 +19,11 @@
            DontDestroyOnLoad(this);
            Application.logMessageReceived += (string condition, string stackTrace, LogType type) =>
            {
                m_logEntries.Add(string.Format("{0}\n{1}", condition, stackTrace));
                if (type == LogType.Error)
                {
                    m_logEntries.Add(string.Format("{0}\n{1}", condition, stackTrace));
                    m_IsVisible = true;
                }
            };
        }

@@ -52,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();