From a17cfe2aacdd7d91349349bfdc698b665a2fb72c Mon Sep 17 00:00:00 2001 From: Conrad Kreyling Date: Mon, 24 Apr 2017 20:00:24 -0400 Subject: [PATCH 1/2] break conditionals out to allow for reused code in LuaIf --- Assets/Fungus/Scripts/Commands/Condition.cs | 156 ++++++++++++++- Assets/Fungus/Scripts/Commands/ElseIf.cs | 49 +---- Assets/Fungus/Scripts/Commands/If.cs | 183 +----------------- .../Fungus/Scripts/Commands/LuaCondition.cs | 126 ++++++++++++ .../Scripts/Commands/LuaCondition.cs.meta | 12 ++ Assets/Fungus/Scripts/Commands/LuaElseIf.cs | 38 ++++ .../Fungus/Scripts/Commands/LuaElseIf.cs.meta | 12 ++ Assets/Fungus/Scripts/Commands/LuaIf.cs | 26 +++ Assets/Fungus/Scripts/Commands/LuaIf.cs.meta | 12 ++ .../Scripts/Commands/VariableCondition.cs | 110 +++++++++++ .../Commands/VariableCondition.cs.meta | 12 ++ 11 files changed, 504 insertions(+), 232 deletions(-) create mode 100644 Assets/Fungus/Scripts/Commands/LuaCondition.cs create mode 100644 Assets/Fungus/Scripts/Commands/LuaCondition.cs.meta create mode 100644 Assets/Fungus/Scripts/Commands/LuaElseIf.cs create mode 100644 Assets/Fungus/Scripts/Commands/LuaElseIf.cs.meta create mode 100644 Assets/Fungus/Scripts/Commands/LuaIf.cs create mode 100644 Assets/Fungus/Scripts/Commands/LuaIf.cs.meta create mode 100644 Assets/Fungus/Scripts/Commands/VariableCondition.cs create mode 100644 Assets/Fungus/Scripts/Commands/VariableCondition.cs.meta diff --git a/Assets/Fungus/Scripts/Commands/Condition.cs b/Assets/Fungus/Scripts/Commands/Condition.cs index d0c4e38f..a8dacb34 100644 --- a/Assets/Fungus/Scripts/Commands/Condition.cs +++ b/Assets/Fungus/Scripts/Commands/Condition.cs @@ -8,11 +8,6 @@ namespace Fungus [AddComponentMenu("")] public abstract class Condition : Command { - [Tooltip("The type of comparison to be performed")] - [SerializeField] protected CompareOperator compareOperator; - - #region Public members - public static string GetOperatorDescription(CompareOperator compareOperator) { string summary = ""; @@ -41,6 +36,157 @@ namespace Fungus return summary; } + #region Public members + + public override void OnEnter() + { + + if (ParentBlock == null) + { + return; + } + + if( !HasNeededProperties() ) + { + Continue(); + return; + } + + if( !this.IsElseIf ) + { + EvaluateAndContinue(); + } + else + { + System.Type previousCommandType = ParentBlock.GetPreviousActiveCommandType(); + + if (previousCommandType.IsSubclassOf(typeof(Condition))) + { + // Else If behaves the same as an If command + EvaluateAndContinue(); + } + else + { + // Else If behaves mostly like an Else command, + // but will also jump to a following Else command. + + // Stop if this is the last command in the list + if (CommandIndex >= ParentBlock.CommandList.Count - 1) + { + StopParentBlock(); + return; + } + + // Find the next End command at the same indent level as this Else If command + int indent = indentLevel; + for (int i = CommandIndex + 1; i < ParentBlock.CommandList.Count; ++i) + { + var command = ParentBlock.CommandList[i]; + + if (command.IndentLevel == indent) + { + System.Type type = command.GetType(); + if (type == typeof(End)) + { + // Execute command immediately after the Else or End command + Continue(command.CommandIndex + 1); + return; + } + } + } + + // No End command found + StopParentBlock(); + } + } + } + + public override bool OpenBlock() + { + return true; + } + #endregion + + protected virtual void EvaluateAndContinue() + { + if (EvaluateCondition()) + { + OnTrue(); + } + else + { + OnFalse(); + } + } + + protected virtual void OnTrue() + { + Continue(); + } + + protected virtual void OnFalse() + { + // Last command in block + if (CommandIndex >= ParentBlock.CommandList.Count) + { + StopParentBlock(); + return; + } + + // Find the next Else, ElseIf or End command at the same indent level as this If command + for (int i = CommandIndex + 1; i < ParentBlock.CommandList.Count; ++i) + { + Command nextCommand = ParentBlock.CommandList[i]; + + if (nextCommand == null) + { + continue; + } + + // Find next command at same indent level as this If command + // Skip disabled commands, comments & labels + if (!((Command)nextCommand).enabled || + nextCommand.GetType() == typeof(Comment) || + nextCommand.GetType() == typeof(Label) || + nextCommand.IndentLevel != indentLevel) + { + continue; + } + + System.Type type = nextCommand.GetType(); + if (type == typeof(Else) || + type == typeof(End)) + { + if (i >= ParentBlock.CommandList.Count - 1) + { + // Last command in Block, so stop + StopParentBlock(); + } + else + { + // Execute command immediately after the Else or End command + Continue(nextCommand.CommandIndex + 1); + return; + } + } + else if (type.IsSubclassOf(typeof(Condition)) && (nextCommand as Condition).IsElseIf) + { + // Execute the Else If command + Continue(i); + + return; + } + } + + // No matching End command found, so just stop the block + StopParentBlock(); + } + + protected abstract bool EvaluateCondition(); + + protected abstract bool HasNeededProperties(); + + protected virtual bool IsElseIf { get { return false; } } } } \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Scripts/Commands/ElseIf.cs index e6cabf71..eee6ab14 100644 --- a/Assets/Fungus/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Scripts/Commands/ElseIf.cs @@ -12,54 +12,11 @@ namespace Fungus "Else If", "Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true.")] [AddComponentMenu("")] - public class ElseIf : If + public class ElseIf : VariableCondition { - #region Public members - - public override void OnEnter() - { - System.Type previousCommandType = ParentBlock.GetPreviousActiveCommandType(); - - if (previousCommandType == typeof(If) || - previousCommandType == typeof(ElseIf) ) - { - // Else If behaves the same as an If command - EvaluateAndContinue(); - } - else - { - // Else If behaves mostly like an Else command, - // but will also jump to a following Else command. - - // Stop if this is the last command in the list - if (CommandIndex >= ParentBlock.CommandList.Count - 1) - { - StopParentBlock(); - return; - } + protected override bool IsElseIf { get { return true; } } - // Find the next End command at the same indent level as this Else If command - int indent = indentLevel; - for (int i = CommandIndex + 1; i < ParentBlock.CommandList.Count; ++i) - { - var command = ParentBlock.CommandList[i]; - - if (command.IndentLevel == indent) - { - System.Type type = command.GetType(); - if (type == typeof(End)) - { - // Execute command immediately after the Else or End command - Continue(command.CommandIndex + 1); - return; - } - } - } - - // No End command found - StopParentBlock(); - } - } + #region Public members public override bool OpenBlock() { diff --git a/Assets/Fungus/Scripts/Commands/If.cs b/Assets/Fungus/Scripts/Commands/If.cs index 680c17f8..c8d15fb0 100644 --- a/Assets/Fungus/Scripts/Commands/If.cs +++ b/Assets/Fungus/Scripts/Commands/If.cs @@ -12,189 +12,10 @@ namespace Fungus "If", "If the test expression is true, execute the following command block.")] [AddComponentMenu("")] - public class If : Condition + public class If : VariableCondition { - [Tooltip("Variable to use in expression")] - [VariableProperty(typeof(BooleanVariable), - typeof(IntegerVariable), - typeof(FloatVariable), - typeof(StringVariable))] - [SerializeField] protected Variable variable; - - [Tooltip("Boolean value to compare against")] - [SerializeField] protected BooleanData booleanData; - - [Tooltip("Integer value to compare against")] - [SerializeField] protected IntegerData integerData; - - [Tooltip("Float value to compare against")] - [SerializeField] protected FloatData floatData; - - [Tooltip("String value to compare against")] - [SerializeField] protected StringDataMulti stringData; - - protected virtual void EvaluateAndContinue() - { - if (EvaluateCondition()) - { - OnTrue(); - } - else - { - OnFalse(); - } - } - - protected virtual void OnTrue() - { - Continue(); - } - - protected virtual void OnFalse() - { - // Last command in block - if (CommandIndex >= ParentBlock.CommandList.Count) - { - StopParentBlock(); - return; - } - - // Find the next Else, ElseIf or End command at the same indent level as this If command - for (int i = CommandIndex + 1; i < ParentBlock.CommandList.Count; ++i) - { - Command nextCommand = ParentBlock.CommandList[i]; - - if (nextCommand == null) - { - continue; - } - - // Find next command at same indent level as this If command - // Skip disabled commands, comments & labels - if (!((Command)nextCommand).enabled || - nextCommand.GetType() == typeof(Comment) || - nextCommand.GetType() == typeof(Label) || - nextCommand.IndentLevel != indentLevel) - { - continue; - } - - System.Type type = nextCommand.GetType(); - if (type == typeof(Else) || - type == typeof(End)) - { - if (i >= ParentBlock.CommandList.Count - 1) - { - // Last command in Block, so stop - StopParentBlock(); - } - else - { - // Execute command immediately after the Else or End command - Continue(nextCommand.CommandIndex + 1); - return; - } - } - else if (type == typeof(ElseIf)) - { - // Execute the Else If command - Continue(i); - - return; - } - } - - // No matching End command found, so just stop the block - StopParentBlock(); - } - - protected virtual bool EvaluateCondition() - { - BooleanVariable booleanVariable = variable as BooleanVariable; - IntegerVariable integerVariable = variable as IntegerVariable; - FloatVariable floatVariable = variable as FloatVariable; - StringVariable stringVariable = variable as StringVariable; - - bool condition = false; - - if (booleanVariable != null) - { - condition = booleanVariable.Evaluate(compareOperator, booleanData.Value); - } - else if (integerVariable != null) - { - condition = integerVariable.Evaluate(compareOperator, integerData.Value); - } - else if (floatVariable != null) - { - condition = floatVariable.Evaluate(compareOperator, floatData.Value); - } - else if (stringVariable != null) - { - condition = stringVariable.Evaluate(compareOperator, stringData.Value); - } - - return condition; - } - #region Public members - - public override void OnEnter() - { - if (ParentBlock == null) - { - return; - } - - if (variable == null) - { - Continue(); - return; - } - - EvaluateAndContinue(); - } - - public override string GetSummary() - { - if (variable == null) - { - return "Error: No variable selected"; - } - - string summary = variable.Key + " "; - summary += Condition.GetOperatorDescription(compareOperator) + " "; - - if (variable.GetType() == typeof(BooleanVariable)) - { - summary += booleanData.GetDescription(); - } - else if (variable.GetType() == typeof(IntegerVariable)) - { - summary += integerData.GetDescription(); - } - else if (variable.GetType() == typeof(FloatVariable)) - { - summary += floatData.GetDescription(); - } - else if (variable.GetType() == typeof(StringVariable)) - { - summary += stringData.GetDescription(); - } - - return summary; - } - - public override bool HasReference(Variable variable) - { - return (variable == this.variable); - } - - public override bool OpenBlock() - { - return true; - } - + public override Color GetButtonColor() { return new Color32(253, 253, 150, 255); diff --git a/Assets/Fungus/Scripts/Commands/LuaCondition.cs b/Assets/Fungus/Scripts/Commands/LuaCondition.cs new file mode 100644 index 00000000..7bd7d81d --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaCondition.cs @@ -0,0 +1,126 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Fungus; +using MoonSharp.Interpreter; + +namespace Fungus +{ + public class LuaCondition : Condition + { + [Tooltip("Lua Environment to use to execute this Lua script (null for global)")] + [SerializeField] protected LuaEnvironment luaEnvironment; + + [Tooltip("The lua comparison string to run; implicitly prepends 'return' onto this")] + [TextArea] + public string luaCompareString; + protected bool initialised; + protected string friendlyName = ""; + protected Closure luaFunction; + + protected override bool EvaluateCondition() + { + bool condition = false; + luaEnvironment.RunLuaFunction(luaFunction, false, (returnValue) => { + if( returnValue != null ) + { + condition = returnValue.Boolean; + } + else + { + Debug.LogWarning("No return value from " + friendlyName); + } + }); + return condition; + } + + protected override bool HasNeededProperties() + { + return !string.IsNullOrEmpty(luaCompareString); + } + + protected virtual void Start() + { + InitExecuteLua(); + } + + protected virtual string GetLuaString() + { + return "return not not (" + luaCompareString + ")"; + } + + /// + /// Initialises the Lua environment and compiles the Lua string for execution later on. + /// + protected virtual void InitExecuteLua() + { + if (initialised) + { + return; + } + + // Cache a descriptive name to use in Lua error messages + friendlyName = gameObject.name + "." + ParentBlock.BlockName + "." + this.GetType().ToString() + " #" + CommandIndex.ToString(); + + Flowchart flowchart = GetFlowchart(); + + // See if a Lua Environment has been assigned to this Flowchart + if (luaEnvironment == null) + { + luaEnvironment = flowchart.LuaEnv; + } + + // No Lua Environment specified so just use any available or create one. + if (luaEnvironment == null) + { + luaEnvironment = LuaEnvironment.GetLua(); + } + + string s = GetLuaString(); + luaFunction = luaEnvironment.LoadLuaFunction(s, friendlyName); + + // Add a binding to the parent flowchart + if (flowchart.LuaBindingName != "") + { + Table globals = luaEnvironment.Interpreter.Globals; + if (globals != null) + { + globals[flowchart.LuaBindingName] = flowchart; + } + } + + // Always initialise when playing in the editor. + // Allows the user to edit the Lua script while the game is playing. + if ( !(Application.isPlaying && Application.isEditor) ) + { + initialised = true; + } + + } + + #region Public members + + public override string GetSummary() + { + if (string.IsNullOrEmpty(luaCompareString)) + { + return "Error: no lua compare string provided"; + } + + return luaCompareString; + } + + + public override bool OpenBlock() + { + return true; + } + + public override Color GetButtonColor() + { + return new Color32(253, 253, 150, 255); + } + + #endregion + } +} diff --git a/Assets/Fungus/Scripts/Commands/LuaCondition.cs.meta b/Assets/Fungus/Scripts/Commands/LuaCondition.cs.meta new file mode 100644 index 00000000..5073dfed --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaCondition.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 75ddfadd68d3d4713803a6b170cb0b51 +timeCreated: 1493078204 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Scripts/Commands/LuaElseIf.cs b/Assets/Fungus/Scripts/Commands/LuaElseIf.cs new file mode 100644 index 00000000..c7a647a5 --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaElseIf.cs @@ -0,0 +1,38 @@ +// 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; + +namespace Fungus +{ + /// + /// Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true. + /// + [CommandInfo("Flow", + "Lua Else If", + "Marks the start of a command block to be executed when the preceding If statement is False and the test expression is true.")] + [AddComponentMenu("")] + public class LuaElseIf : LuaCondition + { + protected override bool IsElseIf { get { return true; } } + + #region Public members + + public override bool OpenBlock() + { + return true; + } + + public override bool CloseBlock() + { + return true; + } + + public override Color GetButtonColor() + { + return new Color32(253, 253, 150, 255); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Commands/LuaElseIf.cs.meta b/Assets/Fungus/Scripts/Commands/LuaElseIf.cs.meta new file mode 100644 index 00000000..fae44b6f --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaElseIf.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9739de3269e5246b399e3a1cd41b94de +timeCreated: 1493078204 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Scripts/Commands/LuaIf.cs b/Assets/Fungus/Scripts/Commands/LuaIf.cs new file mode 100644 index 00000000..0a69e412 --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaIf.cs @@ -0,0 +1,26 @@ +// 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; + +namespace Fungus +{ + /// + /// If the test expression is true, execute the following command block. + /// + [CommandInfo("Flow", + "Lua If", + "If the test expression is true, execute the following command block.")] + [AddComponentMenu("")] + public class LuaIf : LuaCondition + { + #region Public members + + public override Color GetButtonColor() + { + return new Color32(253, 253, 150, 255); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Commands/LuaIf.cs.meta b/Assets/Fungus/Scripts/Commands/LuaIf.cs.meta new file mode 100644 index 00000000..c67f5d4f --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/LuaIf.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a8d396bcbf372485cad471c0bb64bb44 +timeCreated: 1493078204 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Scripts/Commands/VariableCondition.cs b/Assets/Fungus/Scripts/Commands/VariableCondition.cs new file mode 100644 index 00000000..c06edbb7 --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/VariableCondition.cs @@ -0,0 +1,110 @@ +// 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; + +namespace Fungus +{ + public abstract class VariableCondition : Condition + { + [Tooltip("The type of comparison to be performed")] + [SerializeField] protected CompareOperator compareOperator; + + [Tooltip("Variable to use in expression")] + [VariableProperty(typeof(BooleanVariable), + typeof(IntegerVariable), + typeof(FloatVariable), + typeof(StringVariable))] + [SerializeField] protected Variable variable; + + [Tooltip("Boolean value to compare against")] + [SerializeField] protected BooleanData booleanData; + + [Tooltip("Integer value to compare against")] + [SerializeField] protected IntegerData integerData; + + [Tooltip("Float value to compare against")] + [SerializeField] protected FloatData floatData; + + [Tooltip("String value to compare against")] + [SerializeField] protected StringDataMulti stringData; + + protected override bool EvaluateCondition() + { + BooleanVariable booleanVariable = variable as BooleanVariable; + IntegerVariable integerVariable = variable as IntegerVariable; + FloatVariable floatVariable = variable as FloatVariable; + StringVariable stringVariable = variable as StringVariable; + + bool condition = false; + + if (booleanVariable != null) + { + condition = booleanVariable.Evaluate(compareOperator, booleanData.Value); + } + else if (integerVariable != null) + { + condition = integerVariable.Evaluate(compareOperator, integerData.Value); + } + else if (floatVariable != null) + { + condition = floatVariable.Evaluate(compareOperator, floatData.Value); + } + else if (stringVariable != null) + { + condition = stringVariable.Evaluate(compareOperator, stringData.Value); + } + + return condition; + } + + protected override bool HasNeededProperties() + { + return (variable != null); + } + + #region Public members + + public override string GetSummary() + { + if (variable == null) + { + return "Error: No variable selected"; + } + + string summary = variable.Key + " "; + summary += Condition.GetOperatorDescription(compareOperator) + " "; + + if (variable.GetType() == typeof(BooleanVariable)) + { + summary += booleanData.GetDescription(); + } + else if (variable.GetType() == typeof(IntegerVariable)) + { + summary += integerData.GetDescription(); + } + else if (variable.GetType() == typeof(FloatVariable)) + { + summary += floatData.GetDescription(); + } + else if (variable.GetType() == typeof(StringVariable)) + { + summary += stringData.GetDescription(); + } + + return summary; + } + + public override bool HasReference(Variable variable) + { + return (variable == this.variable); + } + + public override Color GetButtonColor() + { + return new Color32(253, 253, 150, 255); + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Commands/VariableCondition.cs.meta b/Assets/Fungus/Scripts/Commands/VariableCondition.cs.meta new file mode 100644 index 00000000..62776780 --- /dev/null +++ b/Assets/Fungus/Scripts/Commands/VariableCondition.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b065f7dff8779442ab5841ccc6ae375b +timeCreated: 1493077787 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From da2efc55d26f7515c00a7af2c4115b05f4d60d9f Mon Sep 17 00:00:00 2001 From: Conrad Kreyling Date: Mon, 24 Apr 2017 20:43:29 -0400 Subject: [PATCH 2/2] Lua If tests --- Assets/Tests/Scripting/Scripting.unity | 1365 +++++++++++++++++------- 1 file changed, 1001 insertions(+), 364 deletions(-) diff --git a/Assets/Tests/Scripting/Scripting.unity b/Assets/Tests/Scripting/Scripting.unity index 51843ead..e78ba873 100644 --- a/Assets/Tests/Scripting/Scripting.unity +++ b/Assets/Tests/Scripting/Scripting.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 8 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -41,7 +42,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -53,7 +54,7 @@ LightmapSettings: m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 4 + serializedVersion: 8 m_Resolution: 2 m_BakeResolution: 40 m_TextureWidth: 1024 @@ -66,43 +67,60 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_DirectLightInLightProbes: 1 m_FinalGather: 0 m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFiltering: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousColorSigma: 1 + m_PVRFilteringAtrousNormalSigma: 1 + m_PVRFilteringAtrousPositionSigma: 1 m_LightingDataAsset: {fileID: 0} - m_RuntimeCPUUsage: 25 + m_ShadowMaskMode: 2 --- !u!196 &5 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1 &115525217 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 115525218} - - 114: {fileID: 115525223} - - 114: {fileID: 115525222} - - 114: {fileID: 115525221} - - 114: {fileID: 115525220} - - 114: {fileID: 115525219} + - component: {fileID: 115525218} + - component: {fileID: 115525223} + - component: {fileID: 115525222} + - component: {fileID: 115525221} + - component: {fileID: 115525220} + - component: {fileID: 115525219} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -119,13 +137,13 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 676156676} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &115525219 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 115525217} @@ -138,7 +156,7 @@ MonoBehaviour: indentLevel: 0 --- !u!114 &115525220 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 115525217} @@ -215,7 +233,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: [] + selectedBlocks: + - {fileID: 115525222} selectedCommands: [] variables: [] description: @@ -233,14 +252,14 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 169310209} - - 114: {fileID: 169310215} - - 114: {fileID: 169310214} - - 114: {fileID: 169310213} - - 114: {fileID: 169310211} - - 114: {fileID: 169310210} + - component: {fileID: 169310209} + - component: {fileID: 169310215} + - component: {fileID: 169310214} + - component: {fileID: 169310213} + - component: {fileID: 169310211} + - component: {fileID: 169310210} m_Layer: 0 m_Name: Flowchart3 m_TagString: Untagged @@ -257,10 +276,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &169310210 MonoBehaviour: m_ObjectHideFlags: 2 @@ -356,7 +375,8 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlocks: [] + selectedBlocks: + - {fileID: 169310214} selectedCommands: [] variables: [] description: If none of the other Flowcharts have Failed then this one will succeed @@ -374,11 +394,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 178675540} - - 114: {fileID: 178675536} - - 114: {fileID: 178675537} + - component: {fileID: 178675540} + - component: {fileID: 178675536} + - component: {fileID: 178675537} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -399,11 +419,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - scrollPos: {x: 0, y: 0} + scrollPos: {x: 1533, y: 642} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 blockViewHeight: 400 - zoom: 1 + zoom: 0.25 scrollViewRect: serializedVersion: 2 x: -343 @@ -447,34 +467,34 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1314799791} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &265055365 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 265055366} - - 114: {fileID: 265055382} - - 114: {fileID: 265055381} - - 114: {fileID: 265055380} - - 114: {fileID: 265055379} - - 114: {fileID: 265055378} - - 114: {fileID: 265055377} - - 114: {fileID: 265055376} - - 114: {fileID: 265055375} - - 114: {fileID: 265055374} - - 114: {fileID: 265055373} - - 114: {fileID: 265055372} - - 114: {fileID: 265055371} - - 114: {fileID: 265055370} - - 114: {fileID: 265055369} - - 114: {fileID: 265055368} - - 114: {fileID: 265055367} + - component: {fileID: 265055366} + - component: {fileID: 265055382} + - component: {fileID: 265055381} + - component: {fileID: 265055380} + - component: {fileID: 265055379} + - component: {fileID: 265055378} + - component: {fileID: 265055377} + - component: {fileID: 265055376} + - component: {fileID: 265055375} + - component: {fileID: 265055374} + - component: {fileID: 265055373} + - component: {fileID: 265055372} + - component: {fileID: 265055371} + - component: {fileID: 265055370} + - component: {fileID: 265055369} + - component: {fileID: 265055368} + - component: {fileID: 265055367} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -491,10 +511,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1595430751} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &265055367 MonoBehaviour: m_ObjectHideFlags: 2 @@ -813,10 +833,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 338809963} - - 114: {fileID: 338809962} + - component: {fileID: 338809963} + - component: {fileID: 338809962} m_Layer: 0 m_Name: TestRunner m_TagString: Untagged @@ -845,32 +865,32 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &396492925 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 396492935} - - 114: {fileID: 396492926} - - 114: {fileID: 396492930} - - 114: {fileID: 396492933} - - 114: {fileID: 396492928} - - 114: {fileID: 396492932} - - 114: {fileID: 396492929} - - 114: {fileID: 396492931} - - 114: {fileID: 396492927} - - 114: {fileID: 396492936} - - 114: {fileID: 396492934} - - 114: {fileID: 396492939} - - 114: {fileID: 396492938} - - 114: {fileID: 396492937} - - 114: {fileID: 396492940} + - component: {fileID: 396492935} + - component: {fileID: 396492926} + - component: {fileID: 396492930} + - component: {fileID: 396492933} + - component: {fileID: 396492928} + - component: {fileID: 396492932} + - component: {fileID: 396492929} + - component: {fileID: 396492931} + - component: {fileID: 396492927} + - component: {fileID: 396492936} + - component: {fileID: 396492934} + - component: {fileID: 396492939} + - component: {fileID: 396492938} + - component: {fileID: 396492937} + - component: {fileID: 396492940} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -1073,10 +1093,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 911947602} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &396492936 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1163,21 +1183,21 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 491823351} - - 114: {fileID: 491823363} - - 114: {fileID: 491823362} - - 114: {fileID: 491823361} - - 114: {fileID: 491823360} - - 114: {fileID: 491823359} - - 114: {fileID: 491823358} - - 114: {fileID: 491823357} - - 114: {fileID: 491823356} - - 114: {fileID: 491823355} - - 114: {fileID: 491823354} - - 114: {fileID: 491823353} - - 114: {fileID: 491823352} + - component: {fileID: 491823351} + - component: {fileID: 491823363} + - component: {fileID: 491823362} + - component: {fileID: 491823361} + - component: {fileID: 491823360} + - component: {fileID: 491823359} + - component: {fileID: 491823358} + - component: {fileID: 491823357} + - component: {fileID: 491823356} + - component: {fileID: 491823355} + - component: {fileID: 491823354} + - component: {fileID: 491823353} + - component: {fileID: 491823352} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -1194,10 +1214,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1883088050} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &491823352 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1452,18 +1472,18 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 575909999} - - 114: {fileID: 575910008} - - 114: {fileID: 575910007} - - 114: {fileID: 575910006} - - 114: {fileID: 575910005} - - 114: {fileID: 575910004} - - 114: {fileID: 575910003} - - 114: {fileID: 575910002} - - 114: {fileID: 575910001} - - 114: {fileID: 575910000} + - component: {fileID: 575909999} + - component: {fileID: 575910008} + - component: {fileID: 575910007} + - component: {fileID: 575910006} + - component: {fileID: 575910005} + - component: {fileID: 575910004} + - component: {fileID: 575910003} + - component: {fileID: 575910002} + - component: {fileID: 575910001} + - component: {fileID: 575910000} m_Layer: 0 m_Name: Flowchart2 m_TagString: Untagged @@ -1480,10 +1500,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &575910000 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1622,8 +1642,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 72 - y: 69 + x: 73 + y: 68 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -1659,7 +1679,8 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlocks: [] + selectedBlocks: + - {fileID: 575910004} selectedCommands: [] variables: [] description: Test if interupting a Say command works @@ -1677,19 +1698,19 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 590474772} - - 114: {fileID: 590474781} - - 114: {fileID: 590474780} - - 114: {fileID: 590474779} - - 114: {fileID: 590474778} - - 114: {fileID: 590474777} - - 114: {fileID: 590474776} - - 114: {fileID: 590474775} - - 114: {fileID: 590474774} - - 114: {fileID: 590474773} - - 114: {fileID: 590474782} + - component: {fileID: 590474772} + - component: {fileID: 590474781} + - component: {fileID: 590474780} + - component: {fileID: 590474779} + - component: {fileID: 590474778} + - component: {fileID: 590474777} + - component: {fileID: 590474776} + - component: {fileID: 590474775} + - component: {fileID: 590474774} + - component: {fileID: 590474773} + - component: {fileID: 590474782} m_Layer: 0 m_Name: Flowchart0 m_TagString: Untagged @@ -1706,10 +1727,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &590474773 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1881,9 +1902,9 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlocks: [] - selectedCommands: - - {fileID: 590474773} + selectedBlocks: + - {fileID: 590474778} + selectedCommands: [] variables: [] description: Test if interupting a Write command works stepPause: 0 @@ -1917,19 +1938,19 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 636123609} - - 114: {fileID: 636123608} - - 114: {fileID: 636123607} - - 114: {fileID: 636123606} - - 114: {fileID: 636123613} - - 114: {fileID: 636123612} - - 114: {fileID: 636123611} - - 114: {fileID: 636123610} - - 114: {fileID: 636123615} - - 114: {fileID: 636123605} - - 114: {fileID: 636123614} + - component: {fileID: 636123609} + - component: {fileID: 636123608} + - component: {fileID: 636123607} + - component: {fileID: 636123606} + - component: {fileID: 636123613} + - component: {fileID: 636123612} + - component: {fileID: 636123611} + - component: {fileID: 636123610} + - component: {fileID: 636123615} + - component: {fileID: 636123605} + - component: {fileID: 636123614} m_Layer: 0 m_Name: Flowchart1 m_TagString: Untagged @@ -2017,9 +2038,9 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlocks: [] - selectedCommands: - - {fileID: 636123614} + selectedBlocks: + - {fileID: 636123613} + selectedCommands: [] variables: [] description: Test if interupting a Write command works stepPause: 0 @@ -2040,10 +2061,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &636123610 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2102,8 +2123,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 248 - y: 75 + x: 249 + y: 76 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -2167,10 +2188,10 @@ GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 646902075} - - 114: {fileID: 646902074} + - component: {fileID: 646902075} + - component: {fileID: 646902074} m_Layer: 0 m_Name: _FungusState m_TagString: Untagged @@ -2189,7 +2210,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 675090867} + selectedFlowchart: {fileID: 1696781520} --- !u!4 &646902075 Transform: m_ObjectHideFlags: 1 @@ -2199,37 +2220,37 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &675090853 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 675090854} - - 114: {fileID: 675090867} - - 114: {fileID: 675090866} - - 114: {fileID: 675090865} - - 114: {fileID: 675090864} - - 114: {fileID: 675090863} - - 114: {fileID: 675090862} - - 114: {fileID: 675090861} - - 114: {fileID: 675090860} - - 114: {fileID: 675090859} - - 114: {fileID: 675090858} - - 114: {fileID: 675090857} - - 114: {fileID: 675090856} - - 114: {fileID: 675090873} - - 114: {fileID: 675090872} - - 114: {fileID: 675090871} - - 114: {fileID: 675090870} - - 114: {fileID: 675090869} - - 114: {fileID: 675090868} - - 114: {fileID: 675090855} + - component: {fileID: 675090854} + - component: {fileID: 675090867} + - component: {fileID: 675090866} + - component: {fileID: 675090865} + - component: {fileID: 675090864} + - component: {fileID: 675090863} + - component: {fileID: 675090862} + - component: {fileID: 675090861} + - component: {fileID: 675090860} + - component: {fileID: 675090859} + - component: {fileID: 675090858} + - component: {fileID: 675090857} + - component: {fileID: 675090856} + - component: {fileID: 675090873} + - component: {fileID: 675090872} + - component: {fileID: 675090871} + - component: {fileID: 675090870} + - component: {fileID: 675090869} + - component: {fileID: 675090868} + - component: {fileID: 675090855} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -2246,10 +2267,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1220349165} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &675090855 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2529,7 +2550,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: [] + selectedBlocks: + - {fileID: 675090866} selectedCommands: [] variables: - {fileID: 675090860} @@ -2657,10 +2679,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 676156676} - - 114: {fileID: 676156675} + - component: {fileID: 676156676} + - component: {fileID: 676156675} m_Layer: 0 m_Name: WaitInput m_TagString: Untagged @@ -2698,20 +2720,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 115525218} m_Father: {fileID: 0} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &697320579 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 697320581} - - 114: {fileID: 697320580} + - component: {fileID: 697320581} + - component: {fileID: 697320580} m_Layer: 0 m_Name: ReadTextFileTest m_TagString: Untagged @@ -2749,23 +2771,23 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1982550309} m_Father: {fileID: 0} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &756526316 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 756526321} - - 20: {fileID: 756526320} - - 92: {fileID: 756526319} - - 124: {fileID: 756526318} - - 81: {fileID: 756526317} + - component: {fileID: 756526321} + - component: {fileID: 756526320} + - component: {fileID: 756526319} + - component: {fileID: 756526318} + - component: {fileID: 756526317} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2824,6 +2846,8 @@ Camera: m_TargetDisplay: 0 m_TargetEye: 3 m_HDR: 0 + m_AllowMSAA: 1 + m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 @@ -2837,21 +2861,21 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &842242620 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 842242624} - - 114: {fileID: 842242623} - - 114: {fileID: 842242622} - - 114: {fileID: 842242621} + - component: {fileID: 842242624} + - component: {fileID: 842242623} + - component: {fileID: 842242622} + - component: {fileID: 842242621} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -2912,19 +2936,19 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &911947601 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 911947602} - - 114: {fileID: 911947603} + - component: {fileID: 911947602} + - component: {fileID: 911947603} m_Layer: 0 m_Name: SaveLoadTest m_TagString: Untagged @@ -2941,11 +2965,11 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 396492935} m_Father: {fileID: 0} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &911947603 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2972,10 +2996,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 984493284} - - 114: {fileID: 984493283} + - component: {fileID: 984493284} + - component: {fileID: 984493283} m_Layer: 0 m_Name: StopFlowchartTest m_TagString: Untagged @@ -3013,7 +3037,6 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 590474772} - {fileID: 636123609} @@ -3025,16 +3048,17 @@ Transform: - {fileID: 1920662342} m_Father: {fileID: 0} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1141004796 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1141004797} - - 222: {fileID: 1141004799} - - 114: {fileID: 1141004798} + - component: {fileID: 1141004797} + - component: {fileID: 1141004799} + - component: {fileID: 1141004798} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -3051,10 +3075,10 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1960747668} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 4, y: 128} @@ -3104,17 +3128,17 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1220349165} - - 114: {fileID: 1220349164} + - component: {fileID: 1220349165} + - component: {fileID: 1220349164} m_Layer: 0 m_Name: NestedWhileTest m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1220349164 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3145,20 +3169,20 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 675090854} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1314799789 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1314799791} - - 114: {fileID: 1314799790} + - component: {fileID: 1314799791} + - component: {fileID: 1314799790} m_Layer: 0 m_Name: HasVariableTest m_TagString: Untagged @@ -3196,21 +3220,21 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 178675540} - {fileID: 1753646195} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1354065529 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1354065530} - - 212: {fileID: 1354065531} + - component: {fileID: 1354065530} + - component: {fileID: 1354065531} m_Layer: 0 m_Name: Mushroom 1 m_TagString: Untagged @@ -3227,10 +3251,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1354065531 SpriteRenderer: m_ObjectHideFlags: 0 @@ -3245,7 +3269,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 0 m_Materials: - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 m_StaticBatchRoot: {fileID: 0} m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} @@ -3253,26 +3279,31 @@ SpriteRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_SelectedWireframeHidden: 1 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: d568b9f360a9641fba3a3c558cfbd607, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 --- !u!1 &1384749029 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1384749030} - - 114: {fileID: 1384749031} + - component: {fileID: 1384749030} + - component: {fileID: 1384749031} m_Layer: 0 m_Name: InvokeTest m_TagString: Untagged @@ -3289,12 +3320,12 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1618689133} - {fileID: 1960615185} m_Father: {fileID: 0} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1384749031 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3316,15 +3347,67 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1 &1529762308 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1529762309} + - component: {fileID: 1529762310} + m_Layer: 0 + m_Name: LuaIfTests + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1529762309 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1529762308} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1696781521} + - {fileID: 1919341912} + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1529762310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1529762308} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + timeout: 5 + ignored: 0 + succeedAfterAllAssertionsAreExecuted: 0 + expectException: 0 + expectedExceptionList: + succeedWhenExceptionIsThrown: 0 + includedPlatforms: -1 + platformsToIgnore: [] + dynamic: 0 + dynamicTypeName: --- !u!1 &1595430749 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1595430751} - - 114: {fileID: 1595430750} + - component: {fileID: 1595430751} + - component: {fileID: 1595430750} m_Layer: 0 m_Name: StopBlockTest m_TagString: Untagged @@ -3362,42 +3445,42 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 265055366} m_Father: {fileID: 0} m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1618689128 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1618689133} - - 114: {fileID: 1618689129} - - 114: {fileID: 1618689131} - - 114: {fileID: 1618689132} - - 114: {fileID: 1618689138} - - 114: {fileID: 1618689139} - - 114: {fileID: 1618689134} - - 114: {fileID: 1618689135} - - 114: {fileID: 1618689136} - - 114: {fileID: 1618689137} - - 114: {fileID: 1618689130} - - 114: {fileID: 1618689141} - - 114: {fileID: 1618689142} - - 114: {fileID: 1618689145} - - 114: {fileID: 1618689146} - - 114: {fileID: 1618689144} - - 114: {fileID: 1618689143} - - 114: {fileID: 1618689147} - - 114: {fileID: 1618689149} - - 114: {fileID: 1618689148} - - 114: {fileID: 1618689150} - - 114: {fileID: 1618689140} - - 114: {fileID: 1618689151} - - 114: {fileID: 1618689152} + - component: {fileID: 1618689133} + - component: {fileID: 1618689129} + - component: {fileID: 1618689131} + - component: {fileID: 1618689132} + - component: {fileID: 1618689138} + - component: {fileID: 1618689139} + - component: {fileID: 1618689134} + - component: {fileID: 1618689135} + - component: {fileID: 1618689136} + - component: {fileID: 1618689137} + - component: {fileID: 1618689130} + - component: {fileID: 1618689141} + - component: {fileID: 1618689142} + - component: {fileID: 1618689145} + - component: {fileID: 1618689146} + - component: {fileID: 1618689144} + - component: {fileID: 1618689143} + - component: {fileID: 1618689147} + - component: {fileID: 1618689149} + - component: {fileID: 1618689148} + - component: {fileID: 1618689150} + - component: {fileID: 1618689140} + - component: {fileID: 1618689151} + - component: {fileID: 1618689152} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -3460,6 +3543,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3599,10 +3683,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1384749030} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1618689134 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3616,6 +3700,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 3 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3659,6 +3744,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3702,6 +3788,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 5 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3745,6 +3832,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 6 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3802,6 +3890,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3857,6 +3946,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3911,6 +4001,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 9 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3937,6 +4028,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 10 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -3991,6 +4083,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 13 indentLevel: 0 + description: delay: 2 invokeType: 0 staticEvent: @@ -4054,6 +4147,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 12 indentLevel: 0 + description: targetObject: {fileID: 1960615183} targetComponentAssemblyName: Fungus.TestInvoke, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -4080,6 +4174,7 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 14 indentLevel: 0 + description: targetObject: {fileID: 1618689128} targetComponentAssemblyName: Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -4143,105 +4238,539 @@ MonoBehaviour: targetObject: {fileID: 1960615183} methodName: TestCallMethod delay: 0 ---- !u!1 &1753646194 +--- !u!1 &1696781519 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1753646195} - - 114: {fileID: 1753646200} - - 114: {fileID: 1753646199} - - 114: {fileID: 1753646198} - - 114: {fileID: 1753646197} - - 114: {fileID: 1753646196} + - component: {fileID: 1696781521} + - component: {fileID: 1696781520} + - component: {fileID: 1696781523} + - component: {fileID: 1696781531} + - component: {fileID: 1696781529} + - component: {fileID: 1696781530} + - component: {fileID: 1696781527} + - component: {fileID: 1696781528} + - component: {fileID: 1696781525} + - component: {fileID: 1696781524} + - component: {fileID: 1696781522} + - component: {fileID: 1696781532} + - component: {fileID: 1696781534} + - component: {fileID: 1696781533} + - component: {fileID: 1696781544} + - component: {fileID: 1696781540} + - component: {fileID: 1696781538} + - component: {fileID: 1696781539} + - component: {fileID: 1696781537} + - component: {fileID: 1696781536} + - component: {fileID: 1696781535} + - component: {fileID: 1696781526} m_Layer: 0 - m_Name: Lua + m_Name: Flowchart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1753646195 +--- !u!114 &1696781520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + selectedBlocks: + - {fileID: 1696781534} + selectedCommands: + - {fileID: 1696781538} + variables: + - {fileID: 1696781532} + description: Tests new Lua conditionals + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!4 &1696781521 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1753646194} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1696781519} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] - m_Father: {fileID: 1314799791} - m_RootOrder: 1 ---- !u!114 &1753646196 + m_Father: {fileID: 1529762309} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1696781522 MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, - type: 2} + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1753646194} + m_GameObject: {fileID: 1696781519} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} m_Name: m_EditorClassIdentifier: - fungusModule: 0 - activeLanguage: en - stringTables: [] - registerTypes: - - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} - - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} ---- !u!114 &1753646197 + itemId: 8 + indentLevel: 0 +--- !u!114 &1696781523 MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, - type: 2} + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1753646194} + m_GameObject: {fileID: 1696781519} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1753646198 + nodeRect: + serializedVersion: 2 + x: 89 + y: 113 + width: 160 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: Simple conditionals + description: + eventHandler: {fileID: 1696781531} + commandList: + - {fileID: 1696781530} + - {fileID: 1696781529} + - {fileID: 1696781528} + - {fileID: 1696781527} + - {fileID: 1696781533} + - {fileID: 1696781525} + - {fileID: 1696781524} + - {fileID: 1696781522} +--- !u!114 &1696781524 MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, - type: 2} + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1753646194} + m_GameObject: {fileID: 1696781519} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} m_Name: m_EditorClassIdentifier: - allEnvironments: 1 - luaEnvironment: {fileID: 1753646197} - tableName: - registerTypes: 1 - 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 + itemId: 7 + indentLevel: 1 + failMessage: +--- !u!114 &1696781525 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa968f01a7f9496bb50e13dfe16760d, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + indentLevel: 0 +--- !u!114 &1696781526 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 28 + indentLevel: 0 +--- !u!114 &1696781527 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9739de3269e5246b399e3a1cd41b94de, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + indentLevel: 0 + luaEnvironment: {fileID: 0} + luaCompareString: i == 4 +--- !u!114 &1696781528 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + indentLevel: 1 + failMessage: +--- !u!114 &1696781529 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a8d396bcbf372485cad471c0bb64bb44, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + luaEnvironment: {fileID: 1919341914} + luaCompareString: 'i != 4 + +' +--- !u!114 &1696781530 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71f455683d4ba4405b8dbba457159620, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + luaEnvironment: {fileID: 1919341914} + luaFile: {fileID: 0} + luaScript: i = 4 + runAsCoroutine: 0 + waitUntilFinished: 1 + returnVariable: {fileID: 0} +--- !u!114 &1696781531 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1696781523} + waitForFrames: 1 +--- !u!114 &1696781532 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: j + value: 5 +--- !u!114 &1696781533 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 050fb9e6e72f442b3b883da8a965bdeb, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 10 + indentLevel: 1 + targetFlowchart: {fileID: 0} + targetBlock: {fileID: 1696781534} + startLabel: + stringRef: {fileID: 0} + stringVal: + startIndex: 0 + callMode: 0 +--- !u!114 &1696781534 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 299 + y: 114 + width: 189 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 9 + blockName: Mixed Conditional Types + description: + eventHandler: {fileID: 0} + commandList: + - {fileID: 1696781544} + - {fileID: 1696781540} + - {fileID: 1696781539} + - {fileID: 1696781538} + - {fileID: 1696781537} + - {fileID: 1696781536} + - {fileID: 1696781535} + - {fileID: 1696781526} +--- !u!114 &1696781535 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 27 + indentLevel: 1 + failMessage: +--- !u!114 &1696781536 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa968f01a7f9496bb50e13dfe16760d, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 26 + indentLevel: 0 +--- !u!114 &1696781537 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 25 + indentLevel: 1 +--- !u!114 &1696781538 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9739de3269e5246b399e3a1cd41b94de, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 23 + indentLevel: 0 + luaEnvironment: {fileID: 1919341914} + luaCompareString: flowchart.GetIntegerVariable("j")==5 and i==5 +--- !u!114 &1696781539 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 24 + indentLevel: 1 + failMessage: +--- !u!114 &1696781540 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 22 + indentLevel: 0 + compareOperator: 0 + variable: {fileID: 1696781532} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 3 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &1696781544 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696781519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 71f455683d4ba4405b8dbba457159620, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 16 + indentLevel: 0 + luaEnvironment: {fileID: 1919341914} + luaFile: {fileID: 0} + luaScript: i = 5 + runAsCoroutine: 0 + waitUntilFinished: 1 + returnVariable: {fileID: 0} +--- !u!1 &1753646194 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1753646195} + - component: {fileID: 1753646200} + - component: {fileID: 1753646199} + - component: {fileID: 1753646198} + - component: {fileID: 1753646197} + - component: {fileID: 1753646196} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1753646195 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 466848, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1753646194} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1314799791} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1753646196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11437776, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1753646194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} +--- !u!114 &1753646197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483650, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1753646194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + startDebugServer: 1 + debugServerPort: 41912 +--- !u!114 &1753646198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11499092, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1753646194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 1 + luaEnvironment: {fileID: 1753646197} + tableName: + registerTypes: 1 + 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.Label, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, @@ -4295,10 +4824,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1759271210} - - 114: {fileID: 1759271211} + - component: {fileID: 1759271210} + - component: {fileID: 1759271211} m_Layer: 0 m_Name: ViewA m_TagString: Untagged @@ -4315,10 +4844,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1759271211 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4339,10 +4868,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1883088050} - - 114: {fileID: 1883088049} + - component: {fileID: 1883088050} + - component: {fileID: 1883088049} m_Layer: 0 m_Name: WhileLoopTest m_TagString: Untagged @@ -4380,20 +4909,126 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 491823351} m_Father: {fileID: 0} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1919341911 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1919341912} + - component: {fileID: 1919341915} + - component: {fileID: 1919341914} + - component: {fileID: 1919341913} + m_Layer: 0 + m_Name: Lua + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1919341912 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1919341911} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1529762309} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1919341913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1919341911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4cc8a659e950044b69d7c62696c36962, type: 3} + m_Name: + m_EditorClassIdentifier: + allEnvironments: 1 + luaEnvironment: {fileID: 1753646197} + tableName: + registerTypes: 1 + 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.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: 1696781519} + component: {fileID: 1696781520} + showInherited: 0 +--- !u!114 &1919341914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1919341911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} + m_Name: + m_EditorClassIdentifier: + startDebugServer: 1 + debugServerPort: 41912 +--- !u!114 &1919341915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1919341911} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c10f0b861365b42b0928858f7b086ff3, type: 3} + m_Name: + m_EditorClassIdentifier: + fungusModule: 0 + activeLanguage: en + stringTables: [] + registerTypes: + - {fileID: 4900000, guid: 9c3ab7a98d51241bbb499643399fa761, type: 3} + - {fileID: 4900000, guid: 93fddea8208764a2dbb189cc238aed40, type: 3} --- !u!1 &1920662341 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1920662342} - - 114: {fileID: 1920662343} + - component: {fileID: 1920662342} + - component: {fileID: 1920662343} m_Layer: 0 m_Name: ViewB m_TagString: Untagged @@ -4410,10 +5045,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 984493284} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1920662343 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4434,10 +5069,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1960615185} - - 114: {fileID: 1960615184} + - component: {fileID: 1960615185} + - component: {fileID: 1960615184} m_Layer: 0 m_Name: TestTarget m_TagString: Untagged @@ -4467,21 +5102,21 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.13777122, y: -0.16843766, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1384749030} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1960747667 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1960747668} - - 223: {fileID: 1960747671} - - 114: {fileID: 1960747670} - - 114: {fileID: 1960747669} + - component: {fileID: 1960747668} + - component: {fileID: 1960747671} + - component: {fileID: 1960747670} + - component: {fileID: 1960747669} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -4498,11 +5133,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 1141004797} m_Father: {fileID: 984493284} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -4552,7 +5187,7 @@ Canvas: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1960747667} m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -4561,6 +5196,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4569,19 +5205,19 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1982550309} - - 114: {fileID: 1982550314} - - 114: {fileID: 1982550313} - - 114: {fileID: 1982550312} - - 114: {fileID: 1982550311} - - 114: {fileID: 1982550310} - - 114: {fileID: 1982550319} - - 114: {fileID: 1982550318} - - 114: {fileID: 1982550317} - - 114: {fileID: 1982550316} - - 114: {fileID: 1982550315} + - component: {fileID: 1982550309} + - component: {fileID: 1982550314} + - component: {fileID: 1982550313} + - component: {fileID: 1982550312} + - component: {fileID: 1982550311} + - component: {fileID: 1982550310} + - component: {fileID: 1982550319} + - component: {fileID: 1982550318} + - component: {fileID: 1982550317} + - component: {fileID: 1982550316} + - component: {fileID: 1982550315} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -4598,13 +5234,13 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 697320581} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1982550310 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4618,7 +5254,7 @@ MonoBehaviour: value: --- !u!114 &1982550311 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4700,7 +5336,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlocks: [] + selectedBlocks: + - {fileID: 1982550313} selectedCommands: [] variables: - {fileID: 1982550310} @@ -4716,7 +5353,7 @@ MonoBehaviour: luaBindingName: flowchart --- !u!114 &1982550315 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4730,7 +5367,7 @@ MonoBehaviour: failMessage: --- !u!114 &1982550316 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4743,7 +5380,7 @@ MonoBehaviour: indentLevel: 1 --- !u!114 &1982550317 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4756,7 +5393,7 @@ MonoBehaviour: indentLevel: 0 --- !u!114 &1982550318 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308} @@ -4769,7 +5406,7 @@ MonoBehaviour: indentLevel: 0 --- !u!114 &1982550319 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1982550308}