From a00e4a6e9800d6937e751de2e4292527d66945fd Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 12:05:51 +0200 Subject: [PATCH 1/3] Fix quest retry --- Assets/Scenes/Main.unity | 10 +++++----- Assets/Scripts/Journal.cs | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 6c4de2b..919379d 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -2898,7 +2898,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.x - value: 0.20577693 + value: 3.32 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.y @@ -2906,7 +2906,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalPosition.z - value: -0.5997834 + value: -1.2 objectReference: {fileID: 0} - target: {fileID: 3388867341823709995, guid: 5d865034cc8c4794082f625589d47ad6, type: 3} propertyPath: m_LocalRotation.w @@ -5363,7 +5363,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: NextQuest + m_text: Retry m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -5837,7 +5837,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: NextQuest + m_text: Next Quest m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -6913,7 +6913,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 243041993} m_TargetAssemblyTypeName: Journal, Assembly-CSharp - m_MethodName: StartNextQuest + m_MethodName: RetryQuest m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index 88043dc..f448b97 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -95,7 +95,9 @@ public class Journal : MonoBehaviour bool success = QuestManager.Instance.RunQuestWithAdventurer(m_availableAdventurers[m_selectedAdventurer], activeQuest); Debug.Log("THE QUESTR ESULT WAS: " + success); adventurerPage.gameObject.SetActive(false); - if(success) + + questPage.Find("QuestResult").gameObject.SetActive(true); + if (success) { questPage.Find("QuestResult/NextQuest").gameObject.SetActive(true); questPage.Find("QuestResult/RetryQuest").gameObject.SetActive(false); @@ -106,7 +108,7 @@ public class Journal : MonoBehaviour } questPage.Find("QuestResult/QuestResultText").gameObject.GetComponent().text = success ? activeQuest.successStr : activeQuest.failedStr; - questPage.Find("QuestResult").gameObject.SetActive(true); + } public void StartNextQuest() -- 2.49.1 From 41b28e9efe7d6f14a2800d6ae08b82ace8405594 Mon Sep 17 00:00:00 2001 From: Minz Date: Sun, 9 Jul 2023 12:25:06 +0200 Subject: [PATCH 2/3] Populate adventurer CV --- .../Images/Adventurers/Adventure Cat.png.meta | 140 +++++++++ Assets/Images/Adventurers/Rufus.png.meta | 140 +++++++++ Assets/Scenes/Main.unity | 290 +----------------- Assets/Scripts/Journal.cs | 10 +- 4 files changed, 299 insertions(+), 281 deletions(-) create mode 100644 Assets/Images/Adventurers/Adventure Cat.png.meta create mode 100644 Assets/Images/Adventurers/Rufus.png.meta diff --git a/Assets/Images/Adventurers/Adventure Cat.png.meta b/Assets/Images/Adventurers/Adventure Cat.png.meta new file mode 100644 index 0000000..79e0f89 --- /dev/null +++ b/Assets/Images/Adventurers/Adventure Cat.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: d5f28e2cddfc37b4995f83eb64cde850 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/Adventurers/Rufus.png.meta b/Assets/Images/Adventurers/Rufus.png.meta new file mode 100644 index 0000000..c761a8b --- /dev/null +++ b/Assets/Images/Adventurers/Rufus.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 163dab4ae579fb74d93cc5f5543537c2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: + 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 919379d..b1c582d 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -714,7 +714,7 @@ GameObject: - component: {fileID: 139192511} - component: {fileID: 139192510} m_Layer: 5 - m_Name: IntelligenceStr + m_Name: AdventurerCV m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -735,10 +735,10 @@ RectTransform: m_Father: {fileID: 219076562} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -7.300049, y: 55.199997} - m_SizeDelta: {x: -46, y: 50} + m_AnchorMin: {x: 0, y: 0.10627446} + m_AnchorMax: {x: 1, y: 0.6963533} + m_AnchoredPosition: {x: -7.300049, y: 147.2} + m_SizeDelta: {x: -46, y: -502} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &139192510 MonoBehaviour: @@ -760,7 +760,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Int Str + m_text: 'beep boop + + asdas + + hehehe' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -823,7 +827,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: -126.669556, z: 0, w: -403.90863} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -934,8 +938,6 @@ RectTransform: - {fileID: 1806738460} - {fileID: 2002200565} - {fileID: 139192509} - - {fileID: 1095212954} - - {fileID: 1271143076} - {fileID: 750125352} - {fileID: 52890059} - {fileID: 600693545} @@ -3620,141 +3622,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 969431951} m_CullTransparentMesh: 1 ---- !u!1 &1095212953 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1095212954} - - component: {fileID: 1095212956} - - component: {fileID: 1095212955} - m_Layer: 5 - m_Name: CharismaStr - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1095212954 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1095212953} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 219076562} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -7.30011, y: 5.2} - m_SizeDelta: {x: -46, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1095212955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1095212953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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_text: Int Str - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1095212956 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1095212953} - m_CullTransparentMesh: 1 --- !u!1001 &1122440499 PrefabInstance: m_ObjectHideFlags: 0 @@ -4040,141 +3907,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6d133d773848b7c4fb911aad8a3b729c, type: 3} ---- !u!1 &1271143075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1271143076} - - component: {fileID: 1271143078} - - component: {fileID: 1271143077} - m_Layer: 5 - m_Name: StrengthStr - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1271143076 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271143075} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 219076562} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -7.30011, y: -44.8} - m_SizeDelta: {x: -46, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1271143077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271143075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - 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_text: Int Str - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1271143078 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271143075} - m_CullTransparentMesh: 1 --- !u!1 &1341305957 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Journal.cs b/Assets/Scripts/Journal.cs index f448b97..076335a 100644 --- a/Assets/Scripts/Journal.cs +++ b/Assets/Scripts/Journal.cs @@ -62,8 +62,14 @@ public class Journal : MonoBehaviour public void SetJournalAdventurerPage(int id) { CharacterData chara = m_availableAdventurers[id]; - TMP_Text nameLabel = adventurerPage.Find("AdventurerName").gameObject.GetComponent(); - nameLabel.text = chara.m_name; + adventurerPage.Find("AdventurerName").gameObject.GetComponent().text = chara.name; + string cv = ""; + foreach (var line in chara.m_dialogueOptions) + { + cv += $"- {line.bulletizedText}\n"; + } + adventurerPage.Find("AdventurerCV").gameObject.GetComponent().text = cv; + } public void SetJournalQuestPage() -- 2.49.1 From 1e373edbf1c94f2ece7486c2d2c740a3afed9e00 Mon Sep 17 00:00:00 2001 From: Minzkraut Date: Sun, 9 Jul 2023 12:28:10 +0200 Subject: [PATCH 3/3] Updated character graphics --- Assets/Images/Adventurers/Adena.png | 4 ++-- Assets/Images/Adventurers/Amadeus.png | 4 ++-- Assets/Images/Adventurers/Derk.png | 4 ++-- Krita Files/Sketches.kra | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Images/Adventurers/Adena.png b/Assets/Images/Adventurers/Adena.png index 2577364..640e9fd 100644 --- a/Assets/Images/Adventurers/Adena.png +++ b/Assets/Images/Adventurers/Adena.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:516c9ef8d70e7b082ba8429474967d4c421e89497854315dab280d46054d2f0e -size 445632 +oid sha256:43834d7fa89dc7e322b19b70dcabd7e215a0820a989dff821152e8ceee03e9de +size 352226 diff --git a/Assets/Images/Adventurers/Amadeus.png b/Assets/Images/Adventurers/Amadeus.png index 7eff2ad..0761b65 100644 --- a/Assets/Images/Adventurers/Amadeus.png +++ b/Assets/Images/Adventurers/Amadeus.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a3beb957f25d1802d1c9c5e411e3bc6ecc7394bea8bababbb9671a0cf6a7eca7 -size 601844 +oid sha256:e828b0f3eda96be347d9632bedcb8f1912681e1f5d3dfb4fa9b938c8203f924e +size 471001 diff --git a/Assets/Images/Adventurers/Derk.png b/Assets/Images/Adventurers/Derk.png index 67c6271..a9760bc 100644 --- a/Assets/Images/Adventurers/Derk.png +++ b/Assets/Images/Adventurers/Derk.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45092e8e5f8a31f0409b8bdb196640a69deb93f6a4daf2a3fdd772a8787da168 -size 419359 +oid sha256:3e721bca71609eae3eb70f1d1811a49fc476dda3a64ee7bee9ac3493c5877528 +size 338440 diff --git a/Krita Files/Sketches.kra b/Krita Files/Sketches.kra index e811b85..0badd79 100644 --- a/Krita Files/Sketches.kra +++ b/Krita Files/Sketches.kra @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c68f6551cdb3c0a99a2368e3f0b46e408ddb35e1bc5dfe7c946b0be3f5881bb7 -size 7676680 +oid sha256:c7a09216028d05d945521335cbcc6791e33dabc141c366421432d4893a641904 +size 7889858 -- 2.49.1