From b14da8fcda2acfcf2caa7e7e0387eb0412ea06cb Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 16 Sep 2015 15:00:28 +0100 Subject: [PATCH 1/6] Added Flowchart.StopAllBlocks() and command callback --- Assets/Fungus/Flowchart/Scripts/Block.cs | 6 ++++++ Assets/Fungus/Flowchart/Scripts/Command.cs | 11 ++++++++++- Assets/Fungus/Flowchart/Scripts/Commands/Call.cs | 2 +- Assets/Fungus/Flowchart/Scripts/Commands/Else.cs | 4 ++-- .../Fungus/Flowchart/Scripts/Commands/ElseIf.cs | 4 ++-- Assets/Fungus/Flowchart/Scripts/Commands/If.cs | 6 +++--- .../Flowchart/Scripts/Commands/InvokeMethod.cs | 4 ++-- Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs | 4 ++-- Assets/Fungus/Flowchart/Scripts/Flowchart.cs | 15 +++++++++++++++ 9 files changed, 43 insertions(+), 13 deletions(-) diff --git a/Assets/Fungus/Flowchart/Scripts/Block.cs b/Assets/Fungus/Flowchart/Scripts/Block.cs index b61f4f54..16391e3e 100644 --- a/Assets/Fungus/Flowchart/Scripts/Block.cs +++ b/Assets/Fungus/Flowchart/Scripts/Block.cs @@ -237,6 +237,12 @@ namespace Fungus public virtual void Stop() { + // Tell the executing command to stop immediately + if (activeCommand != null) + { + activeCommand.OnStopExecuting(); + } + // This will cause the execution loop to break on the next iteration jumpToCommandIndex = int.MaxValue; } diff --git a/Assets/Fungus/Flowchart/Scripts/Command.cs b/Assets/Fungus/Flowchart/Scripts/Command.cs index 12f910ed..9018ef63 100644 --- a/Assets/Fungus/Flowchart/Scripts/Command.cs +++ b/Assets/Fungus/Flowchart/Scripts/Command.cs @@ -95,7 +95,7 @@ namespace Fungus } } - public virtual void Stop() + public virtual void StopParentBlock() { OnExit(); if (parentBlock != null) @@ -104,6 +104,15 @@ namespace Fungus } } + /** + * Called when the parent block has been requested to stop executing, and + * this command is the currently executing command. + * Use this callback to terminate any asynchronous operations and + * cleanup state so that the command is ready to execute again later on. + */ + public virtual void OnStopExecuting() + {} + /** * Called when the new command is added to a block in the editor. */ diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs index b23ad187..d766d3a3 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Call.cs @@ -75,7 +75,7 @@ namespace Fungus if (callMode == CallMode.Stop) { - Stop(); + StopParentBlock(); } else if (callMode == CallMode.Continue) { diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs index c140ebf6..23d8da2d 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Else.cs @@ -20,7 +20,7 @@ namespace Fungus // Stop if this is the last command in the list if (commandIndex >= parentBlock.commandList.Count - 1) { - Stop(); + StopParentBlock(); return; } @@ -43,7 +43,7 @@ namespace Fungus } // No End command found - Stop(); + StopParentBlock(); } public override bool OpenBlock() diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs index 12095328..ca76f72f 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/ElseIf.cs @@ -31,7 +31,7 @@ namespace Fungus // Stop if this is the last command in the list if (commandIndex >= parentBlock.commandList.Count - 1) { - Stop(); + StopParentBlock(); return; } @@ -54,7 +54,7 @@ namespace Fungus } // No End command found - Stop(); + StopParentBlock(); } } diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs index 19b03009..21ac95ba 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/If.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/If.cs @@ -97,7 +97,7 @@ namespace Fungus // Last command in block if (commandIndex >= parentBlock.commandList.Count) { - Stop(); + StopParentBlock(); return; } @@ -128,7 +128,7 @@ namespace Fungus if (i >= parentBlock.commandList.Count - 1) { // Last command in Block, so stop - Stop(); + StopParentBlock(); } else { @@ -147,7 +147,7 @@ namespace Fungus } // No matching End command found, so just stop the block - Stop(); + StopParentBlock(); } public override string GetSummary() diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/InvokeMethod.cs b/Assets/Fungus/Flowchart/Scripts/Commands/InvokeMethod.cs index 13a36a54..2645a75b 100755 --- a/Assets/Fungus/Flowchart/Scripts/Commands/InvokeMethod.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/InvokeMethod.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; using System.Collections; using System.Reflection; using System.Linq; @@ -120,7 +120,7 @@ namespace Fungus } else if(callMode == Call.CallMode.Stop) { - Stop(); + StopParentBlock(); } } } diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs b/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs index 2dd1a837..600d45cc 100644 --- a/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs +++ b/Assets/Fungus/Flowchart/Scripts/Commands/Stop.cs @@ -6,13 +6,13 @@ namespace Fungus { [CommandInfo("Flow", "Stop", - "Stop executing the current Flowchart.")] + "Stop executing the Block that contains this command.")] [AddComponentMenu("")] public class Stop : Command { public override void OnEnter() { - Stop(); + StopParentBlock(); } public override Color GetButtonColor() diff --git a/Assets/Fungus/Flowchart/Scripts/Flowchart.cs b/Assets/Fungus/Flowchart/Scripts/Flowchart.cs index c0c8fe49..102f51cb 100644 --- a/Assets/Fungus/Flowchart/Scripts/Flowchart.cs +++ b/Assets/Fungus/Flowchart/Scripts/Flowchart.cs @@ -425,6 +425,21 @@ namespace Fungus return true; } + /** + * Stop all executing Blocks in this Flowchart. + */ + public virtual void StopAllBlocks() + { + Block [] blocks = GetComponentsInChildren(); + foreach (Block block in blocks) + { + if (block.IsExecuting()) + { + block.Stop(); + } + } + } + /** * Returns a new variable key that is guaranteed not to clash with any existing variable in the list. */ From 929b56ea90744c6ef7d7b6819ad82d82424e448e Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 16 Sep 2015 15:01:20 +0100 Subject: [PATCH 2/6] Added StopFlowchart command --- .../Scripts/Commands/StopFlowchart.cs | 56 +++++++++++++++++++ .../Scripts/Commands/StopFlowchart.cs.meta | 12 ++++ 2 files changed, 68 insertions(+) create mode 100644 Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs create mode 100644 Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs.meta diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs b/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs new file mode 100644 index 00000000..e1a99e02 --- /dev/null +++ b/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs @@ -0,0 +1,56 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +namespace Fungus +{ + [CommandInfo("Flow", + "Stop Flowchart", + "Stops execution of all Blocks in a Flowchart")] + [AddComponentMenu("")] + public class StopFlowchart : Command + { + [Tooltip("Stop all executing Blocks in the Flowchart that contains this command")] + public bool stopParentFlowchart; + + [Tooltip("Stop all executing Blocks in a list of target Flowcharts")] + public List targetFlowcharts = new List(); + + public override void OnEnter() + { + Flowchart flowchart = GetFlowchart(); + + if (stopParentFlowchart) + { + flowchart.StopAllBlocks(); + } + + foreach (Flowchart f in targetFlowcharts) + { + if (f == flowchart) + { + // Flowchart has already been stopped + continue; + } + + f.StopAllBlocks(); + } + } + + public override bool IsReorderableArray(string propertyName) + { + if (propertyName == "targetFlowcharts") + { + return true; + } + + return false; + } + + public override Color GetButtonColor() + { + return new Color32(235, 191, 217, 255); + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs.meta b/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs.meta new file mode 100644 index 00000000..c528201e --- /dev/null +++ b/Assets/Fungus/Flowchart/Scripts/Commands/StopFlowchart.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: ae67a23cb4aa74793b41258ae40bf321 +timeCreated: 1442408419 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From f83cacd3349793f181fd712a7dd71973d99765c1 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 16 Sep 2015 15:01:39 +0100 Subject: [PATCH 3/6] Say command can now be stopped --- Assets/Fungus/Narrative/Scripts/Commands/Say.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs index 4a2f7ce0..03536ab3 100644 --- a/Assets/Fungus/Narrative/Scripts/Commands/Say.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/Say.cs @@ -120,6 +120,17 @@ namespace Fungus executionCount = 0; } + public override void OnStopExecuting() + { + SayDialog sayDialog = SayDialog.GetSayDialog(); + if (sayDialog == null) + { + return; + } + + sayDialog.Stop(); + } + // // ILocalizable implementation // From 40d07ae313f3ad8024ff84d11cdf66af885e3f05 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 16 Sep 2015 15:01:53 +0100 Subject: [PATCH 4/6] Added test for stopping Say command --- Assets/Tests/Scripting/Scripting.unity | 279 ++++++++++++++++++++++++- 1 file changed, 273 insertions(+), 6 deletions(-) diff --git a/Assets/Tests/Scripting/Scripting.unity b/Assets/Tests/Scripting/Scripting.unity index 974bf493..d04e4cb5 100644 --- a/Assets/Tests/Scripting/Scripting.unity +++ b/Assets/Tests/Scripting/Scripting.unity @@ -37,9 +37,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -68,6 +65,7 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 @@ -192,6 +190,7 @@ MonoBehaviour: hideComponents: 1 saveSelection: 1 localizationId: + hideCommands: [] --- !u!114 &396492927 MonoBehaviour: m_ObjectHideFlags: 0 @@ -437,6 +436,223 @@ MonoBehaviour: itemId: 9 errorMessage: indentLevel: 0 +--- !u!1 &636123604 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 636123609} + - 114: {fileID: 636123608} + - 114: {fileID: 636123607} + - 114: {fileID: 636123606} + - 114: {fileID: 636123605} + - 114: {fileID: 636123613} + - 114: {fileID: 636123612} + - 114: {fileID: 636123611} + - 114: {fileID: 636123610} + - 114: {fileID: 636123614} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &636123605 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + storyText: Write some text and wait for input + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + setSayDialog: {fileID: 0} +--- !u!114 &636123606 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 636123607} +--- !u!114 &636123607 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 69 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 636123606} + commandList: + - {fileID: 636123605} +--- !u!114 &636123608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -350 + width: 1126 + height: 869 + selectedBlock: {fileID: 636123613} + selectedCommands: + - {fileID: 636123614} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] +--- !u!4 &636123609 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + 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: 984493284} + m_RootOrder: 0 +--- !u!114 &636123610 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f1ca510a57aa47568a5e4ee558ff41f, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 0 +--- !u!114 &636123611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 + duration: 2 +--- !u!114 &636123612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 636123613} +--- !u!114 &636123613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 248 + y: 75 + width: 120 + height: 40 + itemId: 2 + blockName: New Block + description: + eventHandler: {fileID: 636123612} + commandList: + - {fileID: 636123611} + - {fileID: 636123614} + - {fileID: 636123610} +--- !u!114 &636123614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2fab8abf0343545abbfebd9a7b7b34bd, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 + logType: 0 + logMessage: + stringRef: {fileID: 0} + stringVal: Hi there --- !u!1 &646902073 GameObject: m_ObjectHideFlags: 1 @@ -464,7 +680,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 396492926} + selectedFlowchart: {fileID: 636123608} --- !u!4 &646902075 Transform: m_ObjectHideFlags: 1 @@ -592,7 +808,7 @@ MonoBehaviour: m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowActivationOnStandalone: 0 + m_ForceModuleActive: 0 --- !u!114 &842242622 MonoBehaviour: m_ObjectHideFlags: 0 @@ -610,7 +826,7 @@ MonoBehaviour: m_CancelButton: Cancel m_InputActionsPerSecond: 10 m_RepeatDelay: .5 - m_AllowActivationOnMobileDevice: 0 + m_ForceModuleActive: 0 --- !u!114 &842242623 MonoBehaviour: m_ObjectHideFlags: 0 @@ -687,6 +903,56 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1 &984493282 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 984493284} + - 114: {fileID: 984493283} + m_Layer: 0 + m_Name: StopFlowchartTest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &984493283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 984493282} + 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!4 &984493284 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 984493282} + 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: 636123609} + m_Father: {fileID: 0} + m_RootOrder: 5 --- !u!1 &1384749029 GameObject: m_ObjectHideFlags: 0 @@ -814,6 +1080,7 @@ MonoBehaviour: hideComponents: 1 saveSelection: 1 localizationId: + hideCommands: [] --- !u!114 &1618689130 MonoBehaviour: m_ObjectHideFlags: 2 From 9c3175d2eec0af519dbba61fefda5f6dcab428c2 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 9 Oct 2015 14:56:55 +0100 Subject: [PATCH 5/6] Upgrade to Unity 5.2.1 --- ProjectSettings/ProjectSettings.asset | 14 ++++++++++++++ ProjectSettings/ProjectVersion.txt | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1abb15ad..5f6f9462 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,6 +8,7 @@ PlayerSettings: defaultScreenOrientation: 2 targetDevice: 2 targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: Fungus productName: Sherlock @@ -28,6 +29,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -135,6 +137,15 @@ PlayerSettings: iOSLaunchScreenFillPct: 1 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -231,6 +242,8 @@ PlayerSettings: ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -252,6 +265,7 @@ PlayerSettings: ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e040c5c1..8a062e60 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0 From e44ae3df4536202679e342f739dafcce26336505 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Fri, 9 Oct 2015 15:54:56 +0100 Subject: [PATCH 6/6] Fixes for Stop Flowchart command #288 --- .../Camera/Scripts/Commands/FadeToView.cs | 5 + .../Camera/Scripts/Commands/MoveToView.cs | 5 + Assets/Fungus/Flowchart/Scripts/Block.cs | 1 + Assets/Fungus/Flowchart/Scripts/Command.cs | 6 +- Assets/Fungus/UI/Scripts/Commands/Write.cs | 23 +- Assets/Fungus/UI/Scripts/Writer.cs | 5 +- Assets/Tests/Scripting/Scripting.unity | 1027 ++++++++++++++++- 7 files changed, 1003 insertions(+), 69 deletions(-) diff --git a/Assets/Fungus/Camera/Scripts/Commands/FadeToView.cs b/Assets/Fungus/Camera/Scripts/Commands/FadeToView.cs index af043cde..89e4ffdc 100644 --- a/Assets/Fungus/Camera/Scripts/Commands/FadeToView.cs +++ b/Assets/Fungus/Camera/Scripts/Commands/FadeToView.cs @@ -66,6 +66,11 @@ namespace Fungus } } + public override void OnStopExecuting() + { + CameraController.GetInstance().StopAllCoroutines(); + } + public override string GetSummary() { if (targetView == null) diff --git a/Assets/Fungus/Camera/Scripts/Commands/MoveToView.cs b/Assets/Fungus/Camera/Scripts/Commands/MoveToView.cs index 19da879e..ab2d95e5 100644 --- a/Assets/Fungus/Camera/Scripts/Commands/MoveToView.cs +++ b/Assets/Fungus/Camera/Scripts/Commands/MoveToView.cs @@ -46,6 +46,11 @@ namespace Fungus } } + public override void OnStopExecuting() + { + CameraController.GetInstance().StopAllCoroutines(); + } + public override string GetSummary() { if (targetView == null) diff --git a/Assets/Fungus/Flowchart/Scripts/Block.cs b/Assets/Fungus/Flowchart/Scripts/Block.cs index 16391e3e..946d7398 100644 --- a/Assets/Fungus/Flowchart/Scripts/Block.cs +++ b/Assets/Fungus/Flowchart/Scripts/Block.cs @@ -240,6 +240,7 @@ namespace Fungus // Tell the executing command to stop immediately if (activeCommand != null) { + activeCommand.isExecuting = false; activeCommand.OnStopExecuting(); } diff --git a/Assets/Fungus/Flowchart/Scripts/Command.cs b/Assets/Fungus/Flowchart/Scripts/Command.cs index 9018ef63..6495de0c 100644 --- a/Assets/Fungus/Flowchart/Scripts/Command.cs +++ b/Assets/Fungus/Flowchart/Scripts/Command.cs @@ -83,7 +83,11 @@ namespace Fungus public virtual void Continue() { - Continue(commandIndex + 1); + // This is a noop if the Block has already been stopped + if (isExecuting) + { + Continue(commandIndex + 1); + } } public virtual void Continue(int nextCommandIndex) diff --git a/Assets/Fungus/UI/Scripts/Commands/Write.cs b/Assets/Fungus/UI/Scripts/Commands/Write.cs index e88d1c63..537d88f7 100644 --- a/Assets/Fungus/UI/Scripts/Commands/Write.cs +++ b/Assets/Fungus/UI/Scripts/Commands/Write.cs @@ -42,6 +42,17 @@ namespace Fungus public ColorData setColor = new ColorData(Color.white); + protected Writer GetWriter() + { + Writer writer = textObject.GetComponent(); + if (writer == null) + { + writer = textObject.AddComponent() as Writer; + } + + return writer; + } + public override void OnEnter() { if (textObject == null) @@ -50,7 +61,7 @@ namespace Fungus return; } - Writer writer = FindWriter(textObject); + Writer writer = GetWriter(); if (writer == null) { Continue(); @@ -101,15 +112,9 @@ namespace Fungus return new Color32(235, 191, 217, 255); } - protected Writer FindWriter(GameObject textObject) + public override void OnStopExecuting() { - Writer writer = textObject.GetComponent(); - if (writer == null) - { - writer = textObject.AddComponent() as Writer; - } - - return writer; + GetWriter().Stop(); } // diff --git a/Assets/Fungus/UI/Scripts/Writer.cs b/Assets/Fungus/UI/Scripts/Writer.cs index d936c2d0..98cb8893 100644 --- a/Assets/Fungus/UI/Scripts/Writer.cs +++ b/Assets/Fungus/UI/Scripts/Writer.cs @@ -269,7 +269,10 @@ namespace Fungus public virtual void Stop() { - exitFlag = true; + if (isWriting || isWaitingForInput) + { + exitFlag = true; + } } public virtual void Write(string content, bool clear, bool waitForInput, AudioClip audioClip, Action onComplete) diff --git a/Assets/Tests/Scripting/Scripting.unity b/Assets/Tests/Scripting/Scripting.unity index d04e4cb5..07283d8a 100644 --- a/Assets/Tests/Scripting/Scripting.unity +++ b/Assets/Tests/Scripting/Scripting.unity @@ -85,6 +85,139 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &169310208 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 169310209} + - 114: {fileID: 169310215} + - 114: {fileID: 169310214} + - 114: {fileID: 169310213} + - 114: {fileID: 169310211} + - 114: {fileID: 169310210} + m_Layer: 0 + m_Name: Flowchart3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &169310209 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + 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: 984493284} + m_RootOrder: 3 +--- !u!114 &169310210 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + errorMessage: + indentLevel: 0 +--- !u!114 &169310211 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + duration: 3 +--- !u!114 &169310213 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 169310214} +--- !u!114 &169310214 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 72 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 169310213} + commandList: + - {fileID: 169310211} + - {fileID: 169310210} +--- !u!114 &169310215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 169310208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -350 + width: 1126 + height: 869 + selectedBlock: {fileID: 0} + selectedCommands: [] + variables: [] + description: If none of the other Flowcharts have Failed then this one will succeed + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] --- !u!1 &338809961 GameObject: m_ObjectHideFlags: 0 @@ -397,45 +530,490 @@ MonoBehaviour: --- !u!114 &396492939 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 396492925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + errorMessage: + indentLevel: 0 + compareOperator: 1 + variable: {fileID: 396492927} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 0 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: SomeValue +--- !u!114 &396492940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 396492925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 9 + errorMessage: + indentLevel: 0 +--- !u!1 &575909998 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + 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} + m_Layer: 0 + m_Name: Flowchart2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &575909999 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + 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: 984493284} + m_RootOrder: 2 +--- !u!114 &575910000 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 + failMessage: +--- !u!114 &575910001 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae67a23cb4aa74793b41258ae40bf321, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 0 + stopParentFlowchart: 1 + targetFlowcharts: [] +--- !u!114 &575910002 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 + duration: 1 +--- !u!114 &575910003 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 575910004} +--- !u!114 &575910004 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 248 + y: 75 + width: 120 + height: 40 + itemId: 2 + blockName: New Block + description: + eventHandler: {fileID: 575910003} + commandList: + - {fileID: 575910002} + - {fileID: 575910001} +--- !u!114 &575910005 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + storyText: Write some text and wait for input + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + setSayDialog: {fileID: 0} +--- !u!114 &575910006 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 575910007} +--- !u!114 &575910007 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 72 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 575910006} + commandList: + - {fileID: 575910005} + - {fileID: 575910000} +--- !u!114 &575910008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 575909998} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -350 + width: 1126 + height: 869 + selectedBlock: {fileID: 575910007} + selectedCommands: [] + variables: [] + description: Test if interupting a Say command works + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] +--- !u!1 &590474771 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + 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} + m_Layer: 0 + m_Name: Flowchart0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &590474772 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + 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: 984493284} + m_RootOrder: 0 +--- !u!114 &590474773 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 437f9a4e3dbc647f9bdce95308418bff, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 8 + errorMessage: + indentLevel: 0 + duration: .25 + fadeOut: 0 + targetView: {fileID: 1759271211} + waitUntilFinished: 1 + fadeColor: {r: 0, g: 0, b: 0, a: 1} + fadeTexture: {fileID: 0} +--- !u!114 &590474774 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 7 + errorMessage: + indentLevel: 0 + failMessage: +--- !u!114 &590474775 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae67a23cb4aa74793b41258ae40bf321, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 0 + stopParentFlowchart: 1 + targetFlowcharts: [] +--- !u!114 &590474776 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 + duration: 1 +--- !u!114 &590474777 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 590474778} +--- !u!114 &590474778 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 248 + y: 75 + width: 120 + height: 40 + itemId: 2 + blockName: New Block + description: + eventHandler: {fileID: 590474777} + commandList: + - {fileID: 590474776} + - {fileID: 590474775} +--- !u!114 &590474779 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 590474780} +--- !u!114 &590474780 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 590474771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 70 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 590474779} + commandList: + - {fileID: 590474773} + - {fileID: 590474782} + - {fileID: 590474774} +--- !u!114 &590474781 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 396492925} + m_GameObject: {fileID: 590474771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} m_Name: m_EditorClassIdentifier: - itemId: 6 - errorMessage: - indentLevel: 0 - compareOperator: 1 - variable: {fileID: 396492927} - booleanData: - booleanRef: {fileID: 0} - booleanVal: 0 - integerData: - integerRef: {fileID: 0} - integerVal: 0 - floatData: - floatRef: {fileID: 0} - floatVal: 0 - stringData: - stringRef: {fileID: 0} - stringVal: SomeValue ---- !u!114 &396492940 + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 + y: -350 + width: 1126 + height: 869 + selectedBlock: {fileID: 590474780} + selectedCommands: + - {fileID: 590474773} + variables: [] + description: Test if interupting a Write command works + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] +--- !u!114 &590474782 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 396492925} + m_GameObject: {fileID: 590474771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Script: {fileID: 11500000, guid: 45c952ea1ad444e479b570fa242679c5, type: 3} m_Name: m_EditorClassIdentifier: itemId: 9 errorMessage: indentLevel: 0 + duration: 5 + targetView: {fileID: 1920662343} + waitUntilFinished: 1 --- !u!1 &636123604 GameObject: m_ObjectHideFlags: 0 @@ -447,14 +1025,15 @@ GameObject: - 114: {fileID: 636123608} - 114: {fileID: 636123607} - 114: {fileID: 636123606} - - 114: {fileID: 636123605} - 114: {fileID: 636123613} - 114: {fileID: 636123612} - 114: {fileID: 636123611} - 114: {fileID: 636123610} + - 114: {fileID: 636123615} + - 114: {fileID: 636123605} - 114: {fileID: 636123614} m_Layer: 0 - m_Name: Flowchart + m_Name: Flowchart1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -468,23 +1047,13 @@ MonoBehaviour: m_GameObject: {fileID: 636123604} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} m_Name: m_EditorClassIdentifier: - itemId: 1 + itemId: 7 errorMessage: indentLevel: 0 - storyText: Write some text and wait for input - description: - character: {fileID: 0} - portrait: {fileID: 0} - voiceOverClip: {fileID: 0} - showAlways: 1 - showCount: 1 - extendPrevious: 0 - fadeWhenDone: 1 - waitForClick: 1 - setSayDialog: {fileID: 0} + failMessage: --- !u!114 &636123606 MonoBehaviour: m_ObjectHideFlags: 2 @@ -512,7 +1081,7 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 69 + x: 70 y: 69 width: 120 height: 40 @@ -521,6 +1090,8 @@ MonoBehaviour: description: eventHandler: {fileID: 636123606} commandList: + - {fileID: 636123614} + - {fileID: 636123615} - {fileID: 636123605} --- !u!114 &636123608 MonoBehaviour: @@ -546,11 +1117,11 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlock: {fileID: 636123613} + selectedBlock: {fileID: 636123607} selectedCommands: - {fileID: 636123614} variables: [] - description: + description: Test if interupting a Write command works stepPause: 0 colorCommands: 1 hideComponents: 1 @@ -568,24 +1139,26 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 984493284} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!114 &636123610 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636123604} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f1ca510a57aa47568a5e4ee558ff41f, type: 3} + m_Script: {fileID: 11500000, guid: ae67a23cb4aa74793b41258ae40bf321, type: 3} m_Name: m_EditorClassIdentifier: itemId: 4 errorMessage: indentLevel: 0 + stopParentFlowchart: 1 + targetFlowcharts: [] --- !u!114 &636123611 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636123604} @@ -597,10 +1170,10 @@ MonoBehaviour: itemId: 3 errorMessage: indentLevel: 0 - duration: 2 + duration: 1 --- !u!114 &636123612 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636123604} @@ -612,7 +1185,7 @@ MonoBehaviour: parentBlock: {fileID: 636123613} --- !u!114 &636123613 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636123604} @@ -633,26 +1206,55 @@ MonoBehaviour: eventHandler: {fileID: 636123612} commandList: - {fileID: 636123611} - - {fileID: 636123614} - {fileID: 636123610} --- !u!114 &636123614 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 636123604} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fab8abf0343545abbfebd9a7b7b34bd, type: 3} + m_Script: {fileID: 11500000, guid: 437f9a4e3dbc647f9bdce95308418bff, type: 3} m_Name: m_EditorClassIdentifier: - itemId: 5 + itemId: 8 + errorMessage: + indentLevel: 0 + duration: .100000001 + fadeOut: 0 + targetView: {fileID: 0} + waitUntilFinished: 1 + fadeColor: {r: 0, g: 0, b: 0, a: 1} + fadeTexture: {fileID: 0} +--- !u!114 &636123615 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 636123604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad2261dbe44de43a980e6f7c77c88f7f, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 errorMessage: indentLevel: 0 - logType: 0 - logMessage: + textObject: {fileID: 1141004796} + text: stringRef: {fileID: 0} - stringVal: Hi there + stringVal: ' A long block of text that should keep writing' + description: + clearText: 1 + waitUntilFinished: 1 + textColor: 0 + setAlpha: + floatRef: {fileID: 0} + floatVal: 1 + setColor: + colorRef: {fileID: 0} + colorVal: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &646902073 GameObject: m_ObjectHideFlags: 1 @@ -680,7 +1282,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 636123608} + selectedFlowchart: {fileID: 590474781} --- !u!4 &646902075 Transform: m_ObjectHideFlags: 1 @@ -918,7 +1520,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &984493283 MonoBehaviour: m_ObjectHideFlags: 0 @@ -950,9 +1552,142 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 590474772} - {fileID: 636123609} + - {fileID: 575909999} + - {fileID: 169310209} + - {fileID: 1960747668} + - {fileID: 1354065530} + - {fileID: 1759271210} + - {fileID: 1920662342} m_Father: {fileID: 0} m_RootOrder: 5 +--- !u!1 &1141004796 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1141004797} + - 222: {fileID: 1141004799} + - 114: {fileID: 1141004798} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1141004797 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1141004796} + 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: 1960747668} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 4, y: 128} + m_SizeDelta: {x: 609, y: 81} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1141004798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1141004796} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: New Text +--- !u!222 &1141004799 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1141004796} +--- !u!1 &1354065529 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1354065530} + - 212: {fileID: 1354065531} + m_Layer: 0 + m_Name: Mushroom 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1354065530 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1354065529} + 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: 984493284} + m_RootOrder: 5 +--- !u!212 &1354065531 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1354065529} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: d568b9f360a9641fba3a3c558cfbd607, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!1 &1384749029 GameObject: m_ObjectHideFlags: 0 @@ -1783,6 +2518,92 @@ MonoBehaviour: targetObject: {fileID: 1960615183} methodName: TestCallMethod delay: 0 +--- !u!1 &1759271209 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1759271210} + - 114: {fileID: 1759271211} + m_Layer: 0 + m_Name: ViewA + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1759271210 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1759271209} + 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: 984493284} + m_RootOrder: 6 +--- !u!114 &1759271211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: e0d427add844a4d9faf970a3afa07583, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1759271209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95c387d3e32404bcc91c60318d766bb1, type: 3} + m_Name: + m_EditorClassIdentifier: + viewSize: 1.74694014 + primaryAspectRatio: {x: 4, y: 3} + secondaryAspectRatio: {x: 2, y: 1} +--- !u!1 &1920662341 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1920662342} + - 114: {fileID: 1920662343} + m_Layer: 0 + m_Name: ViewB + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1920662342 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: e0d427add844a4d9faf970a3afa07583, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1920662341} + 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: 984493284} + m_RootOrder: 7 +--- !u!114 &1920662343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: e0d427add844a4d9faf970a3afa07583, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1920662341} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 95c387d3e32404bcc91c60318d766bb1, type: 3} + m_Name: + m_EditorClassIdentifier: + viewSize: .795018613 + primaryAspectRatio: {x: 4, y: 3} + secondaryAspectRatio: {x: 2, y: 1} --- !u!1 &1960615183 GameObject: m_ObjectHideFlags: 0 @@ -1824,3 +2645,93 @@ Transform: m_Children: [] m_Father: {fileID: 1384749030} m_RootOrder: 1 +--- !u!1 &1960747667 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1960747668} + - 223: {fileID: 1960747671} + - 114: {fileID: 1960747670} + - 114: {fileID: 1960747669} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1960747668 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1960747667} + 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_Children: + - {fileID: 1141004797} + m_Father: {fileID: 984493284} + m_RootOrder: 4 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1960747669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1960747667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1960747670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1960747667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1960747671 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1960747667} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0