From 82baf3db3cbacd1cbd0c985d37f9490c108fa9a3 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 15:07:23 +0200 Subject: [PATCH 1/3] 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, From e6ba085a1c670b5ecb747d6f004131e6532e5723 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 15:29:26 +0200 Subject: [PATCH 2/3] Add avatars and fix journal layout --- Assets/Data/Adena.asset | 3 +- Assets/Data/Adventure Cat.asset | 3 +- Assets/Data/Amadeus.asset | 3 +- Assets/Data/Derk.asset | 1 + Assets/Data/Rufus.asset | 1 + Assets/Images/Adventurers/Portraits.meta | 8 + .../Adventurers/Portraits/Adena Portrait.png | 3 + .../Portraits/Adena Portrait.png.meta | 140 ++++++++++++++++++ .../Portraits/Adventure Cat Portrait.png | 3 + .../Portraits/Adventure Cat Portrait.png.meta | 140 ++++++++++++++++++ .../Portraits/Amadeus Portrait.png | 3 + .../Portraits/Amadeus Portrait.png.meta | 140 ++++++++++++++++++ .../Adventurers/Portraits/Derk Portrait.png | 3 + .../Portraits/Derk Portrait.png.meta | 140 ++++++++++++++++++ .../Adventurers/Portraits/Rufus Portrait.png | 3 + .../Portraits/Rufus Portrait.png.meta | 140 ++++++++++++++++++ Assets/Scenes/Main.unity | 41 ++--- .../Scripts/DialogueSystem/CharacterData.cs | 1 + Assets/Scripts/Journal.cs | 2 + 19 files changed, 756 insertions(+), 22 deletions(-) create mode 100644 Assets/Images/Adventurers/Portraits.meta create mode 100644 Assets/Images/Adventurers/Portraits/Adena Portrait.png create mode 100644 Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta create mode 100644 Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png create mode 100644 Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta create mode 100644 Assets/Images/Adventurers/Portraits/Amadeus Portrait.png create mode 100644 Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta create mode 100644 Assets/Images/Adventurers/Portraits/Derk Portrait.png create mode 100644 Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta create mode 100644 Assets/Images/Adventurers/Portraits/Rufus Portrait.png create mode 100644 Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta diff --git a/Assets/Data/Adena.asset b/Assets/Data/Adena.asset index fafbfc5..e1944e9 100644 --- a/Assets/Data/Adena.asset +++ b/Assets/Data/Adena.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Adena m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: d39b423a0c8065a42840ec70a3dbe874, type: 3} m_name: Adena m_charisma: 3 m_strength: 10 m_dexterity: 10 m_intelligence: 10 - m_spawnQuestId: 1 m_dialogueOptions: - text: "G\u2019day Sir, I am the fair Adena, princess of the faraway planet of Velarius." @@ -36,3 +36,4 @@ MonoBehaviour: - text: Away from this place and being worshipped as the goddess that I am, of course. bulletizedText: Being worshipped as a "goddess"... + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Adventure Cat.asset b/Assets/Data/Adventure Cat.asset index a3ffb15..55a666d 100644 --- a/Assets/Data/Adventure Cat.asset +++ b/Assets/Data/Adventure Cat.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Adventure Cat m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: eff079f969ba97a41b289a5d5fd416f0, type: 3} m_name: Adventure Cat m_charisma: 5 m_strength: 10 m_dexterity: 5 m_intelligence: 5 - m_spawnQuestId: 2 m_dialogueOptions: - text: "\u2026 (the cat looks at you, on her name collar you read: Adventure Cat)" @@ -32,3 +32,4 @@ MonoBehaviour: - text: "\u2026 (Although cats are far from stupid, you don\u2019t think that an adventure cat would necessarily think about this)" bulletizedText: N/A + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Amadeus.asset b/Assets/Data/Amadeus.asset index d95c48c..b35ca13 100644 --- a/Assets/Data/Amadeus.asset +++ b/Assets/Data/Amadeus.asset @@ -13,12 +13,12 @@ MonoBehaviour: m_Name: Amadeus m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 364be8af730401347bd42dd24246ea32, type: 3} m_name: Amadeus m_charisma: 2 m_strength: 7 m_dexterity: 7 m_intelligence: 7 - m_spawnQuestId: 1 m_dialogueOptions: - text: "Amadeus the robot, that\u2019s my name. How can I be of service? " bulletizedText: Amadeus. @@ -32,3 +32,4 @@ MonoBehaviour: bulletizedText: Playing instruments... Really badly... - text: "As a free robot on an exciting adventure. No people tho, I hate people\u2026" bulletizedText: As a free robot with no people... + m_typingSfx: {fileID: 0} diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index 5e59821..a815ea8 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Derk m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 8fef586f3af1449418c717b43ef4e25e, type: 3} m_name: Derk m_charisma: 5 m_strength: 5 diff --git a/Assets/Data/Rufus.asset b/Assets/Data/Rufus.asset index 57f3f1e..8be33de 100644 --- a/Assets/Data/Rufus.asset +++ b/Assets/Data/Rufus.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Rufus m_EditorClassIdentifier: m_image: {fileID: 0} + m_avatar: {fileID: 21300000, guid: 622ebc6effcb8c0458b8bf110ada911a, type: 3} m_name: Rufus m_charisma: 8 m_strength: 4 diff --git a/Assets/Images/Adventurers/Portraits.meta b/Assets/Images/Adventurers/Portraits.meta new file mode 100644 index 0000000..da1e4a7 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3e91a2f491690c48b77682f69ba591d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Portraits/Adena Portrait.png b/Assets/Images/Adventurers/Portraits/Adena Portrait.png new file mode 100644 index 0000000..198ca59 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adena Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72b0c066c61ea71da84b15ff5e0bf95a739c81be75103e88dd1843255b6c25d6 +size 98496 diff --git a/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta new file mode 100644 index 0000000..683dfca --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adena Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d39b423a0c8065a42840ec70a3dbe874 +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/Images/Adventurers/Portraits/Adventure Cat Portrait.png b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png new file mode 100644 index 0000000..d1c4e58 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44752b1ba3739d6e9fcb650ff9597e824ae37512883bbf44204ded3b0c89176e +size 118901 diff --git a/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta new file mode 100644 index 0000000..f8978c3 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Adventure Cat Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: eff079f969ba97a41b289a5d5fd416f0 +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/Images/Adventurers/Portraits/Amadeus Portrait.png b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png new file mode 100644 index 0000000..fbde0df --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa6c2d1b56e49c47e3192d93cf837046777d01573ab9e7f25faccf12b882cec7 +size 107033 diff --git a/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta new file mode 100644 index 0000000..832c471 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Amadeus Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 364be8af730401347bd42dd24246ea32 +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/Images/Adventurers/Portraits/Derk Portrait.png b/Assets/Images/Adventurers/Portraits/Derk Portrait.png new file mode 100644 index 0000000..c483c08 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Derk Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a17173100725110ba7237829f7ebc53a7a066e953397d4d1ab238e85d0a03d6 +size 101593 diff --git a/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta new file mode 100644 index 0000000..10815a6 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Derk Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 8fef586f3af1449418c717b43ef4e25e +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/Images/Adventurers/Portraits/Rufus Portrait.png b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png new file mode 100644 index 0000000..fbb85f4 --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade0f02a0481d87a837de83a9630c0613cd83493dec8c454722baafde62d3580 +size 85909 diff --git a/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta new file mode 100644 index 0000000..552181b --- /dev/null +++ b/Assets/Images/Adventurers/Portraits/Rufus Portrait.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 622ebc6effcb8c0458b8bf110ada911a +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 cb351c3..78afd6e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1715,10 +1715,10 @@ RectTransform: m_Father: {fileID: 1555822333} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.10700001} - m_AnchorMax: {x: 1, y: 0.2756175} - m_AnchoredPosition: {x: 0, y: -274} - m_SizeDelta: {x: -46, y: 535.7133} + m_AnchorMin: {x: 0, y: 0.13656823} + m_AnchorMax: {x: 1, y: 0.31286353} + m_AnchoredPosition: {x: 0, y: -256} + m_SizeDelta: {x: -46, y: 529.7133} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &340478448 MonoBehaviour: @@ -1740,7 +1740,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: UUoough result much + m_text: Disaster struck, town and tavern are in ruins.
The C Y B E R P R I + E S T S are victorious once more. Haha. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1767,8 +1768,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3370,7 +3371,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000037193, y: 0.0000069141} + m_AnchoredPosition: {x: 0, y: 0.0000076293945} m_SizeDelta: {x: 83.0101, y: 0.000015259} m_Pivot: {x: 1, y: 0.5} --- !u!114 &653815783 @@ -4728,7 +4729,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: ASS + m_text: Assign m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5477,10 +5478,10 @@ RectTransform: m_Father: {fileID: 137465973} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.2756175} - m_AnchorMax: {x: 1, y: 0.74100006} - m_AnchoredPosition: {x: 0, y: -123.3999} - m_SizeDelta: {x: -46, y: 257.71332} + m_AnchorMin: {x: 0, y: 0.43056828} + m_AnchorMax: {x: 1, y: 0.9014318} + m_AnchoredPosition: {x: 0, y: -133} + m_SizeDelta: {x: -46, y: 253.71332} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1493783872 MonoBehaviour: @@ -5502,9 +5503,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "DEFAULT Find someone to hand out flyers to advertise our tavern to adventurers. - Strength, dexterity, intelligence: doesn\u2019t matter, find someone who would - do this for as little money as possible.\r\n" + m_text: 'Okay, now it''s getting serious.
Turns out the viscous
C Y B E + R P R I E S T S were behind the attack on Trudy.
Seems like they stole an + object that she kept in her wardrobe, not knowing that it was the last piece + required to summon the
C Y B E R D R A G O N to destroy this inn. We need + someone that can stop them! ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5531,8 +5534,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -6649,7 +6652,7 @@ GameObject: - component: {fileID: 1806738462} - component: {fileID: 1806738461} m_Layer: 5 - m_Name: Avatar + m_Name: AdventurerAvatar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/DialogueSystem/CharacterData.cs b/Assets/Scripts/DialogueSystem/CharacterData.cs index 8f38219..5e7ed62 100644 --- a/Assets/Scripts/DialogueSystem/CharacterData.cs +++ b/Assets/Scripts/DialogueSystem/CharacterData.cs @@ -5,6 +5,7 @@ using UnityEngine; public class CharacterData : ScriptableObject { public Sprite m_image; + public Sprite m_avatar; public string m_name; public int m_charisma; diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index 9126f03..d435358 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using TMPro; using UnityEngine; +using UnityEngine.UI; public class Journal : MonoBehaviour { @@ -67,6 +68,7 @@ public class Journal : MonoBehaviour { CharacterData chara = m_availableAdventurers[id]; adventurerPage.Find("AdventurerName").gameObject.GetComponent().text = chara.name; + adventurerPage.Find("AdventurerAvatar").gameObject.GetComponent().sprite = chara.m_avatar; string cv = ""; foreach (var line in chara.m_dialogueOptions) { From c52c9f5a727a1c438dd82a46d2e1e56d0da1083d Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 15:53:42 +0200 Subject: [PATCH 3/3] Fixed text spacing --- Assets/Data/Adena.asset | 10 ++++---- Assets/Data/Amadeus.asset | 6 ++--- Assets/Data/Derk.asset | 4 +-- Assets/Data/Rufus.asset | 12 ++++----- Assets/Scenes/Main.unity | 50 ++++++++++++++++++------------------ Assets/Scenes/MainMenu.unity | 10 ++++---- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Assets/Data/Adena.asset b/Assets/Data/Adena.asset index e1944e9..ac409a1 100644 --- a/Assets/Data/Adena.asset +++ b/Assets/Data/Adena.asset @@ -24,13 +24,13 @@ MonoBehaviour: Velarius." bulletizedText: Adena. Princess. - text: "Working? A princess doesn\u2019t work, what do you have your robotic servants - for, after all? Well, that was before I left, now times are different\u2026" + for, after all?
Well, that was before I left, now times are different\u2026" bulletizedText: Stuck up princess doesn't work... - text: "Once, when I was still a wee little child, a bird landed on my finger - while I was staring at the moon. My parents loved it. \u201CWhat a cute, little - princess,\u201D they said. Well, my favourite moment was when I smashed their - palace into pieces after they tried to marry me to Sir Reginald the Lizardman. - Me and a lizard! Can you imagine?" + while I was staring at the moon.
My parents loved it. \u201CWhat a cute, + little princess,\u201D they said.
Well, my favourite moment was when I + smashed their palace into pieces after they tried to marry me to Sir Reginald + the Lizardman. Me and a lizard! Can you imagine?" bulletizedText: Destroying her parents palace for making her getting married to a lizard... - text: Away from this place and being worshipped as the goddess that I am, of diff --git a/Assets/Data/Amadeus.asset b/Assets/Data/Amadeus.asset index b35ca13..19cac1c 100644 --- a/Assets/Data/Amadeus.asset +++ b/Assets/Data/Amadeus.asset @@ -23,12 +23,12 @@ MonoBehaviour: - text: "Amadeus the robot, that\u2019s my name. How can I be of service? " bulletizedText: Amadeus. - text: "Well, I\u2019m used to working for my old master. A crazy old scholar. - Always wanted me to climb up mountains and pick flowers." +
Always wanted me to climb up mountains and pick flowers." bulletizedText: Used to working with his old master. Climbed mountains and picked flowers. - text: "Even though I\u2019ve seen many things in my life, my master used to do - the fighting. However, once I was told to try my hands at playing an instrument. - I liked it, but my master shut his ears and a nearby cave bear died instantly." + the fighting.
However, once I was told to try my hands at playing an instrument. +
I liked it, but my master shut his ears and a nearby cave bear died instantly." bulletizedText: Playing instruments... Really badly... - text: "As a free robot on an exciting adventure. No people tho, I hate people\u2026" bulletizedText: As a free robot with no people... diff --git a/Assets/Data/Derk.asset b/Assets/Data/Derk.asset index a815ea8..ee6a517 100644 --- a/Assets/Data/Derk.asset +++ b/Assets/Data/Derk.asset @@ -26,8 +26,8 @@ MonoBehaviour: it, no problem for old Derk." bulletizedText: Just wants to work. - text: "This mornin\u2019 I helped an old lady get into one of those high speed - trains. They always say Derk the jerk, but no one ever says \u201CWow, what - a nice guy\u201D. " + trains.
They always say Derk the jerk, but no one ever says
\u201CWow, + what a nice guy\u201D. " bulletizedText: Helped a lady get onto a high speed train. - text: "\u2026 (drools)" bulletizedText: ... diff --git a/Assets/Data/Rufus.asset b/Assets/Data/Rufus.asset index 8be33de..da211c4 100644 --- a/Assets/Data/Rufus.asset +++ b/Assets/Data/Rufus.asset @@ -22,13 +22,13 @@ MonoBehaviour: m_dialogueOptions: - text: I am Rufus, here to help you. bulletizedText: Rufus. - - text: "I am a nature kinda guy, hunt, fetch, you know how it goes. Also, I\u2019m - a natural with people, as you can imagine. Everybody always wants to pet me, - it can be quite annoying." + - text: "I am a nature kinda guy, hunt, fetch, you know how it goes.
Also, + I\u2019m 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 lightswod. Just kidding, I ratted - him out to the authorities of course. + - 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. diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 78afd6e..31731b7 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1715,11 +1715,11 @@ RectTransform: m_Father: {fileID: 1555822333} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.13656823} - m_AnchorMax: {x: 1, y: 0.31286353} - m_AnchoredPosition: {x: 0, y: -256} - m_SizeDelta: {x: -46, y: 529.7133} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 190} + m_SizeDelta: {x: 456, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &340478448 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1768,8 +1768,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1804,7 +1804,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -11.388458, y: 0, z: -14.29776, w: 551.39087} + m_margin: {x: -3.3605957, y: 205.65388, z: -4.3294373, w: 1.5001526} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4474,13 +4474,13 @@ MonoBehaviour: description: 'Okay, now it''s getting serious. Turns out the viscous C Y B E R P R I E S T S were behind the attack on Trudy. Seems like they stole an object that she kept in her wardrobe, not knowing that it was the last piece required - to summon the C Y B E R D R A G O N to destroy this inn. We need someone that - can stop them! ' + to summon
the C Y B E R D R A G O N to destroy this inn. We need someone + that can stop them! ' successStr: "We did it! We saved not only ourselves, but this entire planet. The brave adventurer will certainly be admired by everyone. But we won\u2019t forget you. Without your expertise, we wouldn\u2019t still be standing here. " - failedStr: Disaster struck, town and tavern are in ruins. The C Y B E R P R I - E S T S are victorious once more. Haha. + failedStr: Disaster struck, town and tavern are in ruins.
The C Y B E R P + R I E S T S are victorious once more. Haha. canRetry: 0 strength: 10 intelligence: 5 @@ -5480,7 +5480,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.43056828} m_AnchorMax: {x: 1, y: 0.9014318} - m_AnchoredPosition: {x: 0, y: -133} + m_AnchoredPosition: {x: 0, y: -109} m_SizeDelta: {x: -46, y: 253.71332} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1493783872 @@ -5534,8 +5534,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 32 - m_fontSizeBase: 32 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -5819,11 +5819,11 @@ RectTransform: m_Father: {fileID: 137465973} m_RootOrder: -1 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: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.0028381348, y: 9} + m_SizeDelta: {x: 501.16, y: 278.97} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &1555822334 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5837,14 +5837,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.6862745} 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_Sprite: {fileID: 21300000, guid: 585a2e0607923f74680694f877138c61, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5853,7 +5853,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 1.8 --- !u!222 &1555822335 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6753,7 +6753,7 @@ 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: -3.2, y: 0} + m_AnchoredPosition: {x: 148, y: -19} m_SizeDelta: {x: 202.1752, y: 84.4763} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1836351282 @@ -7685,7 +7685,7 @@ 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: 1.4951, y: 0} + m_AnchoredPosition: {x: 148.00002, y: -19} m_SizeDelta: {x: 211.5662, y: 84.476} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2132596732 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index ddf5c61..7d5c54b 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -486,8 +486,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 95.29 + m_fontSizeBase: 95.29 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -574,7 +574,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 551.6477, y: 219.5069} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1443837444 MonoBehaviour: @@ -652,7 +652,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