diff --git a/Assets/Fungus/Scripts/Commands/SetVariable.cs b/Assets/Fungus/Scripts/Commands/SetVariable.cs index 9c551607..bf61f99c 100644 --- a/Assets/Fungus/Scripts/Commands/SetVariable.cs +++ b/Assets/Fungus/Scripts/Commands/SetVariable.cs @@ -133,6 +133,9 @@ namespace Fungus StringVariable lhs = (variable as StringVariable); string rhs = stringData.Value; + var flowchart = GetFlowchart(); + rhs = flowchart.SubstituteVariables(rhs); + switch (setOperator) { default: diff --git a/Assets/Tests/StringSubstitution/StringSubstitutionTests.unity b/Assets/Tests/StringSubstitution/StringSubstitutionTests.unity index 6eadbd19..e8311704 100644 --- a/Assets/Tests/StringSubstitution/StringSubstitutionTests.unity +++ b/Assets/Tests/StringSubstitution/StringSubstitutionTests.unity @@ -1,15 +1,15 @@ %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 @@ -79,16 +79,17 @@ NavMeshSettings: 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 + accuratePlacement: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &30477053 Prefab: @@ -159,10 +160,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 149266, guid: ffbd0831d997545eab75c364da082c1b, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 35396880} - - 114: {fileID: 35396881} + - component: {fileID: 35396880} + - component: {fileID: 35396881} m_Layer: 0 m_Name: Localization m_TagString: Untagged @@ -179,10 +180,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: 1627631718} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &35396881 MonoBehaviour: m_ObjectHideFlags: 0 @@ -202,10 +203,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 99724764} - - 114: {fileID: 99724763} + - component: {fileID: 99724764} + - component: {fileID: 99724763} m_Layer: 0 m_Name: TestRunner m_TagString: Untagged @@ -234,19 +235,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: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &167744853 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 167744855} - - 114: {fileID: 167744854} + - component: {fileID: 167744855} + - component: {fileID: 167744854} m_Layer: 0 m_Name: _FungusState m_TagString: Untagged @@ -265,7 +266,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 2064973748} + selectedFlowchart: {fileID: 1103568012} --- !u!4 &167744855 Transform: m_ObjectHideFlags: 1 @@ -275,20 +276,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: [] m_Father: {fileID: 0} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &270131671 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 270131672} - - 222: {fileID: 270131674} - - 114: {fileID: 270131673} + - component: {fileID: 270131672} + - component: {fileID: 270131674} + - component: {fileID: 270131673} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -305,10 +306,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: 709636067} 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: 5, y: 0} @@ -359,11 +360,11 @@ GameObject: m_PrefabParentObject: {fileID: 1000011503031426, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 353127413} - - 222: {fileID: 353127412} - - 114: {fileID: 353127411} + - component: {fileID: 353127413} + - component: {fileID: 353127412} + - component: {fileID: 353127411} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -422,10 +423,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: 1240833741} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 586.5, y: -38.369995} @@ -436,11 +437,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 436484126} - - 114: {fileID: 436484128} - - 114: {fileID: 436484127} + - component: {fileID: 436484126} + - component: {fileID: 436484128} + - component: {fileID: 436484127} m_Layer: 0 m_Name: LuaScript m_TagString: Untagged @@ -457,10 +458,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: 1627631718} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &436484127 MonoBehaviour: m_ObjectHideFlags: 0 @@ -555,10 +556,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 545923889} - - 114: {fileID: 545923888} + - component: {fileID: 545923889} + - component: {fileID: 545923888} m_Layer: 0 m_Name: WriteTest m_TagString: Untagged @@ -596,7 +597,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: 2035584479} - {fileID: 875535383} @@ -606,17 +606,18 @@ Transform: - {fileID: 701857887} m_Father: {fileID: 0} m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &567521726 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 567521730} - - 114: {fileID: 567521729} - - 114: {fileID: 567521728} - - 114: {fileID: 567521727} + - component: {fileID: 567521730} + - component: {fileID: 567521729} + - component: {fileID: 567521728} + - component: {fileID: 567521727} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -677,22 +678,22 @@ 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: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &674602482 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000010441424980, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 674602483} - - 222: {fileID: 674602486} - - 114: {fileID: 674602485} - - 114: {fileID: 674602484} + - component: {fileID: 674602483} + - component: {fileID: 674602486} + - component: {fileID: 674602485} + - component: {fileID: 674602484} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -710,11 +711,11 @@ 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: - {fileID: 807797659} m_Father: {fileID: 1303072903} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -38.900024, y: 38.074993} @@ -813,10 +814,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 684307464} - - 114: {fileID: 684307463} + - component: {fileID: 684307464} + - component: {fileID: 684307463} m_Layer: 0 m_Name: FlowchartTest m_TagString: Untagged @@ -854,7 +855,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: 951347108} - {fileID: 1563984263} @@ -862,6 +862,7 @@ Transform: - {fileID: 1249712163} m_Father: {fileID: 0} m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &695468075 stripped Transform: m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} @@ -871,10 +872,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 178698, guid: e0c2b90c058ff43f4a56a266d4fa721b, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 701857887} - - 114: {fileID: 701857888} + - component: {fileID: 701857887} + - component: {fileID: 701857888} m_Layer: 0 m_Name: LuaBindings m_TagString: Untagged @@ -891,10 +892,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: 545923889} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &701857888 MonoBehaviour: m_ObjectHideFlags: 0 @@ -920,11 +921,12 @@ MonoBehaviour: - 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 - UnityEngine.UI.Text, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.TextGenerator, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - UnityEngine.Material, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Texture, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.Font, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - UnityEngine.TextAnchor, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null @@ -945,12 +947,12 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 709636067} - - 223: {fileID: 709636070} - - 114: {fileID: 709636069} - - 114: {fileID: 709636068} + - component: {fileID: 709636067} + - component: {fileID: 709636070} + - component: {fileID: 709636069} + - component: {fileID: 709636068} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -967,11 +969,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: 270131672} m_Father: {fileID: 1475498172} m_RootOrder: 1 + 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} @@ -1038,11 +1040,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 791892758} - - 114: {fileID: 791892757} - - 114: {fileID: 791892756} + - component: {fileID: 791892758} + - component: {fileID: 791892757} + - component: {fileID: 791892756} m_Layer: 0 m_Name: LuaScript m_TagString: Untagged @@ -1099,21 +1101,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: [] m_Father: {fileID: 982964957} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &807797658 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000010058971450, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 807797659} - - 222: {fileID: 807797661} - - 114: {fileID: 807797660} + - component: {fileID: 807797659} + - component: {fileID: 807797661} + - component: {fileID: 807797660} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1131,10 +1133,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: 674602483} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1186,16 +1188,16 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 875535383} - - 114: {fileID: 875535388} - - 114: {fileID: 875535387} - - 114: {fileID: 875535386} - - 114: {fileID: 875535385} - - 114: {fileID: 875535384} - - 114: {fileID: 875535389} - - 114: {fileID: 875535390} + - component: {fileID: 875535383} + - component: {fileID: 875535388} + - component: {fileID: 875535387} + - component: {fileID: 875535386} + - component: {fileID: 875535385} + - component: {fileID: 875535384} + - component: {fileID: 875535389} + - component: {fileID: 875535390} m_Layer: 0 m_Name: FlowchartA m_TagString: Untagged @@ -1212,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: 545923889} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &875535384 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1289,6 +1291,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1321,7 +1325,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 875535387} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 875535384} @@ -1362,7 +1366,7 @@ MonoBehaviour: durationOLD: 0 --- !u!114 &875535390 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 875535382} @@ -1380,11 +1384,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: 951347108} - - 114: {fileID: 951347112} - - 114: {fileID: 951347109} + - component: {fileID: 951347108} + - component: {fileID: 951347112} + - component: {fileID: 951347109} m_Layer: 0 m_Name: FlowchartA m_TagString: Untagged @@ -1401,10 +1405,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: 684307464} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &951347109 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1443,7 +1447,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 0} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 951347109} @@ -1462,10 +1466,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 982964957} - - 114: {fileID: 982964956} + - component: {fileID: 982964957} + - component: {fileID: 982964956} m_Layer: 0 m_Name: LuaTest m_TagString: Untagged @@ -1503,30 +1507,30 @@ 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: 32012240} - {fileID: 791892758} m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &984956674 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000011827784596, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 984956684} - - 223: {fileID: 984956683} - - 114: {fileID: 984956682} - - 225: {fileID: 984956681} - - 114: {fileID: 984956680} - - 114: {fileID: 984956679} - - 114: {fileID: 984956678} - - 114: {fileID: 984956677} - - 114: {fileID: 984956675} - - 82: {fileID: 984956676} + - component: {fileID: 984956684} + - component: {fileID: 984956683} + - component: {fileID: 984956682} + - component: {fileID: 984956681} + - component: {fileID: 984956680} + - component: {fileID: 984956679} + - component: {fileID: 984956678} + - component: {fileID: 984956677} + - component: {fileID: 984956675} + - component: {fileID: 984956676} m_Layer: 5 m_Name: SayDialog m_TagString: Untagged @@ -1567,6 +1571,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -1579,12 +1584,14 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 0 inSlope: 0 outSlope: 0 @@ -1595,7 +1602,8 @@ AudioSource: panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -1606,7 +1614,8 @@ AudioSource: spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -1617,7 +1626,8 @@ AudioSource: reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 1 inSlope: 0 outSlope: 0 @@ -1686,6 +1696,7 @@ MonoBehaviour: storyText: {fileID: 1303072904} characterImage: {fileID: 1301389438} fitTextWithImage: 1 + closeOtherDialogs: 0 --- !u!114 &984956680 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1767,11 +1778,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: 1240833741} m_Father: {fileID: 1008936334} m_RootOrder: 1 + 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} @@ -1783,10 +1794,10 @@ GameObject: m_PrefabParentObject: {fileID: 1000012764122408, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 995388416} - - 114: {fileID: 995388417} + - component: {fileID: 995388416} + - component: {fileID: 995388417} m_Layer: 0 m_Name: John m_TagString: Untagged @@ -1804,10 +1815,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: 1008936334} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &995388417 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1833,10 +1844,10 @@ GameObject: m_PrefabParentObject: {fileID: 1000013832009536, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1008936334} - - 114: {fileID: 1008936333} + - component: {fileID: 1008936334} + - component: {fileID: 1008936333} m_Layer: 0 m_Name: ConversationNameTest m_TagString: Untagged @@ -1876,7 +1887,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: 1521219040} - {fileID: 984956684} @@ -1884,17 +1894,278 @@ Transform: - {fileID: 995388416} m_Father: {fileID: 0} m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1103568006 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1103568007} + - component: {fileID: 1103568012} + - component: {fileID: 1103568011} + - component: {fileID: 1103568010} + - component: {fileID: 1103568009} + - component: {fileID: 1103568008} + - component: {fileID: 1103568013} + - component: {fileID: 1103568018} + - component: {fileID: 1103568017} + - component: {fileID: 1103568016} + - component: {fileID: 1103568015} + - component: {fileID: 1103568014} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1103568007 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + 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: 1202903806} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1103568008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4580f28dd8581476b810b38eea2f1316, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: VarB + value: Two +--- !u!114 &1103568009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4580f28dd8581476b810b38eea2f1316, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: VarA + value: One +--- !u!114 &1103568010 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 1103568011} + waitForFrames: 1 +--- !u!114 &1103568011 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 1103568010} + commandList: + - {fileID: 1103568013} + - {fileID: 1103568018} + - {fileID: 1103568015} + - {fileID: 1103568017} + - {fileID: 1103568014} + - {fileID: 1103568016} +--- !u!114 &1103568012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + 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: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: + - {fileID: 1103568011} + selectedCommands: + - {fileID: 1103568018} + variables: + - {fileID: 1103568009} + - {fileID: 1103568008} + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!114 &1103568013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + variable: {fileID: 1103568008} + setOperator: 0 + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 0 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: '{$VarA}Ok' +--- !u!114 &1103568014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + indentLevel: 1 + failMessage: +--- !u!114 &1103568015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + indentLevel: 1 +--- !u!114 &1103568016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + indentLevel: 0 +--- !u!114 &1103568017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3fa968f01a7f9496bb50e13dfe16760d, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + indentLevel: 0 +--- !u!114 &1103568018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1103568006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 0 + compareOperator: 0 + variable: {fileID: 1103568008} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 0 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: OneOk --- !u!1 &1106846132 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1106846133} - - 223: {fileID: 1106846136} - - 114: {fileID: 1106846135} - - 114: {fileID: 1106846134} + - component: {fileID: 1106846133} + - component: {fileID: 1106846136} + - component: {fileID: 1106846135} + - component: {fileID: 1106846134} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1911,11 +2182,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: 1532141879} m_Father: {fileID: 545923889} m_RootOrder: 3 + 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} @@ -1982,14 +2253,14 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 179118, guid: 3ddf9f33ba98e4b31ba4d2b9722bea00, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1153383140} - - 114: {fileID: 1153383145} - - 114: {fileID: 1153383144} - - 114: {fileID: 1153383143} - - 114: {fileID: 1153383142} - - 114: {fileID: 1153383141} + - component: {fileID: 1153383140} + - component: {fileID: 1153383145} + - component: {fileID: 1153383144} + - component: {fileID: 1153383143} + - component: {fileID: 1153383142} + - component: {fileID: 1153383141} m_Layer: 0 m_Name: Lua m_TagString: Untagged @@ -2006,10 +2277,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: 1475498172} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1153383141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2041,7 +2312,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - remoteDebugger: 0 + startDebugServer: 1 + debugServerPort: 41912 --- !u!114 &1153383143 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2084,15 +2356,16 @@ MonoBehaviour: PublicKeyToken=null - UnityEngine.Vector2, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Fungus.Flowchart, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Fungus.Block, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - System.Action, System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - 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.Command, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - Fungus.CommandInfoAttribute, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - System.Text.StringBuilder, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Rect, UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null boundObjects: - key: text obj: {fileID: 270131671} @@ -2154,19 +2427,70 @@ MonoBehaviour: repeatEveryFrame: 1 executeMethods: 2 executeMethodName: OnExecute +--- !u!1 &1202903804 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1202903806} + - component: {fileID: 1202903805} + m_Layer: 0 + m_Name: SetStringTest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1202903805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202903804} + 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 &1202903806 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1202903804} + 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: 1103568007} + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1240833740 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000011013148650, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1240833741} - - 222: {fileID: 1240833745} - - 114: {fileID: 1240833744} - - 225: {fileID: 1240833743} - - 114: {fileID: 1240833742} + - component: {fileID: 1240833741} + - component: {fileID: 1240833745} + - component: {fileID: 1240833744} + - component: {fileID: 1240833743} + - component: {fileID: 1240833742} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -2184,13 +2508,13 @@ 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: - {fileID: 353127413} - {fileID: 1301389441} - {fileID: 1303072903} m_Father: {fileID: 984956684} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -750.0001, y: 0} @@ -2279,11 +2603,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1249712163} - - 114: {fileID: 1249712162} - - 114: {fileID: 1249712161} + - component: {fileID: 1249712163} + - component: {fileID: 1249712162} + - component: {fileID: 1249712161} m_Layer: 0 m_Name: LuaScript m_TagString: Untagged @@ -2353,22 +2677,22 @@ 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: 684307464} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1301389437 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000010529851912, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1301389441} - - 222: {fileID: 1301389440} - - 114: {fileID: 1301389438} - - 114: {fileID: 1301389439} + - component: {fileID: 1301389441} + - component: {fileID: 1301389440} + - component: {fileID: 1301389438} + - component: {fileID: 1301389439} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -2440,10 +2764,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: 1240833741} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -178.5, y: 263.13} @@ -2455,12 +2779,12 @@ GameObject: m_PrefabParentObject: {fileID: 1000011485501440, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1303072903} - - 222: {fileID: 1303072906} - - 114: {fileID: 1303072904} - - 114: {fileID: 1303072905} + - component: {fileID: 1303072903} + - component: {fileID: 1303072906} + - component: {fileID: 1303072904} + - component: {fileID: 1303072905} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -2478,11 +2802,11 @@ 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: - {fileID: 674602483} m_Father: {fileID: 1240833741} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.78700006} m_AnchoredPosition: {x: 3, y: 14.130005} @@ -2558,14 +2882,14 @@ GameObject: m_PrefabParentObject: {fileID: 1000013537153970, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1467526468} - - 114: {fileID: 1467526473} - - 114: {fileID: 1467526472} - - 114: {fileID: 1467526471} - - 114: {fileID: 1467526470} - - 114: {fileID: 1467526469} + - component: {fileID: 1467526468} + - component: {fileID: 1467526473} + - component: {fileID: 1467526472} + - component: {fileID: 1467526471} + - component: {fileID: 1467526470} + - component: {fileID: 1467526469} m_Layer: 0 m_Name: Lua m_TagString: Untagged @@ -2583,10 +2907,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: 1008936334} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1467526469 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2617,7 +2941,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - remoteDebugger: 0 + startDebugServer: 1 + debugServerPort: 41912 --- !u!114 &1467526471 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2705,10 +3030,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1475498172} - - 114: {fileID: 1475498171} + - component: {fileID: 1475498172} + - component: {fileID: 1475498171} m_Layer: 0 m_Name: RecursionTest m_TagString: Untagged @@ -2746,28 +3071,28 @@ 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: 2064973742} - {fileID: 709636067} - {fileID: 1153383140} m_Father: {fileID: 0} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1521219039 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 1000014056054720, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1521219040} - - 114: {fileID: 1521219046} - - 114: {fileID: 1521219045} - - 114: {fileID: 1521219044} - - 114: {fileID: 1521219043} - - 114: {fileID: 1521219042} - - 114: {fileID: 1521219041} + - component: {fileID: 1521219040} + - component: {fileID: 1521219046} + - component: {fileID: 1521219045} + - component: {fileID: 1521219044} + - component: {fileID: 1521219043} + - component: {fileID: 1521219042} + - component: {fileID: 1521219041} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -2785,13 +3110,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: 1008936334} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1521219041 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 114000012014016746, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} @@ -2806,7 +3131,7 @@ MonoBehaviour: sayDialog: {fileID: 984956679} --- !u!114 &1521219042 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 114000013208230900, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} @@ -2821,7 +3146,7 @@ MonoBehaviour: value: Smith --- !u!114 &1521219043 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 114000013555371204, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} @@ -2838,7 +3163,7 @@ MonoBehaviour: stringVal: 'john: Hi there' --- !u!114 &1521219044 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 114000010274281526, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} @@ -2852,7 +3177,7 @@ MonoBehaviour: waitForFrames: 1 --- !u!114 &1521219045 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 114000010351281010, guid: 18f136094f85940fbb1afd025dbdeec9, type: 2} m_PrefabInternal: {fileID: 0} @@ -2868,6 +3193,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -2899,7 +3226,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 1521219045} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 1521219042} @@ -2918,11 +3245,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 224: {fileID: 1532141879} - - 222: {fileID: 1532141881} - - 114: {fileID: 1532141880} + - component: {fileID: 1532141879} + - component: {fileID: 1532141881} + - component: {fileID: 1532141880} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2939,10 +3266,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: 1106846133} 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: 30, y: 0} @@ -2992,11 +3319,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: 1563984263} - - 114: {fileID: 1563984266} - - 114: {fileID: 1563984264} + - component: {fileID: 1563984263} + - component: {fileID: 1563984266} + - component: {fileID: 1563984264} m_Layer: 0 m_Name: FlowchartB m_TagString: Untagged @@ -3013,10 +3340,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: 684307464} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1563984264 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3055,7 +3382,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 0} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 1563984264} @@ -3074,10 +3401,10 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 1627631718} - - 114: {fileID: 1627631717} + - component: {fileID: 1627631718} + - component: {fileID: 1627631717} m_Layer: 0 m_Name: LocalisationTest m_TagString: Untagged @@ -3115,13 +3442,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: - {fileID: 35396880} - {fileID: 436484126} - {fileID: 695468075} m_Father: {fileID: 0} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1633325651 stripped Transform: m_PrefabParentObject: {fileID: 495584, guid: 49031c561e16d4fcf91c12153f8e0b25, type: 2} @@ -3179,11 +3506,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: 1818190874} - - 114: {fileID: 1818190880} - - 114: {fileID: 1818190876} + - component: {fileID: 1818190874} + - component: {fileID: 1818190880} + - component: {fileID: 1818190876} m_Layer: 0 m_Name: FlowchartB m_TagString: Untagged @@ -3200,10 +3527,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: 545923889} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1818190876 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3242,7 +3569,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 0} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 1818190876} @@ -3307,11 +3634,11 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 139298, guid: c356764ac08ce4af2806a601a4f1e6e9, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2035584479} - - 114: {fileID: 2035584481} - - 114: {fileID: 2035584480} + - component: {fileID: 2035584479} + - component: {fileID: 2035584481} + - component: {fileID: 2035584480} m_Layer: 0 m_Name: LuaScript m_TagString: Untagged @@ -3328,10 +3655,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: 545923889} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2035584480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3383,15 +3710,15 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2064973742} - - 114: {fileID: 2064973748} - - 114: {fileID: 2064973747} - - 114: {fileID: 2064973745} - - 114: {fileID: 2064973744} - - 114: {fileID: 2064973749} - - 114: {fileID: 2064973743} + - component: {fileID: 2064973742} + - component: {fileID: 2064973748} + - component: {fileID: 2064973747} + - component: {fileID: 2064973745} + - component: {fileID: 2064973744} + - component: {fileID: 2064973749} + - component: {fileID: 2064973743} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -3408,10 +3735,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: 1475498172} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2064973743 MonoBehaviour: m_ObjectHideFlags: 2 @@ -3477,6 +3804,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: DoTest description: @@ -3507,8 +3836,10 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 0} - selectedCommands: [] + selectedBlocks: + - {fileID: 2064973747} + selectedCommands: + - {fileID: 2064973743} variables: - {fileID: 2064973745} - {fileID: 2064973744} @@ -3543,13 +3874,13 @@ GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + serializedVersion: 5 m_Component: - - 4: {fileID: 2135590532} - - 20: {fileID: 2135590531} - - 92: {fileID: 2135590530} - - 124: {fileID: 2135590529} - - 81: {fileID: 2135590528} + - component: {fileID: 2135590532} + - component: {fileID: 2135590531} + - component: {fileID: 2135590530} + - component: {fileID: 2135590529} + - component: {fileID: 2135590528} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -3621,7 +3952,7 @@ 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}