Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_client

client_Hale

2018-09-20 9ff9f48c63ba94ec25d3ba698aef7c5429f639e4

 Assets/Editor/Tool/BuildExtersion.cs

@@ -155,7 +155,7 @@
            if (!buildParameters.error)

            {

                AssetSource.allFromEditor = true;

                CheckFontSwitch.CheckAndReplaceFontSwitch();

                //CheckFontSwitch.CheckAndReplaceFontSwitch();

                UpdateUIPrefabSetting.SetAllUIPrefabAssetBundleName();

                UpdateUIWindowSetting.SetAllUIWindowAssetBundleName();

                UpdateSpriteSetting.SetAllSpriteAssetBundleName();