diff --git a/Assets/Tests/Narrative/NarrativeTests.unity b/Assets/Tests/Narrative/NarrativeTests.unity index cb81dcbc..39fa4124 100644 --- a/Assets/Tests/Narrative/NarrativeTests.unity +++ b/Assets/Tests/Narrative/NarrativeTests.unity @@ -112,7 +112,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 1196429429} + selectedFlowchart: {fileID: 2043226671} --- !u!4 &11556238 Transform: m_ObjectHideFlags: 1 @@ -1471,6 +1471,76 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 238588414} +--- !u!1 &254519489 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 254519490} + - 222: {fileID: 254519492} + - 114: {fileID: 254519491} + m_Layer: 0 + m_Name: Middle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &254519490 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 254519489} + 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: 983768062} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 0, y: -1000} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &254519491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 254519489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &254519492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 254519489} --- !u!1 &290123699 GameObject: m_ObjectHideFlags: 0 @@ -1522,6 +1592,76 @@ Transform: m_Children: [] m_Father: {fileID: 2084461895} m_RootOrder: 1 +--- !u!1 &297056949 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 297056950} + - 222: {fileID: 297056952} + - 114: {fileID: 297056951} + m_Layer: 0 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &297056950 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 297056949} + 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: 983768062} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 460.429993, y: -1000} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &297056951 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 297056949} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &297056952 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 297056949} --- !u!1 &319877265 GameObject: m_ObjectHideFlags: 0 @@ -1777,6 +1917,62 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: passCount: 0 +--- !u!1 &462273689 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 462273690} + - 114: {fileID: 462273691} + m_Layer: 0 + m_Name: Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &462273690 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 462273689} + 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: 983768062} + m_Father: {fileID: 1708812488} + m_RootOrder: 0 +--- !u!114 &462273691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 462273689} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f6478b25a400c642b2dee75f022ab12, type: 3} + m_Name: + m_EditorClassIdentifier: + portraitCanvas: {fileID: 983768063} + dimPortraits: 1 + fadeDuration: .75 + moveDuration: 1 + fadeEaseType: 4 + moveEaseType: 4 + shiftOffset: {x: 0, y: 0} + defaultPosition: {fileID: 254519491} + positions: + - {fileID: 969752612} + - {fileID: 254519490} + - {fileID: 297056950} + - {fileID: 1049860613} + - {fileID: 813974793} + charactersOnStage: [] --- !u!1 &538232714 GameObject: m_ObjectHideFlags: 0 @@ -3291,6 +3487,76 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 778843050} +--- !u!1 &813974792 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 813974793} + - 222: {fileID: 813974795} + - 114: {fileID: 813974794} + m_Layer: 0 + m_Name: Offscreen Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &813974793 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813974792} + 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: 983768062} + m_RootOrder: 4 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: 1300, y: -1000} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &813974794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813974792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &813974795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813974792} --- !u!1 &818472420 GameObject: m_ObjectHideFlags: 0 @@ -4369,6 +4635,187 @@ MonoBehaviour: - {fileID: 891159662} - {fileID: 891159649} - {fileID: 891159661} +--- !u!1 &969752611 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 969752612} + - 222: {fileID: 969752614} + - 114: {fileID: 969752613} + m_Layer: 0 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &969752612 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 969752611} + 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: 983768062} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: -460.429993, y: -1000} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &969752613 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 969752611} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &969752614 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 969752611} +--- !u!1 &983768061 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 983768062} + - 223: {fileID: 983768063} + - 114: {fileID: 983768066} + - 114: {fileID: 983768065} + - 225: {fileID: 983768064} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &983768062 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 983768061} + 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: 254519490} + - {fileID: 969752612} + - {fileID: 297056950} + - {fileID: 1049860613} + - {fileID: 813974793} + m_Father: {fileID: 462273690} + m_RootOrder: 0 + 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!223 &983768063 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 983768061} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!225 &983768064 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 983768061} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &983768065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 983768061} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1600, y: 1200} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &983768066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 983768061} + 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!1 &991628163 GameObject: m_ObjectHideFlags: 0 @@ -4614,69 +5061,188 @@ MonoBehaviour: --- !u!4 &1028729102 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1028729100} - 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: 861253872} - - {fileID: 1125936941} - - {fileID: 1685415951} - m_Father: {fileID: 0} - m_RootOrder: 6 ---- !u!224 &1029277842 stripped -RectTransform: - m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1028729100} + 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: 861253872} + - {fileID: 1125936941} + - {fileID: 1685415951} + m_Father: {fileID: 0} + m_RootOrder: 6 +--- !u!224 &1029277842 stripped +RectTransform: + m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 1450066430} +--- !u!1 &1045375688 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1045375689} + - 114: {fileID: 1045375690} + m_Layer: 0 + m_Name: Somebody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1045375689 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1045375688} + 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: 685425359} + m_RootOrder: 3 +--- !u!114 &1045375690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1045375688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} + m_Name: + m_EditorClassIdentifier: + nameText: Somebody + nameColor: {r: .235294104, g: .235294104, b: .235294104, a: 1} + soundEffect: {fileID: 0} + profileSprite: {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} + portraits: + - {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} + portraitsFace: 0 + description: +--- !u!1 &1049860612 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1049860613} + - 222: {fileID: 1049860615} + - 114: {fileID: 1049860614} + m_Layer: 0 + m_Name: Offscreen Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1049860613 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049860612} + 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: 983768062} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: 1} + m_AnchorMax: {x: .5, y: 1} + m_AnchoredPosition: {x: -1300, y: -1000} + m_SizeDelta: {x: 1000, y: 1000} + m_Pivot: {x: .5, y: 0} +--- !u!114 &1049860614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049860612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1049860615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1450066430} ---- !u!1 &1045375688 + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1049860612} +--- !u!1 &1065579870 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 1045375689} - - 114: {fileID: 1045375690} + - 4: {fileID: 1065579871} + - 114: {fileID: 1065579872} m_Layer: 0 - m_Name: Somebody + m_Name: TestCharacter m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1045375689 +--- !u!4 &1065579871 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1045375688} + m_GameObject: {fileID: 1065579870} 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: 685425359} - m_RootOrder: 3 ---- !u!114 &1045375690 + m_Father: {fileID: 1708812488} + m_RootOrder: 2 +--- !u!114 &1065579872 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1045375688} + m_GameObject: {fileID: 1065579870} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} m_Name: m_EditorClassIdentifier: - nameText: Somebody - nameColor: {r: .235294104, g: .235294104, b: .235294104, a: 1} + nameText: TestCharacter + nameColor: {r: 1, g: 1, b: 1, a: 1} soundEffect: {fileID: 0} - profileSprite: {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} + profileSprite: {fileID: 21300000, guid: 5b776e5296df54952a07a367943f5c7c, type: 3} portraits: - - {fileID: 21300000, guid: 10cc2fec4b8aa4db983981588b06b591, type: 3} + - {fileID: 21300000, guid: 5b776e5296df54952a07a367943f5c7c, type: 3} + - {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3} portraitsFace: 0 description: --- !u!1 &1066357890 stripped @@ -6707,6 +7273,58 @@ MonoBehaviour: checkMethods: 1 m_ActionBase: {fileID: 1931935703} checksPerformed: 0 +--- !u!1 &1708812486 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1708812488} + - 114: {fileID: 1708812487} + m_Layer: 0 + m_Name: Portrait_TallImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1708812487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708812486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + timeout: 5 + ignored: 0 + succeedAfterAllAssertionsAreExecuted: 0 + expectException: 0 + expectedExceptionList: + succeedWhenExceptionIsThrown: 0 + includedPlatforms: -1 + platformsToIgnore: [] + dynamic: 0 + dynamicTypeName: +--- !u!4 &1708812488 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1708812486} + 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: 462273690} + - {fileID: 2043226670} + - {fileID: 1065579871} + m_Father: {fileID: 0} + m_RootOrder: 9 --- !u!1 &1714427702 GameObject: m_ObjectHideFlags: 0 @@ -7231,7 +7849,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1895633754 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8033,6 +8651,236 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2011349147} +--- !u!1 &2043226669 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2043226670} + - 114: {fileID: 2043226671} + - 114: {fileID: 2043226673} + - 114: {fileID: 2043226674} + - 114: {fileID: 2043226672} + - 114: {fileID: 2043226675} + - 114: {fileID: 2043226676} + - 114: {fileID: 2043226678} + - 114: {fileID: 2043226677} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2043226670 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + 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: 1708812488} + m_RootOrder: 1 +--- !u!114 &2043226671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + 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: 2043226673} + selectedCommands: + - {fileID: 2043226677} + variables: [] + description: + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: +--- !u!114 &2043226672 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + stage: {fileID: 0} + display: 1 + character: {fileID: 1065579872} + replacedCharacter: {fileID: 0} + portrait: {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3} + offset: 0 + fromPosition: {fileID: 0} + toPosition: {fileID: 969752612} + facing: 0 + useDefaultSettings: 1 + fadeDuration: .5 + moveDuration: 1 + shiftOffset: {x: 0, y: 0} + move: 0 + shiftIntoPlace: 0 + waitUntilFinished: 0 +--- !u!114 &2043226673 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 69 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: New Block + description: + eventHandler: {fileID: 2043226674} + commandList: + - {fileID: 2043226672} + - {fileID: 2043226676} + - {fileID: 2043226675} + - {fileID: 2043226678} + - {fileID: 2043226677} +--- !u!114 &2043226674 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 2043226673} +--- !u!114 &2043226675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + errorMessage: + indentLevel: 0 + stage: {fileID: 0} + display: 1 + character: {fileID: 1065579872} + replacedCharacter: {fileID: 0} + portrait: {fileID: 21300000, guid: 5b776e5296df54952a07a367943f5c7c, type: 3} + offset: 0 + fromPosition: {fileID: 0} + toPosition: {fileID: 254519490} + facing: 0 + useDefaultSettings: 1 + fadeDuration: .5 + moveDuration: 1 + shiftOffset: {x: 0, y: 0} + move: 1 + shiftIntoPlace: 0 + waitUntilFinished: 0 +--- !u!114 &2043226676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 + duration: 1 +--- !u!114 &2043226677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 + stage: {fileID: 0} + display: 1 + character: {fileID: 1065579872} + replacedCharacter: {fileID: 0} + portrait: {fileID: 21300000, guid: 820bab66bb5a044ec961ba8ee3b045cc, type: 3} + offset: 0 + fromPosition: {fileID: 0} + toPosition: {fileID: 297056950} + facing: 0 + useDefaultSettings: 1 + fadeDuration: .5 + moveDuration: 1 + shiftOffset: {x: 0, y: 0} + move: 1 + shiftIntoPlace: 0 + waitUntilFinished: 0 +--- !u!114 &2043226678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2043226669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + errorMessage: + indentLevel: 0 + duration: 1 --- !u!1 &2082946103 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png b/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png new file mode 100644 index 00000000..26b4dbe2 Binary files /dev/null and b/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png differ diff --git a/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png.meta b/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png.meta new file mode 100644 index 00000000..46cdf5bc --- /dev/null +++ b/Assets/Tests/TestAssets/Portraits/John/annoyed_tall.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 5b776e5296df54952a07a367943f5c7c +timeCreated: 1441983293 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: