From b52cabc123795cc021764950c07e4ec103b78f5c Mon Sep 17 00:00:00 2001 From: Steve Halliwell Date: Sat, 15 Aug 2020 14:58:55 +1000 Subject: [PATCH] Fix Collection Contain result missing The result boolean field had not been set to serialized so was not showing correctly in the inspector. --- Assets/Fungus/Docs/CHANGELOG.txt | 1 + .../Scripts/Commands/Collection/CollectionCommandContains.cs | 2 +- .../Scripts/Commands/Collection/CollectionCommandContainsAll.cs | 2 +- .../Scripts/Commands/Collection/CollectionCommandContainsAny.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Fungus/Docs/CHANGELOG.txt b/Assets/Fungus/Docs/CHANGELOG.txt index 0fb6380d..03a886ef 100644 --- a/Assets/Fungus/Docs/CHANGELOG.txt +++ b/Assets/Fungus/Docs/CHANGELOG.txt @@ -9,6 +9,7 @@ Unreleased - Set actions on Property commands targeting structs now save changes. Previously the target variable was not being copied back to the internal struct, causing changes to be discarded. Impacts the following Property Commands, Color, Matrix, Quaternion, Vector2, Vector3, Vector4. - Writer with 0 speed and TMPro text correctly writes at infinite speed, previously was infinite loop. + - Collection Contains* commands now actually show the field to store boolean result. ## Changed diff --git a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContains.cs b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContains.cs index 30e6fd80..bcbd0bc5 100644 --- a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContains.cs +++ b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContains.cs @@ -15,7 +15,7 @@ namespace Fungus public class CollectionCommandContains : CollectionBaseVarCommand { [VariableProperty(typeof(BooleanVariable))] - protected BooleanVariable result; + [SerializeField] protected BooleanVariable result; protected override void OnEnterInner() { diff --git a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAll.cs b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAll.cs index 8794e9f7..834795ca 100644 --- a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAll.cs +++ b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAll.cs @@ -19,7 +19,7 @@ namespace Fungus protected BooleanData inSameOrder = new BooleanData(false); [VariableProperty(typeof(BooleanVariable))] - protected BooleanVariable result; + [SerializeField] protected BooleanVariable result; protected override void OnEnterInner() { diff --git a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAny.cs b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAny.cs index 26ef61da..1450f16d 100644 --- a/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAny.cs +++ b/Assets/Fungus/Scripts/Commands/Collection/CollectionCommandContainsAny.cs @@ -15,7 +15,7 @@ namespace Fungus public class CollectionCommandContainsAny : CollectionBaseTwoCollectionCommand { [VariableProperty(typeof(BooleanVariable))] - protected BooleanVariable result; + [SerializeField] protected BooleanVariable result; protected override void OnEnterInner() {