From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 4ed700a..a36968c 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -571,7 +571,7 @@
private void ExcuteBuildUI()
{
AssetSource.allFromEditor = true;
- CheckFontSwitch.CheckAndReplaceFontSwitch();
+ //CheckFontSwitch.CheckAndReplaceFontSwitch();
UpdateUIPrefabSetting.SetAllUIPrefabAssetBundleName();
UpdateUIWindowSetting.SetAllUIWindowAssetBundleName();
UpdateSpriteSetting.SetAllSpriteAssetBundleName();
--
Gitblit v1.8.0