diff --git a/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs b/Assets/Fungus/Scripts/Commands/PlayUsfxrSound.cs index 80ae7a0d..74360719 100644 --- 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 } } diff --git a/Assets/Fungus/Scripts/Components/PortraitController.cs b/Assets/Fungus/Scripts/Components/PortraitController.cs index a81a708b..543b3b41 100644 --- 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), diff --git a/Assets/FungusExamples/Collection/CollectionPhysics.unity b/Assets/FungusExamples/Collection/CollectionPhysics.unity index fe0afe34..1b0ef0ac 100644 --- 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: diff --git a/Assets/FungusExamples/Conditions/MultipleConditionsExample.unity b/Assets/FungusExamples/Conditions/MultipleConditionsExample.unity index 77971b56..b8024f11 100644 --- 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 diff --git a/Assets/FungusExamples/Conversation/CustomSayDialogs.unity b/Assets/FungusExamples/Conversation/CustomSayDialogs.unity index a17c11c4..b19b9777 100644 --- a/Assets/FungusExamples/Conversation/CustomSayDialogs.unity +++ b/Assets/FungusExamples/Conversation/CustomSayDialogs.unity @@ -1,19 +1,19 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 -SceneSettings: +OcclusionCullingSettings: m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] + serializedVersion: 2 m_OcclusionBakeSettings: smallestOccluder: 5 smallestHole: 0.25 backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -25,6 +25,7 @@ RenderSettings: m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientIntensity: 1 m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SkyboxMaterial: {fileID: 0} m_HaloStrength: 0.5 m_FlareStrength: 1 @@ -37,65 +38,102 @@ 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 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + 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: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 3 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - 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: 1 m_FinalGather: 0 + m_FinalGatherFiltering: 1 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 + m_MixedBakeMode: 1 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 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_RuntimeCPUUsage: 25 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 + agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 - accuratePlacement: 0 minRegionArea: 2 - cellSize: 0.16666667 manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &61581460 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 61581461} - - 222: {fileID: 61581463} - - 114: {fileID: 61581462} - - 114: {fileID: 61581464} + - component: {fileID: 61581461} + - component: {fileID: 61581463} + - component: {fileID: 61581462} + - component: {fileID: 61581464} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -106,18 +144,19 @@ GameObject: --- !u!224 &61581461 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 61581460} 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: 1523056906} m_Father: {fileID: 1700435622} 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} @@ -126,13 +165,14 @@ RectTransform: --- !u!114 &61581462 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 61581460} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -141,8 +181,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -151,23 +189,28 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &61581463 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 61581460} + m_CullTransparentMesh: 0 --- !u!114 &61581464 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 61581460} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -181,17 +224,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 61581462} @@ -209,18 +255,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &205269089 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 205269090} - - 222: {fileID: 205269092} - - 114: {fileID: 205269091} + - component: {fileID: 205269090} + - component: {fileID: 205269092} + - component: {fileID: 205269091} m_Layer: 0 m_Name: Offscreen Right m_TagString: Untagged @@ -231,17 +277,18 @@ GameObject: --- !u!224 &205269090 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} 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: 1544660787} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 1300, y: -1000} @@ -250,13 +297,14 @@ RectTransform: --- !u!114 &205269091 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -265,8 +313,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -275,30 +321,36 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &205269092 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} + m_CullTransparentMesh: 0 --- !u!1 &272906894 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 272906896} - - 223: {fileID: 272906898} - - 114: {fileID: 272906904} - - 225: {fileID: 272906903} - - 114: {fileID: 272906902} - - 114: {fileID: 272906895} - - 114: {fileID: 272906901} - - 114: {fileID: 272906900} - - 114: {fileID: 272906897} - - 82: {fileID: 272906899} + - component: {fileID: 272906896} + - component: {fileID: 272906898} + - component: {fileID: 272906904} + - component: {fileID: 272906903} + - component: {fileID: 272906902} + - component: {fileID: 272906895} + - component: {fileID: 272906901} + - component: {fileID: 272906900} + - component: {fileID: 272906897} + - component: {fileID: 272906899} m_Layer: 5 m_Name: JohnSayDialog m_TagString: Untagged @@ -309,9 +361,10 @@ GameObject: --- !u!114 &272906895 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 @@ -322,24 +375,28 @@ MonoBehaviour: continueButton: {fileID: 1169044575} dialogCanvas: {fileID: 272906898} nameText: {fileID: 405967467} + nameTextGO: {fileID: 0} storyText: {fileID: 1351438330} + storyTextGO: {fileID: 0} characterImage: {fileID: 2050377792} fitTextWithImage: 1 + closeOtherDialogs: 0 --- !u!224 &272906896 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} 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: 620551847} m_Father: {fileID: 0} m_RootOrder: 2 + 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} @@ -348,9 +405,10 @@ RectTransform: --- !u!114 &272906897 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 @@ -364,12 +422,13 @@ MonoBehaviour: --- !u!223 &272906898 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -378,15 +437,17 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!82 &272906899 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 serializedVersion: 4 @@ -398,6 +459,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -410,58 +472,79 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 --- !u!114 &272906900 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 @@ -481,9 +564,10 @@ MonoBehaviour: --- !u!114 &272906901 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 @@ -498,16 +582,18 @@ MonoBehaviour: writeWholeWords: 0 forceRichText: 1 instantComplete: 1 + doReadAheadText: 1 --- !u!114 &272906902 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -518,9 +604,10 @@ MonoBehaviour: --- !u!225 &272906903 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_Alpha: 1 @@ -530,13 +617,14 @@ CanvasGroup: --- !u!114 &272906904 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 272906894} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -552,12 +640,14 @@ MonoBehaviour: --- !u!1 &275029862 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 4: {fileID: 275029864} - - 114: {fileID: 275029863} + - component: {fileID: 275029864} + - component: {fileID: 275029863} m_Layer: 0 m_Name: John m_TagString: Untagged @@ -568,9 +658,10 @@ GameObject: --- !u!114 &275029863 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275029862} m_Enabled: 1 m_EditorHideFlags: 0 @@ -580,36 +671,38 @@ MonoBehaviour: nameText: John nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} portraits: - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} - - {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3} portraitsFace: 2 setSayDialog: {fileID: 272906895} description: --- !u!4 &275029864 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275029862} 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: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &405967464 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 405967465} - - 222: {fileID: 405967466} - - 114: {fileID: 405967467} + - component: {fileID: 405967465} + - component: {fileID: 405967466} + - component: {fileID: 405967467} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -620,17 +713,18 @@ GameObject: --- !u!224 &405967465 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405967464} 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: 620551847} 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} @@ -639,20 +733,23 @@ RectTransform: --- !u!222 &405967466 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405967464} + m_CullTransparentMesh: 0 --- !u!114 &405967467 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405967464} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -661,8 +758,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_FontSize: 50 @@ -680,13 +775,15 @@ MonoBehaviour: --- !u!1 &534534503 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 534534504} - - 222: {fileID: 534534506} - - 114: {fileID: 534534505} + - component: {fileID: 534534504} + - component: {fileID: 534534506} + - component: {fileID: 534534505} m_Layer: 0 m_Name: Right m_TagString: Untagged @@ -697,17 +794,18 @@ GameObject: --- !u!224 &534534504 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} 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: 1544660787} m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 460.43, y: -1000} @@ -716,13 +814,14 @@ RectTransform: --- !u!114 &534534505 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -731,8 +830,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -741,23 +838,29 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &534534506 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} + m_CullTransparentMesh: 0 --- !u!1 &599196444 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 599196445} - - 222: {fileID: 599196447} - - 114: {fileID: 599196446} + - component: {fileID: 599196445} + - component: {fileID: 599196447} + - component: {fileID: 599196446} m_Layer: 0 m_Name: Left m_TagString: Untagged @@ -768,17 +871,18 @@ GameObject: --- !u!224 &599196445 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} 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: 1544660787} m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -460.43, y: -1000} @@ -787,13 +891,14 @@ RectTransform: --- !u!114 &599196446 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -802,8 +907,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -812,25 +915,31 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &599196447 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} + m_CullTransparentMesh: 0 --- !u!1 &620551846 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 620551847} - - 222: {fileID: 620551851} - - 114: {fileID: 620551850} - - 225: {fileID: 620551849} - - 114: {fileID: 620551848} + - component: {fileID: 620551847} + - component: {fileID: 620551851} + - component: {fileID: 620551850} + - component: {fileID: 620551849} + - component: {fileID: 620551848} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -841,20 +950,21 @@ GameObject: --- !u!224 &620551847 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620551846} 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: 405967465} - {fileID: 2050377795} - {fileID: 1351438327} m_Father: {fileID: 272906896} 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} @@ -863,13 +973,14 @@ RectTransform: --- !u!114 &620551848 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620551846} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} m_Name: m_EditorClassIdentifier: m_Delegates: @@ -888,15 +999,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] --- !u!225 &620551849 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620551846} m_Enabled: 1 m_Alpha: 1 @@ -906,13 +1015,14 @@ CanvasGroup: --- !u!114 &620551850 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620551846} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -921,8 +1031,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 49d5ccdda7b99e24787c2abc3891294c, type: 3} m_Type: 1 m_PreserveAspect: 1 @@ -931,24 +1039,30 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &620551851 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620551846} + m_CullTransparentMesh: 0 --- !u!1 &688663768 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 688663772} - - 222: {fileID: 688663771} - - 114: {fileID: 688663769} - - 114: {fileID: 688663770} + - component: {fileID: 688663772} + - component: {fileID: 688663771} + - component: {fileID: 688663769} + - component: {fileID: 688663770} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -959,13 +1073,14 @@ GameObject: --- !u!114 &688663769 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688663768} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -974,8 +1089,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -984,16 +1097,19 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &688663770 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688663768} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 @@ -1003,27 +1119,31 @@ MonoBehaviour: m_PreferredHeight: 350 m_FlexibleWidth: -1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!222 &688663771 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688663768} + m_CullTransparentMesh: 0 --- !u!224 &688663772 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688663768} 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: 925012182} 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} @@ -1032,13 +1152,15 @@ RectTransform: --- !u!1 &762842170 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 762842171} - - 222: {fileID: 762842172} - - 114: {fileID: 762842173} + - component: {fileID: 762842171} + - component: {fileID: 762842172} + - component: {fileID: 762842173} m_Layer: 5 m_Name: NameText m_TagString: Untagged @@ -1049,17 +1171,18 @@ GameObject: --- !u!224 &762842171 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762842170} 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: 925012182} 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} @@ -1068,20 +1191,23 @@ RectTransform: --- !u!222 &762842172 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762842170} + m_CullTransparentMesh: 0 --- !u!114 &762842173 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762842170} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1090,8 +1216,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} m_FontSize: 50 @@ -1109,15 +1233,17 @@ MonoBehaviour: --- !u!1 &925012181 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 925012182} - - 222: {fileID: 925012186} - - 114: {fileID: 925012185} - - 225: {fileID: 925012184} - - 114: {fileID: 925012183} + - component: {fileID: 925012182} + - component: {fileID: 925012186} + - component: {fileID: 925012185} + - component: {fileID: 925012184} + - component: {fileID: 925012183} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -1128,20 +1254,21 @@ GameObject: --- !u!224 &925012182 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925012181} 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: 762842171} - {fileID: 688663772} - {fileID: 1700435622} m_Father: {fileID: 1762881967} 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} @@ -1150,13 +1277,14 @@ RectTransform: --- !u!114 &925012183 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11478524, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925012181} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} m_Name: m_EditorClassIdentifier: m_Delegates: @@ -1175,15 +1303,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] --- !u!225 &925012184 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22583964, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925012181} m_Enabled: 1 m_Alpha: 1 @@ -1193,13 +1319,14 @@ CanvasGroup: --- !u!114 &925012185 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925012181} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1208,8 +1335,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 2e33a3f531b6adc4f9d8a99c83e2ba2d, type: 3} m_Type: 1 m_PreserveAspect: 1 @@ -1218,23 +1343,29 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &925012186 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 925012181} + m_CullTransparentMesh: 0 --- !u!1 &1085130771 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1085130772} - - 222: {fileID: 1085130774} - - 114: {fileID: 1085130773} + - component: {fileID: 1085130772} + - component: {fileID: 1085130774} + - component: {fileID: 1085130773} m_Layer: 0 m_Name: Offscreen Left m_TagString: Untagged @@ -1245,17 +1376,18 @@ GameObject: --- !u!224 &1085130772 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} 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: 1544660787} m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -1300, y: -1000} @@ -1264,13 +1396,14 @@ RectTransform: --- !u!114 &1085130773 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1279,8 +1412,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -1289,24 +1420,30 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1085130774 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} + m_CullTransparentMesh: 0 --- !u!1 &1169044571 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 180152, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1169044572} - - 222: {fileID: 1169044574} - - 114: {fileID: 1169044573} - - 114: {fileID: 1169044575} + - component: {fileID: 1169044572} + - component: {fileID: 1169044574} + - component: {fileID: 1169044573} + - component: {fileID: 1169044575} m_Layer: 5 m_Name: Continue m_TagString: Untagged @@ -1317,18 +1454,19 @@ GameObject: --- !u!224 &1169044572 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22433354, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1169044571} 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: 1951995254} m_Father: {fileID: 1351438327} 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} @@ -1337,13 +1475,14 @@ RectTransform: --- !u!114 &1169044573 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11493918, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1169044571} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1352,8 +1491,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1362,23 +1499,28 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1169044574 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22268826, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1169044571} + m_CullTransparentMesh: 0 --- !u!114 &1169044575 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11419088, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1169044571} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} m_Name: m_EditorClassIdentifier: m_Navigation: @@ -1392,17 +1534,20 @@ MonoBehaviour: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted m_DisabledTrigger: Disabled m_Interactable: 1 m_TargetGraphic: {fileID: 1169044573} @@ -1420,17 +1565,16 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &1226317641 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: 1226317643} - - 114: {fileID: 1226317642} + - component: {fileID: 1226317643} + - component: {fileID: 1226317642} m_Layer: 0 m_Name: _FungusState m_TagString: Untagged @@ -1441,8 +1585,9 @@ GameObject: --- !u!114 &1226317642 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: 1226317641} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1453,27 +1598,29 @@ MonoBehaviour: --- !u!4 &1226317643 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: 1226317641} 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: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1290383786 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: 1290383790} - - 114: {fileID: 1290383789} - - 114: {fileID: 1290383788} - - 114: {fileID: 1290383787} + - component: {fileID: 1290383790} + - component: {fileID: 1290383789} + - component: {fileID: 1290383788} + - component: {fileID: 1290383787} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -1484,24 +1631,26 @@ GameObject: --- !u!114 &1290383787 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3} m_Name: m_EditorClassIdentifier: m_ForceModuleActive: 0 --- !u!114 &1290383788 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -1514,12 +1663,13 @@ MonoBehaviour: --- !u!114 &1290383789 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -1528,26 +1678,29 @@ MonoBehaviour: --- !u!4 &1290383790 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: 1290383786} 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: 179.999, y: 179.999, z: 179.999} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 179.999, y: 179.999, z: 179.999} --- !u!1 &1311069593 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1311069594} - - 222: {fileID: 1311069595} - - 114: {fileID: 1311069596} + - component: {fileID: 1311069594} + - component: {fileID: 1311069595} + - component: {fileID: 1311069596} m_Layer: 0 m_Name: Middle m_TagString: Untagged @@ -1558,17 +1711,18 @@ GameObject: --- !u!224 &1311069594 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} 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: 1544660787} m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -1000} @@ -1577,20 +1731,23 @@ RectTransform: --- !u!222 &1311069595 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} + m_CullTransparentMesh: 0 --- !u!114 &1311069596 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1599,8 +1756,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -1609,17 +1764,21 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1351438326 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1351438327} - - 222: {fileID: 1351438329} - - 114: {fileID: 1351438330} - - 114: {fileID: 1351438328} + - component: {fileID: 1351438327} + - component: {fileID: 1351438329} + - component: {fileID: 1351438330} + - component: {fileID: 1351438328} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -1630,18 +1789,19 @@ GameObject: --- !u!224 &1351438327 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351438326} 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: 1169044572} m_Father: {fileID: 620551847} 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} @@ -1650,13 +1810,14 @@ RectTransform: --- !u!114 &1351438328 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351438326} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 @@ -1666,23 +1827,27 @@ MonoBehaviour: m_PreferredHeight: 200 m_FlexibleWidth: 1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!222 &1351438329 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351438326} + m_CullTransparentMesh: 0 --- !u!114 &1351438330 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1351438326} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1691,8 +1856,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3} m_FontSize: 45 @@ -1710,13 +1873,15 @@ MonoBehaviour: --- !u!1 &1523056905 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1523056906} - - 222: {fileID: 1523056908} - - 114: {fileID: 1523056907} + - component: {fileID: 1523056906} + - component: {fileID: 1523056908} + - component: {fileID: 1523056907} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -1727,17 +1892,18 @@ GameObject: --- !u!224 &1523056906 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523056905} 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: 61581461} 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} @@ -1746,13 +1912,14 @@ RectTransform: --- !u!114 &1523056907 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523056905} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1761,8 +1928,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -1780,22 +1945,26 @@ MonoBehaviour: --- !u!222 &1523056908 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523056905} + m_CullTransparentMesh: 0 --- !u!1 &1544660786 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1544660787} - - 223: {fileID: 1544660791} - - 114: {fileID: 1544660790} - - 114: {fileID: 1544660789} - - 225: {fileID: 1544660788} + - component: {fileID: 1544660787} + - component: {fileID: 1544660791} + - component: {fileID: 1544660790} + - component: {fileID: 1544660789} + - component: {fileID: 1544660788} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1806,14 +1975,14 @@ GameObject: --- !u!224 &1544660787 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} 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: 1311069594} - {fileID: 599196445} @@ -1822,6 +1991,7 @@ RectTransform: - {fileID: 205269090} m_Father: {fileID: 2073331544} m_RootOrder: 0 + 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} @@ -1830,9 +2000,10 @@ RectTransform: --- !u!225 &1544660788 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_Alpha: 1 @@ -1842,13 +2013,14 @@ CanvasGroup: --- !u!114 &1544660789 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -1864,13 +2036,14 @@ MonoBehaviour: --- !u!114 &1544660790 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -1881,12 +2054,13 @@ MonoBehaviour: --- !u!223 &1544660791 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -1895,20 +2069,23 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 --- !u!1 &1700435621 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1700435622} - - 222: {fileID: 1700435624} - - 114: {fileID: 1700435625} - - 114: {fileID: 1700435623} + - component: {fileID: 1700435622} + - component: {fileID: 1700435624} + - component: {fileID: 1700435625} + - component: {fileID: 1700435623} m_Layer: 5 m_Name: StoryText m_TagString: Untagged @@ -1919,18 +2096,19 @@ GameObject: --- !u!224 &1700435622 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700435621} 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: 61581461} m_Father: {fileID: 925012182} 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} @@ -1939,13 +2117,14 @@ RectTransform: --- !u!114 &1700435623 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700435621} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 @@ -1955,23 +2134,27 @@ MonoBehaviour: m_PreferredHeight: 200 m_FlexibleWidth: 1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!222 &1700435624 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700435621} + m_CullTransparentMesh: 0 --- !u!114 &1700435625 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1700435621} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1980,8 +2163,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3} m_FontSize: 45 @@ -1999,15 +2180,15 @@ MonoBehaviour: --- !u!1 &1726345438 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: 1726345443} - - 20: {fileID: 1726345442} - - 92: {fileID: 1726345441} - - 124: {fileID: 1726345440} - - 81: {fileID: 1726345439} + - component: {fileID: 1726345443} + - component: {fileID: 1726345442} + - component: {fileID: 1726345440} + - component: {fileID: 1726345439} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2018,34 +2199,36 @@ GameObject: --- !u!81 &1726345439 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: 1726345438} m_Enabled: 1 --- !u!124 &1726345440 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726345438} - m_Enabled: 1 ---- !u!92 &1726345441 -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: 1726345438} m_Enabled: 1 --- !u!20 &1726345442 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: 1726345438} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 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 @@ -2066,35 +2249,40 @@ 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: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &1726345443 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: 1726345438} 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: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1755499605 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 4: {fileID: 1755499610} - - 114: {fileID: 1755499606} - - 114: {fileID: 1755499608} - - 114: {fileID: 1755499609} - - 114: {fileID: 1755499607} + - component: {fileID: 1755499610} + - component: {fileID: 1755499606} + - component: {fileID: 1755499608} + - component: {fileID: 1755499609} + - component: {fileID: 1755499607} m_Layer: 0 m_Name: Flowchart m_TagString: Untagged @@ -2105,9 +2293,10 @@ GameObject: --- !u!114 &1755499606 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2126,7 +2315,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 1755499608} + selectedBlocks: + - {fileID: 1755499608} selectedCommands: - {fileID: 1755499607} variables: [] @@ -2143,8 +2333,9 @@ MonoBehaviour: --- !u!114 &1755499607 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2152,24 +2343,37 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemId: 1 - errorMessage: indentLevel: 0 conversationText: stringRef: {fileID: 0} stringVal: 'john bored left: Wow, I''ve got my own SayDialog! - sherlock bored right: Big whoop, so do I. + sherlock + bored right: Big whoop, so do I. john hide: sherlock hide:' + clearPrevious: + booleanRef: {fileID: 0} + booleanVal: 1 + waitForInput: + booleanRef: {fileID: 0} + booleanVal: 1 + waitForSeconds: + floatRef: {fileID: 0} + floatVal: 0 + fadeWhenDone: + booleanRef: {fileID: 0} + booleanVal: 1 --- !u!114 &1755499608 MonoBehaviour: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2178,22 +2382,26 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 68 - y: 70 - width: 120 + x: 120 + y: 120 + width: 80 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: eventHandler: {fileID: 1755499609} commandList: - {fileID: 1755499607} + suppressAllAutoSelections: 0 --- !u!114 &1755499609 MonoBehaviour: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2201,36 +2409,42 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1755499608} + suppressBlockAutoSelect: 0 + waitForFrames: 1 --- !u!4 &1755499610 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} 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: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1762881965 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1762881967} - - 223: {fileID: 1762881969} - - 114: {fileID: 1762881975} - - 225: {fileID: 1762881974} - - 114: {fileID: 1762881973} - - 114: {fileID: 1762881966} - - 114: {fileID: 1762881972} - - 114: {fileID: 1762881971} - - 114: {fileID: 1762881968} - - 82: {fileID: 1762881970} + - component: {fileID: 1762881967} + - component: {fileID: 1762881969} + - component: {fileID: 1762881975} + - component: {fileID: 1762881974} + - component: {fileID: 1762881973} + - component: {fileID: 1762881966} + - component: {fileID: 1762881972} + - component: {fileID: 1762881971} + - component: {fileID: 1762881968} + - component: {fileID: 1762881970} m_Layer: 5 m_Name: SherlockSayDialog m_TagString: Untagged @@ -2241,9 +2455,10 @@ GameObject: --- !u!114 &1762881966 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2254,24 +2469,28 @@ MonoBehaviour: continueButton: {fileID: 61581464} dialogCanvas: {fileID: 1762881969} nameText: {fileID: 762842173} + nameTextGO: {fileID: 0} storyText: {fileID: 1700435625} + storyTextGO: {fileID: 0} characterImage: {fileID: 688663769} fitTextWithImage: 1 + closeOtherDialogs: 0 --- !u!224 &1762881967 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} 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: 925012182} m_Father: {fileID: 0} m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -2280,9 +2499,10 @@ RectTransform: --- !u!114 &1762881968 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11481894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2296,12 +2516,13 @@ MonoBehaviour: --- !u!223 &1762881969 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 @@ -2310,15 +2531,17 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 --- !u!82 &1762881970 AudioSource: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 serializedVersion: 4 @@ -2330,6 +2553,7 @@ AudioSource: Loop: 0 Mute: 0 Spatialize: 0 + SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 MinDistance: 1 @@ -2342,58 +2566,79 @@ AudioSource: rolloffCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 - - time: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 spreadCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 3 + time: 0 value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 --- !u!114 &1762881971 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11404316, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2413,9 +2658,10 @@ MonoBehaviour: --- !u!114 &1762881972 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11487070, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2430,16 +2676,18 @@ MonoBehaviour: writeWholeWords: 0 forceRichText: 1 instantComplete: 1 + doReadAheadText: 1 --- !u!114 &1762881973 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11486804, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -2450,9 +2698,10 @@ MonoBehaviour: --- !u!225 &1762881974 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_Alpha: 1 @@ -2462,13 +2711,14 @@ CanvasGroup: --- !u!114 &1762881975 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1762881965} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -2484,12 +2734,14 @@ MonoBehaviour: --- !u!1 &1825768325 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 4: {fileID: 1825768327} - - 114: {fileID: 1825768326} + - component: {fileID: 1825768327} + - component: {fileID: 1825768326} m_Layer: 0 m_Name: Sherlock m_TagString: Untagged @@ -2500,9 +2752,10 @@ GameObject: --- !u!114 &1825768326 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825768325} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2512,7 +2765,6 @@ MonoBehaviour: nameText: Character Name nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} portraits: - {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} portraitsFace: 0 @@ -2521,26 +2773,30 @@ MonoBehaviour: --- !u!4 &1825768327 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825768325} 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 &1951995253 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 155030, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 1951995254} - - 222: {fileID: 1951995256} - - 114: {fileID: 1951995255} + - component: {fileID: 1951995254} + - component: {fileID: 1951995256} + - component: {fileID: 1951995255} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -2551,17 +2807,18 @@ GameObject: --- !u!224 &1951995254 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22443574, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951995253} 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: 1169044572} 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} @@ -2570,13 +2827,14 @@ RectTransform: --- !u!114 &1951995255 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11431470, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951995253} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2585,8 +2843,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 @@ -2604,21 +2860,25 @@ MonoBehaviour: --- !u!222 &1951995256 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22257884, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1951995253} + m_CullTransparentMesh: 0 --- !u!1 &2050377791 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 224: {fileID: 2050377795} - - 222: {fileID: 2050377794} - - 114: {fileID: 2050377792} - - 114: {fileID: 2050377793} + - component: {fileID: 2050377795} + - component: {fileID: 2050377794} + - component: {fileID: 2050377792} + - component: {fileID: 2050377793} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -2629,13 +2889,14 @@ GameObject: --- !u!114 &2050377792 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050377791} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2644,8 +2905,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -2654,16 +2913,19 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!114 &2050377793 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050377791} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 @@ -2673,27 +2935,31 @@ MonoBehaviour: m_PreferredHeight: 350 m_FlexibleWidth: -1 m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!222 &2050377794 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050377791} + m_CullTransparentMesh: 0 --- !u!224 &2050377795 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2050377791} 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: 620551847} 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} @@ -2702,12 +2968,14 @@ RectTransform: --- !u!1 &2073331542 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 + m_CorrespondingSourceObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - - 4: {fileID: 2073331544} - - 114: {fileID: 2073331543} + - component: {fileID: 2073331544} + - component: {fileID: 2073331543} m_Layer: 0 m_Name: Stage m_TagString: Untagged @@ -2718,9 +2986,10 @@ GameObject: --- !u!114 &2073331543 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073331542} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2729,10 +2998,10 @@ MonoBehaviour: m_EditorClassIdentifier: portraitCanvas: {fileID: 1544660791} dimPortraits: 1 + dimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} fadeDuration: 0.75 moveDuration: 1 fadeEaseType: 4 - moveEaseType: 4 shiftOffset: {x: 0, y: 0} defaultPosition: {fileID: 1311069596} positions: @@ -2741,24 +3010,19 @@ MonoBehaviour: - {fileID: 534534504} - {fileID: 1085130772} - {fileID: 205269090} - cachedPositions: - - {fileID: 599196445} - - {fileID: 1311069594} - - {fileID: 534534504} - - {fileID: 1085130772} - - {fileID: 205269090} - charactersOnStage: [] --- !u!4 &2073331544 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073331542} 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: 1544660787} m_Father: {fileID: 0} m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity b/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity index 17ade9f3..81024bae 100644 --- a/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity +++ b/Assets/FungusExamples/FirstPerson/FirstPersonDemo.unity @@ -50,12 +50,11 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 10 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 m_AtlasSize: 1024 @@ -63,6 +62,7 @@ LightmapSettings: m_AOMaxDistance: 1 m_CompAOExponent: 1 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,10 +77,16 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 m_PVRFilterTypeDirect: 0 m_PVRFilterTypeIndirect: 0 m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentMIS: 0 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 @@ -88,7 +94,9 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -118,7 +126,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 100000, guid: 63f131f616a63164497c245cc6ea0bb3, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 92124521} @@ -135,7 +144,8 @@ Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 400000, guid: 63f131f616a63164497c245cc6ea0bb3, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92124520} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -149,7 +159,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11400000, guid: 63f131f616a63164497c245cc6ea0bb3, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 92124520} m_Enabled: 1 m_EditorHideFlags: 0 @@ -160,132 +171,132 @@ MonoBehaviour: nameColor: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} soundEffect: {fileID: 0} portraits: + - {fileID: 21300000, guid: 061fcd6caac25954287291fffde7cd2c, type: 3} + - {fileID: 21300000, guid: e8a9122c4dc10b14da3b625e1f2634c9, type: 3} + - {fileID: 21300000, guid: 016de568d0fe25e45bc32a6c01c0e456, type: 3} + - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} + - {fileID: 21300000, guid: 38ccc1258813909498d806f622c3edb6, type: 3} + - {fileID: 21300000, guid: d8b4be5652abe8a438eb34290ae8c163, type: 3} + - {fileID: 21300000, guid: 03bc547cc0049594bae51f00903eedef, type: 3} + - {fileID: 21300000, guid: 059763178da334d408b6fa05fdea33c8, type: 3} + - {fileID: 21300000, guid: a6b4fd71ceffb6e4b9f3272ef8a5c2c3, type: 3} + - {fileID: 21300000, guid: b14a874c86c5f6345ae0f84ec697575f, type: 3} + - {fileID: 21300000, guid: d7af8fdea3ead3c4b8a4e54d014b255d, type: 3} - {fileID: 21300000, guid: a79a4c2e96ba5fd418c637fe852e92d9, type: 3} - {fileID: 21300000, guid: 7c9434f7e81b4264f9c56afc7180b8cf, type: 3} - - {fileID: 21300000, guid: bb66ae101c944a34e870fde3693b756d, type: 3} + - {fileID: 21300000, guid: 636094c1361ce1b44b4ace0fc587d758, type: 3} - {fileID: 21300000, guid: ab808050bc535a643afaf4755050339e, type: 3} + - {fileID: 21300000, guid: 64376d4849cae324a80743317c8aa539, type: 3} + - {fileID: 21300000, guid: 96b0380b84e6f4546886b1d58ca0f280, type: 3} + - {fileID: 21300000, guid: cbc4101c77001344eb9d31ddf978001c, type: 3} - {fileID: 21300000, guid: 59bb03809f57a71499d03ddac98c4203, type: 3} - - {fileID: 21300000, guid: a6b4fd71ceffb6e4b9f3272ef8a5c2c3, type: 3} - - {fileID: 21300000, guid: 636094c1361ce1b44b4ace0fc587d758, type: 3} - - {fileID: 21300000, guid: 267c50c3c26c7e24fa27aece06aad7cd, type: 3} - - {fileID: 21300000, guid: 9ce6cf540ce2ece4dacce467ace3bca4, type: 3} - - {fileID: 21300000, guid: 38ccc1258813909498d806f622c3edb6, type: 3} - - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} - - {fileID: 21300000, guid: 59d7c816c1cfb9944b5a28dfbbfe2109, type: 3} - - {fileID: 21300000, guid: d8b4be5652abe8a438eb34290ae8c163, type: 3} - - {fileID: 21300000, guid: 059763178da334d408b6fa05fdea33c8, type: 3} - {fileID: 21300000, guid: 09b05a675bbbc4e4b8f3b031a1fb63f5, type: 3} + - {fileID: 21300000, guid: 6aedf8395780557418c4b84288657314, type: 3} - {fileID: 21300000, guid: 3bcfc8e7b3c790e45b57cc6db1526225, type: 3} + - {fileID: 21300000, guid: bb66ae101c944a34e870fde3693b756d, type: 3} + - {fileID: 21300000, guid: d38d394fe4d92ae4da3d41e6ff3b0385, type: 3} + - {fileID: 21300000, guid: 267c50c3c26c7e24fa27aece06aad7cd, type: 3} + - {fileID: 21300000, guid: 59d7c816c1cfb9944b5a28dfbbfe2109, type: 3} - {fileID: 21300000, guid: 3f74023835f9bd34d88b85ac04062465, type: 3} - - {fileID: 21300000, guid: 64376d4849cae324a80743317c8aa539, type: 3} - - {fileID: 21300000, guid: 016de568d0fe25e45bc32a6c01c0e456, type: 3} - - {fileID: 21300000, guid: 6aedf8395780557418c4b84288657314, type: 3} - {fileID: 21300000, guid: 58ba1a99d9b61514984191565c416eca, type: 3} - - {fileID: 21300000, guid: 96b0380b84e6f4546886b1d58ca0f280, type: 3} - - {fileID: 21300000, guid: cbc4101c77001344eb9d31ddf978001c, type: 3} - - {fileID: 21300000, guid: e8a9122c4dc10b14da3b625e1f2634c9, type: 3} - - {fileID: 21300000, guid: b14a874c86c5f6345ae0f84ec697575f, type: 3} - - {fileID: 21300000, guid: 061fcd6caac25954287291fffde7cd2c, type: 3} - - {fileID: 21300000, guid: 03bc547cc0049594bae51f00903eedef, type: 3} - - {fileID: 21300000, guid: d7af8fdea3ead3c4b8a4e54d014b255d, type: 3} - - {fileID: 21300000, guid: d38d394fe4d92ae4da3d41e6ff3b0385, type: 3} + - {fileID: 21300000, guid: 9ce6cf540ce2ece4dacce467ace3bca4, type: 3} portraitsFace: 2 setSayDialog: {fileID: 0} description: --- !u!1001 &128347548 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalPosition.x value: -27.27 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalPosition.y value: 6.896 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalPosition.z value: -5.77 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} + - target: {fileID: 4233245772446736, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} propertyPath: m_RootOrder value: 11 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 929d45c4d9c08874ba1eaf9ba09de51d, type: 3} --- !u!1001 &242282596 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalPosition.x value: 29.17 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalPosition.y value: -1.29 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalPosition.z value: 23.36 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} + - target: {fileID: 4847703888409938, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ce35e97bd56b1944d8592fa0e400a240, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: ce35e97bd56b1944d8592fa0e400a240, type: 3} --- !u!1 &242282597 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1766213715120214, guid: ce35e97bd56b1944d8592fa0e400a240, - type: 2} - m_PrefabInternal: {fileID: 242282596} + type: 3} + m_PrefabInstance: {fileID: 242282596} + m_PrefabAsset: {fileID: 0} --- !u!114 &242282598 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -296,7 +307,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 562 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -304,7 +315,8 @@ MonoBehaviour: y: 0 width: 0 height: 0 - selectedBlocks: [] + selectedBlocks: + - {fileID: 242282601} selectedCommands: [] variables: - {fileID: 242282599} @@ -323,7 +335,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -337,7 +350,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -363,7 +377,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -372,9 +387,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 463 - y: 183 - width: 120 + x: 480 + y: 180 + width: 100 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -389,11 +404,13 @@ MonoBehaviour: - {fileID: 242282600} - {fileID: 242282631} - {fileID: 242282629} + suppressAllAutoSelections: 0 --- !u!114 &242282602 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -406,7 +423,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -432,7 +450,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -456,7 +475,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -470,7 +490,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -490,7 +511,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -519,7 +541,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -528,9 +551,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 470 - y: 118 - width: 120 + x: 480 + y: 120 + width: 80 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -541,11 +564,13 @@ MonoBehaviour: commandList: - {fileID: 242282607} - {fileID: 242282606} + suppressAllAutoSelections: 0 --- !u!114 &242282609 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -569,7 +594,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -593,7 +619,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -617,7 +644,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -630,7 +658,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -657,7 +686,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -681,7 +711,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -690,8 +721,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 292 - y: 118 + x: 300 + y: 120 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -709,11 +740,13 @@ MonoBehaviour: - {fileID: 242282611} - {fileID: 242282604} - {fileID: 242282605} + suppressAllAutoSelections: 0 --- !u!114 &242282616 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -733,7 +766,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -759,7 +793,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -785,7 +820,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -811,7 +847,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -837,7 +874,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -850,7 +888,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -863,7 +902,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -872,11 +912,190 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 indentLevel: 0 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 242282599} + data: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + 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: + 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 - variable: {fileID: 242282599} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} - booleanVal: 1 + booleanVal: 0 integerData: integerRef: {fileID: 0} integerVal: 0 @@ -926,7 +1145,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -934,14 +1154,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 242282625} + suppressBlockAutoSelect: 0 tagFilter: - Player FireOn: 1 + colliderVar: {fileID: 0} --- !u!114 &242282625 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -951,7 +1174,7 @@ MonoBehaviour: nodeRect: serializedVersion: 2 x: 140 - y: 113 + y: 120 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -971,11 +1194,13 @@ MonoBehaviour: - {fileID: 242282616} - {fileID: 242282622} - {fileID: 242282627} + suppressAllAutoSelections: 0 --- !u!114 &242282626 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -989,7 +1214,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1002,7 +1228,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1011,8 +1238,187 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 31 indentLevel: 1 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 242282626} + 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: + 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 - variable: {fileID: 242282626} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -1065,7 +1471,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1098,7 +1505,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1107,11 +1515,99 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 29 indentLevel: 0 - variable: {fileID: 242282626} + anyVar: + variable: {fileID: 242282626} + data: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + 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: + 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} setOperator: 0 + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} - booleanVal: 1 + booleanVal: 0 integerData: integerRef: {fileID: 0} integerVal: 0 @@ -1161,7 +1657,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1187,7 +1684,8 @@ MonoBehaviour: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 242282597} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -1199,7 +1697,8 @@ BoxCollider: GameObject: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 428461411} @@ -1215,19 +1714,21 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428461409} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 1112454213} + selectedFlowchart: {fileID: 640305175} --- !u!4 &428461411 Transform: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428461409} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1240,7 +1741,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 640305176} @@ -1275,7 +1777,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1283,12 +1786,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 640305174} + suppressBlockAutoSelect: 0 waitForFrames: 1 --- !u!114 &640305174 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1298,8 +1803,8 @@ MonoBehaviour: nodeRect: serializedVersion: 2 x: -100 - y: 204 - width: 120 + y: 200 + width: 80 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1312,11 +1817,13 @@ MonoBehaviour: - {fileID: 640305178} - {fileID: 640305179} - {fileID: 640305177} + suppressAllAutoSelections: 0 --- !u!114 &640305175 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1327,7 +1834,7 @@ MonoBehaviour: scrollPos: {x: 125.5, y: -148.5} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 477 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -1337,7 +1844,8 @@ MonoBehaviour: height: 0 selectedBlocks: - {fileID: 640305181} - selectedCommands: [] + selectedCommands: + - {fileID: 640305193} variables: [] description: stepPause: 0 @@ -1353,7 +1861,8 @@ MonoBehaviour: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1366,7 +1875,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1379,7 +1889,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1392,7 +1903,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1420,7 +1932,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1437,7 +1950,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1446,9 +1960,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 30 - y: 202 - width: 143 + x: 40 + y: 200 + width: 140 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1469,11 +1983,13 @@ MonoBehaviour: - {fileID: 640305187} - {fileID: 640305184} - {fileID: 640305193} + suppressAllAutoSelections: 0 --- !u!114 &640305182 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1499,7 +2015,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1526,7 +2043,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1552,7 +2070,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1565,7 +2084,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1582,7 +2102,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1595,7 +2116,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1621,7 +2143,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1633,7 +2156,8 @@ MonoBehaviour: storyText: 'We''ll you''ve tripped me up again John. - I never expected it to be this... plain.' + I never expected it + to be this... plain.' description: character: {fileID: 640977585} portrait: {fileID: 21300000, guid: 65cda1e3dd1ec8c4bb828adc5bb06c7d, type: 3} @@ -1650,7 +2174,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1676,7 +2201,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1704,7 +2230,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1730,7 +2257,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640305172} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1741,7 +2269,7 @@ MonoBehaviour: indentLevel: 0 description: targetObject: {fileID: 1377282257} - targetComponentAssemblyName: Fungus.Examples.LookingAtDoor, Assembly-CSharp, Version=0.0.0.0, + targetComponentAssemblyName: Fungus.Examples.LookingAtDoor, FungusExamples, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null targetComponentFullname: UnityEngine.Component[] targetComponentText: LookingAtDoor @@ -1758,7 +2286,8 @@ GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 100000, guid: 58c1cf3a7fe8fb84da0483858e15fbc7, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 640977584} @@ -1775,7 +2304,8 @@ Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 400000, guid: 58c1cf3a7fe8fb84da0483858e15fbc7, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640977583} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1789,7 +2319,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 11400000, guid: 58c1cf3a7fe8fb84da0483858e15fbc7, type: 2} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640977583} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1800,39 +2331,39 @@ MonoBehaviour: nameColor: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1} soundEffect: {fileID: 0} portraits: - - {fileID: 21300000, guid: c27113fd8a09c7c45a856e5d3c843c11, type: 3} - - {fileID: 21300000, guid: 67bc1238f72c52b49bd0ad82c79756ac, type: 3} - - {fileID: 21300000, guid: b9482ea03e69b5a4aa5e7827da354549, type: 3} - - {fileID: 21300000, guid: ed8fca01dcf5bfc4f86bc063889a5013, type: 3} - {fileID: 21300000, guid: 8f5b5b110e73a414eb229eeead86200f, type: 3} - - {fileID: 21300000, guid: 03f8d661d54a3a04797d21ab54424abb, type: 3} + - {fileID: 21300000, guid: 65cda1e3dd1ec8c4bb828adc5bb06c7d, type: 3} + - {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} + - {fileID: 21300000, guid: 0815f9b817b27b7499559c635a844bf0, type: 3} - {fileID: 21300000, guid: bca405818493a4f4a8fb63a69294d19a, type: 3} - - {fileID: 21300000, guid: 779f8bb1130ec974aa263a5e91518085, type: 3} + - {fileID: 21300000, guid: 75b6e7c8c9b6b4d40ae30dc671be34b7, type: 3} + - {fileID: 21300000, guid: 03f8d661d54a3a04797d21ab54424abb, type: 3} + - {fileID: 21300000, guid: 529a0cc84e8173a4d8f60e222d904cdb, type: 3} - {fileID: 21300000, guid: ed3f5dd119e6015479f898ab63bab12b, type: 3} - - {fileID: 21300000, guid: f233fc32ad198a44880e410c5577da9c, type: 3} - {fileID: 21300000, guid: 7497fd82318972540af8666a234a9685, type: 3} - - {fileID: 21300000, guid: 448053637e8df7a42824234afeafa291, type: 3} - - {fileID: 21300000, guid: cec88ab3171afc54b92db075974123ea, type: 3} - - {fileID: 21300000, guid: 65cda1e3dd1ec8c4bb828adc5bb06c7d, type: 3} + - {fileID: 21300000, guid: 5ba6e5e5e65bc084ba912d2d2d8718df, type: 3} + - {fileID: 21300000, guid: b9482ea03e69b5a4aa5e7827da354549, type: 3} - {fileID: 21300000, guid: 96ca91f43a9c1f74b970b59f46047e74, type: 3} + - {fileID: 21300000, guid: 779f8bb1130ec974aa263a5e91518085, type: 3} - {fileID: 21300000, guid: 5426a8c5c16e04d439b48a522267b236, type: 3} - - {fileID: 21300000, guid: 5ba6e5e5e65bc084ba912d2d2d8718df, type: 3} - - {fileID: 21300000, guid: 7add35a7d20a5ee41b0bfde9052ddfd6, type: 3} - - {fileID: 21300000, guid: d2c8a5a70bd6f11468f4d8ea151dec90, type: 3} - - {fileID: 21300000, guid: 3fd077b79b3018945961e206b6435268, type: 3} + - {fileID: 21300000, guid: c27113fd8a09c7c45a856e5d3c843c11, type: 3} + - {fileID: 21300000, guid: 67bc1238f72c52b49bd0ad82c79756ac, type: 3} + - {fileID: 21300000, guid: a3710c5af5b436a46b8d0ff4235d1dfe, type: 3} - {fileID: 21300000, guid: 36652428f3b9f6d41840d56c65aa0d64, type: 3} - - {fileID: 21300000, guid: 0815f9b817b27b7499559c635a844bf0, type: 3} - - {fileID: 21300000, guid: 75b6e7c8c9b6b4d40ae30dc671be34b7, type: 3} - - {fileID: 21300000, guid: 529a0cc84e8173a4d8f60e222d904cdb, type: 3} - {fileID: 21300000, guid: 6384dc397ea803d4abf0d1de10afb1c1, type: 3} - - {fileID: 21300000, guid: bd1b1199c415fc642ae13055981f42aa, type: 3} - - {fileID: 21300000, guid: 6d5c34a95aa09ce4a9be9f7258a02c0d, type: 3} - - {fileID: 21300000, guid: a3710c5af5b436a46b8d0ff4235d1dfe, type: 3} - - {fileID: 21300000, guid: e7a0368af3f28b1438c458df61e691c1, type: 3} + - {fileID: 21300000, guid: ed8fca01dcf5bfc4f86bc063889a5013, type: 3} + - {fileID: 21300000, guid: 448053637e8df7a42824234afeafa291, type: 3} + - {fileID: 21300000, guid: 7add35a7d20a5ee41b0bfde9052ddfd6, type: 3} + - {fileID: 21300000, guid: cec88ab3171afc54b92db075974123ea, type: 3} + - {fileID: 21300000, guid: f233fc32ad198a44880e410c5577da9c, type: 3} + - {fileID: 21300000, guid: 58f5b79d262f6814bb4ebb44e29efe90, type: 3} - {fileID: 21300000, guid: 97171eca7b577c5438e9516b956c042a, type: 3} - {fileID: 21300000, guid: 4cfc408caecceeb45989d991a2dccb3c, type: 3} - - {fileID: 21300000, guid: 58f5b79d262f6814bb4ebb44e29efe90, type: 3} - - {fileID: 21300000, guid: 84cdbfde1b7d4c24ab7071894480d5db, type: 3} + - {fileID: 21300000, guid: 6d5c34a95aa09ce4a9be9f7258a02c0d, type: 3} + - {fileID: 21300000, guid: d2c8a5a70bd6f11468f4d8ea151dec90, type: 3} + - {fileID: 21300000, guid: e7a0368af3f28b1438c458df61e691c1, type: 3} + - {fileID: 21300000, guid: bd1b1199c415fc642ae13055981f42aa, type: 3} + - {fileID: 21300000, guid: 3fd077b79b3018945961e206b6435268, type: 3} portraitsFace: 1 setSayDialog: {fileID: 0} description: @@ -1840,7 +2371,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 698185390} @@ -1858,7 +2390,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698185389} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 32, y: 0, z: 0} @@ -1871,7 +2404,8 @@ Transform: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698185389} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -1883,7 +2417,8 @@ BoxCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698185389} m_Enabled: 1 m_CastShadows: 1 @@ -1892,7 +2427,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -1902,6 +2439,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1918,14 +2456,16 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 698185389} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &799556140 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 799556141} @@ -1940,7 +2480,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799556140} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1955,61 +2496,62 @@ Transform: m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1051275018 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalPosition.x value: 15.197114 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalPosition.y value: 1.49 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalPosition.z value: -21.592121 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalRotation.y value: 0.9454946 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalRotation.w value: 0.32563797 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_RootOrder value: 9 objectReference: {fileID: 0} - - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} + - target: {fileID: 4329592467799608, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 141.992 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: 35bb61afc1f4fe74d9e3be3be019faa9, type: 3} --- !u!1 &1051275019 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1621252211410962, guid: 35bb61afc1f4fe74d9e3be3be019faa9, - type: 2} - m_PrefabInternal: {fileID: 1051275018} + type: 3} + m_PrefabInstance: {fileID: 1051275018} + m_PrefabAsset: {fileID: 0} --- !u!114 &1051275020 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2023,7 +2565,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2031,14 +2574,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1051275022} + suppressBlockAutoSelect: 0 tagFilter: - Player FireOn: 1 + colliderVar: {fileID: 0} --- !u!114 &1051275022 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2047,8 +2593,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 174 - y: 126 + x: 240 + y: 120 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -2069,11 +2615,13 @@ MonoBehaviour: - {fileID: 1051275026} - {fileID: 1051275036} - {fileID: 1051275033} + suppressAllAutoSelections: 0 --- !u!114 &1051275023 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2084,7 +2632,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 571 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -2112,7 +2660,8 @@ MonoBehaviour: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -2124,7 +2673,8 @@ BoxCollider: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2156,7 +2706,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2176,7 +2727,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2185,11 +2737,99 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 8 indentLevel: 1 - variable: {fileID: 1051275028} + anyVar: + variable: {fileID: 1051275028} + data: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + 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: + 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} setOperator: 0 + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} - booleanVal: 1 + booleanVal: 0 integerData: integerRef: {fileID: 0} integerVal: 0 @@ -2239,7 +2879,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2253,7 +2894,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2279,7 +2921,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2292,7 +2935,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2305,7 +2949,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2314,7 +2959,8 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 4 indentLevel: 1 - storyText: "You found a mechanism of some kind, Sherlock! \n\nIt appears to be incomplete." + storyText: "You found a mechanism of some kind, Sherlock! \n\nIt appears to be + incomplete." description: character: {fileID: 92124522} portrait: {fileID: 21300000, guid: 059763178da334d408b6fa05fdea33c8, type: 3} @@ -2331,7 +2977,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2344,7 +2991,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2357,7 +3005,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2366,8 +3015,187 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 indentLevel: 0 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 1051275020} + 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: + 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 - variable: {fileID: 1051275020} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -2420,7 +3248,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1051275019} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2452,13 +3281,15 @@ MonoBehaviour: --- !u!1 &1112454204 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1802049371907118, guid: 929d45c4d9c08874ba1eaf9ba09de51d, - type: 2} - m_PrefabInternal: {fileID: 128347548} + type: 3} + m_PrefabInstance: {fileID: 128347548} + m_PrefabAsset: {fileID: 0} --- !u!114 &1112454205 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2484,7 +3315,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2498,11 +3330,13 @@ MonoBehaviour: waitUntilFinished: 1 fadeColor: {r: 0, g: 0, b: 0, a: 1} fadeTexture: {fileID: 0} + fadeTweenType: 4 --- !u!114 &1112454207 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2515,7 +3349,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2528,7 +3363,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2542,7 +3378,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2551,11 +3388,190 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 indentLevel: 0 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 1112454209} + data: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + 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: + 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 - variable: {fileID: 1112454209} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} - booleanVal: 1 + booleanVal: 0 integerData: integerRef: {fileID: 0} integerVal: 0 @@ -2605,7 +3621,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2613,14 +3630,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1112454212} + suppressBlockAutoSelect: 0 tagFilter: - Player FireOn: 1 + colliderVar: {fileID: 0} --- !u!114 &1112454212 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2629,9 +3649,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 303 - y: 71 - width: 120 + x: 240 + y: 80 + width: 80 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -2644,11 +3664,13 @@ MonoBehaviour: - {fileID: 1112454208} - {fileID: 1112454206} - {fileID: 1112454207} + suppressAllAutoSelections: 0 --- !u!114 &1112454213 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2659,7 +3681,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 400 + blockViewHeight: 463 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -2668,7 +3690,7 @@ MonoBehaviour: width: 0 height: 0 selectedBlocks: - - {fileID: 1112454222} + - {fileID: 1112454212} selectedCommands: [] variables: - {fileID: 1112454209} @@ -2687,7 +3709,8 @@ MonoBehaviour: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -2699,7 +3722,8 @@ BoxCollider: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2712,7 +3736,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2725,7 +3750,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2751,7 +3777,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2764,7 +3791,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2790,7 +3818,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2799,8 +3828,187 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 7 indentLevel: 0 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 1112454209} + 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: + 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 - variable: {fileID: 1112454209} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -2853,7 +4061,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2866,7 +4075,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2875,8 +4085,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 295 - y: 167 + x: 240 + y: 160 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -2897,11 +4107,13 @@ MonoBehaviour: - {fileID: 1112454218} - {fileID: 1112454217} - {fileID: 1112454216} + suppressAllAutoSelections: 0 --- !u!114 &1112454223 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2914,7 +4126,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2927,7 +4140,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2936,8 +4150,187 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 34 indentLevel: 1 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 1112454226} + 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: + 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 - variable: {fileID: 1112454226} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -2990,7 +4383,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1112454204} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3004,7 +4398,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1140326302} @@ -3022,7 +4417,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1140326301} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 32, y: 0, z: 0} @@ -3035,7 +4431,8 @@ Transform: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1140326301} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -3047,7 +4444,8 @@ BoxCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1140326301} m_Enabled: 1 m_CastShadows: 1 @@ -3056,7 +4454,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3066,6 +4466,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3082,14 +4483,16 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1140326301} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1173591953 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1173591954} @@ -3104,7 +4507,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173591953} m_LocalRotation: {x: -0, y: -0.7071099, z: -0, w: -0.7071037} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3118,7 +4522,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1265131653} @@ -3136,7 +4541,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265131652} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 32, y: 0, z: 0} @@ -3149,7 +4555,8 @@ Transform: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265131652} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -3161,7 +4568,8 @@ BoxCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265131652} m_Enabled: 1 m_CastShadows: 1 @@ -3170,7 +4578,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3180,6 +4590,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3196,14 +4607,16 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1265131652} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1353701872 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1353701873} @@ -3220,7 +4633,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353701872} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.7, z: 0} @@ -3233,20 +4647,24 @@ Transform: AudioListener: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353701872} m_Enabled: 1 --- !u!20 &1353701875 Camera: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1353701872} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} m_FocalLength: 50 @@ -3280,7 +4698,8 @@ Camera: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1377282260} @@ -3303,7 +4722,8 @@ GameObject: CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -3316,7 +4736,8 @@ CapsuleCollider: Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} serializedVersion: 2 m_Mass: 1 @@ -3331,7 +4752,8 @@ Rigidbody: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_LocalRotation: {x: -0, y: -0.72912025, z: -0, w: 0.6843857} m_LocalPosition: {x: 15.43, y: 2.39, z: 7.06} @@ -3345,7 +4767,8 @@ Transform: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3360,7 +4783,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3372,7 +4796,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3390,7 +4815,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3407,7 +4833,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3421,7 +4848,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1377282257} m_Enabled: 0 m_EditorHideFlags: 0 @@ -3433,7 +4861,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1433038987} @@ -3448,7 +4877,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1433038986} m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3459,57 +4889,58 @@ Transform: m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -180.00002, z: 0} --- !u!1001 &1532025983 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalPosition.x value: -20.97 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalPosition.y value: 1.26664 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalPosition.z value: 19.17 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} + - target: {fileID: 4739217584310986, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} propertyPath: m_RootOrder value: 8 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b376fcef73a1f7c4dabdb17903073600, type: 2} - m_IsPrefabAsset: 0 + m_SourcePrefab: {fileID: 100100000, guid: b376fcef73a1f7c4dabdb17903073600, type: 3} --- !u!1 &1532025984 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1247888977727998, guid: b376fcef73a1f7c4dabdb17903073600, - type: 2} - m_PrefabInternal: {fileID: 1532025983} + type: 3} + m_PrefabInstance: {fileID: 1532025983} + m_PrefabAsset: {fileID: 0} --- !u!114 &1532025985 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3517,14 +4948,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1532025986} + suppressBlockAutoSelect: 0 tagFilter: - Player FireOn: 1 + colliderVar: {fileID: 0} --- !u!114 &1532025986 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3533,8 +4967,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 398 - y: 95 + x: 360 + y: 120 width: 120 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} @@ -3549,11 +4983,13 @@ MonoBehaviour: - {fileID: 1532025993} - {fileID: 1532025991} - {fileID: 1532025990} + suppressAllAutoSelections: 0 --- !u!114 &1532025987 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3567,7 +5003,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3578,7 +5015,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 402 + blockViewHeight: 451 zoom: 1 scrollViewRect: serializedVersion: 2 @@ -3605,7 +5042,8 @@ MonoBehaviour: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -3617,7 +5055,8 @@ BoxCollider: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3637,7 +5076,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3650,7 +5090,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3663,7 +5104,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3692,7 +5134,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532025984} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3701,11 +5144,99 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 1 indentLevel: 0 - variable: {fileID: 1532025987} + anyVar: + variable: {fileID: 1532025987} + data: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 1 + 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: + 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} setOperator: 0 + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} - booleanVal: 1 + booleanVal: 0 integerData: integerRef: {fileID: 0} integerVal: 0 @@ -3755,7 +5286,8 @@ MonoBehaviour: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1674035080} @@ -3772,11 +5304,12 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674035076} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -3790,11 +5323,12 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674035076} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -3804,7 +5338,8 @@ MonoBehaviour: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674035076} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3817,7 +5352,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1788221414} @@ -3840,7 +5376,8 @@ GameObject: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3860,7 +5397,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3880,7 +5418,8 @@ MonoBehaviour: MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3888,14 +5427,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1788221409} + suppressBlockAutoSelect: 0 tagFilter: - Player FireOn: 4 + colliderVar: {fileID: 0} --- !u!114 &1788221409 MonoBehaviour: m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3904,9 +5446,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 191 - y: 130 - width: 138 + x: 240 + y: 120 + width: 140 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -3917,11 +5459,13 @@ MonoBehaviour: commandList: - {fileID: 1788221407} - {fileID: 1788221406} + suppressAllAutoSelections: 0 --- !u!114 &1788221410 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3958,7 +5502,8 @@ MonoBehaviour: SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Material: {fileID: 0} m_IsTrigger: 1 @@ -3970,7 +5515,8 @@ SphereCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Enabled: 0 m_CastShadows: 1 @@ -3979,7 +5525,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -3989,6 +5537,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4005,14 +5554,16 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1788221414 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1788221405} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 15.41, y: 0, z: 6.87} @@ -4025,7 +5576,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1874215334} @@ -4041,15 +5593,18 @@ GameObject: Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1874215332} m_Enabled: 1 - serializedVersion: 8 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 0.9716981, g: 0.94916916, b: 0.81127626, a: 1} m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: m_Type: 0 @@ -4059,6 +5614,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -4066,19 +5639,23 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1874215334 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1874215332} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: -0.5000051, z: 0} @@ -4091,7 +5668,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 1888166673} @@ -4106,7 +5684,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1888166672} m_LocalRotation: {x: -0, y: -0.70710576, z: -0, w: 0.7071079} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4120,7 +5699,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2020540870} @@ -4138,7 +5718,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020540869} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 32, y: 0, z: 0} @@ -4151,7 +5732,8 @@ Transform: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020540869} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -4163,7 +5745,8 @@ BoxCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020540869} m_Enabled: 1 m_CastShadows: 1 @@ -4172,7 +5755,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -4182,6 +5767,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4198,14 +5784,16 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2020540869} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &2066122661 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2066122662} @@ -4220,7 +5808,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2066122661} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4235,7 +5824,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2075535578} @@ -4250,7 +5840,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2075535577} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -4264,7 +5855,8 @@ Transform: GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - component: {fileID: 2143952363} @@ -4282,7 +5874,8 @@ GameObject: Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143952362} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.5, z: 0} @@ -4295,7 +5888,8 @@ Transform: BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143952362} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -4307,7 +5901,8 @@ BoxCollider: MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143952362} m_Enabled: 1 m_CastShadows: 1 @@ -4316,7 +5911,9 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: @@ -4326,6 +5923,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4342,6 +5940,7 @@ MeshRenderer: MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143952362} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity b/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity index 2f53a3b6..6cc54cc0 100644 --- a/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity +++ b/Assets/FungusExamples/MenuShuffle/MenuShuffle.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 8 + serializedVersion: 9 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -39,6 +39,7 @@ RenderSettings: m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -49,20 +50,19 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: - serializedVersion: 9 + serializedVersion: 12 m_Resolution: 2 m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 + m_AtlasSize: 1024 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 0 m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 m_Padding: 2 m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 @@ -77,17 +77,28 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 - m_PVRFilteringMode: 1 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + 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_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + 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: 1 + m_UseShadowmask: 0 --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -107,13 +118,17 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &205269089 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 205269090} - component: {fileID: 205269092} @@ -128,9 +143,10 @@ GameObject: --- !u!224 &205269090 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -147,13 +163,14 @@ RectTransform: --- !u!114 &205269091 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -162,8 +179,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -172,19 +187,25 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &205269092 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 205269089} + m_CullTransparentMesh: 0 --- !u!1 &275029862 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 275029864} - component: {fileID: 275029863} @@ -198,9 +219,10 @@ GameObject: --- !u!114 &275029863 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275029862} m_Enabled: 1 m_EditorHideFlags: 0 @@ -211,21 +233,23 @@ MonoBehaviour: nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} portraits: - - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} - {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3} - {fileID: 21300000, guid: a92b08a118b7d46f59dd091acb2e4102, type: 3} - {fileID: 21300000, guid: f0a480312d1664a9d9c7749fed3eb1b5, type: 3} + - {fileID: 21300000, guid: 58bfb145092302e4083ef8a9e4eeb576, type: 3} - {fileID: 21300000, guid: 03bc547cc0049594bae51f00903eedef, type: 3} - - {fileID: 21300000, guid: ab808050bc535a643afaf4755050339e, type: 3} - {fileID: 21300000, guid: d7af8fdea3ead3c4b8a4e54d014b255d, type: 3} + - {fileID: 21300000, guid: ab808050bc535a643afaf4755050339e, type: 3} portraitsFace: 2 setSayDialog: {fileID: 0} description: --- !u!4 &275029864 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 275029862} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -237,9 +261,11 @@ Transform: --- !u!1 &534534503 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 534534504} - component: {fileID: 534534506} @@ -254,9 +280,10 @@ GameObject: --- !u!224 &534534504 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -273,13 +300,14 @@ RectTransform: --- !u!114 &534534505 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -288,8 +316,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -298,19 +324,25 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &534534506 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 534534503} + m_CullTransparentMesh: 0 --- !u!1 &599196444 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 599196445} - component: {fileID: 599196447} @@ -325,9 +357,10 @@ GameObject: --- !u!224 &599196445 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -344,13 +377,14 @@ RectTransform: --- !u!114 &599196446 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -359,8 +393,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -369,19 +401,25 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &599196447 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 599196444} + m_CullTransparentMesh: 0 --- !u!1 &1085130771 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1085130772} - component: {fileID: 1085130774} @@ -396,9 +434,10 @@ GameObject: --- !u!224 &1085130772 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -415,13 +454,14 @@ RectTransform: --- !u!114 &1085130773 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -430,8 +470,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -440,19 +478,24 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!222 &1085130774 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085130771} + m_CullTransparentMesh: 0 --- !u!1 &1226317641 GameObject: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1226317643} - component: {fileID: 1226317642} @@ -466,8 +509,9 @@ GameObject: --- !u!114 &1226317642 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: 1226317641} m_Enabled: 1 m_EditorHideFlags: 0 @@ -478,8 +522,9 @@ MonoBehaviour: --- !u!4 &1226317643 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: 1226317641} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -491,9 +536,10 @@ Transform: --- !u!1 &1290383786 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1290383790} - component: {fileID: 1290383789} @@ -509,24 +555,26 @@ GameObject: --- !u!114 &1290383787 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 2d49b7c1bcd2e07499844da127be038d, type: 3} m_Name: m_EditorClassIdentifier: m_ForceModuleActive: 0 --- !u!114 &1290383788 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} m_Name: m_EditorClassIdentifier: m_HorizontalAxis: Horizontal @@ -539,12 +587,13 @@ MonoBehaviour: --- !u!114 &1290383789 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: 1290383786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} m_Name: m_EditorClassIdentifier: m_FirstSelected: {fileID: 0} @@ -553,8 +602,9 @@ MonoBehaviour: --- !u!4 &1290383790 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: 1290383786} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -566,9 +616,11 @@ Transform: --- !u!1 &1311069593 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1311069594} - component: {fileID: 1311069595} @@ -583,9 +635,10 @@ GameObject: --- !u!224 &1311069594 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -602,20 +655,23 @@ RectTransform: --- !u!222 &1311069595 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} + m_CullTransparentMesh: 0 --- !u!114 &1311069596 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1311069593} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -624,8 +680,6 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} m_Type: 0 m_PreserveAspect: 1 @@ -634,12 +688,16 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &1544660786 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1544660787} - component: {fileID: 1544660791} @@ -656,9 +714,10 @@ GameObject: --- !u!224 &1544660787 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -680,9 +739,10 @@ RectTransform: --- !u!225 &1544660788 CanvasGroup: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_Alpha: 1 @@ -692,13 +752,14 @@ CanvasGroup: --- !u!114 &1544660789 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: m_UiScaleMode: 1 @@ -714,13 +775,14 @@ MonoBehaviour: --- !u!114 &1544660790 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 @@ -731,9 +793,10 @@ MonoBehaviour: --- !u!223 &1544660791 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544660786} m_Enabled: 1 serializedVersion: 3 @@ -752,13 +815,13 @@ Canvas: --- !u!1 &1726345438 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1726345443} - component: {fileID: 1726345442} - - component: {fileID: 1726345441} - component: {fileID: 1726345440} - component: {fileID: 1726345439} m_Layer: 0 @@ -771,34 +834,36 @@ GameObject: --- !u!81 &1726345439 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: 1726345438} m_Enabled: 1 --- !u!124 &1726345440 Behaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726345438} - m_Enabled: 1 ---- !u!92 &1726345441 -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: 1726345438} m_Enabled: 1 --- !u!20 &1726345442 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: 1726345438} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 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 @@ -820,16 +885,17 @@ Camera: m_TargetEye: 3 m_HDR: 0 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &1726345443 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: 1726345438} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} @@ -841,9 +907,11 @@ Transform: --- !u!1 &1745642867 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1745642869} - component: {fileID: 1745642868} @@ -857,9 +925,10 @@ GameObject: --- !u!114 &1745642868 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745642867} m_Enabled: 1 m_EditorHideFlags: 0 @@ -870,14 +939,14 @@ MonoBehaviour: nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} portraits: - - {fileID: 21300000, guid: b9482ea03e69b5a4aa5e7827da354549, type: 3} - - {fileID: 21300000, guid: 7497fd82318972540af8666a234a9685, type: 3} - {fileID: 21300000, guid: 75b6e7c8c9b6b4d40ae30dc671be34b7, type: 3} + - {fileID: 21300000, guid: 7497fd82318972540af8666a234a9685, type: 3} - {fileID: 21300000, guid: 5ba6e5e5e65bc084ba912d2d2d8718df, type: 3} - - {fileID: 21300000, guid: e7a0368af3f28b1438c458df61e691c1, type: 3} - - {fileID: 21300000, guid: ed8fca01dcf5bfc4f86bc063889a5013, type: 3} + - {fileID: 21300000, guid: b9482ea03e69b5a4aa5e7827da354549, type: 3} - {fileID: 21300000, guid: a3710c5af5b436a46b8d0ff4235d1dfe, type: 3} + - {fileID: 21300000, guid: ed8fca01dcf5bfc4f86bc063889a5013, type: 3} - {fileID: 21300000, guid: 58f5b79d262f6814bb4ebb44e29efe90, type: 3} + - {fileID: 21300000, guid: e7a0368af3f28b1438c458df61e691c1, type: 3} - {fileID: 21300000, guid: 3fd077b79b3018945961e206b6435268, type: 3} portraitsFace: 1 setSayDialog: {fileID: 0} @@ -885,8 +954,10 @@ MonoBehaviour: --- !u!4 &1745642869 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745642867} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -898,9 +969,11 @@ Transform: --- !u!1 &1755499605 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1755499610} - component: {fileID: 1755499606} @@ -957,9 +1030,10 @@ GameObject: --- !u!114 &1755499606 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -967,7 +1041,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: version: 1 - scrollPos: {x: 599.9552, y: 235.70175} + scrollPos: {x: 502.9552, y: 140.70175} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 blockViewHeight: 400 @@ -979,9 +1053,8 @@ MonoBehaviour: width: 1114 height: 859 selectedBlocks: - - {fileID: 1755499614} - selectedCommands: - - {fileID: 1755499650} + - {fileID: 1755499616} + selectedCommands: [] variables: - {fileID: 1755499646} - {fileID: 1755499645} @@ -998,8 +1071,9 @@ MonoBehaviour: --- !u!114 &1755499607 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1012,9 +1086,10 @@ MonoBehaviour: --- !u!114 &1755499608 MonoBehaviour: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1023,9 +1098,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -211.53827 - y: 63.510056 - width: 120 + x: -240 + y: 0 + width: 100 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1039,12 +1114,14 @@ MonoBehaviour: - {fileID: 1755499632} - {fileID: 1755499611} - {fileID: 1755499607} + suppressAllAutoSelections: 0 --- !u!114 &1755499609 MonoBehaviour: m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1052,12 +1129,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1755499608} + suppressBlockAutoSelect: 0 waitForFrames: 1 --- !u!4 &1755499610 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1755499605} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1069,8 +1149,9 @@ Transform: --- !u!114 &1755499611 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1093,8 +1174,9 @@ MonoBehaviour: --- !u!114 &1755499612 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1103,9 +1185,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -25.506847 - y: 33.40146 - width: 120 + x: 0 + y: 0 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1116,11 +1198,13 @@ MonoBehaviour: commandList: - {fileID: 1755499631} - {fileID: 1755499613} + suppressAllAutoSelections: 0 --- !u!114 &1755499613 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1139,8 +1223,9 @@ MonoBehaviour: --- !u!114 &1755499614 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1149,9 +1234,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -213.08838 - y: 110.851654 - width: 120 + x: -200 + y: 60 + width: 100 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1169,11 +1254,13 @@ MonoBehaviour: - {fileID: 1755499649} - {fileID: 1755499647} - {fileID: 1755499648} + suppressAllAutoSelections: 0 --- !u!114 &1755499615 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1196,8 +1283,9 @@ MonoBehaviour: --- !u!114 &1755499616 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1206,9 +1294,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -26.9375 - y: 286.16745 - width: 120 + x: 0 + y: 240 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1219,11 +1307,13 @@ MonoBehaviour: commandList: - {fileID: 1755499618} - {fileID: 1755499617} + suppressAllAutoSelections: 0 --- !u!114 &1755499617 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1242,8 +1332,9 @@ MonoBehaviour: --- !u!114 &1755499618 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1263,12 +1354,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499619 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1291,8 +1384,9 @@ MonoBehaviour: --- !u!114 &1755499620 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1301,9 +1395,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -31.868958 - y: 228.63354 - width: 120 + x: 0 + y: 200 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1314,11 +1408,13 @@ MonoBehaviour: commandList: - {fileID: 1755499622} - {fileID: 1755499621} + suppressAllAutoSelections: 0 --- !u!114 &1755499621 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1337,8 +1433,9 @@ MonoBehaviour: --- !u!114 &1755499622 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1358,12 +1455,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499623 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1386,8 +1485,9 @@ MonoBehaviour: --- !u!114 &1755499624 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1396,9 +1496,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -31.320831 - y: 182.05807 - width: 120 + x: 0 + y: 160 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1409,11 +1509,13 @@ MonoBehaviour: commandList: - {fileID: 1755499626} - {fileID: 1755499625} + suppressAllAutoSelections: 0 --- !u!114 &1755499625 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1432,8 +1534,9 @@ MonoBehaviour: --- !u!114 &1755499626 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1453,12 +1556,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499627 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1481,8 +1586,9 @@ MonoBehaviour: --- !u!114 &1755499628 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1491,9 +1597,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -29.402863 - y: 120.41409 - width: 120 + x: 0 + y: 120 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1504,11 +1610,13 @@ MonoBehaviour: commandList: - {fileID: 1755499630} - {fileID: 1755499629} + suppressAllAutoSelections: 0 --- !u!114 &1755499629 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1527,8 +1635,9 @@ MonoBehaviour: --- !u!114 &1755499630 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1548,12 +1657,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499631 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1573,12 +1684,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499632 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1601,8 +1714,9 @@ MonoBehaviour: --- !u!114 &1755499633 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1611,9 +1725,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -23.588982 - y: -17.28334 - width: 120 + x: 0 + y: -40 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1624,11 +1738,13 @@ MonoBehaviour: commandList: - {fileID: 1755499635} - {fileID: 1755499634} + suppressAllAutoSelections: 0 --- !u!114 &1755499634 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1647,8 +1763,9 @@ MonoBehaviour: --- !u!114 &1755499635 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1668,12 +1785,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499636 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1696,8 +1815,9 @@ MonoBehaviour: --- !u!114 &1755499637 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1706,9 +1826,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -27.150684 - y: -84.40664 - width: 120 + x: 0 + y: -80 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1719,11 +1839,13 @@ MonoBehaviour: commandList: - {fileID: 1755499639} - {fileID: 1755499638} + suppressAllAutoSelections: 0 --- !u!114 &1755499638 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1742,8 +1864,9 @@ MonoBehaviour: --- !u!114 &1755499639 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1763,12 +1886,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499640 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1791,8 +1916,9 @@ MonoBehaviour: --- !u!114 &1755499641 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1801,9 +1927,9 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: -34.82194 - y: -140.57092 - width: 120 + x: 0 + y: -120 + width: 60 height: 40 tint: {r: 1, g: 1, b: 1, a: 1} useCustomTint: 0 @@ -1814,11 +1940,13 @@ MonoBehaviour: commandList: - {fileID: 1755499643} - {fileID: 1755499642} + suppressAllAutoSelections: 0 --- !u!114 &1755499642 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1837,8 +1965,9 @@ MonoBehaviour: --- !u!114 &1755499643 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1858,12 +1987,14 @@ MonoBehaviour: fadeWhenDone: 1 waitForClick: 1 stopVoiceover: 1 + waitForVO: 0 setSayDialog: {fileID: 0} --- !u!114 &1755499644 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1876,8 +2007,9 @@ MonoBehaviour: --- !u!114 &1755499645 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1890,8 +2022,9 @@ MonoBehaviour: --- !u!114 &1755499646 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1904,8 +2037,9 @@ MonoBehaviour: --- !u!114 &1755499647 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1914,8 +2048,96 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 42 indentLevel: 1 - variable: {fileID: 1755499646} + anyVar: + variable: {fileID: 1755499646} + 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: + 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} setOperator: 0 + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -1928,11 +2150,48 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + 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} --- !u!114 &1755499648 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1944,8 +2203,9 @@ MonoBehaviour: --- !u!114 &1755499649 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1954,8 +2214,187 @@ MonoBehaviour: m_EditorClassIdentifier: itemId: 40 indentLevel: 0 + anyOrAllConditions: 0 + conditions: + - compareOperator: 0 + anyVar: + variable: {fileID: 1755499645} + 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: + 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 - variable: {fileID: 1755499645} + anyVar: + variable: {fileID: 0} + 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: + 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} + variable: {fileID: 0} booleanData: booleanRef: {fileID: 0} booleanVal: 0 @@ -1968,11 +2407,48 @@ MonoBehaviour: stringData: stringRef: {fileID: 0} stringVal: + animatorData: + animatorRef: {fileID: 0} + animatorVal: {fileID: 0} + audioSourceData: + audioSourceRef: {fileID: 0} + audioSourceVal: {fileID: 0} + colorData: + colorRef: {fileID: 0} + colorVal: {r: 0, g: 0, b: 0, a: 0} + gameObjectData: + gameObjectRef: {fileID: 0} + gameObjectVal: {fileID: 0} + materialData: + materialRef: {fileID: 0} + materialVal: {fileID: 0} + objectData: + objectRef: {fileID: 0} + objectVal: {fileID: 0} + rigidbody2DData: + rigidbody2DRef: {fileID: 0} + rigidbody2DVal: {fileID: 0} + spriteData: + spriteRef: {fileID: 0} + spriteVal: {fileID: 0} + 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} --- !u!114 &1755499650 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: 1755499605} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1991,9 +2467,11 @@ MonoBehaviour: --- !u!1 &2073331542 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2073331544} - component: {fileID: 2073331543} @@ -2007,9 +2485,10 @@ GameObject: --- !u!114 &2073331543 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, - type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073331542} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2033,8 +2512,10 @@ MonoBehaviour: --- !u!4 &2073331544 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 3} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2073331542} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/FungusExamples/Usfxr/UsfxrAudioExample.unity b/Assets/FungusExamples/Usfxr/UsfxrAudioExample.unity index fbe24378..519a8aec 100644 --- 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 diff --git a/Assets/FungusExamples/Variables/tempvarcol.unity b/Assets/FungusExamples/Variables/tempvarcol.unity deleted file mode 100644 index 376a29a6..00000000 --- a/Assets/FungusExamples/Variables/tempvarcol.unity +++ /dev/null @@ -1,1571 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - 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 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 10 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 1 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &37731967 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 37731974} - - component: {fileID: 37731973} - - component: {fileID: 37731972} - - component: {fileID: 37731970} - - component: {fileID: 37731969} - - component: {fileID: 37731976} - - component: {fileID: 37731978} - - component: {fileID: 37731977} - - component: {fileID: 37731975} - - component: {fileID: 37731971} - - component: {fileID: 37731968} - - component: {fileID: 37731983} - - component: {fileID: 37731982} - - component: {fileID: 37731981} - - component: {fileID: 37731980} - - component: {fileID: 37731979} - - component: {fileID: 37731984} - - component: {fileID: 37731986} - - component: {fileID: 37731985} - - component: {fileID: 37731987} - - component: {fileID: 37731988} - - component: {fileID: 37731989} - - component: {fileID: 37731993} - - component: {fileID: 37731992} - - component: {fileID: 37731991} - - component: {fileID: 37731990} - - component: {fileID: 37731995} - - component: {fileID: 37731994} - - component: {fileID: 37731999} - - component: {fileID: 37731998} - - component: {fileID: 37731997} - - component: {fileID: 37731996} - - component: {fileID: 37732001} - - component: {fileID: 37732000} - - component: {fileID: 37732002} - - component: {fileID: 37732004} - - component: {fileID: 37732003} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &37731968 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a30a3b6902ecde54ea81d503f6a2b27e, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 3 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - variableToUse: {fileID: 37731990} - onlyIfUnique: - booleanRef: {fileID: 0} - booleanVal: 0 ---- !u!114 &37731969 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} - m_Name: - m_EditorClassIdentifier: - parentBlock: {fileID: 37731972} - waitForFrames: 1 ---- !u!114 &37731970 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: IntVar - value: 5 ---- !u!114 &37731971 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a30a3b6902ecde54ea81d503f6a2b27e, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 2 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 210858193} - variableToUse: {fileID: 37731970} - onlyIfUnique: - booleanRef: {fileID: 0} - booleanVal: 0 ---- !u!114 &37731972 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} - m_Name: - m_EditorClassIdentifier: - nodeRect: - serializedVersion: 2 - x: 75 - y: 173 - width: 120 - height: 40 - tint: {r: 1, g: 1, b: 1, a: 1} - useCustomTint: 0 - itemId: 0 - blockName: New Block - description: - eventHandler: {fileID: 37731969} - commandList: - - {fileID: 37731975} - - {fileID: 37731971} - - {fileID: 37731968} ---- !u!114 &37731973 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 1 - scrollPos: {x: -1, y: 0} - variablesScrollPos: {x: 0, y: 0} - variablesExpanded: 1 - blockViewHeight: 402 - zoom: 1 - scrollViewRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - selectedBlocks: - - {fileID: 37731999} - selectedCommands: - - {fileID: 37731996} - variables: - - {fileID: 37731970} - - {fileID: 37731976} - - {fileID: 37731978} - - {fileID: 37731977} - - {fileID: 37731990} - - {fileID: 37732004} - - {fileID: 37732003} - description: - stepPause: 0 - colorCommands: 1 - hideComponents: 1 - saveSelection: 1 - localizationId: - showLineNumbers: 0 - hideCommands: [] - luaEnvironment: {fileID: 0} - luaBindingName: flowchart ---- !u!4 &37731974 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 793, y: 446, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &37731975 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a30a3b6902ecde54ea81d503f6a2b27e, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 1 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} - variableToUse: {fileID: 37731970} - onlyIfUnique: - booleanRef: {fileID: 0} - booleanVal: 0 ---- !u!114 &37731976 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 705fa1ac97df74e3a84ff952ffd923f1, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: FloatVar - value: 0 ---- !u!114 &37731977 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f840a548df62b49846fc51a60426fe, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: IntVarCol - value: {fileID: 210858193} ---- !u!114 &37731978 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f840a548df62b49846fc51a60426fe, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: IntCol - value: {fileID: 649623691} ---- !u!114 &37731979 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2fab8abf0343545abbfebd9a7b7b34bd, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 7 - indentLevel: 1 - logType: 0 - logMessage: - stringRef: {fileID: 0} - stringVal: '{$IntVar}' ---- !u!114 &37731980 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 6 - indentLevel: 0 ---- !u!114 &37731981 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1ce547d5384ce3a41b7142cab8ab41dd, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 5 - indentLevel: 0 - collection: - collectionRef: {fileID: 37731978} - collectionVal: {fileID: 649623691} - item: {fileID: 37731970} ---- !u!114 &37731982 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} - m_Name: - m_EditorClassIdentifier: - parentBlock: {fileID: 37731983} - waitForFrames: 3 ---- !u!114 &37731983 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} - m_Name: - m_EditorClassIdentifier: - nodeRect: - serializedVersion: 2 - x: 81 - y: 296 - width: 120 - height: 40 - tint: {r: 1, g: 1, b: 1, a: 1} - useCustomTint: 0 - itemId: 4 - blockName: New Block1 - description: - eventHandler: {fileID: 37731982} - commandList: - - {fileID: 37731981} - - {fileID: 37731979} - - {fileID: 37731980} - - {fileID: 37731984} - - {fileID: 37731985} - - {fileID: 37731986} - - {fileID: 37731987} - - {fileID: 37731988} - - {fileID: 37731989} ---- !u!114 &37731984 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 75a3711bc9cd44e429e15e10f6029fae, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 8 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} - variableToUse: {fileID: 37731970} - integer: {fileID: 37731970} ---- !u!114 &37731985 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 10 - indentLevel: 0 - anyVar: - variable: {fileID: 37731970} - 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: 5 - 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: - 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} - setOperator: 0 - variable: {fileID: 0} - booleanData: - booleanRef: {fileID: 0} - booleanVal: 0 - integerData: - integerRef: {fileID: 0} - integerVal: 0 - floatData: - floatRef: {fileID: 0} - floatVal: 0 - stringData: - stringRef: {fileID: 0} - stringVal: - animatorData: - animatorRef: {fileID: 0} - animatorVal: {fileID: 0} - audioSourceData: - audioSourceRef: {fileID: 0} - audioSourceVal: {fileID: 0} - colorData: - colorRef: {fileID: 0} - colorVal: {r: 0, g: 0, b: 0, a: 0} - gameObjectData: - gameObjectRef: {fileID: 0} - gameObjectVal: {fileID: 0} - materialData: - materialRef: {fileID: 0} - materialVal: {fileID: 0} - objectData: - objectRef: {fileID: 0} - objectVal: {fileID: 0} - rigidbody2DData: - rigidbody2DRef: {fileID: 0} - rigidbody2DVal: {fileID: 0} - spriteData: - spriteRef: {fileID: 0} - spriteVal: {fileID: 0} - 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} ---- !u!114 &37731986 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59afe81b26e37ea4ea10dd91dfeee937, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 9 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} - variableToUse: {fileID: 37731970} - integer: {fileID: 37731970} - lastInsteadOfFirst: - booleanRef: {fileID: 0} - booleanVal: 1 ---- !u!114 &37731987 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bf40659a274400d40856f146223798ac, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 11 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} - variableToUse: {fileID: 37731970} - index: - integerRef: {fileID: 0} - integerVal: 2 - getset: 1 ---- !u!114 &37731988 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 00093f39e8583954ba5935bca806f0f1, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 12 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} ---- !u!114 &37731989 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7359fcb744d14a41acae4b3a2e34b73, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 13 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 649623691} ---- !u!114 &37731990 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b1941e052c0ed4280b25507cd2e6ad8f, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: GOVar - value: {fileID: 1462591783} ---- !u!114 &37731991 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a30a3b6902ecde54ea81d503f6a2b27e, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 15 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - variableToUse: {fileID: 37731990} - onlyIfUnique: - booleanRef: {fileID: 0} - booleanVal: 0 ---- !u!114 &37731992 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} - m_Name: - m_EditorClassIdentifier: - parentBlock: {fileID: 37731993} - waitForFrames: 2 ---- !u!114 &37731993 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} - m_Name: - m_EditorClassIdentifier: - nodeRect: - serializedVersion: 2 - x: 76 - y: 231 - width: 120 - height: 40 - tint: {r: 1, g: 1, b: 1, a: 1} - useCustomTint: 0 - itemId: 14 - blockName: New Block2 - description: - eventHandler: {fileID: 37731992} - commandList: - - {fileID: 37731991} - - {fileID: 37731995} - - {fileID: 37731994} ---- !u!114 &37731994 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8509f58e038dd8c46b98cab78d34e06a, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 17 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - tagString: - stringRef: {fileID: 0} - stringVal: Collection ---- !u!114 &37731995 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b071472a9dcdc7469059042e2e6e50d, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 16 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} ---- !u!114 &37731996 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5996bc0e902a19f4fa257341b0691de3, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 20 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - shape: 0 - position1: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: 0, z: 0} - capsulePosition2: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: 1, z: 0} - radius: - floatRef: {fileID: 0} - floatVal: 0.5 - boxHalfExtends: - vector3Ref: {fileID: 0} - vector3Val: {x: 0.5, y: 0.5, z: 0.5} - boxOrientation: - quaternionRef: {fileID: 0} - quaternionVal: {x: 0, y: 0, z: 0, w: 1} - layerMask: - serializedVersion: 2 - m_Bits: 4294967295 - queryTriggerInteraction: 0 ---- !u!114 &37731997 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b071472a9dcdc7469059042e2e6e50d, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 19 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} ---- !u!114 &37731998 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} - m_Name: - m_EditorClassIdentifier: - parentBlock: {fileID: 37731999} - waitForFrames: 4 ---- !u!114 &37731999 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} - m_Name: - m_EditorClassIdentifier: - nodeRect: - serializedVersion: 2 - x: 82 - y: 354 - width: 120 - height: 40 - tint: {r: 1, g: 1, b: 1, a: 1} - useCustomTint: 0 - itemId: 18 - blockName: New Block3 - description: - eventHandler: {fileID: 37731998} - commandList: - - {fileID: 37731997} - - {fileID: 37731996} - - {fileID: 37732001} - - {fileID: 37732000} - - {fileID: 37732002} ---- !u!114 &37732000 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 44a4b238cb3af004bbae4a6145089ea2, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 22 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - shape: 1 - position1: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: -1, z: 0} - capsulePosition2: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: 0, z: 0} - radius: - floatRef: {fileID: 0} - floatVal: 0.5 - boxHalfExtends: - vector3Ref: {fileID: 0} - vector3Val: {x: 0.5, y: 0.5, z: 0.5} - boxOrientation: - quaternionRef: {fileID: 0} - quaternionVal: {x: 0, y: 0, z: 0, w: 1} - layerMask: - serializedVersion: 2 - m_Bits: 4294967295 - queryTriggerInteraction: 0 - direction: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: 2, z: 0} - maxDistance: - floatRef: {fileID: 0} - floatVal: 3.4028235e+38 ---- !u!114 &37732001 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b071472a9dcdc7469059042e2e6e50d, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 21 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} ---- !u!114 &37732002 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c27aec18d802f45429190093660305e4, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 23 - indentLevel: 0 - collection: - collectionRef: {fileID: 0} - collectionVal: {fileID: 1130536777} - shape: 1 - position1: - vector3Ref: {fileID: 0} - vector3Val: {x: 0, y: 0, z: 0} - radius: - floatRef: {fileID: 0} - floatVal: 0.5 - shapeSize: - vector3Ref: {fileID: 0} - vector3Val: {x: 0.5, y: 0.5, z: 0.5} - shapeAngle: - floatRef: {fileID: 0} - floatVal: 0 - layerMask: - serializedVersion: 2 - m_Bits: 4294967295 - minDepth: - floatRef: {fileID: 0} - floatVal: -Infinity - maxDepth: - floatRef: {fileID: 0} - floatVal: Infinity - capsuleDirection: 0 ---- !u!114 &37732003 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 516fbed763cd80c44835637e64a1da18, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: Var1 - value: {x: 0, y: 0, z: 0, w: 0} ---- !u!114 &37732004 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37731967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0d1ebdecfe2cb147bc3558abb25d154, type: 3} - m_Name: - m_EditorClassIdentifier: - scope: 0 - key: Var - value: {x: 0, y: 0, z: 0, w: 1} ---- !u!1 &210858192 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 210858194} - - component: {fileID: 210858193} - m_Layer: 0 - m_Name: IntVarCollection - m_TagString: Collection - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &210858193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210858192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a852e2fd041ceda439efd62fd08491ca, type: 3} - m_Name: - m_EditorClassIdentifier: - collection: [] ---- !u!4 &210858194 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 210858192} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 793, y: 446, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &649623689 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 649623690} - - component: {fileID: 649623691} - m_Layer: 0 - m_Name: IntCollection - m_TagString: Collection - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &649623690 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 649623689} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 793, y: 446, 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!114 &649623691 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 649623689} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 221f0f261cfcb8a40b9f79cbc51a9148, type: 3} - m_Name: - m_EditorClassIdentifier: - collection: 64000000020000001e00000004000000050000000500000005000000 ---- !u!1 &758729195 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 758729197} - - component: {fileID: 758729196} - m_Layer: 0 - m_Name: _FungusState - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &758729196 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 758729195} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} - m_Name: - m_EditorClassIdentifier: - selectedFlowchart: {fileID: 37731973} ---- !u!4 &758729197 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 758729195} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1130536776 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1130536778} - - component: {fileID: 1130536777} - m_Layer: 0 - m_Name: GameObjectCollection - m_TagString: Collection - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1130536777 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1130536776} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 150bd15698fd79541ace6f07d5304837, type: 3} - m_Name: - m_EditorClassIdentifier: - collection: [] ---- !u!4 &1130536778 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1130536776} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 793, y: 446, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1462591783 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1462591786} - - component: {fileID: 1462591785} - - component: {fileID: 1462591784} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1462591784 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462591783} - m_Enabled: 1 ---- !u!20 &1462591785 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462591783} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_GateFitMode: 2 - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1462591786 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1462591783} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1645508181 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1645508185} - - component: {fileID: 1645508184} - - component: {fileID: 1645508183} - - component: {fileID: 1645508182} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1645508182 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1645508181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ForceModuleActive: 0 ---- !u!114 &1645508183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1645508181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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 &1645508184 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1645508181} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 5 ---- !u!4 &1645508185 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1645508181} - 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: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1696218256 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1696218260} - - component: {fileID: 1696218259} - - component: {fileID: 1696218258} - - component: {fileID: 1696218257} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!65 &1696218257 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696218256} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1696218258 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696218256} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &1696218259 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696218256} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1696218260 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1696218256} - 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: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1959819937 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1959819939} - - component: {fileID: 1959819938} - m_Layer: 0 - m_Name: 2D Poly - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &1959819938 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959819937} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: 0, y: 1} - - {x: -0.95105654, y: 0.30901697} - - {x: -0.5877852, y: -0.80901706} - - {x: 0.58778536, y: -0.80901694} - - {x: 0.9510565, y: 0.30901712} ---- !u!4 &1959819939 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1959819937} - 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: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/FungusExamples/Variables/tempvarcol.unity.meta b/Assets/FungusExamples/Variables/tempvarcol.unity.meta deleted file mode 100644 index 3bee5e71..00000000 --- a/Assets/FungusExamples/Variables/tempvarcol.unity.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d1fc868ea81c9154c90640d45e2fd2ba -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/Editor/TestUtils.cs b/Assets/Tests/Editor/TestUtils.cs index 9ea4f4a5..7935133e 100644 --- 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); } } } \ No newline at end of file diff --git a/Assets/Tests/PlayMode/FungusPlayModeTests.asmdef b/Assets/Tests/PlayMode/FungusPlayModeTests.asmdef index 0bb9be7b..1e1d75d1 100644 --- 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, diff --git a/Packages/manifest.json b/Packages/manifest.json index 0c07c7fb..de5df7f5 100755 --- 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", diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index b529100c..487dd4a4 100644 --- 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 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 87079c13..1c8f32f0 100644 --- 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)