Update for 2019.3.10

Sanity check and correct example scenes
5 years ago · 1faddc3455
15 changed files with 4190 additions and 3044 deletions
--- a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs
+++ b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs
@ -14,7 +14,7 @@ using UnityEngine.Serialization;
                 "Play Usfxr Sound", 
                 "Plays a usfxr synth sound. Use the usfxr editor [Tools > Fungus > Utilities > Generate usfxr Sound Effects] to create the SettingsString. Set a ParentTransform if using positional sound. See https://github.com/zeh/usfxr for more information about usfxr.")]
    [AddComponentMenu("")]
-    [ExecuteInEditMode]
+    //[ExecuteInEditMode]
    public class PlayUsfxrSound : Command
    {
        [Tooltip("Transform to use for positional audio")]
@ -29,7 +29,7 @@ using UnityEngine.Serialization;
        protected SfxrSynth _synth = new SfxrSynth();

        //Call this if the settings have changed
-        protected virtual void UpdateCache() 
+        protected virtual void UpdateCache()  
        {
            if (!string.IsNullOrEmpty(_SettingsString.Value)) 
            {
@ -103,6 +103,12 @@ using UnityEngine.Serialization;
            }
        }

+        public override void OnValidate()
+        {
+            OnEnable();
+            base.OnValidate();
+        }
+
        #endregion
    }
 }
--- a/Assets/Fungus/Scripts/Components/PortraitController.cs
+++ b/Assets/Fungus/Scripts/Components/PortraitController.cs
@ -207,6 +207,11 @@ namespace Fungus
            {
                foreach (var item in character.Portraits)
                {
+                    if(item == null)
+                    {
+                        Debug.LogError("null in portrait list on character " + character.name);
+                        continue;
+                    }
                    // Create a new portrait object
                    GameObject po = new GameObject(item.name,
                                                            typeof(RectTransform),
--- a/Assets/FungusExamples/Collection/CollectionPhysics.unity
+++ b/Assets/FungusExamples/Collection/CollectionPhysics.unity
@ -96,6 +96,7 @@ LightmapSettings:
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 1
 --- !u!196 &4
@ -224,6 +225,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -316,6 +318,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -408,6 +411,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -500,6 +504,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -592,6 +597,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -684,6 +690,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -776,6 +783,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -868,6 +876,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -960,6 +969,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1052,6 +1062,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1188,6 +1199,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1280,6 +1292,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1372,6 +1385,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1464,6 +1478,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1556,6 +1571,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1648,6 +1664,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1740,6 +1757,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1832,6 +1850,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -1924,6 +1943,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2016,6 +2036,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2108,6 +2129,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2200,6 +2222,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2292,6 +2315,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2384,6 +2408,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2476,6 +2501,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2568,6 +2594,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2660,6 +2687,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2752,6 +2780,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2844,6 +2873,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -2936,6 +2966,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3028,6 +3059,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3120,6 +3152,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3212,6 +3245,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3304,6 +3338,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3396,6 +3431,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3488,6 +3524,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3580,6 +3617,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3672,6 +3710,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3764,6 +3803,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -3863,7 +3903,8 @@ MonoBehaviour:
  - {fileID: 1146013537}
  description: 'Collects all gameobjects hit by a cast in a Collection.

-    If they are tagged as ''Player'' and destroys them inside a Loop'
+    If they
+    are tagged as ''Player'' and destroys them inside a Loop'
  stepPause: 0
  colorCommands: 1
  hideComponents: 1
@ -4090,9 +4131,100 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  itemId: 6
  indentLevel: 1
+  anyOrAllConditions: 0
+  conditions:
+  - compareOperator: 0
+    anyVar:
+      variable: {fileID: 1146013527}
+      data:
+        animatorData:
+          animatorRef: {fileID: 0}
+          animatorVal: {fileID: 0}
+        audioSourceData:
+          audioSourceRef: {fileID: 0}
+          audioSourceVal: {fileID: 0}
+        booleanData:
+          booleanRef: {fileID: 0}
+          booleanVal: 0
+        collectionData:
+          collectionRef: {fileID: 0}
+          collectionVal: {fileID: 0}
+        collider2DData:
+          collider2DRef: {fileID: 0}
+          collider2DVal: {fileID: 0}
+        colliderData:
+          colliderRef: {fileID: 0}
+          colliderVal: {fileID: 0}
+        colorData:
+          colorRef: {fileID: 0}
+          colorVal: {r: 0, g: 0, b: 0, a: 0}
+        floatData:
+          floatRef: {fileID: 0}
+          floatVal: 0
+        gameObjectData:
+          gameObjectRef: {fileID: 0}
+          gameObjectVal: {fileID: 0}
+        integerData:
+          integerRef: {fileID: 0}
+          integerVal: 0
+        materialData:
+          materialRef: {fileID: 0}
+          materialVal: {fileID: 0}
+        matrix4x4Data:
+          matrix4x4Ref: {fileID: 0}
+          matrix4x4Val:
+            e00: 0
+            e01: 0
+            e02: 0
+            e03: 0
+            e10: 0
+            e11: 0
+            e12: 0
+            e13: 0
+            e20: 0
+            e21: 0
+            e22: 0
+            e23: 0
+            e30: 0
+            e31: 0
+            e32: 0
+            e33: 0
+        objectData:
+          objectRef: {fileID: 0}
+          objectVal: {fileID: 0}
+        quaternionData:
+          quaternionRef: {fileID: 0}
+          quaternionVal: {x: 0, y: 0, z: 0, w: 0}
+        rigidbody2DData:
+          rigidbody2DRef: {fileID: 0}
+          rigidbody2DVal: {fileID: 0}
+        rigidbodyData:
+          rigidbodyRef: {fileID: 0}
+          rigidbodyVal: {fileID: 0}
+        spriteData:
+          spriteRef: {fileID: 0}
+          spriteVal: {fileID: 0}
+        stringData:
+          stringRef: {fileID: 0}
+          stringVal: Player
+        textureData:
+          textureRef: {fileID: 0}
+          textureVal: {fileID: 0}
+        transformData:
+          transformRef: {fileID: 0}
+          transformVal: {fileID: 0}
+        vector2Data:
+          vector2Ref: {fileID: 0}
+          vector2Val: {x: 0, y: 0}
+        vector3Data:
+          vector3Ref: {fileID: 0}
+          vector3Val: {x: 0, y: 0, z: 0}
+        vector4Data:
+          vector4Ref: {fileID: 0}
+          vector4Val: {x: 0, y: 0, z: 0, w: 0}
  compareOperator: 0
  anyVar:
-    variable: {fileID: 1146013527}
+    variable: {fileID: 0}
    data:
      animatorData:
        animatorRef: {fileID: 0}
@ -4163,7 +4295,7 @@ MonoBehaviour:
        spriteVal: {fileID: 0}
      stringData:
        stringRef: {fileID: 0}
-        stringVal: Player
+        stringVal: 
      textureData:
        textureRef: {fileID: 0}
        textureVal: {fileID: 0}
@ -4264,6 +4396,9 @@ MonoBehaviour:
    collectionRef: {fileID: 0}
    collectionVal: {fileID: 175082097}
  item: {fileID: 1146013528}
+  curIndex:
+    integerRef: {fileID: 0}
+    integerVal: 0
 --- !u!114 &1146013535
 MonoBehaviour:
  m_ObjectHideFlags: 2
@ -4491,6 +4626,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -4545,6 +4681,7 @@ GameObject:
  - component: {fileID: 1246222929}
  - component: {fileID: 1246222928}
  - component: {fileID: 1246222941}
+  - component: {fileID: 1246222942}
  m_Layer: 0
  m_Name: Sphere
  m_TagString: Untagged
@ -4603,12 +4740,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f9c3eb9160fdceb448b5e55362ac1ee4, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  itemId: 2
-  indentLevel: 0
-  getOrSet: 1
-  property: 11
-  transformVar: {fileID: 1246222929}
-  inOutVar: {fileID: 1246222932}
 --- !u!114 &1246222931
 MonoBehaviour:
  m_ObjectHideFlags: 2
@ -4686,8 +4817,8 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: 303
-    y: 62
+    x: 300
+    y: 60
    width: 120
    height: 40
  tint: {r: 1, g: 1, b: 1, a: 1}
@ -4700,7 +4831,7 @@ MonoBehaviour:
  - {fileID: 1246222933}
  - {fileID: 1246222928}
  - {fileID: 1246222941}
-  - {fileID: 1246222930}
+  - {fileID: 1246222942}
  suppressAllAutoSelections: 0
 --- !u!114 &1246222936
 MonoBehaviour:
@ -4729,7 +4860,7 @@ MonoBehaviour:
  selectedBlocks:
  - {fileID: 1246222935}
  selectedCommands:
-  - {fileID: 1246222928}
+  - {fileID: 1246222942}
  variables:
  - {fileID: 1246222932}
  - {fileID: 1246222931}
@ -4771,6 +4902,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -4819,7 +4951,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1246222941
 MonoBehaviour:
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
@ -4841,6 +4973,26 @@ MonoBehaviour:
    vector3Ref: {fileID: 1246222931}
    vector3Val: {x: 0, y: 0, z: 0}
  operation: 0
+--- !u!114 &1246222942
+MonoBehaviour:
+  m_ObjectHideFlags: 2
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1246222927}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2fb064de1b711a449845627f19b7f7b1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  itemId: 5
+  indentLevel: 0
+  getOrSet: 1
+  property: 11
+  transformData:
+    transformRef: {fileID: 1246222929}
+    transformVal: {fileID: 1246222940}
+  inOutVar: {fileID: 1246222932}
 --- !u!1 &1280324143
 GameObject:
  m_ObjectHideFlags: 0
@ -4901,6 +5053,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5076,6 +5229,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5168,6 +5322,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5260,6 +5415,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5352,6 +5508,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5444,6 +5601,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5536,6 +5694,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5628,6 +5787,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5720,6 +5880,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5812,6 +5973,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5904,6 +6066,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -5996,6 +6159,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6088,6 +6252,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6180,6 +6345,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6272,6 +6438,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6364,6 +6531,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6456,6 +6624,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6548,6 +6717,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6640,6 +6810,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6732,6 +6903,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6824,6 +6996,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -6916,6 +7089,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7008,6 +7182,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7100,6 +7275,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7192,6 +7368,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7284,6 +7461,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7376,6 +7554,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7548,6 +7727,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7640,6 +7820,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
@ -7732,6 +7913,7 @@ MeshRenderer:
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
--- a/Assets/FungusExamples/Conditions/MultipleConditionsExample.unity
+++ b/Assets/FungusExamples/Conditions/MultipleConditionsExample.unity
@ -96,6 +96,7 @@ LightmapSettings:
    m_PVRFilteringAtrousPositionSigmaAO: 1
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
  m_LightingDataAsset: {fileID: 0}
  m_UseShadowmask: 1
 --- !u!196 &4
@ -727,9 +728,9 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: 67
-    y: 70
-    width: 109.2
+    x: 140
+    y: 120
+    width: 100
    height: 40
  tint: {r: 1, g: 1, b: 1, a: 1}
  useCustomTint: 0
@ -760,7 +761,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  version: 1
-  scrollPos: {x: 0, y: 0}
+  scrollPos: {x: 153.5, y: 116.5}
  variablesScrollPos: {x: 0, y: 0}
  variablesExpanded: 1
  blockViewHeight: 527
@ -772,9 +773,8 @@ MonoBehaviour:
    width: 1114
    height: 859
  selectedBlocks:
-  - {fileID: 1292574165}
-  selectedCommands:
-  - {fileID: 1292574163}
+  - {fileID: 1292574186}
+  selectedCommands: []
  variables:
  - {fileID: 1292574180}
  - {fileID: 1292574179}
@ -2002,9 +2002,9 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: 229
-    y: 70
-    width: 131.6
+    x: 120
+    y: 200
+    width: 140
    height: 40
  tint: {r: 1, g: 1, b: 1, a: 1}
  useCustomTint: 0
--- a/Assets/FungusExamples/Conversation/CustomSayDialogs.unity
+++ b/Assets/FungusExamples/Conversation/CustomSayDialogs.unity
--- a/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity
+++ b/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity
--- a/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity
+++ b/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity
--- a/Assets/FungusExamples/Usfxr/UsfxrAudioExample.unity
+++ b/Assets/FungusExamples/Usfxr/UsfxrAudioExample.unity
@ -1,32 +1,33 @@
 %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: .25
+    smallestHole: 0.25
    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
 --- !u!104 &2
 RenderSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 9
  m_Fog: 0
-  m_FogColor: {r: .5, g: .5, b: .5, a: 1}
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
  m_FogMode: 3
-  m_FogDensity: .00999999978
+  m_FogDensity: 0.01
  m_LinearFogStart: 0
  m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
-  m_AmbientEquatorColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
-  m_AmbientGroundColor: {r: .200000003, g: .200000003, b: .200000003, a: 1}
+  m_AmbientSkyColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_AmbientEquatorColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_AmbientGroundColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
  m_AmbientIntensity: 1
  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
  m_SkyboxMaterial: {fileID: 0}
-  m_HaloStrength: .5
+  m_HaloStrength: 0.5
  m_FlareStrength: 1
  m_FlareFadeSpeed: 3
  m_HaloTexture: {fileID: 0}
@ -37,67 +38,116 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
 --- !u!157 &4
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 5
+  serializedVersion: 11
  m_GIWorkflowMode: 1
-  m_LightmapsMode: 1
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
    m_IndirectOutputScale: 1
    m_AlbedoBoost: 1
-    m_TemporalCoherenceThreshold: 1
    m_EnvironmentLightingMode: 0
    m_EnableBakedLightmaps: 1
    m_EnableRealtimeLightmaps: 0
  m_LightmapEditorSettings:
-    serializedVersion: 3
+    serializedVersion: 12
    m_Resolution: 1
    m_BakeResolution: 50
-    m_TextureWidth: 1024
-    m_TextureHeight: 1024
+    m_AtlasSize: 1024
+    m_AO: 0
    m_AOMaxDistance: 1
-    m_Padding: 2
    m_CompAOExponent: 0
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
    m_TextureCompression: 0
    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
    m_FinalGatherRayCount: 1024
    m_ReflectionCompression: 2
-  m_LightmapSnapshot: {fileID: 0}
-  m_RuntimeCPUUsage: 25
+    m_MixedBakeMode: 1
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 512
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 0
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 0
 --- !u!196 &5
 NavMeshSettings:
  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_BuildSettings:
    serializedVersion: 2
-    agentRadius: .5
+    agentTypeID: 0
+    agentRadius: 0.5
    agentHeight: 2
    agentSlope: 45
-    agentClimb: .400000006
+    agentClimb: 0.4
    ledgeDropHeight: 0
    maxJumpAcrossDistance: 0
-    accuratePlacement: 0
    minRegionArea: 2
-    cellSize: .166666657
    manualCellSize: 0
+    cellSize: 0.16666666
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!115 &344033345
+MonoScript:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 5
+  m_Script: 
+  m_DefaultReferences: {}
+  m_Icon: {fileID: 0}
+  m_ExecutionOrder: 0
+  m_ClassName: PlayUsfxrSound
+  m_Namespace: Fungus
 --- !u!1 &347148955
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
-  - 4: {fileID: 347148960}
-  - 20: {fileID: 347148959}
-  - 92: {fileID: 347148958}
-  - 124: {fileID: 347148957}
-  - 81: {fileID: 347148956}
-  - 114: {fileID: 347148961}
+  - component: {fileID: 347148960}
+  - component: {fileID: 347148959}
+  - component: {fileID: 347148957}
+  - component: {fileID: 347148956}
+  - component: {fileID: 347148961}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@ -108,41 +158,43 @@ GameObject:
 --- !u!81 &347148956
 AudioListener:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 347148955}
  m_Enabled: 1
 --- !u!124 &347148957
 Behaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 347148955}
-  m_Enabled: 1
--- !u!92 &347148958
-Behaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 347148955}
  m_Enabled: 1
 --- !u!20 &347148959
 Camera:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 347148955}
  m_Enabled: 1
  serializedVersion: 2
  m_ClearFlags: 1
-  m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
  m_NormalizedViewPortRect:
    serializedVersion: 2
    x: 0
    y: 0
    width: 1
    height: 1
-  near clip plane: .300000012
+  near clip plane: 0.3
  far clip plane: 1000
  field of view: 60
  orthographic: 1
@ -156,15 +208,18 @@ Camera:
  m_TargetDisplay: 0
  m_TargetEye: 3
  m_HDR: 0
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
-  m_StereoSeparation: .0219999999
-  m_StereoMirrorMode: 0
+  m_StereoSeparation: 0.022
 --- !u!4 &347148960
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 347148955}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -10}
@ -172,11 +227,13 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &347148961
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 347148955}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -186,19 +243,19 @@ MonoBehaviour:
  screenFadeTexture: {fileID: 2800000, guid: f6c7b1f3a78a24703b70c746d8b9c768, type: 3}
  swipePanIcon: {fileID: 2800000, guid: 41bc737f4dc1b40db872aca00bcd7d4b, type: 3}
  swipeIconPosition: {x: 1, y: 0}
+  setCameraZ: 1
  cameraZ: -10
-  waiting: 0
-  swipePanActive: 0
-  swipeSpeedMultiplier: 1
+  swipeCamera: {fileID: 0}
 --- !u!1 &1245640432
 GameObject:
  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
-  - 4: {fileID: 1245640434}
-  - 114: {fileID: 1245640433}
+  - component: {fileID: 1245640434}
+  - component: {fileID: 1245640433}
  m_Layer: 0
  m_Name: _FungusState
  m_TagString: Untagged
@ -209,8 +266,9 @@ GameObject:
 --- !u!114 &1245640433
 MonoBehaviour:
  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1245640432}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -221,30 +279,113 @@ MonoBehaviour:
 --- !u!4 &1245640434
 Transform:
  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1245640432}
  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: 0}
-  m_RootOrder: 0
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1452360235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1452360239}
+  - component: {fileID: 1452360238}
+  - component: {fileID: 1452360237}
+  - component: {fileID: 1452360236}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1452360236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452360235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ForceModuleActive: 0
+--- !u!114 &1452360237
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452360235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1452360238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452360235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 5
+--- !u!4 &1452360239
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1452360235}
+  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: 0}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1818246741
 GameObject:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
  m_Component:
-  - 4: {fileID: 1818246742}
-  - 114: {fileID: 1818246743}
-  - 114: {fileID: 1818246749}
-  - 114: {fileID: 1818246748}
-  - 114: {fileID: 1818246747}
-  - 114: {fileID: 1818246746}
-  - 114: {fileID: 1818246745}
-  - 114: {fileID: 1818246744}
+  - component: {fileID: 1818246742}
+  - component: {fileID: 1818246743}
+  - component: {fileID: 1818246749}
+  - component: {fileID: 1818246744}
+  - component: {fileID: 1818246748}
+  - component: {fileID: 1818246747}
+  - component: {fileID: 1818246746}
+  - component: {fileID: 1818246745}
  m_Layer: 0
  m_Name: Flowchart
  m_TagString: Untagged
@ -255,28 +396,31 @@ GameObject:
 --- !u!4 &1818246742
 Transform:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  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: 0}
-  m_RootOrder: 1
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1818246743
 MonoBehaviour:
  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  version: 1.0
-  scrollPos: {x: 352.51593, y: 571.148438}
+  version: 1
+  scrollPos: {x: 352.51593, y: 571.14844}
  variablesScrollPos: {x: 0, y: 0}
  variablesExpanded: 1
  blockViewHeight: 400
@ -287,22 +431,27 @@ MonoBehaviour:
    y: -889
    width: 1187
    height: 1416
-  selectedBlock: {fileID: 1818246749}
-  selectedCommands:
-  - {fileID: 1818246745}
+  selectedBlocks: []
+  selectedCommands: []
  variables: []
  description: "This scene shows how to use Usfxr to play\nprocedural sound effects.
-    \nSelect: Window > Generate usfxr Sound Effects\nto edit your own procedural sounds."
+    \nSelect: Window > Generate usfxr Sound Effects\nto edit your own procedural
+    sounds."
  stepPause: 0
  colorCommands: 1
  hideComponents: 1
  saveSelection: 1
  localizationId: 
+  showLineNumbers: 0
+  hideCommands: []
+  luaEnvironment: {fileID: 0}
+  luaBindingName: flowchart
 --- !u!114 &1818246744
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -310,79 +459,94 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  parentBlock: {fileID: 1818246749}
+  suppressBlockAutoSelect: 0
+  waitForFrames: 1
 --- !u!114 &1818246745
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a3ff412ad89846a47a70a620a222cbf8, type: 3}
+  m_Script: {fileID: 344033345}
  m_Name: 
  m_EditorClassIdentifier: 
-  itemId: 3
-  errorMessage: 
+  itemId: 8
  indentLevel: 0
  ParentTransform: {fileID: 0}
-  SettingsString: 0,.5,,.0259,.3178,.2433,.3,.7694,,,,,,,,,.4286,.673,,,,,,,,1,,,,,,
-  waitDuration: .25
+  _SettingsString:
+    stringRef: {fileID: 0}
+    stringVal: 1,.5,,.1749,.0094,.2571,.3,.6665,.2,-.2852,,,,,,,,,,,.2159,.1001,,.1209,-.1511,1,,,,,,
+  waitDuration: 0.5
+  SettingsStringOLD: 
 --- !u!114 &1818246746
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a3ff412ad89846a47a70a620a222cbf8, type: 3}
+  m_Script: {fileID: 344033345}
  m_Name: 
  m_EditorClassIdentifier: 
-  itemId: 2
-  errorMessage: 
+  itemId: 7
  indentLevel: 0
  ParentTransform: {fileID: 0}
-  SettingsString: 1,.5,,.1749,.0094,.2571,.3,.6665,.2,-.2852,,,,,,,,,,,.2159,.1001,,.1209,-.1511,1,,,,,,
-  waitDuration: .25
+  _SettingsString:
+    stringRef: {fileID: 0}
+    stringVal: 1,.5,,.142,,.1233,.3,.4328,,,,,,,,,,,,,,,,,,1,,,.1,,,
+  waitDuration: 0.5
+  SettingsStringOLD: 
 --- !u!114 &1818246747
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a3ff412ad89846a47a70a620a222cbf8, type: 3}
+  m_Script: {fileID: 344033345}
  m_Name: 
  m_EditorClassIdentifier: 
-  itemId: 1
-  errorMessage: 
+  itemId: 6
  indentLevel: 0
  ParentTransform: {fileID: 0}
-  SettingsString: 1,.5,,.142,,.1233,.3,.4328,,,,,,,,,,,,,,,,,,1,,,.1,,,
-  waitDuration: .25
+  _SettingsString:
+    stringRef: {fileID: 0}
+    stringVal: 0,.5,,.0004,.354,.414,.3,.731,,,,,,,,,,,,,,,,,,1,,,,,,
+  waitDuration: 0.5
+  SettingsStringOLD: 
 --- !u!114 &1818246748
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a3ff412ad89846a47a70a620a222cbf8, type: 3}
+  m_Script: {fileID: 344033345}
  m_Name: 
  m_EditorClassIdentifier: 
-  itemId: 0
-  errorMessage: 
+  itemId: 5
  indentLevel: 0
  ParentTransform: {fileID: 0}
-  SettingsString: 0,.5,,.0004,.354,.414,.3,.731,,,,,,,,,,,,,,,,,,1,,,,,,
-  waitDuration: .25
+  _SettingsString:
+    stringRef: {fileID: 0}
+    stringVal: 0,.5,,.0259,.3178,.2433,.3,.7694,,,,,,,,,.4286,.673,,,,,,,,1,,,,,,
+  waitDuration: 0.5
+  SettingsStringOLD: 
 --- !u!114 &1818246749
 MonoBehaviour:
  m_ObjectHideFlags: 2
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1818246741}
  m_Enabled: 1
  m_EditorHideFlags: 0
@ -391,16 +555,19 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  nodeRect:
    serializedVersion: 2
-    x: -91
-    y: -489
-    width: 138
+    x: -120
+    y: -480
+    width: 140
    height: 40
+  tint: {r: 1, g: 1, b: 1, a: 1}
+  useCustomTint: 0
  itemId: 4
  blockName: Sound Sequence
  description: 
  eventHandler: {fileID: 1818246744}
  commandList:
  - {fileID: 1818246748}
-  - {fileID: 1818246747}
-  - {fileID: 1818246746}
  - {fileID: 1818246745}
+  - {fileID: 1818246746}
+  - {fileID: 1818246747}
+  suppressAllAutoSelections: 0
--- a/Assets/FungusExamples/Variables/tempvarcol.unity
+++ b/Assets/FungusExamples/Variables/tempvarcol.unity
--- a/Assets/FungusExamples/Variables/tempvarcol.unity.meta
+++ b/Assets/FungusExamples/Variables/tempvarcol.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d1fc868ea81c9154c90640d45e2fd2ba
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Tests/Editor/TestUtils.cs
+++ b/Assets/Tests/Editor/TestUtils.cs
@ -56,7 +56,7 @@ namespace Fungus.EditorUtils
                }
            }

-            UnityEngine.Object.Destroy(resTest);
+            UnityEngine.Object.DestroyImmediate(resTest);
        }
    }
 }
--- a/Assets/Tests/PlayMode/FungusPlayModeTests.asmdef
+++ b/Assets/Tests/PlayMode/FungusPlayModeTests.asmdef
@ -7,9 +7,7 @@
        "FungusEditor",
        "FungusEditorTests"
    ],
-    "includePlatforms": [
-        "Editor"
-    ],
+    "includePlatforms": [],
    "excludePlatforms": [],
    "allowUnsafeCode": false,
    "overrideReferences": true,
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@ -2,10 +2,9 @@
  "dependencies": {
    "com.unity.2d.sprite": "1.0.0",
    "com.unity.ext.nunit": "1.0.0",
-    "com.unity.package-manager-ui": "2.2.0",
-    "com.unity.test-framework": "1.0.13",
+    "com.unity.test-framework": "1.1.13",
    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.1.0",
+    "com.unity.timeline": "1.2.6",
    "com.unity.ugui": "1.0.0",
    "com.unity.modules.ai": "1.0.0",
    "com.unity.modules.androidjni": "1.0.0",
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
@ -3,10 +3,33 @@
 --- !u!159 &1
 EditorSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 3
+  serializedVersion: 9
  m_ExternalVersionControlSupport: Hidden Meta Files
  m_SerializationMode: 2
-  m_WebSecurityEmulationEnabled: 0
-  m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
+  m_LineEndingsForNewScripts: 1
  m_DefaultBehaviorMode: 1
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
  m_SpritePackerMode: 0
+  m_SpritePackerPaddingPower: 1
+  m_EtcTextureCompressorBehavior: 0
+  m_EtcTextureFastCompressor: 2
+  m_EtcTextureNormalCompressor: 2
+  m_EtcTextureBestCompressor: 5
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp;asmref
+  m_ProjectGenerationRootNamespace: 
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_ShowLightmapResolutionOverlay: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2019.2.11f1
-m_EditorVersionWithRevision: 2019.2.11f1 (5f859a4cfee5)
+m_EditorVersion: 2019.3.10f1
+m_EditorVersionWithRevision: 2019.3.10f1 (5968d7f82152)