diff --git a/Assets/Fungus/Narrative/Scripts/Commands/Portrait.cs b/Assets/Fungus/Narrative/Scripts/Commands/Portrait.cs index 297cd26a..e7be2eea 100755 --- a/Assets/Fungus/Narrative/Scripts/Commands/Portrait.cs +++ b/Assets/Fungus/Narrative/Scripts/Commands/Portrait.cs @@ -381,6 +381,8 @@ namespace Fungus GameObject tempGO = GameObject.Instantiate(character.state.portraitImage.gameObject); tempGO.transform.SetParent(character.state.portraitImage.transform, false); tempGO.transform.localPosition = Vector3.zero; + tempGO.transform.localScale = character.state.position.localScale; + Image tempImage = tempGO.GetComponent(); tempImage.sprite = character.state.portraitImage.sprite; tempImage.preserveAspect = true; diff --git a/Assets/Tests/Narrative/NarrativeTests.unity b/Assets/Tests/Narrative/NarrativeTests.unity index 7fb0ca2f..2e49cbaa 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: 24983358} + selectedFlowchart: {fileID: 711866616} --- !u!4 &11556238 Transform: m_ObjectHideFlags: 1 @@ -388,9 +388,8 @@ MonoBehaviour: y: -350 width: 1289 height: 869 - selectedBlock: {fileID: 24983361} - selectedCommands: - - {fileID: 24983364} + selectedBlock: {fileID: 0} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -912,10 +911,10 @@ RectTransform: - {fileID: 1633375116} m_Father: {fileID: 724348928} m_RootOrder: 5 - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -575} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &45801411 MonoBehaviour: @@ -1259,6 +1258,117 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 97347670} +--- !u!1 &131087273 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110276, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 131087274} + - 223: {fileID: 131087275} + - 114: {fileID: 131087278} + - 114: {fileID: 131087277} + - 225: {fileID: 131087276} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &131087274 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 131087273} + 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: 879247670} + - {fileID: 1022563244} + - {fileID: 1968482742} + - {fileID: 1336986580} + - {fileID: 1754947673} + m_Father: {fileID: 825247592} + 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 &131087275 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22310270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 131087273} + 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 &131087276 +CanvasGroup: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22510270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 131087273} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &131087277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 131087273} + 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 &131087278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 131087273} + 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 &134022279 GameObject: m_ObjectHideFlags: 0 @@ -1499,10 +1609,10 @@ RectTransform: - {fileID: 364445738} m_Father: {fileID: 724348928} m_RootOrder: 6 - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -655} + m_SizeDelta: {x: 1300, y: 50} m_Pivot: {x: .5, y: .5} --- !u!114 &149131496 MonoBehaviour: @@ -3006,10 +3116,10 @@ RectTransform: - {fileID: 1837434063} m_Father: {fileID: 724348928} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -155} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &596686162 MonoBehaviour: @@ -3473,167 +3583,60 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 700088254} ---- !u!1 &724348927 +--- !u!1 &711866612 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 115112, guid: 9bb64c8df70904eecac3f71f81bf339b, type: 2} + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 724348928} - - 114: {fileID: 724348930} - - 114: {fileID: 724348929} + - 4: {fileID: 711866613} + - 114: {fileID: 711866616} + - 114: {fileID: 711866615} + - 114: {fileID: 711866614} + - 114: {fileID: 711866617} + - 114: {fileID: 711866620} + - 114: {fileID: 711866621} + - 114: {fileID: 711866618} m_Layer: 0 - m_Name: ButtonGroup + m_Name: Flowchart m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &724348928 -RectTransform: +--- !u!4 &711866613 +Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22415112, guid: 9bb64c8df70904eecac3f71f81bf339b, - type: 2} + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 724348927} + m_GameObject: {fileID: 711866612} 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: 1044538971} - - {fileID: 596686161} - - {fileID: 2127610499} - - {fileID: 782033639} - - {fileID: 1996499111} - - {fileID: 45801410} - - {fileID: 149131495} - m_Father: {fileID: 1393368592} + m_Children: [] + m_Father: {fileID: 1667572790} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -1.84769997e-05, y: 191} - m_SizeDelta: {x: 1300, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &724348929 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404782, guid: 9bb64c8df70904eecac3f71f81bf339b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 724348927} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 ---- !u!114 &724348930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11404786, guid: 9bb64c8df70904eecac3f71f81bf339b, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 724348927} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 5 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 0 ---- !u!1 &736071346 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 736071351} - - 114: {fileID: 736071350} - - 114: {fileID: 736071349} - - 114: {fileID: 736071348} - - 114: {fileID: 736071347} - - 114: {fileID: 736071352} - - 114: {fileID: 736071359} - - 114: {fileID: 736071355} - - 114: {fileID: 736071358} - - 114: {fileID: 736071353} - - 114: {fileID: 736071354} - - 114: {fileID: 736071357} - - 114: {fileID: 736071356} - - 114: {fileID: 736071360} - - 114: {fileID: 736071362} - - 114: {fileID: 736071361} - - 114: {fileID: 736071364} - - 114: {fileID: 736071363} - - 114: {fileID: 736071366} - - 114: {fileID: 736071365} - - 114: {fileID: 736071368} - - 114: {fileID: 736071367} - m_Layer: 0 - m_Name: Flowchart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &736071347 -MonoBehaviour: - m_ObjectHideFlags: 2 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736071346} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} - m_Name: - m_EditorClassIdentifier: - itemId: 1 - errorMessage: - indentLevel: 0 - storyText: 'Play sound effect from dialog{wc} - - And another line which is very long so tests looping works ok without any problems - whatsoever' - description: - character: {fileID: 0} - portrait: {fileID: 0} - voiceOverClip: {fileID: 0} - showAlways: 1 - showCount: 1 - extendPrevious: 0 - fadeWhenDone: 1 - waitForClick: 1 - setSayDialog: {fileID: 0} ---- !u!114 &736071348 +--- !u!114 &711866614 MonoBehaviour: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736071346} + m_GameObject: {fileID: 711866612} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} m_Name: m_EditorClassIdentifier: - parentBlock: {fileID: 736071349} ---- !u!114 &736071349 + parentBlock: {fileID: 711866615} +--- !u!114 &711866615 MonoBehaviour: m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736071346} + m_GameObject: {fileID: 711866612} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} @@ -3641,28 +3644,26 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 61 - y: 69 + x: 68 + y: 71 width: 120 height: 40 itemId: 0 - blockName: Start Saying + blockName: Start description: - eventHandler: {fileID: 736071348} + eventHandler: {fileID: 711866614} commandList: - - {fileID: 736071359} - - {fileID: 736071347} - - {fileID: 736071352} - - {fileID: 736071360} - - {fileID: 736071366} - - {fileID: 736071365} ---- !u!114 &736071350 + - {fileID: 711866617} + - {fileID: 711866621} + - {fileID: 711866620} + - {fileID: 711866618} +--- !u!114 &711866616 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 736071346} + m_GameObject: {fileID: 711866612} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} @@ -3672,11 +3673,320 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} variablesScrollPos: {x: 0, y: 0} variablesExpanded: 1 - blockViewHeight: 513 + blockViewHeight: 400 zoom: 1 scrollViewRect: serializedVersion: 2 - x: -350 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlock: {fileID: 711866615} + selectedCommands: + - {fileID: 711866618} + variables: [] + description: ' + +' + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + hideCommands: [] +--- !u!114 &711866617 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 711866612} + 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: 1635768761} + replacedCharacter: {fileID: 0} + portrait: {fileID: 21300000, guid: 450277e404c2d4d1e87c5bd4012283bb, type: 3} + offset: 0 + fromPosition: {fileID: 0} + toPosition: {fileID: 1022563244} + facing: 2 + useDefaultSettings: 1 + fadeDuration: .5 + moveDuration: 1 + shiftOffset: {x: 0, y: 0} + move: 0 + shiftIntoPlace: 0 + waitUntilFinished: 0 +--- !u!114 &711866618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 711866612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + errorMessage: + indentLevel: 0 +--- !u!114 &711866620 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 711866612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ac5ce55bc698fa4290939ef6e426501, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + errorMessage: + indentLevel: 0 + stage: {fileID: 0} + display: 1 + character: {fileID: 1635768761} + replacedCharacter: {fileID: 0} + portrait: {fileID: 21300000, guid: c779e34c6eb8e45da98c70cf2802a54c, type: 3} + offset: 0 + fromPosition: {fileID: 0} + toPosition: {fileID: 0} + facing: 2 + useDefaultSettings: 1 + fadeDuration: .5 + moveDuration: 1 + shiftOffset: {x: 0, y: 0} + move: 0 + shiftIntoPlace: 0 + waitUntilFinished: 1 +--- !u!114 &711866621 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 711866612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3315ad2ebb85443909a1203d56d9344e, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + errorMessage: + indentLevel: 0 + duration: 1 +--- !u!1 &724348927 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 115112, guid: 9bb64c8df70904eecac3f71f81bf339b, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 724348928} + - 114: {fileID: 724348930} + - 114: {fileID: 724348929} + m_Layer: 0 + m_Name: ButtonGroup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &724348928 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22415112, guid: 9bb64c8df70904eecac3f71f81bf339b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 724348927} + 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: 1044538971} + - {fileID: 596686161} + - {fileID: 2127610499} + - {fileID: 782033639} + - {fileID: 1996499111} + - {fileID: 45801410} + - {fileID: 149131495} + m_Father: {fileID: 1393368592} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -1.84769997e-05, y: 191} + m_SizeDelta: {x: 1300, y: 680} + m_Pivot: {x: .5, y: .5} +--- !u!114 &724348929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404782, guid: 9bb64c8df70904eecac3f71f81bf339b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 724348927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &724348930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404786, guid: 9bb64c8df70904eecac3f71f81bf339b, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 724348927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 +--- !u!1 &736071346 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 736071351} + - 114: {fileID: 736071350} + - 114: {fileID: 736071349} + - 114: {fileID: 736071348} + - 114: {fileID: 736071347} + - 114: {fileID: 736071352} + - 114: {fileID: 736071359} + - 114: {fileID: 736071355} + - 114: {fileID: 736071358} + - 114: {fileID: 736071353} + - 114: {fileID: 736071354} + - 114: {fileID: 736071357} + - 114: {fileID: 736071356} + - 114: {fileID: 736071360} + - 114: {fileID: 736071362} + - 114: {fileID: 736071361} + - 114: {fileID: 736071364} + - 114: {fileID: 736071363} + - 114: {fileID: 736071366} + - 114: {fileID: 736071365} + - 114: {fileID: 736071368} + - 114: {fileID: 736071367} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &736071347 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 736071346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec422cd568a9c4a31ad7c36d0572b9da, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + errorMessage: + indentLevel: 0 + storyText: 'Play sound effect from dialog{wc} + + And another line which is very long so tests looping works ok without any problems + whatsoever' + description: + character: {fileID: 0} + portrait: {fileID: 0} + voiceOverClip: {fileID: 0} + showAlways: 1 + showCount: 1 + extendPrevious: 0 + fadeWhenDone: 1 + waitForClick: 1 + setSayDialog: {fileID: 0} +--- !u!114 &736071348 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 736071346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 736071349} +--- !u!114 &736071349 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 736071346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 61 + y: 69 + width: 120 + height: 40 + itemId: 0 + blockName: Start Saying + description: + eventHandler: {fileID: 736071348} + commandList: + - {fileID: 736071359} + - {fileID: 736071347} + - {fileID: 736071352} + - {fileID: 736071360} + - {fileID: 736071366} + - {fileID: 736071365} +--- !u!114 &736071350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 736071346} + 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: 513 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -350 y: -350 width: 1121 height: 870 @@ -4107,7 +4417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &764446531 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4294,10 +4604,10 @@ RectTransform: - {fileID: 1684276425} m_Father: {fileID: 724348928} m_RootOrder: 3 - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -365} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &782033640 MonoBehaviour: @@ -4658,6 +4968,74 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 818472420} +--- !u!1 &825247590 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110274, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 825247592} + - 114: {fileID: 825247591} + - 114: {fileID: 825247593} + m_Layer: 0 + m_Name: Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &825247591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 825247590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6f6478b25a400c642b2dee75f022ab12, type: 3} + m_Name: + m_EditorClassIdentifier: + portraitCanvas: {fileID: 131087275} + dimPortraits: 1 + fadeDuration: .75 + moveDuration: 1 + fadeEaseType: 4 + moveEaseType: 4 + shiftOffset: {x: 0, y: 0} + defaultPosition: {fileID: 879247671} + positions: + - {fileID: 1022563244} + - {fileID: 879247670} + - {fileID: 1968482742} + - {fileID: 1336986580} + - {fileID: 1754947673} + charactersOnStage: [] +--- !u!4 &825247592 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 825247590} + 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: 131087274} + m_Father: {fileID: 1667572790} + m_RootOrder: 2 +--- !u!114 &825247593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 825247590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd9f5c93d50b44e9ba1b822ff6993500, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &852567084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4953,6 +5331,76 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 861253878} +--- !u!1 &879247669 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110278, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 879247670} + - 222: {fileID: 879247672} + - 114: {fileID: 879247671} + m_Layer: 0 + m_Name: Middle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &879247670 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879247669} + 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: 131087274} + 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 &879247671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879247669} + 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 &879247672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210274, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 879247669} --- !u!1 &891159641 GameObject: m_ObjectHideFlags: 0 @@ -5957,6 +6405,76 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1 &1022563243 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110282, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1022563244} + - 222: {fileID: 1022563246} + - 114: {fileID: 1022563245} + m_Layer: 0 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1022563244 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410280, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1022563243} + 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: 131087274} + 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 &1022563245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410284, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1022563243} + 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 &1022563246 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1022563243} --- !u!1 &1024293038 GameObject: m_ObjectHideFlags: 0 @@ -6166,10 +6684,10 @@ RectTransform: - {fileID: 96381568} m_Father: {fileID: 724348928} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -50} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &1044538972 MonoBehaviour: @@ -7258,6 +7776,33 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1176433423} +--- !u!1 &1182946598 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1182946599} + m_Layer: 0 + m_Name: TestAssertions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1182946599 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1182946598} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.0500000007, y: -.540000021, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1667572790} + m_RootOrder: 3 --- !u!1 &1188419013 GameObject: m_ObjectHideFlags: 0 @@ -8070,6 +8615,76 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1336986579 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110272, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1336986580} + - 222: {fileID: 1336986582} + - 114: {fileID: 1336986581} + 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 &1336986580 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1336986579} + 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: 131087274} + 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 &1336986581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1336986579} + 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 &1336986582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210272, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1336986579} --- !u!1 &1393368591 GameObject: m_ObjectHideFlags: 0 @@ -8327,6 +8942,55 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!1 &1635768759 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 100000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1635768760} + - 114: {fileID: 1635768761} + m_Layer: 0 + m_Name: JohnCharacter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1635768760 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 400000, guid: b20518d45890e4be59ba82946f88026c, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1635768759} + 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: 1667572790} + m_RootOrder: 1 +--- !u!114 &1635768761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400000, guid: b20518d45890e4be59ba82946f88026c, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1635768759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 25fb867d2049d41f597aefdd6b19f598, type: 3} + m_Name: + m_EditorClassIdentifier: + nameText: Character Name + nameColor: {r: 1, g: 1, b: 1, a: 1} + soundEffect: {fileID: 0} + profileSprite: {fileID: 21300000, guid: 450277e404c2d4d1e87c5bd4012283bb, type: 3} + portraits: + - {fileID: 21300000, guid: 450277e404c2d4d1e87c5bd4012283bb, type: 3} + - {fileID: 21300000, guid: c779e34c6eb8e45da98c70cf2802a54c, type: 3} + portraitsFace: 1 + description: --- !u!1 &1648578756 GameObject: m_ObjectHideFlags: 0 @@ -8596,6 +9260,59 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!1 &1667572788 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1667572790} + - 114: {fileID: 1667572789} + m_Layer: 0 + m_Name: PortraitFlipTest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1667572789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667572788} + 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 &1667572790 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667572788} + 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: 711866613} + - {fileID: 1635768760} + - {fileID: 825247592} + - {fileID: 1182946599} + m_Father: {fileID: 0} + m_RootOrder: 11 --- !u!1 &1684276424 GameObject: m_ObjectHideFlags: 0 @@ -9082,6 +9799,76 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1 &1754947672 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110280, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1754947673} + - 222: {fileID: 1754947675} + - 114: {fileID: 1754947674} + 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 &1754947673 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410278, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1754947672} + 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: 131087274} + 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 &1754947674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410282, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1754947672} + 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 &1754947675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210276, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1754947672} --- !u!1 &1797328010 GameObject: m_ObjectHideFlags: 0 @@ -9838,6 +10625,76 @@ MonoBehaviour: other: {fileID: 0} otherPropertyPath: constantValueGeneric: 0 +--- !u!1 &1968482741 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1968482742} + - 222: {fileID: 1968482744} + - 114: {fileID: 1968482743} + m_Layer: 0 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1968482742 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968482741} + 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: 131087274} + 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 &1968482743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968482741} + 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 &1968482744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22210270, guid: c6289d5f8fa843145a2355af9cb09719, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1968482741} --- !u!1 &1982302732 GameObject: m_ObjectHideFlags: 0 @@ -9994,7 +10851,7 @@ RectTransform: m_Father: {fileID: 364445738} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -10066,10 +10923,10 @@ RectTransform: - {fileID: 788504224} m_Father: {fileID: 724348928} m_RootOrder: 4 - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -470} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &1996499112 MonoBehaviour: @@ -10955,10 +11812,10 @@ RectTransform: - {fileID: 2046151993} m_Father: {fileID: 724348928} m_RootOrder: 2 - 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -260} + m_SizeDelta: {x: 1300, y: 100} m_Pivot: {x: .5, y: .5} --- !u!114 &2127610500 MonoBehaviour: diff --git a/Assets/Tests/Narrative/PortraitFlipTest.cs b/Assets/Tests/Narrative/PortraitFlipTest.cs new file mode 100644 index 00000000..47cd0e45 --- /dev/null +++ b/Assets/Tests/Narrative/PortraitFlipTest.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using System.Collections; + +public class PortraitFlipTest : MonoBehaviour { + + void Update () + { + Transform t = gameObject.transform.FindChild("Canvas/JohnCharacter"); + + if (t == null) + { + return; + } + + if (t.transform.localScale.x != -1f) + { + IntegrationTest.Fail("Character object not flipped horizontally"); + } + } +} diff --git a/Assets/Tests/Narrative/PortraitFlipTest.cs.meta b/Assets/Tests/Narrative/PortraitFlipTest.cs.meta new file mode 100644 index 00000000..6f7b76b0 --- /dev/null +++ b/Assets/Tests/Narrative/PortraitFlipTest.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: cd9f5c93d50b44e9ba1b822ff6993500 +timeCreated: 1444231183 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: