Merge branch 'master' into leonard

client_Wu Xijin

2018-10-21 6f8ed2e37f8762fb3501a671d0dca40bcd68edae

 Assets/Editor/Tool/BuildExtersion.cs

@@ -154,6 +154,8 @@
            var buildParameters = new BuildParameters();

            if (!buildParameters.error)

            {

                AssetSource.allFromEditor = true;

                //CheckFontSwitch.CheckAndReplaceFontSwitch();

                UpdateUIPrefabSetting.SetAllUIPrefabAssetBundleName();

                UpdateUIWindowSetting.SetAllUIWindowAssetBundleName();

                UpdateSpriteSetting.SetAllSpriteAssetBundleName();