diff --git a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs index 8cfa076b..88849482 100644 --- a/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs +++ b/Assets/Fungus/Scripts/EventHandlers/EndEdit.cs @@ -28,7 +28,7 @@ namespace Fungus.EventHandlers ExecuteBlock(); } - #region Public methods + #region Public members public override string GetSummary() { diff --git a/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt b/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt index d67f7c5d..cd16b192 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt +++ b/Assets/Fungus/Thirdparty/FungusLua/Resources/Types/FungusTypes.txt @@ -30,7 +30,8 @@ "Fungus.Variables.TransformVariable", "Fungus.Variable", "Fungus.Variables.Vector2Variable", - "Fungus.Variables.Vector3Variable" + "Fungus.Variables.Vector3Variable", + "Fungus.Commands.Label" ], "extensionTypes" : [ ] diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs index 86b34226..abe5dfca 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs @@ -247,7 +247,7 @@ namespace Fungus } } - #region Public methods + #region Public members /// /// Execute after a period of time. diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs index 3ca90aef..fdd145a8 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs @@ -73,7 +73,7 @@ namespace Fungus } } - #region Public methods + #region Public members /// /// Add all declared bindings to the globals table. diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs index 22277eaf..d6ea5c49 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs @@ -11,7 +11,7 @@ namespace Fungus /// /// Executes Lua script defined in a string property or in an external file. /// - public class LuaScript : MonoBehaviour, ILuaScript + public class LuaScript : MonoBehaviour { /// /// The Lua Environment to use when executing Lua script. @@ -118,7 +118,7 @@ namespace Fungus return s; } - #region ILuaScript implementation + #region Public members /// /// Execute the Lua script. diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs index aa7d3598..f2428fb9 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs @@ -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. /// - public class LuaStore : LuaBindingsBase, ILuaStore + public class LuaStore : LuaBindingsBase { protected Table primeTable; @@ -63,6 +63,15 @@ namespace Fungus return true; } + #region Public members + + /// + /// A Lua table that can be shared between multiple LuaEnvironments. + /// + 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 BoundObjects { get { return null; } } #endregion - - #region ILuaStore implementation - - /// - /// A Lua table that can be shared between multiple LuaEnvironments. - /// - public virtual Table PrimeTable { get { return primeTable; } } - - #endregion } } \ No newline at end of file diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs index 1d2a06e9..37b83c1d 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs @@ -13,10 +13,20 @@ using Fungus.Utils; namespace Fungus { + /// + /// Options for using the Lua FungusModule. + /// + 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. + } + /// /// A collection of utilites to use in Lua for common Unity / Fungus tasks. /// - 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(); - 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 + /// + /// The currently selected language in the string table. Affects variable substitution. + /// public virtual string ActiveLanguage { get { return activeLanguage; } set { activeLanguage = value; } } + /// + /// Returns a string from the string table for this key. + /// The string returned depends on the active language. + /// public virtual string GetString(string key) { if (stringTable != null) @@ -314,6 +302,11 @@ namespace Fungus return ""; } + /// + /// 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. + /// [MoonSharpHidden] public virtual bool SubstituteStrings(StringBuilder input) { @@ -382,36 +375,60 @@ namespace Fungus return modified; } + /// + /// Performs string substitution on the input string, replacing tokens of the form {$VarName} with + /// matching variables, localised strings, etc. in the scene. + /// public virtual string Substitute(string input) { return stringSubstituter.SubstituteStrings(input); } - + + /// + /// Find a game object by name and returns it. + /// public virtual GameObject Find(string name) { return GameObject.Find(name); } + /// + /// Returns one active GameObject tagged tag. Returns null if no GameObject was found. + /// public virtual GameObject FindWithTag(string tag) { return GameObject.FindGameObjectWithTag(tag); } + /// + /// Returns a list of active GameObjects tagged tag. Returns empty array if no GameObject was found. + /// public virtual GameObject[] FindGameObjectsWithTag(string tag) { return GameObject.FindGameObjectsWithTag(tag); } - + + /// + /// Create a copy of a GameObject. + /// Can be used to instantiate prefabs. + /// public virtual GameObject Instantiate(GameObject go) { return GameObject.Instantiate(go); } + /// + /// Destroys an instance of a GameObject. + /// public virtual void Destroy(GameObject go) { GameObject.Destroy(go); } + /// + /// Spawns an instance of a named prefab resource. + /// The prefab must exist in a Resources folder in the project. + /// public virtual GameObject Spawn(string resourceName) { // Auto spawn a say dialog object from the prefab @@ -425,16 +442,51 @@ namespace Fungus return null; } + /// + /// Use the conversation manager to play out a conversation + /// public virtual IEnumerator DoConversation(string conv) { return conversationManager.DoConversation(conv); } + /// + /// Sync the active say dialog with what Lua thinks the SayDialog should be + /// public void SetSayDialog(SayDialog sayDialog) { SayDialog.ActiveSayDialog = sayDialog; } #endregion + + #region LuaEnvironmentInitializer implementation + + public override void Initialize() + { + luaEnvironment = GetComponent(); + 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 } } \ No newline at end of file diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs deleted file mode 100644 index 7fd82517..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs +++ /dev/null @@ -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 -{ - /// - /// Executes Lua script defined in a string property or in an external file. - /// - public interface ILuaScript - { - /// - /// Execute the Lua script. - /// This is the function to call if you want to trigger execution from an external script. - /// - void OnExecute(); - } -} \ No newline at end of file diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs.meta b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs.meta deleted file mode 100644 index 749ac74a..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaScript.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: abbbc56988f804fc393471c69ca748cb -timeCreated: 1473671672 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs deleted file mode 100644 index 2888adff..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs +++ /dev/null @@ -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 - { - /// - /// A Lua table that can be shared between multiple LuaEnvironments. - /// - Table PrimeTable { get; } - } -} \ No newline at end of file diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs.meta b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs.meta deleted file mode 100644 index dd27467c..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaStore.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 6851f703962d046f7ba2182643f4b3c9 -timeCreated: 1473675184 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs deleted file mode 100644 index 73e9ddaa..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs +++ /dev/null @@ -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 -{ - /// - /// Options for using the Lua FungusModule. - /// - 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 - { - /// - /// The currently selected language in the string table. Affects variable substitution. - /// - string ActiveLanguage { get; set; } - - /// - /// Returns a string from the string table for this key. - /// The string returned depends on the active language. - /// - string GetString(string key); - - /// - /// 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. - /// - bool SubstituteStrings(StringBuilder input); - - /// - /// Performs string substitution on the input string, replacing tokens of the form {$VarName} with - /// matching variables, localised strings, etc. in the scene. - /// - string Substitute(string input); - - /// - /// Find a game object by name and returns it. - /// - GameObject Find(string name); - - /// - /// Returns one active GameObject tagged tag. Returns null if no GameObject was found. - /// - GameObject FindWithTag(string tag); - - /// - /// Returns a list of active GameObjects tagged tag. Returns empty array if no GameObject was found. - /// - GameObject[] FindGameObjectsWithTag(string tag); - - /// - /// Create a copy of a GameObject. - /// Can be used to instantiate prefabs. - /// - GameObject Instantiate(GameObject go); - - /// - /// Destroys an instance of a GameObject. - /// - void Destroy(GameObject go); - - /// - /// Spawns an instance of a named prefab resource. - /// The prefab must exist in a Resources folder in the project. - /// - GameObject Spawn(string resourceName); - - /// - /// Use the conversation manager to play out a conversation - /// - /// - IEnumerator DoConversation(string conv); - - /// - /// Sync the active say dialog with what Lua thinks the SayDialog should be - /// - /// - void SetSayDialog(SayDialog sayDialog); - } -} \ No newline at end of file diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs.meta b/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs.meta deleted file mode 100644 index 26c6b600..00000000 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/ILuaUtils.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: d24a505bdb666456d84b02a983fe5bee -timeCreated: 1473674337 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/Lua/FungusTests.unity b/Assets/Tests/Lua/FungusTests.unity index 973f8cbc..069244b1 100644 --- a/Assets/Tests/Lua/FungusTests.unity +++ b/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