diff --git a/Assets/Fungus/Narrative/Images/DialogBox.png b/Assets/Fungus/Narrative/Images/DialogBox.png index e34fa165..2a08af22 100644 Binary files a/Assets/Fungus/Narrative/Images/DialogBox.png and b/Assets/Fungus/Narrative/Images/DialogBox.png differ diff --git a/Assets/Fungus/Narrative/Images/DialogBox.png.meta b/Assets/Fungus/Narrative/Images/DialogBox.png.meta index dd264892..60b83ad3 100644 --- a/Assets/Fungus/Narrative/Images/DialogBox.png.meta +++ b/Assets/Fungus/Narrative/Images/DialogBox.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: eeb00f6cd27e9ef4d9174551b3342dec +timeCreated: 1469115576 +licenseType: Pro TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,13 +17,16 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: filterMode: -1 @@ -30,18 +35,23 @@ TextureImporter: 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} + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 153, y: 193, z: 140, w: 249} spritePixelsToUnits: 100 alphaIsTransparency: 1 textureType: 8 buildTargetSettings: [] spriteSheet: sprites: [] + outline: [] spritePackingTag: userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Narrative/Resources/SayDialog.prefab b/Assets/Fungus/Narrative/Resources/SayDialog.prefab index 1e9d05fe..ccf38d1c 100644 --- a/Assets/Fungus/Narrative/Resources/SayDialog.prefab +++ b/Assets/Fungus/Narrative/Resources/SayDialog.prefab @@ -416,7 +416,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: clickMode: 1 - shiftKeyEnabled: 1 nextClickDelay: 0 cancelEnabled: 1 ignoreMenuClicks: 1 @@ -494,10 +493,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3} - m_FontSize: 50 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 50 m_Alignment: 0 m_AlignByGeometry: 0 @@ -532,7 +531,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 50 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -559,9 +558,9 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: eeb00f6cd27e9ef4d9174551b3342dec, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 1 - m_FillCenter: 0 + m_FillCenter: 1 m_FillMethod: 0 m_FillAmount: 1 m_FillClockwise: 1 @@ -678,6 +677,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 22443574} m_Father: {fileID: 22488896} @@ -696,6 +696,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 22433354} m_RootOrder: 0 @@ -713,12 +714,13 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 22488900} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1386, y: 263.13} + m_AnchoredPosition: {x: 1321.5, y: 263.13} m_SizeDelta: {x: 357, y: 435} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488894 @@ -730,13 +732,14 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 22488896} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 588.75, y: 235.37001} - m_SizeDelta: {x: 1178.5, y: 71} + m_AnchoredPosition: {x: 553, y: 251} + m_SizeDelta: {x: 1106, y: 71} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488896 RectTransform: @@ -747,6 +750,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 22488894} - {fileID: 22433354} @@ -754,8 +758,8 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 799, y: 145.63} - m_SizeDelta: {x: 1531, y: 200} + m_AnchoredPosition: {x: 753, y: 145.63} + m_SizeDelta: {x: 1439, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &22488900 RectTransform: @@ -766,6 +770,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 22448914} - {fileID: 22488896} @@ -773,8 +778,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -805, y: 0} - m_SizeDelta: {x: 1605, y: 335} + m_AnchoredPosition: {x: -750.0001, y: 0} + m_SizeDelta: {x: 1500, y: 335} m_Pivot: {x: 0, y: 0} --- !u!224 &22488902 RectTransform: @@ -785,6 +790,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: - {fileID: 22488900} m_Father: {fileID: 0}