diff --git a/Assets/Tests/Narrative/NarrativeTests.unity b/Assets/Tests/Narrative/NarrativeTests.unity index 55f3e49d..4a3d5cd8 100644 --- a/Assets/Tests/Narrative/NarrativeTests.unity +++ b/Assets/Tests/Narrative/NarrativeTests.unity @@ -170,7 +170,9 @@ MonoBehaviour: indentLevel: 0 storyText: 'Wait for input and continue{wi}Wait for input and clear{wc} - More text after a wc tag' + More text after a wc tag. + + Exit tag{x}' description: character: {fileID: 0} portrait: {fileID: 0} @@ -244,8 +246,7 @@ MonoBehaviour: width: 1121 height: 869 selectedBlock: {fileID: 24983361} - selectedCommands: - - {fileID: 24983362} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -264,10 +265,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1731000812} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!114 &24983360 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -282,7 +283,7 @@ MonoBehaviour: duration: 2 --- !u!114 &24983361 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -293,8 +294,8 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 211 - y: 71 + x: 244 + y: 69 width: 120 height: 40 itemId: 3 @@ -310,7 +311,7 @@ MonoBehaviour: - {fileID: 24983366} --- !u!114 &24983362 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -337,7 +338,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &24983363 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -349,7 +350,7 @@ MonoBehaviour: parentBlock: {fileID: 24983361} --- !u!114 &24983364 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -376,7 +377,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &24983365 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -391,7 +392,7 @@ MonoBehaviour: duration: 2 --- !u!114 &24983366 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -418,7 +419,7 @@ MonoBehaviour: callMode: 0 --- !u!114 &24983367 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 24983354} @@ -613,249 +614,55 @@ MonoBehaviour: - {fileID: 21300000, guid: b498a62f179e149be9515ba5614ccfa3, type: 3} portraitsFace: 2 description: ---- !u!1 &527730228 +--- !u!1 &401634244 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 527730229} - - 222: {fileID: 527730231} - - 114: {fileID: 527730230} - m_Layer: 5 - m_Name: NameText + - 4: {fileID: 401634245} + - 114: {fileID: 401634246} + m_Layer: 0 + m_Name: TestAssertions m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &527730229 -RectTransform: +--- !u!4 &401634245 +Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 527730228} + m_GameObject: {fileID: 401634244} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 642.626648, y: 110.301666, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1111691353} - m_RootOrder: 1 - m_AnchorMin: {x: .0131249959, y: 1} - m_AnchorMax: {x: .785268068, y: 1} - m_AnchoredPosition: {x: -22.25, y: -914} - m_SizeDelta: {x: -68.5, y: 71} - m_Pivot: {x: .5, y: .5} ---- !u!114 &527730230 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 527730228} - 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: .258823544, g: .254901975, b: .262745112, a: 1} - m_FontData: - m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Character Name ---- !u!222 &527730231 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 527730228} ---- !u!1 &618248552 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 618248553} - - 222: {fileID: 618248556} - - 114: {fileID: 618248555} - - 114: {fileID: 618248554} - m_Layer: 5 - m_Name: StoryText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &618248553 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 618248552} - 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: 1450485987} - m_Father: {fileID: 1704217017} + m_Father: {fileID: 1731000812} 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: .5, y: .5} ---- !u!114 &618248554 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 618248552} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 1150 - m_PreferredHeight: 200 - m_FlexibleWidth: 1 - m_FlexibleHeight: -1 ---- !u!114 &618248555 +--- !u!114 &401634246 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 618248552} - 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_FontData: - m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Story text ---- !u!222 &618248556 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 618248552} ---- !u!1 &623638068 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 148914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 623638072} - - 222: {fileID: 623638071} - - 114: {fileID: 623638070} - - 114: {fileID: 623638069} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &623638069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439142, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 623638068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1679637790, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreLayout: 0 - m_MinWidth: -1 - m_MinHeight: -1 - m_PreferredWidth: 350 - m_PreferredHeight: 350 - m_FlexibleWidth: -1 - m_FlexibleHeight: -1 ---- !u!114 &623638070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 623638068} + m_GameObject: {fileID: 401634244} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 8bafa54482a87ac4cbd7ff1bfd1ac93a, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - 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 &623638071 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 623638068} ---- !u!224 &623638072 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 623638068} - 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: 1704217017} - 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: .5, y: .5} + checkAfterTime: 7 + repeatCheckTime: 0 + repeatEveryTime: 1 + checkAfterFrames: 1 + repeatCheckFrame: 1 + repeatEveryFrame: 1 + hasFailed: 0 + checkMethods: 1 + m_ActionBase: {fileID: 1157191816} + checksPerformed: 0 --- !u!1 &891159641 GameObject: m_ObjectHideFlags: 0 @@ -924,9 +731,8 @@ MonoBehaviour: y: -350 width: 1502 height: 989 - selectedBlock: {fileID: 891159676} - selectedCommands: - - {fileID: 891159665} + selectedBlock: {fileID: 891159644} + selectedCommands: [] variables: [] description: stepPause: 0 @@ -1285,7 +1091,7 @@ MonoBehaviour: indentLevel: 0 stage: {fileID: 0} display: 1 - character: {fileID: 0} + character: {fileID: 362523163} replacedCharacter: {fileID: 290123700} portrait: {fileID: 21300000, guid: f0a480312d1664a9d9c7749fed3eb1b5, type: 3} offset: 0 @@ -1552,7 +1358,7 @@ MonoBehaviour: m_EditorClassIdentifier: nodeRect: serializedVersion: 2 - x: 211 + x: 212 y: 139 width: 120 height: 40 @@ -1667,251 +1473,15 @@ RectTransform: m_PrefabParentObject: {fileID: 22410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_PrefabInternal: {fileID: 1450066430} ---- !u!1 &1066357890 +--- !u!1 &1066357890 stripped GameObject: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 188902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1066357891} - - 223: {fileID: 1066357897} - - 114: {fileID: 1066357896} - - 225: {fileID: 1066357895} - - 114: {fileID: 1066357899} - - 114: {fileID: 1066357894} - - 114: {fileID: 1066357893} - - 114: {fileID: 1066357898} - - 82: {fileID: 1066357892} - m_Layer: 5 - m_Name: SayDialog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1066357891 + m_PrefabInternal: {fileID: 1801619622} +--- !u!224 &1066357891 stripped RectTransform: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - 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: 1111691353} - m_Father: {fileID: 1731000812} - 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!82 &1066357892 -AudioSource: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8294266, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 ---- !u!114 &1066357893 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3} - m_Name: - m_EditorClassIdentifier: - targetTextObject: {fileID: 618248552} - writingSpeed: 60 - punctuationPause: .25 - hiddenTextColor: {r: 1, g: 1, b: 1, a: 0} - writeWholeWords: 0 ---- !u!114 &1066357894 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3} - m_Name: - m_EditorClassIdentifier: - writingSpeed: 30 - writingSound: {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3} - writingVolume: 1 - loopWritingSound: 1 - beepPerCharacter: 0 - slowBeepsAt: 10 - fastBeepsAt: 30 - punctuationPause: .200000003 - alwaysFadeDialog: 0 - fadeDuration: .25 - fadeEaseType: 0 - alwaysMoveDialog: 0 - startPosition: {x: 0, y: 0} - moveSpeed: 1000 - moveEaseType: 0 - dialogCanvas: {fileID: 1066357897} - nameText: {fileID: 527730230} - storyText: {fileID: 618248555} - characterImage: {fileID: 623638070} - characterTypingSound: {fileID: 0} - continueImage: {fileID: 1450485988} - continueSound: {fileID: 0} ---- !u!225 &1066357895 -CanvasGroup: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22588896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1066357896 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488906, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 32 - 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!223 &1066357897 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22388894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - 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: 1 ---- !u!114 &1066357898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3} - m_Name: - m_EditorClassIdentifier: - clickMode: 2 - keyPressMode: 2 - nextClickDelay: .200000003 - keyList: 0900000020000000 ---- !u!114 &1066357899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1066357890} - 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 + m_PrefabInternal: {fileID: 1801619622} --- !u!1 &1083481054 GameObject: m_ObjectHideFlags: 0 @@ -1952,120 +1522,27 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 ---- !u!1 &1111691352 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1111691353} - - 222: {fileID: 1111691358} - - 114: {fileID: 1111691357} - - 225: {fileID: 1111691356} - - 114: {fileID: 1111691355} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1111691353 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1111691352} - 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: 1704217017} - - {fileID: 527730229} - m_Father: {fileID: 1066357891} - m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -800, y: -600} - m_SizeDelta: {x: 1600, y: 1200} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1111691355 +--- !u!4 &1155926874 stripped +Transform: + m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} + m_PrefabInternal: {fileID: 1450066430} +--- !u!114 &1157191816 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1111691352} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 4 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1066357898} - m_MethodName: SetDialogClickedFlag - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - delegates: [] ---- !u!225 &1111691356 -CanvasGroup: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22588894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1111691352} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!114 &1111691357 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488904, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1111691352} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: 2586c8e41f35d2f4fadde53020bf4207, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Sprite: {fileID: 21300000, guid: eeb00f6cd27e9ef4d9174551b3342dec, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1111691358 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288900, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1111691352} ---- !u!4 &1155926874 stripped -Transform: - m_PrefabParentObject: {fileID: 410270, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} - m_PrefabInternal: {fileID: 1450066430} + go: {fileID: 1066357890} + thisPropertyPath: gameObject.activeSelf + compareToType: 1 + other: {fileID: 0} + otherPropertyPath: + constantValueGeneric: 0 --- !u!224 &1439815621 stripped RectTransform: m_PrefabParentObject: {fileID: 22410276, guid: c6289d5f8fa843145a2355af9cb09719, @@ -2117,182 +1594,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c6289d5f8fa843145a2355af9cb09719, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1450485986 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1450485987} - - 222: {fileID: 1450485991} - - 114: {fileID: 1450485988} - - 212: {fileID: 1450485990} - - 95: {fileID: 1450485989} - m_Layer: 5 - m_Name: Continue - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1450485987 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1450485986} - 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: 618248553} - m_RootOrder: 0 - m_AnchorMin: {x: .942586243, y: .0550000034} - m_AnchorMax: {x: .988172412, y: .0550000034} - m_AnchoredPosition: {x: -.400008023, y: 21.6499996} - m_SizeDelta: {x: -.400001526, y: 43.2999992} - m_Pivot: {x: .500000417, y: .5} ---- !u!114 &1450485988 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11488898, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1450485986} - 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: 1} - m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!95 &1450485989 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 9588894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1450485986} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 1 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 ---- !u!212 &1450485990 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 21288894, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1450485986} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 0 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!222 &1450485991 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22288896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1450485986} ---- !u!1 &1704217016 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 139138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1704217017} - - 222: {fileID: 1704217019} - - 114: {fileID: 1704217018} - m_Layer: 5 - m_Name: Container - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1704217017 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22439138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1704217016} - 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: 618248553} - - {fileID: 623638072} - m_Father: {fileID: 1111691353} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -2, y: -381} - m_SizeDelta: {x: -90, y: -846} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1704217018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11439140, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1704217016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 7 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 ---- !u!222 &1704217019 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22239138, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1704217016} --- !u!1 &1731000811 GameObject: m_ObjectHideFlags: 0 @@ -2319,6 +1620,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 401634245} - {fileID: 24983359} - {fileID: 1066357891} m_Father: {fileID: 0} @@ -2344,6 +1646,136 @@ MonoBehaviour: platformsToIgnore: [] dynamic: 0 dynamicTypeName: +--- !u!1001 &1801619622 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1731000812} + m_Modifications: + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488902, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22488896, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22448914, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 8a005a9e0713f4cc1b5ad29fb07657d3, type: 2} + m_IsPrefabParent: 0 --- !u!1 &2084461894 GameObject: m_ObjectHideFlags: 0