Browse Source

Avoid type registration warnings when Fungus is not installed

master
chrisgregan 9 years ago
parent
commit
1bd0521db5
  1. 2
      Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab
  2. 9
      Assets/FungusLua/Scripts/LuaUtils.cs

2
Assets/FungusLua/Resources/Prefabs/LuaEnvironment.prefab

@ -40,11 +40,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
fungusModule: 0
stringTable: {fileID: 0} stringTable: {fileID: 0}
activeLanguage: en activeLanguage: en
timeScale: -1 timeScale: -1
registerTypes: registerTypes:
- {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3}
- {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3}
--- !u!114 &11493126 --- !u!114 &11493126
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1

9
Assets/FungusLua/Scripts/LuaUtils.cs

@ -103,6 +103,8 @@ namespace Fungus
/// </summary> /// </summary>
protected virtual void InitTypes() protected virtual void InitTypes()
{ {
bool isFungusInstalled = (Type.GetType("Fungus.Flowchart") != null);
foreach (TextAsset textFile in registerTypes) foreach (TextAsset textFile in registerTypes)
{ {
if (textFile == null) if (textFile == null)
@ -119,6 +121,13 @@ namespace Fungus
continue; continue;
} }
// Don't register fungus types if the Fungus library is not present
if (!isFungusInstalled &&
typeName.StartsWith("Fungus."))
{
continue;
}
LuaEnvironment.RegisterType(typeName); LuaEnvironment.RegisterType(typeName);
} }
} }

Loading…
Cancel
Save