From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 532f6f4..7fe6b04 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -334,6 +334,11 @@
EditorApplication.delayCall += ExcuteBuildUI;
}
+ if (GUILayout.Button("BuiltIn"))
+ {
+ EditorApplication.delayCall += ExcuteBuildBuiltIn;
+ }
+
if (GUILayout.Button("Audio"))
{
EditorApplication.delayCall += ExcuteBuildAudio;
@@ -403,6 +408,8 @@
EditorGUILayout.Space();
GUILayout.BeginHorizontal();
+
+ ClientPackage.obfuscatorEnabled = EditorGUILayout.Toggle("obfuscator enable ", ClientPackage.obfuscatorEnabled);
#if UNITY_ANDROID
if (GUILayout.Button("APK"))
@@ -492,6 +499,7 @@
ExcuteBuildLevels();
ExcuteBuildGraphic();
ExcuteBuildUI();
+ ExcuteBuildBuiltIn();
AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
@@ -532,6 +540,14 @@
AssetBundleBuildExtersion.Build(outputPath, _category, opt, (BuildTarget)m_UserData.m_BuildTarget);
}
+ private void ExcuteBuildBuiltIn()
+ {
+ BuiltInResourceSetting.SetLaunchBackGround(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget);
+ BuiltInResourceSetting.SetLoginBackGround(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget);
+ BuiltInResourceSetting.SetLoginLogo(publishers.Split('|')[0], (BuildTarget)m_UserData.m_BuildTarget);
+ ExcuteBuildAsset("builtin");
+ }
+
private void ExcuteBuildAudio()
{
UpdateAudioSetting.SetAllAudioAssetBundleName();
@@ -554,7 +570,7 @@
{
UpdateScriptableObjectsSetting.SetAllScriptableObjectAssetBundleName();
ExcuteBuildAsset("config");
- TableTool.ReadAllTxtToBytes(StringUtility.Contact(m_UserData.m_OutputPath, "/config"));
+ TableTool.CopyConfigsToOutPutPath(StringUtility.Contact(m_UserData.m_OutputPath, "/config"));
}
private void ExcuteBuildLevels()
--
Gitblit v1.8.0