From 6f8ed2e37f8762fb3501a671d0dca40bcd68edae Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期日, 21 十月 2018 10:26:29 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 Assets/Editor/Tool/BuildExtersion.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Assets/Editor/Tool/BuildExtersion.cs b/Assets/Editor/Tool/BuildExtersion.cs
index f44f13e..88a67ee 100644
--- a/Assets/Editor/Tool/BuildExtersion.cs
+++ b/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();

--
Gitblit v1.8.0