From bde0131ac3740f11f433b70c4fc402c78b83323f Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 13 Jan 2016 17:00:21 +0000 Subject: [PATCH] Added command to fade UI objects #349 --- Assets/Fungus/UI/Scripts/Commands/FadeUI.cs | 143 +++ .../Fungus/UI/Scripts/Commands/FadeUI.cs.meta | 12 + Assets/Fungus/UI/Scripts/Commands/TweenUI.cs | 131 +++ .../UI/Scripts/Commands/TweenUI.cs.meta | 12 + Assets/Tests/UI/TextTests.unity | 860 ++++++++++++++---- 5 files changed, 966 insertions(+), 192 deletions(-) create mode 100644 Assets/Fungus/UI/Scripts/Commands/FadeUI.cs create mode 100644 Assets/Fungus/UI/Scripts/Commands/FadeUI.cs.meta create mode 100644 Assets/Fungus/UI/Scripts/Commands/TweenUI.cs create mode 100644 Assets/Fungus/UI/Scripts/Commands/TweenUI.cs.meta diff --git a/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs b/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs new file mode 100644 index 00000000..a4323f17 --- /dev/null +++ b/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs @@ -0,0 +1,143 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; +using System.Collections.Generic; +using Fungus; + +namespace Fungus +{ + + [CommandInfo("UI", + "Fade UI", + "Fades a UI object")] + public class FadeUI : TweenUI + { + public enum FadeMode + { + Alpha, + Color + } + + public FadeMode fadeMode = FadeMode.Alpha; + + public ColorData targetColor = new ColorData(Color.white); + + public FloatData targetAlpha = new FloatData(1f); + + protected override void ApplyTween(GameObject go) + { + foreach (Image image in go.GetComponentsInChildren()) + { + if (duration == 0f) + { + switch (fadeMode) + { + case FadeMode.Alpha: + Color tempColor = image.color; + tempColor.a = targetAlpha; + image.color = tempColor; + break; + case FadeMode.Color: + image.color = targetColor; + break; + } + } + else + { + switch (fadeMode) + { + case FadeMode.Alpha: + LeanTween.alpha(image.rectTransform, targetAlpha, duration).setEase(tweenType).setEase(tweenType); + break; + case FadeMode.Color: + LeanTween.color(image.rectTransform, targetColor, duration).setEase(tweenType).setEase(tweenType); + break; + } + } + } + + foreach (Text text in go.GetComponentsInChildren()) + { + if (duration == 0f) + { + switch (fadeMode) + { + case FadeMode.Alpha: + Color tempColor = text.color; + tempColor.a = targetAlpha; + text.color = tempColor; + break; + case FadeMode.Color: + text.color = targetColor; + break; + } + } + else + { + switch (fadeMode) + { + case FadeMode.Alpha: + LeanTween.textAlpha(text.rectTransform, targetAlpha, duration).setEase(tweenType); + break; + case FadeMode.Color: + LeanTween.textColor(text.rectTransform, targetColor, duration).setEase(tweenType); + break; + } + } + } + + foreach (TextMesh textMesh in go.GetComponentsInChildren()) + { + if (duration == 0f) + { + switch (fadeMode) + { + case FadeMode.Alpha: + Color tempColor = textMesh.color; + tempColor.a = targetAlpha; + textMesh.color = tempColor; + break; + case FadeMode.Color: + textMesh.color = targetColor; + break; + } + } + else + { + switch (fadeMode) + { + case FadeMode.Alpha: + LeanTween.alpha(go, targetAlpha, duration).setEase(tweenType); + break; + case FadeMode.Color: + LeanTween.color(go, targetColor, duration).setEase(tweenType); + break; + } + } + } + } + + protected override string GetSummaryValue() + { + return targetAlpha.Value.ToString(); + } + + public override bool IsPropertyVisible(string propertyName) + { + if (fadeMode == FadeMode.Alpha && + propertyName == "targetColor") + { + return false; + } + + if (fadeMode == FadeMode.Color && + propertyName == "targetAlpha") + { + return false; + } + + return true; + } + } + +} diff --git a/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs.meta b/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs.meta new file mode 100644 index 00000000..d04d3d13 --- /dev/null +++ b/Assets/Fungus/UI/Scripts/Commands/FadeUI.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5c6dd8d3a780f4d1ea772e3daf10c372 +timeCreated: 1444819884 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs b/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs new file mode 100644 index 00000000..5b8d93de --- /dev/null +++ b/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs @@ -0,0 +1,131 @@ +using UnityEngine; +using UnityEngine.UI; +using System.Collections; +using System.Collections.Generic; +using Fungus; + +namespace Fungus +{ + + public abstract class TweenUI : Command + { + [Tooltip("List of objects to be affected by the tween")] + public List targetObjects = new List(); + + [Tooltip("Type of tween easing to apply")] + public LeanTweenType tweenType = LeanTweenType.easeOutQuad; + + [Tooltip("Wait until this command completes before continuing execution")] + public BooleanData waitUntilFinished = new BooleanData(true); + + [Tooltip("Time for the tween to complete")] + public FloatData duration = new FloatData(1f); + + public override void OnEnter() + { + if (targetObjects.Count == 0) + { + Continue(); + return; + } + + ApplyTween(); + + if (!waitUntilFinished) + { + Continue(); + } + } + + protected virtual void ApplyTween() + { + foreach (GameObject targetObject in targetObjects) + { + if (targetObject == null) + { + continue; + } + + ApplyTween(targetObject); + } + + if (waitUntilFinished) + { + LeanTween.value(gameObject, 0f, 1f, duration).setOnComplete(OnComplete); + } + } + + protected abstract void ApplyTween(GameObject go); + + protected virtual void OnComplete() + { + Continue(); + } + + public override void OnCommandAdded(Block parentBlock) + { + // Add an empty slot by default. Saves an unnecessary user click. + if (targetObjects.Count == 0) + { + targetObjects.Add(null); + } + } + + protected virtual string GetSummaryValue() + { + return ""; + } + + public override string GetSummary() + { + if (targetObjects.Count == 0) + { + return "Error: No targetObjects selected"; + } + else if (targetObjects.Count == 1) + { + if (targetObjects[0] == null) + { + return "Error: No targetObjects selected"; + } + return targetObjects[0].name + " = " + GetSummaryValue() + " alpha"; + } + + string objectList = ""; + foreach (GameObject gameObject in targetObjects) + { + if (gameObject == null) + { + continue; + } + + if (objectList == "") + { + objectList += gameObject.name; + } + else + { + objectList += ", " + gameObject.name; + } + } + + return objectList + " = " + GetSummaryValue() + " alpha"; + } + + public override Color GetButtonColor() + { + return new Color32(180, 250, 250, 255); + } + + public override bool IsReorderableArray(string propertyName) + { + if (propertyName == "targetObjects") + { + return true; + } + + return false; + } + } + +} \ No newline at end of file diff --git a/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs.meta b/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs.meta new file mode 100644 index 00000000..a828cc8f --- /dev/null +++ b/Assets/Fungus/UI/Scripts/Commands/TweenUI.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c43a65504f4024abaa7581ddfa448f2d +timeCreated: 1444819884 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tests/UI/TextTests.unity b/Assets/Tests/UI/TextTests.unity index 76b8bfc2..2f3bcef8 100644 --- a/Assets/Tests/UI/TextTests.unity +++ b/Assets/Tests/UI/TextTests.unity @@ -8,25 +8,25 @@ SceneSettings: m_PVSPortalsArray: [] m_OcclusionBakeSettings: smallestOccluder: 5 - smallestHole: .25 + smallestHole: 0.25 backfaceThreshold: 100 --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 6 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: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + 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_SkyboxMaterial: {fileID: 0} - m_HaloStrength: .5 + m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 m_HaloTexture: {fileID: 0} @@ -40,7 +40,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 5 + serializedVersion: 6 m_GIWorkflowMode: 1 m_LightmapsMode: 1 m_GISettings: @@ -66,7 +66,7 @@ LightmapSettings: m_FinalGather: 0 m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 - m_LightmapSnapshot: {fileID: 0} + m_LightingDataAsset: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 NavMeshSettings: @@ -74,15 +74,15 @@ NavMeshSettings: m_ObjectHideFlags: 0 m_BuildSettings: serializedVersion: 2 - agentRadius: .5 + agentRadius: 0.5 agentHeight: 2 agentSlope: 45 - agentClimb: .400000006 + agentClimb: 0.4 ledgeDropHeight: 0 maxJumpAcrossDistance: 0 accuratePlacement: 0 minRegionArea: 2 - cellSize: .166666672 + cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} --- !u!1 &34230112 @@ -116,9 +116,9 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &34230114 MonoBehaviour: m_ObjectHideFlags: 0 @@ -131,7 +131,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -146,6 +146,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -197,6 +198,97 @@ MonoBehaviour: compareType: 0 comparisonType: 4 ignoreCase: 0 +--- !u!1 &78431860 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 78431861} + - 223: {fileID: 78431864} + - 114: {fileID: 78431863} + - 114: {fileID: 78431862} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &78431861 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 78431860} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 673069186} + m_Father: {fileID: 1108190806} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &78431862 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 78431860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &78431863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 78431860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &78431864 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 78431860} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &80527385 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +328,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 --- !u!1 &95196512 GameObject: m_ObjectHideFlags: 0 @@ -293,8 +385,10 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -345,9 +439,9 @@ RectTransform: m_RootOrder: 2 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.00000858, y: -79} + m_AnchoredPosition: {x: 1.0000086, y: -79} m_SizeDelta: {x: 1.5, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &185519271 MonoBehaviour: m_ObjectHideFlags: 0 @@ -359,7 +453,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} m_Name: m_EditorClassIdentifier: - checkAfterTime: .5 + checkAfterTime: 0.5 repeatCheckTime: 0 repeatEveryTime: 1 checkAfterFrames: 1 @@ -403,7 +497,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -420,7 +514,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -435,6 +529,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -537,6 +632,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &245735758 GameObject: m_ObjectHideFlags: 0 @@ -591,7 +687,7 @@ Transform: - {fileID: 1032256624} - {fileID: 1017201038} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 --- !u!114 &291493362 MonoBehaviour: m_ObjectHideFlags: 0 @@ -925,6 +1021,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &394147077 GameObject: m_ObjectHideFlags: 0 @@ -940,7 +1037,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &394147078 Transform: m_ObjectHideFlags: 0 @@ -955,7 +1052,7 @@ Transform: - {fileID: 770681021} - {fileID: 950568789} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 --- !u!114 &394147079 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1027,7 +1124,26 @@ Transform: - {fileID: 1619905204} - {fileID: 954527802} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 +--- !u!114 &407301897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4928c6c2b973874c8d4e6c9a69bb5b4, type: 3} + m_Name: + m_EditorClassIdentifier: + go: {fileID: 673069183} + thisPropertyPath: Text.color.a + compareToType: 1 + other: {fileID: 0} + otherPropertyPath: + constantValueGeneric: 0 + compareTypes: 0 + floatingPointError: 0.00009999999747378752 --- !u!114 &419867297 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1078,10 +1194,10 @@ RectTransform: m_Father: {fileID: 507643414} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &493382918 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1145,7 +1261,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} m_Name: m_EditorClassIdentifier: - checkAfterTime: .5 + checkAfterTime: 0.5 repeatCheckTime: 0 repeatEveryTime: 1 checkAfterFrames: 1 @@ -1168,7 +1284,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 10 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -1185,7 +1301,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1200,6 +1316,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1225,9 +1342,9 @@ RectTransform: m_RootOrder: 15 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: .5, y: -384} + m_AnchoredPosition: {x: 0.5, y: -384} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &501693565 GameObject: m_ObjectHideFlags: 0 @@ -1264,7 +1381,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -234} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &501693567 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1299,7 +1416,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -1316,7 +1433,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1331,6 +1448,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1395,7 +1513,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &508656459 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1467,7 +1585,7 @@ Transform: - {fileID: 1411617024} - {fileID: 1200195692} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!1 &626950206 GameObject: m_ObjectHideFlags: 0 @@ -1497,11 +1615,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 732059695} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &626950208 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1564,7 +1682,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1579,6 +1697,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1604,9 +1723,84 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &673069183 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 673069186} + - 222: {fileID: 673069185} + - 114: {fileID: 673069184} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &673069184 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 673069183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Fade away + +' +--- !u!222 &673069185 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 673069183} +--- !u!224 &673069186 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 673069183} + 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: 78431861} + m_RootOrder: 0 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 99} + m_SizeDelta: {x: 370, y: 84} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &717214671 GameObject: m_ObjectHideFlags: 0 @@ -1637,7 +1831,7 @@ Transform: - {fileID: 773300315} - {fileID: 352621262} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 --- !u!114 &717214673 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1690,11 +1884,11 @@ RectTransform: - {fileID: 507643414} m_Father: {fileID: 770681021} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 87.5} - m_SizeDelta: {x: 431.299988, y: 53.9000015} - m_Pivot: {x: .5, y: .5} + m_SizeDelta: {x: 431.3, y: 53.9} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &732059696 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1715,11 +1909,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -1796,9 +1990,9 @@ RectTransform: m_RootOrder: 5 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: .5, y: -174} + m_AnchoredPosition: {x: 0.5, y: -174} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &750279028 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1833,7 +2027,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -1850,7 +2044,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1865,6 +2059,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -1966,6 +2161,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1 &770976494 GameObject: m_ObjectHideFlags: 0 @@ -1990,7 +2186,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 770976494} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -7.82000017, y: -1.01999998, z: 0} + m_LocalPosition: {x: -7.82, y: -1.02, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1732768666} @@ -2034,8 +2230,10 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -2135,11 +2333,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 234842813} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 6, y: 148} m_SizeDelta: {x: 485, y: 53} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &814315341 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2167,6 +2365,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2229,9 +2428,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &872356303 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2244,7 +2443,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: .5} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2259,6 +2458,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2325,7 +2525,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 2.5, y: -139} m_SizeDelta: {x: 1, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &899652411 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2360,7 +2560,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -2377,7 +2577,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2392,6 +2592,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2434,9 +2635,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &911858107 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2449,7 +2650,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: .5} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2464,6 +2665,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -2516,7 +2718,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 60 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -2560,7 +2762,7 @@ AudioSource: OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: 58cb220e0c6c34a1280967cdc9271d68, type: 3} m_PlayOnAwake: 0 - m_Volume: .0829999968 + m_Volume: 0.083 m_Pitch: 1 Loop: 0 Mute: 0 @@ -2589,6 +2791,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -2599,6 +2802,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -2609,6 +2813,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -2619,6 +2824,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &950568788 GameObject: m_ObjectHideFlags: 0 @@ -2817,6 +3023,138 @@ MonoBehaviour: saveSelection: 1 localizationId: hideCommands: [] +--- !u!1 &957032111 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 957032112} + - 114: {fileID: 957032117} + - 114: {fileID: 957032116} + - 114: {fileID: 957032114} + - 114: {fileID: 957032113} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &957032112 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 957032111} + 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: 1108190806} + m_RootOrder: 2 +--- !u!114 &957032113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 957032111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5c6dd8d3a780f4d1ea772e3daf10c372, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + targetObjects: + - {fileID: 673069183} + tweenType: 2 + waitUntilFinished: + booleanRef: {fileID: 0} + booleanVal: 1 + duration: + floatRef: {fileID: 0} + floatVal: 1 + fadeMode: 0 + targetColor: + colorRef: {fileID: 0} + colorVal: {r: 1, g: 1, b: 1, a: 1} + targetAlpha: + floatRef: {fileID: 0} + floatVal: 0 +--- !u!114 &957032114 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 957032111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 957032116} +--- !u!114 &957032116 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 957032111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 957032114} + commandList: + - {fileID: 957032113} +--- !u!114 &957032117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 957032111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1.0 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlock: {fileID: 957032116} + selectedCommands: + - {fileID: 957032113} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] --- !u!1 &988367244 GameObject: m_ObjectHideFlags: 0 @@ -2850,9 +3188,9 @@ RectTransform: m_RootOrder: 14 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: .25, y: -354} + m_AnchoredPosition: {x: 0.25, y: -354} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &988367246 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2866,8 +3204,8 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 - hiddenTextColor: {r: .500811279, g: .213235319, b: 1, a: 1} + punctuationPause: 0.25 + hiddenTextColor: {r: 0.5008113, g: 0.21323532, b: 1, a: 1} writeWholeWords: 1 forceRichText: 1 instantComplete: 1 @@ -2898,6 +3236,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -3844,7 +4183,7 @@ Transform: - {fileID: 1437805978} - {fileID: 1845987942} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!1 &1032256623 GameObject: m_ObjectHideFlags: 0 @@ -3908,7 +4247,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1074972644} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.29999995, y: 3.25256348, z: 0} + m_LocalPosition: {x: 1.3, y: 3.2525635, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1732768666} @@ -3955,6 +4294,55 @@ MonoBehaviour: checkMethods: 1 m_ActionBase: {fileID: 1463555119} checksPerformed: 0 +--- !u!1 &1096607114 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1096607115} + - 114: {fileID: 1096607116} + m_Layer: 0 + m_Name: TestAssertions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1096607115 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1096607114} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 80, y: 15, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1108190806} + m_RootOrder: 0 +--- !u!114 &1096607116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1096607114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} + m_Name: + m_EditorClassIdentifier: + checkAfterTime: 2 + repeatCheckTime: 0 + repeatEveryTime: 1 + checkAfterFrames: 1 + repeatCheckFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + checkMethods: 1 + m_ActionBase: {fileID: 407301897} + checksPerformed: 0 --- !u!1 &1106313367 GameObject: m_ObjectHideFlags: 0 @@ -4077,6 +4465,58 @@ Transform: m_Children: [] m_Father: {fileID: 717214672} m_RootOrder: 0 +--- !u!1 &1108190804 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1108190806} + - 114: {fileID: 1108190805} + m_Layer: 0 + m_Name: FadeUITest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1108190805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1108190804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + timeout: 5 + ignored: 0 + succeedAfterAllAssertionsAreExecuted: 1 + expectException: 0 + expectedExceptionList: + succeedWhenExceptionIsThrown: 0 + includedPlatforms: -1 + platformsToIgnore: [] + dynamic: 0 + dynamicTypeName: +--- !u!4 &1108190806 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1108190804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1096607115} + - {fileID: 78431861} + - {fileID: 957032112} + m_Father: {fileID: 0} + m_RootOrder: 11 --- !u!1 &1112601922 GameObject: m_ObjectHideFlags: 0 @@ -4109,11 +4549,11 @@ RectTransform: - {fileID: 640528467} m_Father: {fileID: 1518184826} m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -218.5, y: 142.5} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1112601924 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4134,11 +4574,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -4160,19 +4600,23 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_EndEdit: + m_OnEndEdit: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_OnValueChange: + m_OnValueChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} m_Text: Sample input - m_CaretBlinkRate: .850000024 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 --- !u!114 &1112601925 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4261,7 +4705,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -4278,7 +4722,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4293,6 +4737,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -4320,7 +4765,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 1, y: -49} m_SizeDelta: {x: 1, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1121374956 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4376,9 +4821,9 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1121990699 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4391,7 +4836,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4406,6 +4851,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 0 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -4515,11 +4961,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1730131643} m_RootOrder: 3 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 1, y: 169.5} m_SizeDelta: {x: 889, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1218238774 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4531,7 +4977,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} m_Name: m_EditorClassIdentifier: - checkAfterTime: .5 + checkAfterTime: 0.5 repeatCheckTime: 0 repeatEveryTime: 1 checkAfterFrames: 1 @@ -4575,7 +5021,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -4592,7 +5038,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4607,6 +5053,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -4666,11 +5113,11 @@ RectTransform: - {fileID: 1301448259} m_Father: {fileID: 732059695} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1301448258 GameObject: m_ObjectHideFlags: 0 @@ -4701,10 +5148,10 @@ RectTransform: m_Father: {fileID: 1290158568} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1301448260 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4765,7 +5212,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 1966871423} + selectedFlowchart: {fileID: 957032117} --- !u!4 &1308535842 Transform: m_ObjectHideFlags: 1 @@ -4810,9 +5257,9 @@ RectTransform: m_RootOrder: 8 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.48091125e-05, y: -264} - m_SizeDelta: {x: 6.96182251e-05, y: 30} - m_Pivot: {x: .5, y: .5} + m_AnchoredPosition: {x: -0.000034809113, y: -264} + m_SizeDelta: {x: 0.000069618225, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1405192201 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4846,7 +5293,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4861,6 +5308,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -4962,6 +5410,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!114 &1430574585 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5199,7 +5648,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1437805977} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 195.19339, y: 518.459595, z: 0} + m_LocalPosition: {x: 195.19339, y: 518.4596, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1032150759} @@ -5354,14 +5803,14 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: .407655716, g: .620854914, b: .95588237, a: .0196078438} + m_BackGroundColor: {r: 0.40765572, g: 0.6208549, b: 0.9558824, a: 0.019607844} 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 @@ -5377,7 +5826,7 @@ Camera: m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 + m_StereoSeparation: 0.022 m_StereoMirrorMode: 0 --- !u!4 &1465093121 Transform: @@ -5390,7 +5839,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!1 &1476144413 GameObject: m_ObjectHideFlags: 0 @@ -5422,7 +5871,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -5454,6 +5903,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -5481,7 +5931,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -333, y: -294} m_SizeDelta: {x: -665, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1490749230 GameObject: m_ObjectHideFlags: 0 @@ -5514,11 +5964,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1411617024} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .5} - m_AnchorMax: {x: 1, y: .5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 54.25} m_SizeDelta: {x: 1, y: 108.5} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1490749232 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5546,6 +5996,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -5570,8 +6021,8 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 60 - punctuationPause: .25 - hiddenTextColor: {r: .463235319, g: .463235319, b: .463235319, a: 1} + punctuationPause: 0.25 + hiddenTextColor: {r: 0.46323532, g: 0.46323532, b: 0.46323532, a: 1} writeWholeWords: 0 forceRichText: 1 instantComplete: 1 @@ -5635,6 +6086,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 panLevelCustomCurve: serializedVersion: 2 m_Curve: @@ -5645,6 +6097,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 spreadCustomCurve: serializedVersion: 2 m_Curve: @@ -5655,6 +6108,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 reverbZoneMixCustomCurve: serializedVersion: 2 m_Curve: @@ -5665,6 +6119,7 @@ AudioSource: tangentMode: 0 m_PreInfinity: 2 m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1518184822 GameObject: m_ObjectHideFlags: 0 @@ -5737,6 +6192,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!224 &1518184826 RectTransform: m_ObjectHideFlags: 0 @@ -5788,9 +6244,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -.5} + m_AnchoredPosition: {x: 0, y: -0.5} m_SizeDelta: {x: -20, y: -13} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1595694583 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5803,7 +6259,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: .5} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5818,6 +6274,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -5860,9 +6317,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: .25, y: -18} - m_SizeDelta: {x: -.5, y: 37} - m_Pivot: {x: .5, y: .5} + m_AnchoredPosition: {x: 0.25, y: -18} + m_SizeDelta: {x: -0.5, y: 37} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1612264388 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5875,7 +6332,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -5890,6 +6347,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -5935,7 +6393,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -107, y: -294} m_SizeDelta: {x: -665, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1614606399 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5949,7 +6407,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -5981,6 +6439,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -6064,7 +6523,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1649786892 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6077,7 +6536,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6092,6 +6551,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -6136,9 +6596,9 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2.50339508e-05, y: -14} - m_SizeDelta: {x: 4.9829483e-05, y: 30} - m_Pivot: {x: .5, y: .5} + m_AnchoredPosition: {x: -0.00002503395, y: -14} + m_SizeDelta: {x: 0.000049829483, y: 30} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1651293175 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6151,7 +6611,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -6166,6 +6626,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -6190,7 +6651,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -6262,7 +6723,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_RepeatDelay: .5 + m_RepeatDelay: 0.5 m_ForceModuleActive: 0 --- !u!114 &1661537280 MonoBehaviour: @@ -6289,7 +6750,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 --- !u!114 &1696639491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6339,9 +6800,9 @@ RectTransform: m_RootOrder: 13 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -.5, y: -324} + m_AnchoredPosition: {x: -0.5, y: -324} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1719294951 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6355,8 +6816,8 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 - hiddenTextColor: {r: .500811279, g: .213235319, b: 1, a: 1} + punctuationPause: 0.25 + hiddenTextColor: {r: 0.5008113, g: 0.21323532, b: 1, a: 1} writeWholeWords: 1 forceRichText: 1 instantComplete: 1 @@ -6387,6 +6848,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -6470,6 +6932,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: 0 m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!224 &1730131643 RectTransform: m_ObjectHideFlags: 0 @@ -6555,7 +7018,7 @@ Transform: - {fileID: 770976495} - {fileID: 1074972645} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 --- !u!114 &1733152910 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6636,8 +7099,10 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 @@ -6649,7 +7114,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1754111083} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .50999999, y: -1.71000004, z: 0} + m_LocalPosition: {x: 0.51, y: -1.71, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 245735760} @@ -6667,7 +7132,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 60 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -6704,11 +7169,11 @@ RectTransform: - {fileID: 1121990698} m_Father: {fileID: 234842813} m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -52, y: 109} m_SizeDelta: {x: 370, y: 35} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1783342059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6729,11 +7194,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -6755,19 +7220,23 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_EndEdit: + m_OnEndEdit: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_OnValueChange: + m_OnValueChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} m_Text: - m_CaretBlinkRate: .850000024 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 --- !u!114 &1783342060 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7068,11 +7537,11 @@ RectTransform: - {fileID: 34230113} m_Father: {fileID: 1518184826} m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -218.5, y: 172.5} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1912867845 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7093,11 +7562,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -7119,19 +7588,23 @@ MonoBehaviour: m_HideMobileInput: 0 m_CharacterValidation: 0 m_CharacterLimit: 0 - m_EndEdit: + m_OnEndEdit: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_OnValueChange: + m_OnValueChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_SelectionColor: {r: .65882355, g: .807843149, b: 1, a: .752941191} + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} m_Text: - m_CaretBlinkRate: .850000024 + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 --- !u!114 &1912867846 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7220,7 +7693,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -204} m_SizeDelta: {x: 0, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1920590682 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7255,7 +7728,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -7272,7 +7745,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -7287,6 +7760,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -7363,7 +7837,7 @@ MonoBehaviour: variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 blockViewHeight: 400 - zoom: .998999953 + zoom: 0.99899995 scrollViewRect: serializedVersion: 2 x: -343 @@ -7435,7 +7909,7 @@ MonoBehaviour: slider: {fileID: 732059696} value: floatRef: {fileID: 0} - floatVal: .5 + floatVal: 0.5 --- !u!114 &1992408041 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7488,9 +7962,9 @@ RectTransform: m_RootOrder: 12 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 344.130005, y: -294} + m_AnchoredPosition: {x: 344.13, y: -294} m_SizeDelta: {x: -684.75, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2004095630 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7504,7 +7978,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -7536,6 +8010,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -7581,7 +8056,7 @@ RectTransform: m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 128, y: -294} m_SizeDelta: {x: -665, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2015818682 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7595,7 +8070,7 @@ MonoBehaviour: m_EditorClassIdentifier: targetTextObject: {fileID: 0} writingSpeed: 30 - punctuationPause: .25 + punctuationPause: 0.25 hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} writeWholeWords: 0 forceRichText: 1 @@ -7627,6 +8102,7 @@ MonoBehaviour: m_MinSize: 10 m_MaxSize: 40 m_Alignment: 0 + m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 @@ -7696,11 +8172,11 @@ MonoBehaviour: m_Transition: 1 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + 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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 - m_FadeDuration: .100000001 + m_FadeDuration: 0.1 m_SpriteState: m_HighlightedSprite: {fileID: 0} m_PressedSprite: {fileID: 0} @@ -7763,11 +8239,11 @@ RectTransform: - {fileID: 1649786891} m_Father: {fileID: 352621262} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -3.05180001e-05, y: 110} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000030518, y: 110} m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: .5, y: .5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2105561243 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7784,6 +8260,6 @@ MonoBehaviour: compareToType: 1 other: {fileID: 0} otherPropertyPath: - constantValueGeneric: .5 + constantValueGeneric: 0.5 compareTypes: 0 - floatingPointError: 9.9999997473787516e-05 + floatingPointError: 0.00009999999747378752