Browse Source

Fixed can't use FungusLua separately to rest of Fungus #596

master
Christopher 8 years ago
parent
commit
c02eda3b81
  1. 7
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs
  2. 2
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs

7
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs vendored

@ -64,7 +64,9 @@ namespace Fungus
protected StringSubstituter stringSubstituter; protected StringSubstituter stringSubstituter;
#if !FUNGUSLUA_STANDALONE
protected ConversationManager conversationManager; protected ConversationManager conversationManager;
#endif
/// <summary> /// <summary>
/// Registers all listed c# types for interop with Lua. /// Registers all listed c# types for interop with Lua.
@ -251,8 +253,10 @@ namespace Fungus
stringSubstituter = new StringSubstituter(); stringSubstituter = new StringSubstituter();
stringSubstituter.CacheSubstitutionHandlers(); stringSubstituter.CacheSubstitutionHandlers();
#if !FUNGUSLUA_STANDALONE
conversationManager = new ConversationManager(); conversationManager = new ConversationManager();
conversationManager.PopulateCharacterCache(); conversationManager.PopulateCharacterCache();
#endif
if (fungusModule == FungusModuleOptions.UseGlobalVariables) if (fungusModule == FungusModuleOptions.UseGlobalVariables)
{ {
@ -448,6 +452,8 @@ namespace Fungus
return null; return null;
} }
#if !FUNGUSLUA_STANDALONE
/// <summary> /// <summary>
/// Use the conversation manager to play out a conversation /// Use the conversation manager to play out a conversation
/// </summary> /// </summary>
@ -485,6 +491,7 @@ namespace Fungus
{ {
return MenuDialog.GetMenuDialog(); return MenuDialog.GetMenuDialog();
} }
#endif
#endregion #endregion

2
Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs vendored

@ -5,7 +5,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
#if NETFX_CORE
using MarkerMetro.Unity.WinLegacy.Reflection; using MarkerMetro.Unity.WinLegacy.Reflection;
#endif
namespace Fungus namespace Fungus
{ {

Loading…
Cancel
Save