Merge branch 'master' into leonard

client_Wu Xijin

2018-08-14 31c2cebbccba45a00a755981dd6d0cdd0a0459e9

 Assets/Editor/Tool/ExcelParseTool.cs

@@ -82,7 +82,7 @@
            }
            catch (Exception e)
            {
                DesignDebug.LogError(e.ToString());
                DebugEx.LogError(e.ToString());
            }
            ConfigManager.Instance.SyncLoadConfigs();
            m_FitterKeys.Clear();
@@ -139,7 +139,7 @@
                }
                catch (Exception e)
                {
                    DesignDebug.LogError(e.ToString());
                    DebugEx.LogError(e.ToString());
                }
            }