From ef08be49ccd8cf61e93d8921cbeb09100e663b48 Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期四, 14 一月 2021 14:48:33 +0800
Subject: [PATCH] Merge branch 'master' into RLRuntime
---
Assets/Editor/Tool/AssetSourceSetting.cs | 1 +
Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 10 ++++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 56f7575..8126ca7 100644
--- a/Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Assets/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -357,6 +357,11 @@
EditorApplication.delayCall += ExcuteBuildAudio;
}
+ if (GUILayout.Button("Video"))
+ {
+ EditorApplication.delayCall += ExcuteBuildVideo;
+ }
+
if (GUILayout.Button("Levels"))
{
EditorApplication.delayCall += ExcuteBuildLevels;
@@ -550,6 +555,7 @@
}
ExcuteBuildAudio();
+ ExcuteBuildVideo();
ExcuteBuildMobEffectShader();
ExcuteBuildConfig();
ExcuteBuildLevels();
@@ -612,6 +618,10 @@
{
UpdateAudioSetting.SetAllAudioAssetBundleName();
ExcuteBuildAsset("audio");
+ }
+
+ private void ExcuteBuildVideo()
+ {
UpdateVideoSetting.SetAllVideoAssetBundleName();
ExcuteBuildAsset("video");
}
diff --git a/Assets/Editor/Tool/AssetSourceSetting.cs b/Assets/Editor/Tool/AssetSourceSetting.cs
index e29db02..42412c4 100644
--- a/Assets/Editor/Tool/AssetSourceSetting.cs
+++ b/Assets/Editor/Tool/AssetSourceSetting.cs
@@ -16,6 +16,7 @@
{
// allFromEditor = EditorGUILayout.Toggle("allFromEditor:", AssetSource.allFromEditor);
AssetSource.audioFromEditor = EditorGUILayout.Toggle("audioFromEditor:", AssetSource.audioFromEditor);
+ AssetSource.videoFromEditor = EditorGUILayout.Toggle("videoFromEditor:", AssetSource.videoFromEditor);
AssetSource.effectFromEditor = EditorGUILayout.Toggle("effectFromEditor:", AssetSource.effectFromEditor);
AssetSource.mobFromEditor = EditorGUILayout.Toggle("mobFromEditor:", AssetSource.mobFromEditor);
AssetSource.refdataFromEditor = EditorGUILayout.Toggle("refdataFromEditor:", AssetSource.refdataFromEditor);
--
Gitblit v1.8.0