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

liuzhiwei

2020-11-13 adf4e32c75f0886b330c6ad449f6a2a46b3d3771

 Assets/Scripts/Common/ErrorLogOnGUIMyTools.cs

@@ -19,7 +19,8 @@
            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));
            };
        }