Browse Source

Defines and fallbacks for 2017 and 2018 (#781)

master
Steve Halliwell 5 years ago committed by GitHub
parent
commit
ce7e75aa50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      Assets/Fungus/Scripts/Editor/FlowchartWindow.cs
  2. 23
      Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs
  3. 2
      Assets/Fungus/Scripts/Editor/LuaScriptedImporter.cs
  4. 4
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs

10
Assets/Fungus/Scripts/Editor/FlowchartWindow.cs

@ -1257,10 +1257,10 @@ namespace Fungus.EditorUtils
}
else
{
menu.AddDisabledItem(new GUIContent("StopAll"), false);//, () => StopAllBlocks());
menu.AddDisabledItem(new GUIContent("Stop"), false);//, () => StopThisBlock(hitBlock));
menu.AddDisabledItem(new GUIContent("Execute"), false);//, () => ExecuteThisBlock(hitBlock, false));
menu.AddDisabledItem(new GUIContent("Execute (Stop All First)"), false);//, () => ExecuteThisBlock(hitBlock, true));
menu.AddDisabledItem(new GUIContent("StopAll"));//, false), () => StopAllBlocks());
menu.AddDisabledItem(new GUIContent("Stop"));//, false);, () => StopThisBlock(hitBlock));
menu.AddDisabledItem(new GUIContent("Execute"));//, false);, () => ExecuteThisBlock(hitBlock, false));
menu.AddDisabledItem(new GUIContent("Execute (Stop All First)"));//, false);, () => ExecuteThisBlock(hitBlock, true));
}
}
else
@ -1285,7 +1285,7 @@ namespace Fungus.EditorUtils
}
else
{
menu.AddDisabledItem(new GUIContent("StopAll"), false);//, () => StopAllBlocks());
menu.AddDisabledItem(new GUIContent("StopAll"));//, false);, () => StopAllBlocks());
}
}

23
Assets/Fungus/Scripts/Editor/FungusEditorPreferences.cs

@ -27,6 +27,7 @@ namespace Fungus
LoadOnScriptLoad();
}
#if UNITY_2019_1_OR_NEWER
[SettingsProvider]
public static SettingsProvider CreateFungusSettingsProvider()
{
@ -35,7 +36,20 @@ namespace Fungus
var provider = new SettingsProvider("Project/Fungus", SettingsScope.Project)
{
// Create the SettingsProvider and initialize its drawing (IMGUI) function in place:
guiHandler = (searchContext) =>
guiHandler = (searchContext) => PreferencesGUI()
// // Populate the search keywords to enable smart search filtering and label highlighting:
// keywords = new HashSet<string>(new[] { "Number", "Some String" })
};
return provider;
}
#else
[PreferenceItem("Fungus")]
#endif
private static void PreferencesGUI()
{
// Load the preferences
if (!prefsLoaded)
@ -97,13 +111,6 @@ namespace Fungus
EditorPrefs.SetBool(HIDE_MUSH_KEY, hideMushroomInHierarchy);
EditorPrefs.SetBool(USE_LEGACY_MENUS, useLegacyMenus);
}
},
// // Populate the search keywords to enable smart search filtering and label highlighting:
// keywords = new HashSet<string>(new[] { "Number", "Some String" })
};
return provider;
}
public static void LoadOnScriptLoad()

2
Assets/Fungus/Scripts/Editor/LuaScriptedImporter.cs

@ -4,6 +4,7 @@ using System.IO;
namespace Fungus.EditorUtils
{
#if UNITY_2018_4_OR_NEWER
[ScriptedImporter(1, "lua")]
public class LuaScriptedImporter : ScriptedImporter
{
@ -14,4 +15,5 @@ namespace Fungus.EditorUtils
ctx.SetMainObject(lua);
}
}
#endif
}

4
Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/MenuItems.cs vendored

@ -77,7 +77,11 @@ namespace Fungus
}
GameObject go = PrefabUtility.InstantiatePrefab(prefab) as GameObject;
#if UNITY_2018_4_OR_NEWER
PrefabUtility.UnpackPrefabInstance(go, PrefabUnpackMode.Completely, InteractionMode.AutomatedAction);
#else
PrefabUtility.DisconnectPrefabInstance(go);
#endif
if (centerInScene)
{

Loading…
Cancel
Save