Merge branch 'master' into RLRuntime

lwb

2021-01-14 ef08be49ccd8cf61e93d8921cbeb09100e663b48

Merge branch 'master' into RLRuntime

 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");
        }

 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);