Skip to content

Commit 447ea74

Browse files
authored
Merge pull request #186 from watson-developer-cloud/feature-185-CustomScenesOnBuild
* Fixec issue 185
2 parents 88f1b6b + 33ab611 commit 447ea74

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

Config.json.enc

960 Bytes
Binary file not shown.

Examples/ServiceExamples/Scripts/ExampleDocumentConversion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class ExampleDocumentConversion : MonoBehaviour
2626

2727
void Start()
2828
{
29-
LogSystem.InstallDefaultReactors(); LogSystem.InstallDefaultReactors();
29+
LogSystem.InstallDefaultReactors();
3030
string examplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/watson_beats_jeopardy.html";
3131

3232
if (!m_DocumentConversion.ConvertDocument(OnConvertDocument, examplePath, ConversionTarget.NORMALIZED_TEXT))

Scripts/Editor/Build.cs

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*
1616
*/
1717

18+
1819
#if UNITY_EDITOR
1920

2021
using UnityEngine;
@@ -45,6 +46,13 @@ public static BuildOptions BuildOptions
4546
get { return (BuildOptions)EditorPrefs.GetInt(Application.productName + "BuildOptions"); }
4647
set { EditorPrefs.SetInt(Application.productName + "BuildOptions", (int)value); }
4748
}
49+
50+
public static string[] BuildScenes
51+
{
52+
get { return string.IsNullOrEmpty( EditorPrefs.GetString(Application.productName + "BuildScenes"))? null : EditorPrefs.GetString(Application.productName + "BuildScenes").Split('|'); }
53+
set { if (value == null || value.Length == 0) EditorPrefs.SetString(Application.productName + "BuildScenes", null); else EditorPrefs.SetString(Application.productName + "BuildScenes",string.Join("|", value)); }
54+
}
55+
4856
#endregion
4957

5058
[UnityEditor.Callbacks.DidReloadScripts]
@@ -60,15 +68,23 @@ private static void OnScriptsReloaded()
6068

6169
private static string[] GetBuildScenes()
6270
{
63-
List<string> scenes = new List<string>();
64-
foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
71+
if (BuildScenes != null && BuildScenes.Length > 0)
72+
{
73+
return BuildScenes;
74+
}
75+
else
6576
{
66-
if (scene == null || !scene.enabled)
67-
continue;
68-
scenes.Add(scene.path);
77+
List<string> scenes = new List<string>();
78+
foreach (EditorBuildSettingsScene scene in EditorBuildSettings.scenes)
79+
{
80+
if (scene == null || !scene.enabled)
81+
continue;
82+
scenes.Add(scene.path);
83+
}
84+
85+
return scenes.ToArray();
6986
}
7087

71-
return scenes.ToArray();
7288
}
7389

7490
/// <summary>

0 commit comments

Comments
 (0)