From 6ce4ae16561fd205c8bb3f530d5a20033f207f4f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 18:19:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackPlayer
---
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 4bbdb37..b86cb35 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -387,6 +387,7 @@
GUILayout.EndHorizontal();
EditorGUILayout.Space();
+#endif
GUILayout.BeginHorizontal();
EditorGUILayout.TextField("SDK Project Path", ClientPackage.SDK_PLUGIN_PROJECT);
if (GUILayout.Button("Browse", GUILayout.MaxWidth(75f)))
@@ -396,7 +397,6 @@
GUILayout.EndHorizontal();
EditorGUILayout.Space();
-#endif
publishers = EditorGUILayout.TextField("Publishers", publishers, GUILayout.Height(50));
--
Gitblit v1.8.0