Browse Source

Reverted ILuaScript, ILuaStore, ILuaUtils interfaces

master
Christopher 8 years ago
parent
commit
9a07ccd5fd
  1. 2
      Assets/Fungus/Scripts/EventHandlers/EndEdit.cs
  2. 3
      Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt
  3. 2
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs
  4. 2
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs
  5. 4
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs
  6. 20
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs
  7. 118
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs
  8. 17
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs
  9. 12
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs.meta
  10. 15
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs
  11. 12
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs.meta
  12. 90
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs
  13. 12
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs.meta
  14. 136
      Assets/Tests/Lua/FungusTests.unity

2
Assets/Fungus/Scripts/EventHandlers/EndEdit.cs

@ -28,7 +28,7 @@ namespace Fungus.EventHandlers
ExecuteBlock();
}
#region Public methods
#region Public members
public override string GetSummary()
{

3
Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt vendored

@ -30,7 +30,8 @@
"Fungus.Variables.TransformVariable",
"Fungus.Variable",
"Fungus.Variables.Vector2Variable",
"Fungus.Variables.Vector3Variable"
"Fungus.Variables.Vector3Variable",
"Fungus.Commands.Label"
],
"extensionTypes" : [
]

2
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs vendored

@ -247,7 +247,7 @@ namespace Fungus
}
}
#region Public methods
#region Public members
/// <summary>
/// Execute after a period of time.

2
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs vendored

@ -73,7 +73,7 @@ namespace Fungus
}
}
#region Public methods
#region Public members
/// <summary>
/// Add all declared bindings to the globals table.

4
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs vendored

@ -11,7 +11,7 @@ namespace Fungus
/// <summary>
/// Executes Lua script defined in a string property or in an external file.
/// </summary>
public class LuaScript : MonoBehaviour, ILuaScript
public class LuaScript : MonoBehaviour
{
/// <summary>
/// The Lua Environment to use when executing Lua script.
@ -118,7 +118,7 @@ namespace Fungus
return s;
}
#region ILuaScript implementation
#region Public members
/// <summary>
/// Execute the Lua script.

20
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs vendored

@ -12,7 +12,7 @@ namespace Fungus
/// This is useful for transferring values from one scene to another. One one LuaStore component may exist
/// in a scene at a time.
/// </summary>
public class LuaStore : LuaBindingsBase, ILuaStore
public class LuaStore : LuaBindingsBase
{
protected Table primeTable;
@ -63,6 +63,15 @@ namespace Fungus
return true;
}
#region Public members
/// <summary>
/// A Lua table that can be shared between multiple LuaEnvironments.
/// </summary>
public virtual Table PrimeTable { get { return primeTable; } }
#endregion
#region LuaBindingsBase implementation
public override void AddBindings(LuaEnvironment luaEnv)
@ -97,14 +106,5 @@ namespace Fungus
public override List<BoundObject> BoundObjects { get { return null; } }
#endregion
#region ILuaStore implementation
/// <summary>
/// A Lua table that can be shared between multiple LuaEnvironments.
/// </summary>
public virtual Table PrimeTable { get { return primeTable; } }
#endregion
}
}

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

@ -13,10 +13,20 @@ using Fungus.Utils;
namespace Fungus
{
/// <summary>
/// Options for using the Lua FungusModule.
/// </summary>
public enum FungusModuleOptions
{
UseGlobalVariables, // Fungus helper items will be available as global variables.
UseFungusVariable, // Fungus helper items will be available in the 'fungus' global variable.
NoFungusModule // The fungus helper module will not be loaded.
}
/// <summary>
/// A collection of utilites to use in Lua for common Unity / Fungus tasks.
/// </summary>
public class LuaUtils : LuaEnvironmentInitializer, ISubstitutionHandler, ILuaUtils
public class LuaUtils : LuaEnvironmentInitializer, ISubstitutionHandler
{
[Tooltip("Controls if the fungus utilities are accessed from globals (e.g. say) or via a fungus variable (e.g. fungus.say). You can also choose to disable loading the fungus module if it's not required by your script.")]
[SerializeField] protected FungusModuleOptions fungusModule = FungusModuleOptions.UseGlobalVariables;
@ -262,39 +272,17 @@ namespace Fungus
}
}
#region LuaEnvironment.Initializer implementation
public override void Initialize()
{
luaEnvironment = GetComponent<LuaEnvironment>();
if (luaEnvironment == null)
{
Debug.LogError("No Lua Environment found");
return;
}
if (luaEnvironment.Interpreter == null)
{
Debug.LogError("No Lua interpreter found");
return;
}
InitTypes();
InitFungusModule();
InitBindings();
}
public override string PreprocessScript(string input)
{
return input;
}
#endregion
#region ILuaUtils implementation
#region Public members
/// <summary>
/// The currently selected language in the string table. Affects variable substitution.
/// </summary>
public virtual string ActiveLanguage { get { return activeLanguage; } set { activeLanguage = value; } }
/// <summary>
/// Returns a string from the string table for this key.
/// The string returned depends on the active language.
/// </summary>
public virtual string GetString(string key)
{
if (stringTable != null)
@ -314,6 +302,11 @@ namespace Fungus
return "";
}
/// <summary>
/// Implementation of StringSubstituter.ISubstitutionHandler
/// Substitutes specially formatted tokens in the text with global variables and string table values.
/// The string table value used depends on the currently loaded string table and active language.
/// </summary>
[MoonSharpHidden]
public virtual bool SubstituteStrings(StringBuilder input)
{
@ -382,36 +375,60 @@ namespace Fungus
return modified;
}
/// <summary>
/// Performs string substitution on the input string, replacing tokens of the form {$VarName} with
/// matching variables, localised strings, etc. in the scene.
/// </summary>
public virtual string Substitute(string input)
{
return stringSubstituter.SubstituteStrings(input);
}
/// <summary>
/// Find a game object by name and returns it.
/// </summary>
public virtual GameObject Find(string name)
{
return GameObject.Find(name);
}
/// <summary>
/// Returns one active GameObject tagged tag. Returns null if no GameObject was found.
/// </summary>
public virtual GameObject FindWithTag(string tag)
{
return GameObject.FindGameObjectWithTag(tag);
}
/// <summary>
/// Returns a list of active GameObjects tagged tag. Returns empty array if no GameObject was found.
/// </summary>
public virtual GameObject[] FindGameObjectsWithTag(string tag)
{
return GameObject.FindGameObjectsWithTag(tag);
}
/// <summary>
/// Create a copy of a GameObject.
/// Can be used to instantiate prefabs.
/// </summary>
public virtual GameObject Instantiate(GameObject go)
{
return GameObject.Instantiate(go);
}
/// <summary>
/// Destroys an instance of a GameObject.
/// </summary>
public virtual void Destroy(GameObject go)
{
GameObject.Destroy(go);
}
/// <summary>
/// Spawns an instance of a named prefab resource.
/// The prefab must exist in a Resources folder in the project.
/// </summary>
public virtual GameObject Spawn(string resourceName)
{
// Auto spawn a say dialog object from the prefab
@ -425,16 +442,51 @@ namespace Fungus
return null;
}
/// <summary>
/// Use the conversation manager to play out a conversation
/// </summary>
public virtual IEnumerator DoConversation(string conv)
{
return conversationManager.DoConversation(conv);
}
/// <summary>
/// Sync the active say dialog with what Lua thinks the SayDialog should be
/// </summary>
public void SetSayDialog(SayDialog sayDialog)
{
SayDialog.ActiveSayDialog = sayDialog;
}
#endregion
#region LuaEnvironmentInitializer implementation
public override void Initialize()
{
luaEnvironment = GetComponent<LuaEnvironment>();
if (luaEnvironment == null)
{
Debug.LogError("No Lua Environment found");
return;
}
if (luaEnvironment.Interpreter == null)
{
Debug.LogError("No Lua interpreter found");
return;
}
InitTypes();
InitFungusModule();
InitBindings();
}
public override string PreprocessScript(string input)
{
return input;
}
#endregion
}
}

17
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs vendored

@ -1,17 +0,0 @@
// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
namespace Fungus
{
/// <summary>
/// Executes Lua script defined in a string property or in an external file.
/// </summary>
public interface ILuaScript
{
/// <summary>
/// Execute the Lua script.
/// This is the function to call if you want to trigger execution from an external script.
/// </summary>
void OnExecute();
}
}

12
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs.meta vendored

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: abbbc56988f804fc393471c69ca748cb
timeCreated: 1473671672
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

15
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs vendored

@ -1,15 +0,0 @@
// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
using MoonSharp.Interpreter;
namespace Fungus
{
public interface ILuaStore
{
/// <summary>
/// A Lua table that can be shared between multiple LuaEnvironments.
/// </summary>
Table PrimeTable { get; }
}
}

12
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs.meta vendored

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 6851f703962d046f7ba2182643f4b3c9
timeCreated: 1473675184
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

90
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs vendored

@ -1,90 +0,0 @@
// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
using UnityEngine;
using System.Collections;
using System.Text;
namespace Fungus
{
/// <summary>
/// Options for using the Lua FungusModule.
/// </summary>
public enum FungusModuleOptions
{
UseGlobalVariables, // Fungus helper items will be available as global variables.
UseFungusVariable, // Fungus helper items will be available in the 'fungus' global variable.
NoFungusModule // The fungus helper module will not be loaded.
}
public interface ILuaUtils
{
/// <summary>
/// The currently selected language in the string table. Affects variable substitution.
/// </summary>
string ActiveLanguage { get; set; }
/// <summary>
/// Returns a string from the string table for this key.
/// The string returned depends on the active language.
/// </summary>
string GetString(string key);
/// <summary>
/// Implementation of StringSubstituter.ISubstitutionHandler
/// Substitutes specially formatted tokens in the text with global variables and string table values.
/// The string table value used depends on the currently loaded string table and active language.
/// </summary>
bool SubstituteStrings(StringBuilder input);
/// <summary>
/// Performs string substitution on the input string, replacing tokens of the form {$VarName} with
/// matching variables, localised strings, etc. in the scene.
/// </summary>
string Substitute(string input);
/// <summary>
/// Find a game object by name and returns it.
/// </summary>
GameObject Find(string name);
/// <summary>
/// Returns one active GameObject tagged tag. Returns null if no GameObject was found.
/// </summary>
GameObject FindWithTag(string tag);
/// <summary>
/// Returns a list of active GameObjects tagged tag. Returns empty array if no GameObject was found.
/// </summary>
GameObject[] FindGameObjectsWithTag(string tag);
/// <summary>
/// Create a copy of a GameObject.
/// Can be used to instantiate prefabs.
/// </summary>
GameObject Instantiate(GameObject go);
/// <summary>
/// Destroys an instance of a GameObject.
/// </summary>
void Destroy(GameObject go);
/// <summary>
/// Spawns an instance of a named prefab resource.
/// The prefab must exist in a Resources folder in the project.
/// </summary>
GameObject Spawn(string resourceName);
/// <summary>
/// Use the conversation manager to play out a conversation
/// </summary>
/// <param name="conv"></param>
IEnumerator DoConversation(string conv);
/// <summary>
/// Sync the active say dialog with what Lua thinks the SayDialog should be
/// </summary>
/// <param name="sayDialog"></param>
void SetSayDialog(SayDialog sayDialog);
}
}

12
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs.meta vendored

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: d24a505bdb666456d84b02a983fe5bee
timeCreated: 1473674337
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

136
Assets/Tests/Lua/FungusTests.unity

@ -149,18 +149,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Button, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Canvas, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.FacingDirection, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Utils.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- UnityEngine.TextGenerator, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Texture, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Font, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@ -1601,7 +1600,7 @@ MonoBehaviour:
serializedVersion: 2
x: 67
y: 70
width: 140
width: 136
height: 40
itemId: 0
blockName: ShowMushroom
@ -1733,7 +1732,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1001 &130678264
@ -2907,7 +2905,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &267053835
@ -3043,7 +3040,6 @@ MonoBehaviour:
- {fileID: 1448414865}
- {fileID: 401213763}
- {fileID: 1562268133}
cachedPositions: []
--- !u!4 &293853618 stripped
Transform:
m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2}
@ -4299,7 +4295,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &450503107
@ -4632,7 +4627,31 @@ MonoBehaviour:
luaEnvironment: {fileID: 0}
tableName:
registerTypes: 1
boundTypes: []
boundTypes:
- UnityEngine.GameObject, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.PrimitiveType, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Component, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Type, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- UnityEngine.SendMessageOptions, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- UnityEngine.SceneManagement.Scene, UnityEngine, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.LuaEnvironment, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Commands.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
boundObjects:
- key: flowchart
obj: {fileID: 1983492490}
@ -4920,7 +4939,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &511430244
@ -4989,7 +5007,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &553579777
@ -5314,7 +5331,6 @@ MonoBehaviour:
nameText: John {$score}
nameColor: {r: 0.034482718, g: 1, b: 0, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
portraits:
- {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
portraitsFace: 0
@ -5936,7 +5952,6 @@ MonoBehaviour:
nameText: Mushroom
nameColor: {r: 1, g: 1, b: 1, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
portraits:
- {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
portraitsFace: 0
@ -6154,16 +6169,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.LuaEnvironment, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Commands.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.RectTransform+ReapplyDrivenProperties, UnityEngine, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector3, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@ -6487,7 +6503,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &761668838
@ -7038,7 +7053,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &831376437 stripped
@ -7216,7 +7230,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &863130402
@ -9127,7 +9140,7 @@ MonoBehaviour:
variablesScrollPos: {x: 0, y: 0}
variablesExpanded: 1
blockViewHeight: 400
zoom: 1
zoom: 0.98599917
scrollViewRect:
serializedVersion: 2
x: -343
@ -9399,7 +9412,6 @@ MonoBehaviour:
nameText: Sherlock
nameColor: {r: 1, g: 1, b: 1, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 21300000, guid: 8f5b5b110e73a414eb229eeead86200f, type: 3}
portraits:
- {fileID: 21300000, guid: 8f5b5b110e73a414eb229eeead86200f, type: 3}
- {fileID: 21300000, guid: c779e34c6eb8e45da98c70cf2802a54c, type: 3}
@ -9753,7 +9765,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1109996700
MonoBehaviour:
m_ObjectHideFlags: 0
@ -10905,7 +10917,6 @@ MonoBehaviour:
nameText: Watson
nameColor: {r: 1, g: 1, b: 1, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 21300000, guid: a92b08a118b7d46f59dd091acb2e4102, type: 3}
portraits:
- {fileID: 21300000, guid: a92b08a118b7d46f59dd091acb2e4102, type: 3}
- {fileID: 21300000, guid: 03bc547cc0049594bae51f00903eedef, type: 3}
@ -11999,15 +12010,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.LuaEnvironment, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Commands.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
boundObjects:
- key: flowchart
obj: {fileID: 1669001929}
@ -12054,7 +12067,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &1519552796
@ -12720,7 +12732,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1001 &1659443707
@ -12945,7 +12956,7 @@ MonoBehaviour:
serializedVersion: 2
x: 241
y: 51
width: 148
width: 141
height: 40
itemId: 0
blockName: RunBlockAtIndex
@ -12993,7 +13004,7 @@ MonoBehaviour:
luaBindingName: flowchart
--- !u!114 &1669001935
MonoBehaviour:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1669001929}
@ -13018,7 +13029,7 @@ MonoBehaviour:
- {fileID: 1669001936}
--- !u!114 &1669001936
MonoBehaviour:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1669001929}
@ -13559,15 +13570,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.LuaEnvironment, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Commands.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
boundObjects:
- key: flowchart
obj: {fileID: 807616582}
@ -14189,7 +14202,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3}
m_Name:
m_EditorClassIdentifier:
selectedFlowchart: {fileID: 999440650}
selectedFlowchart: {fileID: 1669001934}
--- !u!4 &1791050794
Transform:
m_ObjectHideFlags: 1
@ -14359,7 +14372,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!4 &1793585732
@ -14406,7 +14418,6 @@ MonoBehaviour:
nameText: Rinku
nameColor: {r: 1, g: 1, b: 1, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 0}
portraits: []
portraitsFace: 0
setSayDialog: {fileID: 0}
@ -14518,18 +14529,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.FacingDirection, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Utils.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Button, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Canvas, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.UI.Image, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- UnityEngine.TextGenerator, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Texture, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Font, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@ -14599,7 +14609,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &1824458250
@ -14743,7 +14752,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &1830471815
@ -14919,7 +14927,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &1880266302
@ -15968,7 +15975,6 @@ MonoBehaviour:
executeAfterFrames: 1
repeatExecuteFrame: 1
repeatEveryFrame: 1
hasFailed: 0
executeMethods: 2
executeMethodName: OnExecute
--- !u!1 &2087053783
@ -16339,11 +16345,12 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Character, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.AudioClip, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Sprite, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.FacingDirection, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Utils.PortraitState, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- Fungus.SayDialog, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Stage, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Canvas, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
@ -16420,16 +16427,17 @@ MonoBehaviour:
- UnityEngine.Object, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Single, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.Variable, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.LuaEnvironment, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- Fungus.Commands.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
- System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Material, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Shader, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
- UnityEngine.Color, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null

Loading…
Cancel
Save