From 82baf3db3cbacd1cbd0c985d37f9490c108fa9a3 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 15:07:23 +0200 Subject: [PATCH] Add UI Images --- Assets/Data/Derk.asset | 1 + Assets/Data/Rufus.asset | 5 +- Assets/Images/UI.meta | 8 ++ Assets/Images/UI/Button.png | 3 + Assets/Images/UI/Button.png.meta | 140 ++++++++++++++++++++++++ Assets/Images/UI/Logbook.png | 3 + Assets/Images/UI/Logbook.png.meta | 140 ++++++++++++++++++++++++ Assets/Scenes/Main.unity | 170 +++++++++++++++--------------- Packages/manifest.json | 1 + Packages/packages-lock.json | 6 ++ 10 files changed, 390 insertions(+), 87 deletions(-) create mode 100644 Assets/Images/UI.meta create mode 100644 Assets/Images/UI/Button.png create mode 100644 Assets/Images/UI/Button.png.meta create mode 100644 Assets/Images/UI/Logbook.png create mode 100644 Assets/Images/UI/Logbook.png.meta diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index 2f0f537..5e59821 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -30,3 +30,4 @@ MonoBehaviour: bulletizedText: Helped a lady get onto a high speed train. - text: "\u2026 (drools)" bulletizedText: ... + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Rufus.asset b/Assets/Data/Rufus.asset index 3e1a0b4..57f3f1e 100644 --- a/Assets/Data/Rufus.asset +++ b/Assets/Data/Rufus.asset @@ -25,9 +25,10 @@ MonoBehaviour: a natural with people, as you can imagine. Everybody always wants to pet me, it can be quite annoying." bulletizedText: Anywhere with nature and people. - - text: Once, there was this guy that tried to steal my bone. I found him by following - his scent and then I stabbed him with my lightsword. Just kidding, I ratted + - text: Once, there was this guy that tried to steal my bone.I found him by following + his scent and then I stabbed him with my lightswod. Just kidding, I ratted him out to the authorities of course. bulletizedText: Told the authorities about the guy who stole his bone. - text: Hmm, probably going on adventures with my 5 kids. bulletizedText: Going on adventures with his kids. + m_typingSfx: {fileID: 0} diff --git a/Assets/Images/UI.meta b/Assets/Images/UI.meta new file mode 100644 index 0000000..24807ad --- /dev/null +++ b/Assets/Images/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d34c7ccc82bfd954a9f9c706beb6308e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Button.png b/Assets/Images/UI/Button.png new file mode 100644 index 0000000..d451350 --- /dev/null +++ b/Assets/Images/UI/Button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bc4885ab62b37e23aeb2d97df3f5156f4ff8094871faf1a08279830e5faabf0 +size 117231 diff --git a/Assets/Images/UI/Button.png.meta b/Assets/Images/UI/Button.png.meta new file mode 100644 index 0000000..57380c4 --- /dev/null +++ b/Assets/Images/UI/Button.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 585a2e0607923f74680694f877138c61 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1000 + spriteBorder: {x: 221, y: 223, z: 268, w: 267} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Logbook.png b/Assets/Images/UI/Logbook.png new file mode 100644 index 0000000..59d6fa2 --- /dev/null +++ b/Assets/Images/UI/Logbook.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a56085614c7bfa710e3cc748241e689827518df4bbffbc9384a32373277352c6 +size 240166 diff --git a/Assets/Images/UI/Logbook.png.meta b/Assets/Images/UI/Logbook.png.meta new file mode 100644 index 0000000..e503a4a --- /dev/null +++ b/Assets/Images/UI/Logbook.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 763c55d9ac13c224981581d1410bc2f3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index e4cc30f..cb351c3 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -153,6 +153,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2020681402} - {fileID: 137465973} - {fileID: 121754991} m_Father: {fileID: 1559227856} @@ -176,15 +177,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.49191397, b: 0.14779866, a: 0.8980392} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 763c55d9ac13c224981581d1410bc2f3, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -422,7 +423,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -431,7 +432,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &52890062 CanvasRenderer: m_ObjectHideFlags: 0 @@ -471,14 +472,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 219076562} - - {fileID: 2020681402} m_Father: {fileID: 22208186} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.47327077, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -68.744995, y: -0.00018310547} - m_SizeDelta: {x: -67.54999, y: -34.48999} + m_AnchorMin: {x: 0.61686033, y: 0.09260184} + m_AnchorMax: {x: 0.929, y: 0.90718377} + m_AnchoredPosition: {x: 8.163025, y: -4.035492} + m_SizeDelta: {x: 16.411194, y: 0.5169983} m_Pivot: {x: 1, y: 0.5} --- !u!114 &121754992 MonoBehaviour: @@ -659,10 +659,10 @@ RectTransform: m_Father: {fileID: 22208186} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.47327077, y: 1} - m_AnchoredPosition: {x: 34.46991, y: 0} - m_SizeDelta: {x: -35.93982, y: -34.489685} + m_AnchorMin: {x: 0.061604585, y: 0.09260184} + m_AnchorMax: {x: 0.395, y: 0.9225819} + m_AnchoredPosition: {x: 8.396118, y: -5.377411} + m_SizeDelta: {x: -10.859604, y: -26.569199} m_Pivot: {x: 0, y: 0.5} --- !u!114 &137465974 MonoBehaviour: @@ -677,7 +677,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.6901961} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -737,7 +737,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.10627446} m_AnchorMax: {x: 1, y: 0.6963533} - m_AnchoredPosition: {x: -7.300049, y: 147.2} + m_AnchoredPosition: {x: -7.3000183, y: 147.2} m_SizeDelta: {x: -46, y: -502} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &139192510 @@ -773,8 +773,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -876,8 +876,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 175} - m_SizeDelta: {x: 600, y: 177.26} + m_AnchoredPosition: {x: 0, y: 303.3046} + m_SizeDelta: {x: 758.4863, y: 305.5646} m_Pivot: {x: 1, y: 1} --- !u!114 &188659889 MonoBehaviour: @@ -962,7 +962,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.7372549} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1403,8 +1403,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1749,8 +1749,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2003,7 +2003,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 50.4279} + m_SizeDelta: {x: 0, y: 81.4388} m_Pivot: {x: 0.5, y: 0} --- !u!1 &417895584 GameObject: @@ -2158,7 +2158,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &424163797 RectTransform: m_ObjectHideFlags: 0 @@ -3077,7 +3077,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3086,7 +3086,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &600693548 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3219,7 +3219,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &646912193 RectTransform: m_ObjectHideFlags: 0 @@ -3370,8 +3370,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -8.5, y: 0.0000019073486} - m_SizeDelta: {x: 39.4857, y: -13.9759} + m_AnchoredPosition: {x: -0.000037193, y: 0.0000069141} + m_SizeDelta: {x: 83.0101, y: 0.000015259} m_Pivot: {x: 1, y: 0.5} --- !u!114 &653815783 MonoBehaviour: @@ -3616,8 +3616,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3800,7 +3800,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3809,7 +3809,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 2 --- !u!222 &750125355 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3897,7 +3897,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -28.672, y: 0} + m_AnchoredPosition: {x: -61.30005, y: 15.719} m_SizeDelta: {x: -57.344, y: 50} m_Pivot: {x: 0.5, y: 0} --- !u!114 &883111206 @@ -3947,8 +3947,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4251,14 +4251,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.392} + m_Color: {r: 0, g: 0, b: 0, a: 0.39215687} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5069,8 +5069,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -10, y: -10} + m_AnchoredPosition: {x: 0, y: -7.0066} + m_SizeDelta: {x: -10, y: -24.0132} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1374039714 MonoBehaviour: @@ -5121,8 +5121,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 30 - m_fontSizeBase: 30 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -5157,7 +5157,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 15.287109, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -5208,8 +5208,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 300, y: -160.26} - m_SizeDelta: {x: 600, y: 34} + m_AnchoredPosition: {x: 379.24316, y: -265.44666} + m_SizeDelta: {x: 758.4863, y: 80.2359} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1398844816 MonoBehaviour: @@ -5275,7 +5275,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5513,8 +5513,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -5834,7 +5834,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6034,8 +6034,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6452,14 +6452,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -6488,7 +6488,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 11.786491, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -6569,8 +6569,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6670,11 +6670,11 @@ RectTransform: m_Father: {fileID: 219076562} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.77936023} - m_AnchorMax: {x: 0.28434756, y: 1} - m_AnchoredPosition: {x: 7.3424683, y: -8.04248} - m_SizeDelta: {x: -16.714996, y: -15.714996} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.700012, y: -15.900055} + m_SizeDelta: {x: 150, y: 180} + m_Pivot: {x: 0, y: 1} --- !u!114 &1806738461 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6750,8 +6750,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.000030517578, y: 46} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: -3.2, y: 0} + m_SizeDelta: {x: 202.1752, y: 84.4763} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1836351282 MonoBehaviour: @@ -6829,7 +6829,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6951,8 +6951,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 47.4} - m_SizeDelta: {x: 271.6, y: 47.559998} + m_AnchoredPosition: {x: 0, y: 70.97293} + m_SizeDelta: {x: 372.9425, y: 71.1329} m_Pivot: {x: 0, y: 1} --- !u!114 &1871873840 MonoBehaviour: @@ -6974,7 +6974,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7226,8 +7226,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.28434756, y: 0.7508199} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 5.3428946, y: -3.539978} - m_SizeDelta: {x: -23.87421, y: -24.720001} + m_AnchoredPosition: {x: 25.899, y: 6.1965} + m_SizeDelta: {x: -52.077, y: -44.1929} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2002200566 MonoBehaviour: @@ -7258,8 +7258,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -7408,13 +7408,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2069816767} - m_Father: {fileID: 121754991} + m_Father: {fileID: 22208186} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -14.2065735, y: -16.62239} - m_SizeDelta: {x: 28.528793, y: 23.427994} + m_AnchoredPosition: {x: -95.3, y: -75.3} + m_SizeDelta: {x: 98.3142, y: 100.5864} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2020681403 MonoBehaviour: @@ -7492,7 +7492,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7595,13 +7595,13 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 45 + m_fontSizeBase: 45 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -7682,8 +7682,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.000030517578, y: 46} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 1.4951, y: 0} + m_SizeDelta: {x: 211.5662, y: 84.476} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2132596732 MonoBehaviour: @@ -7761,7 +7761,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Packages/manifest.json b/Packages/manifest.json index baee32a..7e071fd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "2.0.5", "com.unity.feature.development": "1.0.1", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 2373dfe..4da4dac 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,11 @@ { "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "2.0.5", "depth": 0,