diff --git a/.DS_Store b/.DS_Store index ac0b85d7..28426ceb 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store index a690fea5..c7d52e7c 100644 Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ diff --git a/Assets/Settings/Build Profiles.meta b/Assets/Settings/Build Profiles.meta new file mode 100644 index 00000000..6593956a --- /dev/null +++ b/Assets/Settings/Build Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6ba11b83a33a47ae97a2c030f4437b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Build Profiles/macOS.asset b/Assets/Settings/Build Profiles/macOS.asset new file mode 100644 index 00000000..13665d51 --- /dev/null +++ b/Assets/Settings/Build Profiles/macOS.asset @@ -0,0 +1,47 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 15003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: macOS + m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.Build.Profile.BuildProfile + m_AssetVersion: 1 + m_BuildTarget: 2 + m_Subtarget: 2 + m_PlatformId: 0d2129357eac403d8b359c2dcbf82502 + m_PlatformBuildProfile: + rid: 8483784835878617158 + m_OverrideGlobalSceneList: 0 + m_Scenes: [] + m_ScriptingDefines: [] + m_PlayerSettingsYaml: + m_Settings: [] + references: + version: 2 + RefIds: + - rid: 8483784835878617158 + type: {class: OSXStandaloneBuildProfile, ns: UnityEditor.OSXStandalone, asm: UnityEditor.OSXStandalone.Extensions} + data: + m_Development: 0 + m_ConnectProfiler: 0 + m_BuildWithDeepProfilingSupport: 0 + m_AllowDebugging: 0 + m_WaitForManagedDebugger: 0 + m_ManagedDebuggerFixedPort: 0 + m_ExplicitNullChecks: 0 + m_ExplicitDivideByZeroChecks: 0 + m_ExplicitArrayBoundsChecks: 0 + m_CompressionType: 0 + m_InstallInBuildFolder: 0 + m_InsightsSettingsContainer: + m_BuildProfileEngineDiagnosticsState: 2 + m_MacOSXcodeBuildConfig: 1 + m_Architecture: 2 + m_CreateXcodeProject: 0 diff --git a/Assets/Settings/Build Profiles/macOS.asset.meta b/Assets/Settings/Build Profiles/macOS.asset.meta new file mode 100644 index 00000000..2a1b0d5e --- /dev/null +++ b/Assets/Settings/Build Profiles/macOS.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 507d789f650e6469aafc1773c976cb0e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/.DS_Store b/Assets/StreamingAssets/.DS_Store index 898c0e50..fdd22ddd 100644 Binary files a/Assets/StreamingAssets/.DS_Store and b/Assets/StreamingAssets/.DS_Store differ diff --git a/Assets/StreamingAssets/Localization/French.xml b/Assets/StreamingAssets/Localization/French.xml index 8c134815..76b36be3 100644 --- a/Assets/StreamingAssets/Localization/French.xml +++ b/Assets/StreamingAssets/Localization/French.xml @@ -35,6 +35,8 @@ Disponible(s) Au QG En mission + + Récap' Quête Invasion de Rats @@ -62,7 +64,6 @@ Un groupe de bandit demandent un droit de passage au abord d'un pont. Vous êtes contraint de pay... de les abattre. Après un combat acharné, vos aventuriers l'emporte ! - Or Or. diff --git a/Assets/_/.DS_Store b/Assets/_/.DS_Store index ef68b895..55752920 100644 Binary files a/Assets/_/.DS_Store and b/Assets/_/.DS_Store differ diff --git a/Assets/_/Content/.DS_Store b/Assets/_/Content/.DS_Store index 2c18ce5a..6c8daeee 100644 Binary files a/Assets/_/Content/.DS_Store and b/Assets/_/Content/.DS_Store differ diff --git a/Assets/_/Content/Sprites.meta b/Assets/_/Content/Sprites.meta new file mode 100644 index 00000000..fad1803b --- /dev/null +++ b/Assets/_/Content/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f1bccd7cd4a1c483fb787906ba6228ea +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Features/UI/.DS_Store b/Assets/_/Content/Sprites/.DS_Store similarity index 74% rename from Assets/_/Features/UI/.DS_Store rename to Assets/_/Content/Sprites/.DS_Store index ab1251a8..628f1e0f 100644 Binary files a/Assets/_/Features/UI/.DS_Store and b/Assets/_/Content/Sprites/.DS_Store differ diff --git a/Assets/_/Content/Sprites/AVI-logo.png b/Assets/_/Content/Sprites/AVI-logo.png new file mode 100644 index 00000000..86685be9 Binary files /dev/null and b/Assets/_/Content/Sprites/AVI-logo.png differ diff --git a/Assets/_/Content/Sprites/AVI-logo.png.meta b/Assets/_/Content/Sprites/AVI-logo.png.meta new file mode 100644 index 00000000..96f8daad --- /dev/null +++ b/Assets/_/Content/Sprites/AVI-logo.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2c6248ac814304e0999e01c4da5f37ac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Content/Sprites/Background_green.png b/Assets/_/Content/Sprites/Background_green.png new file mode 100644 index 00000000..6ce86f70 Binary files /dev/null and b/Assets/_/Content/Sprites/Background_green.png differ diff --git a/Assets/_/Content/Sprites/Background_green.png.meta b/Assets/_/Content/Sprites/Background_green.png.meta new file mode 100644 index 00000000..bc089b9c --- /dev/null +++ b/Assets/_/Content/Sprites/Background_green.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: e0673d29f9bac4b4f9e01ba7f6d253cf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Content/Sprites/cover.png b/Assets/_/Content/Sprites/cover.png new file mode 100644 index 00000000..86edda59 Binary files /dev/null and b/Assets/_/Content/Sprites/cover.png differ diff --git a/Assets/_/Content/Sprites/cover.png.meta b/Assets/_/Content/Sprites/cover.png.meta new file mode 100644 index 00000000..b0eb8c9c --- /dev/null +++ b/Assets/_/Content/Sprites/cover.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: fb940c24e391f4841ba3b5a18f80decc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Content/Sprites/cursor.png b/Assets/_/Content/Sprites/cursor.png new file mode 100644 index 00000000..2d614a6c Binary files /dev/null and b/Assets/_/Content/Sprites/cursor.png differ diff --git a/Assets/_/Content/Sprites/cursor.png.meta b/Assets/_/Content/Sprites/cursor.png.meta new file mode 100644 index 00000000..7bc65fed --- /dev/null +++ b/Assets/_/Content/Sprites/cursor.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2e13a6792973f4bd1bde9bbd6350947c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Content/Sprites/icone.png b/Assets/_/Content/Sprites/icone.png new file mode 100644 index 00000000..5a11bfc4 Binary files /dev/null and b/Assets/_/Content/Sprites/icone.png differ diff --git a/Assets/_/Content/Sprites/icone.png.meta b/Assets/_/Content/Sprites/icone.png.meta new file mode 100644 index 00000000..5c5edf0f --- /dev/null +++ b/Assets/_/Content/Sprites/icone.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 7356543a802e040f18c822d55bcc8dec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Content/Sprites/text.png b/Assets/_/Content/Sprites/text.png new file mode 100644 index 00000000..711fa84c Binary files /dev/null and b/Assets/_/Content/Sprites/text.png differ diff --git a/Assets/_/Content/Sprites/text.png.meta b/Assets/_/Content/Sprites/text.png.meta new file mode 100644 index 00000000..01b57d4b --- /dev/null +++ b/Assets/_/Content/Sprites/text.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 889128e4757934138abb506bbc5a61e6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 0 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_/Database/prefabs/Board.prefab b/Assets/_/Database/prefabs/Board.prefab index 38ee8f1a..6b055fcb 100644 --- a/Assets/_/Database/prefabs/Board.prefab +++ b/Assets/_/Database/prefabs/Board.prefab @@ -168,8 +168,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 3072838618752696753} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.056666672} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0.056697607} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -347,6 +347,96 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &294388718174183180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7705016881237931988} + - component: {fileID: 8766836445759778954} + - component: {fileID: 9106016913992558507} + - component: {fileID: 2035660219998346445} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7705016881237931988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294388718174183180} + 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: + - {fileID: 3097600141765312524} + m_Father: {fileID: 6819652725965201757} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!222 &8766836445759778954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294388718174183180} + m_CullTransparentMesh: 1 +--- !u!114 &9106016913992558507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294388718174183180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2035660219998346445 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 294388718174183180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Mask + m_ShowMaskGraphic: 0 --- !u!1 &322112679775282624 GameObject: m_ObjectHideFlags: 0 @@ -416,7 +506,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000072956085, y: -0.000015258789} + m_AnchoredPosition: {x: -0.000025205314, y: -0.000035582452} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!1 &350460613147089024 @@ -528,6 +618,142 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &351971345950024804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7267875684990974403} + - component: {fileID: 3188619242474804518} + - component: {fileID: 1621839540040652426} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7267875684990974403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 351971345950024804} + 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: 7691756626580674919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3188619242474804518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 351971345950024804} + m_CullTransparentMesh: 1 +--- !u!114 &1621839540040652426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 351971345950024804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + 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: quest.completed.title + 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: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: -608.73035, y: 0, z: -612.8826, 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!1 &398748192572359346 GameObject: m_ObjectHideFlags: 0 @@ -944,8 +1170,8 @@ MonoBehaviour: m_Calls: [] m_text: inventory m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} - m_sharedMaterial: {fileID: -624193526770214323, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1053,6 +1279,7 @@ RectTransform: - {fileID: 3278240824482656541} - {fileID: 2327252244098032487} - {fileID: 7856372776130389046} + - {fileID: 135118099895439414} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1430,9 +1657,9 @@ RectTransform: m_Father: {fileID: 1962241777349435167} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: -17} m_Pivot: {x: 0, y: 1} --- !u!222 &1102299685750143739 CanvasRenderer: @@ -1518,7 +1745,7 @@ RectTransform: m_Father: {fileID: 6799311224910918046} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -1595,9 +1822,9 @@ RectTransform: m_Father: {fileID: 3428204698449784346} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: -17, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &2122576678338583654 CanvasRenderer: @@ -1680,8 +1907,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2685396307151346427} m_HandleRect: {fileID: 2881309443443177717} m_Direction: 0 - m_Value: 0 - m_Size: 0 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1719,7 +1946,7 @@ RectTransform: m_Father: {fileID: 6710742144378787211} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 0.99998707} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -1957,7 +2184,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 7500699926199109763} m_HandleRect: {fileID: 1724379704039101092} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -1998,9 +2225,9 @@ RectTransform: m_Father: {fileID: 4491822891276527056} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &2399151214911001308 CanvasRenderer: @@ -2248,7 +2475,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6546785238518158625} m_HandleRect: {fileID: 6344478158976838597} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -2572,9 +2799,9 @@ RectTransform: m_Father: {fileID: 8068581746560711683} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5183539785091098361 CanvasRenderer: @@ -2778,6 +3005,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2084210309601890224 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8815688695268144792} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8815688695268144792 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2084210309601890224} + 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: + - {fileID: 5251358698974899163} + m_Father: {fileID: 6226994085177399707} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2108350536492577640 GameObject: m_ObjectHideFlags: 0 @@ -3012,8 +3275,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 5331052957273410202} m_HandleRect: {fileID: 5461951377529854845} m_Direction: 0 - m_Value: 1 - m_Size: 0.99999994 + m_Value: 0 + m_Size: 0.9999999 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3053,9 +3316,9 @@ RectTransform: m_Father: {fileID: 3428204698449784346} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -17, y: -17} m_Pivot: {x: 0, y: 1} --- !u!222 &790821042176173600 CanvasRenderer: @@ -3141,7 +3404,7 @@ RectTransform: m_Father: {fileID: 5619379698950436239} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0.99994886} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -3763,8 +4026,8 @@ MonoBehaviour: m_Calls: [] m_text: guild_name m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} - m_sharedMaterial: {fileID: -624193526770214323, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4032,9 +4295,9 @@ RectTransform: m_Father: {fileID: 4491822891276527056} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &6823750286419036997 CanvasRenderer: @@ -4123,6 +4386,132 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &3002909843601362555 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6226994085177399707} + - component: {fileID: 3118672235837943077} + - component: {fileID: 19822821495936146} + - component: {fileID: 6888285296207582056} + m_Layer: 5 + m_Name: Scrollbar Horizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6226994085177399707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3002909843601362555} + 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: + - {fileID: 8815688695268144792} + m_Father: {fileID: 6819652725965201757} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!222 &3118672235837943077 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3002909843601362555} + m_CullTransparentMesh: 1 +--- !u!114 &19822821495936146 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3002909843601362555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6888285296207582056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3002909843601362555} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Scrollbar + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6812313699242036110} + m_HandleRect: {fileID: 5251358698974899163} + m_Direction: 0 + m_Value: 1 + m_Size: 0.99999994 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3050417146564079151 GameObject: m_ObjectHideFlags: 0 @@ -4488,6 +4877,115 @@ MonoBehaviour: _adventurerPrefab: {fileID: 1341503220104474312, guid: 21765b2d0e5f0432abd4164ab6087032, type: 3} _heroesPanel: {fileID: 6274511911080403015} _sort: 0 +--- !u!1 &3216173412687774394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6819652725965201757} + - component: {fileID: 1375004613378696675} + - component: {fileID: 6097058702276586897} + - component: {fileID: 4556855794710090954} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6819652725965201757 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3216173412687774394} + 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: + - {fileID: 7705016881237931988} + - {fileID: 6226994085177399707} + - {fileID: 7283145194436841440} + m_Father: {fileID: 7691756626580674919} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: 894.6, y: 581.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1375004613378696675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3216173412687774394} + m_CullTransparentMesh: 1 +--- !u!114 &6097058702276586897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3216173412687774394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + 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 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4556855794710090954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3216173412687774394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ScrollRect + m_Content: {fileID: 3097600141765312524} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 7705016881237931988} + m_HorizontalScrollbar: {fileID: 6888285296207582056} + m_VerticalScrollbar: {fileID: 4279882190326111622} + m_HorizontalScrollbarVisibility: 1 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &3250724793988948774 GameObject: m_ObjectHideFlags: 0 @@ -4856,6 +5354,42 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3504475542246067993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4141521778400496153} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4141521778400496153 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3504475542246067993} + 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: + - {fileID: 6569702951716177080} + m_Father: {fileID: 7283145194436841440} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3565011208519959990 GameObject: m_ObjectHideFlags: 0 @@ -5086,7 +5620,7 @@ MonoBehaviour: m_Content: {fileID: 8137423015168411238} m_Horizontal: 1 m_Vertical: 1 - m_MovementType: 1 + m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -5725,9 +6259,9 @@ RectTransform: m_Father: {fileID: 3876055368885639954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &1759602683172727562 CanvasRenderer: @@ -5811,7 +6345,7 @@ MonoBehaviour: m_HandleRect: {fileID: 328293514909523749} m_Direction: 2 m_Value: 1 - m_Size: 0.9997847 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -6173,7 +6707,7 @@ RectTransform: m_Father: {fileID: 2699881071253524576} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -6548,8 +7082,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 8703195390105664981} m_HandleRect: {fileID: 3530285975064587704} m_Direction: 0 - m_Value: 1 - m_Size: 1 + m_Value: 0 + m_Size: 0.99999994 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -6679,6 +7213,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4787441538094188782} m_CullTransparentMesh: 1 +--- !u!1 &5017359089990763485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 135118099895439414} + m_Layer: 5 + m_Name: CompletedQuest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &135118099895439414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5017359089990763485} + 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: + - {fileID: 7691756626580674919} + m_Father: {fileID: 8532325058224575853} + 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} --- !u!1 &5060588774402513910 GameObject: m_ObjectHideFlags: 0 @@ -6712,7 +7282,7 @@ RectTransform: m_Father: {fileID: 8637385150641195092} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -6865,9 +7435,9 @@ RectTransform: m_Father: {fileID: 3876055368885639954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: -17} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3880366320823064457 CanvasRenderer: @@ -6955,9 +7525,9 @@ RectTransform: m_Father: {fileID: 4491822891276527056} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &536723218811273033 CanvasRenderer: @@ -7214,9 +7784,9 @@ RectTransform: m_Father: {fileID: 1962241777349435167} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &8730973958650118064 CanvasRenderer: @@ -7474,6 +8044,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 8268430600917994507} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5584013068972881911 GameObject: m_ObjectHideFlags: 0 @@ -7646,6 +8228,142 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5633389504192656249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3097600141765312524} + - component: {fileID: 7646314157350360823} + - component: {fileID: 1751571581238491511} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3097600141765312524 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5633389504192656249} + 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: 7705016881237931988} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 300} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7646314157350360823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5633389504192656249} + m_CullTransparentMesh: 1 +--- !u!114 &1751571581238491511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5633389504192656249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI + 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: events + 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: 36 + m_fontSizeBase: 36 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5652917536534232816 GameObject: m_ObjectHideFlags: 0 @@ -8091,9 +8809,9 @@ RectTransform: m_Father: {fileID: 3428204698449784346} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} --- !u!222 &3900347314901675441 CanvasRenderer: @@ -8176,8 +8894,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 4760075567392361995} m_HandleRect: {fileID: 5384227279536408190} m_Direction: 2 - m_Value: 0 - m_Size: 0.10704945 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8217,9 +8935,9 @@ RectTransform: m_Father: {fileID: 3876055368885639954} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &5746886293652869050 CanvasRenderer: @@ -8589,6 +9307,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6027800497090524118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5251358698974899163} + - component: {fileID: 1956342017196923970} + - component: {fileID: 6812313699242036110} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5251358698974899163 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6027800497090524118} + 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: 8815688695268144792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1956342017196923970 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6027800497090524118} + m_CullTransparentMesh: 1 +--- !u!114 &6812313699242036110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6027800497090524118} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 8f03a8a721d67c84eb485a11354614c3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6061182800533002577 GameObject: m_ObjectHideFlags: 0 @@ -8622,7 +9415,7 @@ RectTransform: m_Father: {fileID: 3610408492675600390} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.9999999, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -8774,9 +9567,9 @@ RectTransform: m_Father: {fileID: 8068581746560711683} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 1, y: 1} --- !u!222 &3603276246973647457 CanvasRenderer: @@ -9019,7 +9812,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000102996826, y: -0.00008282142} + m_AnchoredPosition: {x: 0.0000004582107, y: -0.000021135485} m_SizeDelta: {x: 0, y: 300} m_Pivot: {x: 0, y: 1} --- !u!114 &6628848959831924696 @@ -9222,7 +10015,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -748} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7502266542887470960 CanvasRenderer: @@ -9276,6 +10069,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_isVerbose: 1 m_adventurersSO: {fileID: 11400000, guid: e17bc4be959f945c492b56a466347639, type: 2} + _content: {fileID: 8585461738485252514} _adventurerPrefab: {fileID: 1341503220104474312, guid: 21765b2d0e5f0432abd4164ab6087032, type: 3} _photoStudio: {fileID: 0} --- !u!114 &5876571252886620074 @@ -9793,7 +10587,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_isVerbose: 1 - _questFactoryDatabase: {fileID: 11400000, guid: e8f120ee188e64915aef36c8454c8f68, type: 2} _panel: {fileID: 8627772138779158688} _questCardPrefab: {fileID: 6316715669414803120, guid: e000f0c5406f044fd8f7ca26d4324abb, type: 3} --- !u!1 &6737398237813950679 @@ -9863,8 +10656,8 @@ MonoBehaviour: m_Calls: [] m_text: quests_list m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} - m_sharedMaterial: {fileID: -624193526770214323, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10101,7 +10894,7 @@ RectTransform: m_Father: {fileID: 2480540214533913702} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -10285,8 +11078,8 @@ MonoBehaviour: m_Calls: [] m_text: heroes_list m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} - m_sharedMaterial: {fileID: -624193526770214323, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10490,6 +11283,83 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7385681040235734591 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7691756626580674919} + - component: {fileID: 3303333048785712956} + - component: {fileID: 7913355626988244472} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7691756626580674919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7385681040235734591} + 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: + - {fileID: 7267875684990974403} + - {fileID: 6819652725965201757} + m_Father: {fileID: 135118099895439414} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: 1500, y: 900} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3303333048785712956 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7385681040235734591} + m_CullTransparentMesh: 1 +--- !u!114 &7913355626988244472 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7385681040235734591} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: b68ad85e7013e644792dbadb4e6d0a36, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &7772260127023043379 GameObject: m_ObjectHideFlags: 0 @@ -10792,9 +11662,9 @@ RectTransform: m_Father: {fileID: 8068581746560711683} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_SizeDelta: {x: 0, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &3978262122137819446 CanvasRenderer: @@ -10916,7 +11786,7 @@ RectTransform: m_Father: {fileID: 6134261457785533790} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -11259,7 +12129,7 @@ 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.000061035156, y: -0.000045776367} + m_AnchoredPosition: {x: 0.00012207031, y: 0.000061035156} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5245041732441881304 @@ -11377,6 +12247,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_isVerbose: 1 _questLogPrefab: {fileID: 8916378548461795201, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + _logPanel: {fileID: 3261389646913874471} --- !u!1 &8295292878231353938 GameObject: m_ObjectHideFlags: 0 @@ -11502,9 +12373,9 @@ RectTransform: m_Father: {fileID: 1962241777349435167} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 20} + m_SizeDelta: {x: -17, y: 20} m_Pivot: {x: 0, y: 0} --- !u!222 &2829659717135124127 CanvasRenderer: @@ -11629,6 +12500,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8413631529226237978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7283145194436841440} + - component: {fileID: 2297981181212484859} + - component: {fileID: 8411840712986063543} + - component: {fileID: 4279882190326111622} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7283145194436841440 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413631529226237978} + 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: + - {fileID: 4141521778400496153} + m_Father: {fileID: 6819652725965201757} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!222 &2297981181212484859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413631529226237978} + m_CullTransparentMesh: 1 +--- !u!114 &8411840712986063543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413631529226237978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4279882190326111622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8413631529226237978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Scrollbar + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1727553568516756370} + m_HandleRect: {fileID: 6569702951716177080} + m_Direction: 2 + m_Value: 1 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8433489613274066227 GameObject: m_ObjectHideFlags: 0 @@ -12376,7 +13373,7 @@ RectTransform: 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_SizeDelta: {x: 0, y: -748} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6191225931018580379 CanvasRenderer: @@ -12563,7 +13560,7 @@ RectTransform: m_Father: {fileID: 3333784552561598407} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -12674,8 +13671,8 @@ MonoBehaviour: ' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} - m_sharedMaterial: {fileID: -624193526770214323, guid: 44cc5e4b4ce644394a7b14151c11fee3, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -13051,6 +14048,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8986205109650278055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6569702951716177080} + - component: {fileID: 850394018484125562} + - component: {fileID: 1727553568516756370} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6569702951716177080 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986205109650278055} + 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: 4141521778400496153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &850394018484125562 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986205109650278055} + m_CullTransparentMesh: 1 +--- !u!114 &1727553568516756370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8986205109650278055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + 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_Sprite: {fileID: 21300000, guid: 8f03a8a721d67c84eb485a11354614c3, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &9093184463853851874 GameObject: m_ObjectHideFlags: 0 @@ -13281,7 +14353,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 44.25 + m_fontSize: 42.7 m_fontSizeBase: 60 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -13461,6 +14533,112 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &1790048301584481922 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8137423015168411238} + m_Modifications: + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8916378548461795201, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_Name + value: QuestLog + objectReference: {fileID: 0} + - target: {fileID: 8916378548461795201, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} +--- !u!224 &4523294056981341506 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + m_PrefabInstance: {fileID: 1790048301584481922} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6268904676365327782 PrefabInstance: m_ObjectHideFlags: 0 @@ -13507,7 +14685,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} propertyPath: m_SizeDelta.y - value: 166.5 + value: 200 objectReference: {fileID: 0} - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} propertyPath: m_LocalPosition.x @@ -13539,11 +14717,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0003314452 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00010396581 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13561,11 +14739,17 @@ PrefabInstance: propertyPath: m_Name value: Content objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1915739530612085586, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} m_RemovedGameObjects: - {fileID: 2386806354432922595, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} - {fileID: 1146643167690284576, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} - m_AddedGameObjects: [] + - {fileID: 3665497870108466714, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + - {fileID: 422674636916425610, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2743378854649912256, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} + insertIndex: -1 + addedObject: {fileID: 4523294056981341506} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 8916378548461795201, guid: e35df6e18981f45ce84747c24f0e1de4, type: 3} insertIndex: -1 @@ -13594,10 +14778,10 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 diff --git a/Assets/_/Features/AudioSystem/Runtime/AudioManager.cs b/Assets/_/Features/AudioSystem/Runtime/AudioManager.cs index e26357ed..98913a2b 100644 --- a/Assets/_/Features/AudioSystem/Runtime/AudioManager.cs +++ b/Assets/_/Features/AudioSystem/Runtime/AudioManager.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; namespace AudioSystem.Runtime { - public class AudioManager : BaseMonobehaviour + public class AudioManager : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/AudioSystem/Runtime/LevelAudioHandler.cs b/Assets/_/Features/AudioSystem/Runtime/LevelAudioHandler.cs index 29339b0b..e442ed2b 100644 --- a/Assets/_/Features/AudioSystem/Runtime/LevelAudioHandler.cs +++ b/Assets/_/Features/AudioSystem/Runtime/LevelAudioHandler.cs @@ -3,7 +3,7 @@ using UnityEngine.SceneManagement; namespace Core.Runtime { - public class SceneLoader : BaseMonobehaviour + public class SceneLoader : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Cheat/Runtime/Cheat.cs b/Assets/_/Features/Cheat/Runtime/Cheat.cs index 53136454..5d06fb24 100644 --- a/Assets/_/Features/Cheat/Runtime/Cheat.cs +++ b/Assets/_/Features/Cheat/Runtime/Cheat.cs @@ -8,7 +8,7 @@ using UnityEngine.SceneManagement; namespace Cheat.Runtime { - public class Cheat : BaseMonobehaviour + public class Cheat : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Core/Runtime/BaseMonoBehaviour.cs b/Assets/_/Features/Core/Runtime/BaseMonoBehaviour.cs index 0badbe02..fb58dac8 100644 --- a/Assets/_/Features/Core/Runtime/BaseMonoBehaviour.cs +++ b/Assets/_/Features/Core/Runtime/BaseMonoBehaviour.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Core.Runtime { - public class BaseMonobehaviour : MonoBehaviour + public class BaseMonoBehaviour : MonoBehaviour { #region Publics @@ -101,9 +101,14 @@ namespace Core.Runtime #region DEBUG - protected void Info(string message) + protected void Info(string message, Color color) { - Debug.Log(message); + if (color == null) + { + color = Color.aliceBlue; + } + + Debug.Log($"{message}"); } protected void Error(string message) diff --git a/Assets/_/Features/Core/Runtime/FactsSystem/FactDictionary.cs b/Assets/_/Features/Core/Runtime/FactsSystem/FactDictionary.cs index 924a9a8b..ba7f5311 100644 --- a/Assets/_/Features/Core/Runtime/FactsSystem/FactDictionary.cs +++ b/Assets/_/Features/Core/Runtime/FactsSystem/FactDictionary.cs @@ -29,14 +29,14 @@ namespace Core.Runtime return false; } - public void SetFact(string key, T value, BaseMonobehaviour.FactPersistence persistence) + public void SetFact(string key, T value, BaseMonoBehaviour.FactPersistence persistence) { if (_facts.TryGetValue(key, out var existingFact)) { if (existingFact is Fact typedFact) { typedFact.Value = value; - typedFact.IsPersistent = persistence == BaseMonobehaviour.FactPersistence.Persistent; + typedFact.IsPersistent = persistence == BaseMonoBehaviour.FactPersistence.Persistent; } else { @@ -45,7 +45,7 @@ namespace Core.Runtime } else { - bool isPersistent = persistence == BaseMonobehaviour.FactPersistence.Persistent; + bool isPersistent = persistence == BaseMonoBehaviour.FactPersistence.Persistent; _facts[key] = new Fact(value, isPersistent); } } diff --git a/Assets/_/Features/Core/Runtime/GameManager.cs b/Assets/_/Features/Core/Runtime/GameManager.cs index b53945a7..49ac34c1 100644 --- a/Assets/_/Features/Core/Runtime/GameManager.cs +++ b/Assets/_/Features/Core/Runtime/GameManager.cs @@ -7,7 +7,7 @@ using UnityEngine.SceneManagement; namespace Core.Runtime { - public class GameManager: BaseMonobehaviour + public class GameManager: BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Core/Runtime/LocalizationSystem.cs b/Assets/_/Features/Core/Runtime/LocalizationSystem.cs index a4ed5eeb..bb2b6b28 100644 --- a/Assets/_/Features/Core/Runtime/LocalizationSystem.cs +++ b/Assets/_/Features/Core/Runtime/LocalizationSystem.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace Core.Runtime { - public class LocalizationSystem : BaseMonobehaviour + public class LocalizationSystem : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Core/Runtime/SceneLoader.cs b/Assets/_/Features/Core/Runtime/SceneLoader.cs index a4818f23..48146b06 100644 --- a/Assets/_/Features/Core/Runtime/SceneLoader.cs +++ b/Assets/_/Features/Core/Runtime/SceneLoader.cs @@ -6,7 +6,7 @@ using Random = UnityEngine.Random; namespace Core.Runtime { - public class SceneLoader : BaseMonobehaviour + public class SceneLoader : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Core/Runtime/UIManager.cs b/Assets/_/Features/Core/Runtime/UIManager.cs index 3525cea1..a0fe18cc 100644 --- a/Assets/_/Features/Core/Runtime/UIManager.cs +++ b/Assets/_/Features/Core/Runtime/UIManager.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace Core.Runtime { - public class UIManager : BaseMonobehaviour + public class UIManager : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Decor/Runtime/AdventurerApearanceSpawner.cs b/Assets/_/Features/Decor/Runtime/AdventurerApearanceSpawner.cs index d825c902..edad8255 100644 --- a/Assets/_/Features/Decor/Runtime/AdventurerApearanceSpawner.cs +++ b/Assets/_/Features/Decor/Runtime/AdventurerApearanceSpawner.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace Decor.Runtime { - public class AdventurerApearanceSpawner : BaseMonobehaviour + public class AdventurerApearanceSpawner : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Decor/Runtime/AdventurerModelBinder.cs b/Assets/_/Features/Decor/Runtime/AdventurerModelBinder.cs index 49f16e3b..86ac8f5c 100644 --- a/Assets/_/Features/Decor/Runtime/AdventurerModelBinder.cs +++ b/Assets/_/Features/Decor/Runtime/AdventurerModelBinder.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Decor.Runtime { - public class AdventurerModelBinder : BaseMonobehaviour + public class AdventurerModelBinder : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Decor/Runtime/Portrait/PortraitGenerator.cs b/Assets/_/Features/Decor/Runtime/Portrait/PortraitGenerator.cs index 4c229320..829ebca7 100644 --- a/Assets/_/Features/Decor/Runtime/Portrait/PortraitGenerator.cs +++ b/Assets/_/Features/Decor/Runtime/Portrait/PortraitGenerator.cs @@ -9,7 +9,7 @@ using UnityEngine.AI; namespace Decor.Runtime { - public class PortraitGenerator : BaseMonobehaviour + public class PortraitGenerator : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Decor/Runtime/Portrait/TakePhoto.cs b/Assets/_/Features/Decor/Runtime/Portrait/TakePhoto.cs index ebd66733..ad514dd5 100644 --- a/Assets/_/Features/Decor/Runtime/Portrait/TakePhoto.cs +++ b/Assets/_/Features/Decor/Runtime/Portrait/TakePhoto.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; namespace _.Features.Decor.Runtime { - public class TakePhoto : BaseMonobehaviour + public class TakePhoto : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Decor/Runtime/QuestSign.cs b/Assets/_/Features/Decor/Runtime/QuestSign.cs index 9eb1ec28..5cd04dcd 100644 --- a/Assets/_/Features/Decor/Runtime/QuestSign.cs +++ b/Assets/_/Features/Decor/Runtime/QuestSign.cs @@ -9,7 +9,7 @@ using UnityEngine; namespace Decor.Runtime { - public class QuestSign: BaseMonobehaviour + public class QuestSign: BaseMonoBehaviour { #region private & protected diff --git a/Assets/_/Features/GoalSystem/Runtime/GoalSystem.cs b/Assets/_/Features/GoalSystem/Runtime/GoalSystem.cs index 8160d332..b49ceacd 100644 --- a/Assets/_/Features/GoalSystem/Runtime/GoalSystem.cs +++ b/Assets/_/Features/GoalSystem/Runtime/GoalSystem.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace Goals.Runtime { - public class GoalSystem : BaseMonobehaviour + public class GoalSystem : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/LoadGame/LoadGame.cs b/Assets/_/Features/MenuSystem/Runtime/LoadGame/LoadGame.cs index 02b36ef5..037d4c62 100644 --- a/Assets/_/Features/MenuSystem/Runtime/LoadGame/LoadGame.cs +++ b/Assets/_/Features/MenuSystem/Runtime/LoadGame/LoadGame.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace MenuSystem.Runtime.LoadGame { - public class LoadGame : BaseMonobehaviour + public class LoadGame : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/MenuManager.cs b/Assets/_/Features/MenuSystem/Runtime/MenuManager.cs index e9b3a86f..d6dc3adc 100644 --- a/Assets/_/Features/MenuSystem/Runtime/MenuManager.cs +++ b/Assets/_/Features/MenuSystem/Runtime/MenuManager.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; namespace MenuSystem.Runtime { - public class MenuManager : BaseMonobehaviour + public class MenuManager : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/NewGame/NewGame.cs b/Assets/_/Features/MenuSystem/Runtime/NewGame/NewGame.cs index 57c8be65..80f6037b 100644 --- a/Assets/_/Features/MenuSystem/Runtime/NewGame/NewGame.cs +++ b/Assets/_/Features/MenuSystem/Runtime/NewGame/NewGame.cs @@ -10,7 +10,7 @@ using UnityEngine; namespace MenuSystem.Runtime { - public class NewGame : BaseMonobehaviour + public class NewGame : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/Pause/PauseMenu.cs b/Assets/_/Features/MenuSystem/Runtime/Pause/PauseMenu.cs index 37c7ceef..7f3bf3ae 100644 --- a/Assets/_/Features/MenuSystem/Runtime/Pause/PauseMenu.cs +++ b/Assets/_/Features/MenuSystem/Runtime/Pause/PauseMenu.cs @@ -5,7 +5,7 @@ using Cursor = UnityEngine.Cursor; namespace MenuSystem.Runtime { - public class PauseMenu : BaseMonobehaviour + public class PauseMenu : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/Settings/AudioMenuModule.cs b/Assets/_/Features/MenuSystem/Runtime/Settings/AudioMenuModule.cs index 609a3f9d..e2a334bd 100644 --- a/Assets/_/Features/MenuSystem/Runtime/Settings/AudioMenuModule.cs +++ b/Assets/_/Features/MenuSystem/Runtime/Settings/AudioMenuModule.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace MenuSystem.Runtime.Settings { - public class AudioMenuModule : BaseMonobehaviour, IMenuModule + public class AudioMenuModule : BaseMonoBehaviour, IMenuModule { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/Settings/SettingsMenu.cs b/Assets/_/Features/MenuSystem/Runtime/Settings/SettingsMenu.cs index 3c800a11..da56ac75 100644 --- a/Assets/_/Features/MenuSystem/Runtime/Settings/SettingsMenu.cs +++ b/Assets/_/Features/MenuSystem/Runtime/Settings/SettingsMenu.cs @@ -5,7 +5,7 @@ using UnityEngine.UI; namespace MenuSystem.Runtime { - public class SettingsMenu : BaseMonobehaviour + public class SettingsMenu : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/MenuSystem/Runtime/TitleScreen/TitleScreen.cs b/Assets/_/Features/MenuSystem/Runtime/TitleScreen/TitleScreen.cs index 58114578..3e628bfb 100644 --- a/Assets/_/Features/MenuSystem/Runtime/TitleScreen/TitleScreen.cs +++ b/Assets/_/Features/MenuSystem/Runtime/TitleScreen/TitleScreen.cs @@ -7,7 +7,7 @@ using UnityEngine; namespace MenuSystem.Runtime.TitleScreen { - public class TitleScreen : BaseMonobehaviour + public class TitleScreen : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Player/Runtime/Deplacements.cs b/Assets/_/Features/Player/Runtime/Deplacements.cs index 2d8afab1..81d6920e 100644 --- a/Assets/_/Features/Player/Runtime/Deplacements.cs +++ b/Assets/_/Features/Player/Runtime/Deplacements.cs @@ -5,7 +5,7 @@ using UnityEngine.Serialization; namespace Player.Runtime { - public class Deplacements : BaseMonobehaviour + public class Deplacements : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs b/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs new file mode 100644 index 00000000..ce665fc1 --- /dev/null +++ b/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs @@ -0,0 +1,44 @@ +using Core.Runtime; +using UnityEngine; + +namespace Quests.Runtime +{ + public class QuestHistory : BaseMonoBehaviour + { + + #region Publics + + // + + #endregion + + + #region Unity API + + // + + #endregion + + + #region Main Methods + + // + + #endregion + + + #region Utils + + /* Fonctions privées utiles */ + + #endregion + + + #region Privates and Protected + + [SerializeField] TextMesh _historyContent; + + #endregion + } +} + diff --git a/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs.meta b/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs.meta new file mode 100644 index 00000000..8931a31a --- /dev/null +++ b/Assets/_/Features/Quests/Runtime/Events/QuestHistory.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a360a2299eba4e078acfa47eac0464e3 +timeCreated: 1760204281 \ No newline at end of file diff --git a/Assets/_/Features/Quests/Runtime/QuestInitializer.cs b/Assets/_/Features/Quests/Runtime/QuestInitializer.cs index c2ee00b1..e661ec89 100644 --- a/Assets/_/Features/Quests/Runtime/QuestInitializer.cs +++ b/Assets/_/Features/Quests/Runtime/QuestInitializer.cs @@ -5,7 +5,7 @@ using UnityEngine; namespace Quests.Runtime._.Features.Quests { - public class QuestInitializer : BaseMonobehaviour + public class QuestInitializer : BaseMonoBehaviour { void Awake() { diff --git a/Assets/_/Features/Quests/Runtime/QuestManager.cs b/Assets/_/Features/Quests/Runtime/QuestManager.cs index 18ca2ef0..b1407de1 100644 --- a/Assets/_/Features/Quests/Runtime/QuestManager.cs +++ b/Assets/_/Features/Quests/Runtime/QuestManager.cs @@ -10,7 +10,7 @@ using Random = UnityEngine.Random; namespace Quests.Runtime { - public class QuestManager : BaseMonobehaviour + public class QuestManager : BaseMonoBehaviour { #region Singleton @@ -33,6 +33,8 @@ namespace Quests.Runtime public static event Action OnEventFromQuest; public static event Action> OnAvailableQuestsUpdated; + public static event Action OnCheckStateQuest; + #endregion #region Unity API @@ -77,6 +79,9 @@ namespace Quests.Runtime if (_activeQuests == null) _activeQuests = new List(); if (_completedQuests == null) _completedQuests = new List(); if (_disponibleQuests == null) _disponibleQuests = new List(); + + // On Check L'état des quêtes avant toutes choses + CheckStateQuest(); } #endregion @@ -174,12 +179,24 @@ namespace Quests.Runtime /// public void NotifyCompletedQuests() { - foreach (var quest in _completedQuests) + foreach (QuestClass quest in _completedQuests) { OnQuestCompleted?.Invoke(quest); } } + public void CheckStateQuest() + { + List quests = GetFact>("accepted_quests"); + + if (quests == null) return; + + foreach (QuestClass quest in quests) + { + OnCheckStateQuest?.Invoke(quest); + } + } + /// /// Récupère l'historique des events lié à une quête /// @@ -334,10 +351,9 @@ namespace Quests.Runtime AdventurerClass adventurer = QuestClass.GetOneAdventurerFromId(adventurerId); if (adventurer == null) { - Info($"Aventurer {adventurerId} introuvable"); continue; } - Info($"{adventurer.Name} est dans la team avec le status dispo : {adventurer.IsAvailable}"); + if (adventurer != null && adventurer.IsAvailable == false) { adventurer.IsAvailable = true; @@ -346,7 +362,7 @@ namespace Quests.Runtime } if (anyChanged) { - Info("Comme les données on changées, on les sauvegarde."); + SaveFacts(); } } diff --git a/Assets/_/Features/Tests/Editor/QuestManagerTests.cs b/Assets/_/Features/Tests/Editor/QuestManagerTests.cs index 7ec77042..306d3b7f 100644 --- a/Assets/_/Features/Tests/Editor/QuestManagerTests.cs +++ b/Assets/_/Features/Tests/Editor/QuestManagerTests.cs @@ -24,11 +24,11 @@ namespace GuildTycoon.Tests.Editor // Ensure profile and base facts are set _gameManager.Profile = "UnitTestProfile"; _gameManager.Fact = new FactDictionnary(); - GameManager.m_gameFacts = _gameManager.Fact; // ensure BaseMonobehaviour access works + GameManager.m_gameFacts = _gameManager.Fact; // ensure BaseMonoBehaviour access works // Pre-seed facts used by QuestManager - _gameManager.Fact.SetFact("accepted_quests", new List(), BaseMonobehaviour.FactPersistence.Normal); - _gameManager.Fact.SetFact("events_quests_history", new Dictionary>(), BaseMonobehaviour.FactPersistence.Normal); + _gameManager.Fact.SetFact("accepted_quests", new List(), BaseMonoBehaviour.FactPersistence.Normal); + _gameManager.Fact.SetFact("events_quests_history", new Dictionary>(), BaseMonoBehaviour.FactPersistence.Normal); // Create QuestManager _qmGO = new GameObject("QuestManager_Test"); @@ -64,7 +64,7 @@ namespace GuildTycoon.Tests.Editor // Seed facts with the same quest so QuestManager can update saved state var accepted = new List { new QuestClass(questId, quest.Name, quest.Description, quest.Objective, quest.Duration, quest.Difficulty, quest.Rewards, quest.MinLevel) { State = QuestStateEnum.InProgress } }; - _gameManager.Fact.SetFact("accepted_quests", accepted, BaseMonobehaviour.FactPersistence.Normal); + _gameManager.Fact.SetFact("accepted_quests", accepted, BaseMonoBehaviour.FactPersistence.Normal); QuestClass completedRaised = null; Action handler = q => completedRaised = q; diff --git a/Assets/_/Features/Tests/Runtime/AutoLoaderGame.cs b/Assets/_/Features/Tests/Runtime/AutoLoaderGame.cs index 18a85c60..8fff7f3f 100644 --- a/Assets/_/Features/Tests/Runtime/AutoLoaderGame.cs +++ b/Assets/_/Features/Tests/Runtime/AutoLoaderGame.cs @@ -4,7 +4,7 @@ using UnityEngine.SceneManagement; namespace TestFacts.Runtime { - public class AutoLoaderGame : BaseMonobehaviour + public class AutoLoaderGame : BaseMonoBehaviour { #region Publics diff --git a/Assets/_/Features/Tests/Runtime/TestFacts.cs b/Assets/_/Features/Tests/Runtime/TestFacts.cs index db64d0d2..747fe865 100644 --- a/Assets/_/Features/Tests/Runtime/TestFacts.cs +++ b/Assets/_/Features/Tests/Runtime/TestFacts.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace TestFacts.Runtime { - public class TestFacts : BaseMonobehaviour + public class TestFacts : BaseMonoBehaviour { string _fact; @@ -60,7 +60,7 @@ namespace TestFacts.Runtime { foreach (var fact in GetAllFacts()) { - Info($"Fact[{fact.Key}] = {fact.Value}"); + Info($"Fact[{fact.Key}] = {fact.Value}", Color.aliceBlue); } } } diff --git a/Assets/_/Features/Tests/Runtime/Triche.cs b/Assets/_/Features/Tests/Runtime/Triche.cs index a29f879a..cf7f335b 100644 --- a/Assets/_/Features/Tests/Runtime/Triche.cs +++ b/Assets/_/Features/Tests/Runtime/Triche.cs @@ -7,14 +7,14 @@ using UnityEngine; namespace TestFacts.Runtime { - public class Triche : BaseMonobehaviour + public class Triche : BaseMonoBehaviour { [ContextMenu("Add 99999 Gold")] void AddInfiniteGold() { PlayerClass profile = GetFact(GameManager.Instance.Profile); profile.Money = 99999; - Info("➕99999 Gold added"); + Info("➕99999 Gold added", Color.green); SaveFacts(); } diff --git a/Assets/_/Features/UI.meta b/Assets/_/Features/UI.meta index bfa2da53..7ff68763 100644 --- a/Assets/_/Features/UI.meta +++ b/Assets/_/Features/UI.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 1af87ae38a8c4cc392838e512ee0a5a7 -timeCreated: 1753972331 \ No newline at end of file +guid: 9d93f672c88e468a91bf9a1881447d3d +timeCreated: 1760972259 \ No newline at end of file diff --git a/Assets/_/Features/UI/Runtime.meta b/Assets/_/Features/UI/Runtime.meta index 282ce22b..06ba8479 100644 --- a/Assets/_/Features/UI/Runtime.meta +++ b/Assets/_/Features/UI/Runtime.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 70056d884cd64fc182b3fb1051cf37f6 -timeCreated: 1753972353 \ No newline at end of file +guid: c7346c50ac9344e887b8f4b585e19507 +timeCreated: 1760972269 \ No newline at end of file diff --git a/Assets/_/Features/UI/Runtime/.DS_Store b/Assets/_/Features/UI/Runtime/.DS_Store deleted file mode 100644 index 6af426cb..00000000 Binary files a/Assets/_/Features/UI/Runtime/.DS_Store and /dev/null differ diff --git a/Assets/_/Features/UI/Runtime/Adventurers.meta b/Assets/_/Features/UI/Runtime/Adventurers.meta index 0573b706..b38e1652 100644 --- a/Assets/_/Features/UI/Runtime/Adventurers.meta +++ b/Assets/_/Features/UI/Runtime/Adventurers.meta @@ -1,3 +1,3 @@ fileFormatVersion: 2 -guid: 2d3f76b5fab34eb4a7a72108fc94d9ff -timeCreated: 1754227951 \ No newline at end of file +guid: 6fb8b539b31e4439bab43c1385c6091c +timeCreated: 1760972333 \ No newline at end of file diff --git a/Assets/_/Features/UI/Runtime/Adventurers/.DS_Store b/Assets/_/Features/UI/Runtime/Adventurers/.DS_Store deleted file mode 100644 index f686f2b7..00000000 Binary files a/Assets/_/Features/UI/Runtime/Adventurers/.DS_Store and /dev/null differ diff --git a/Assets/_/Features/UI/Runtime/Adventurers/AdventurerCardSelectionnable.cs b/Assets/_/Features/UI/Runtime/Adventurers/AdventurerCardSelectionnable.cs deleted file mode 100644 index a0d53622..00000000 --- a/Assets/_/Features/UI/Runtime/Adventurers/AdventurerCardSelectionnable.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using Adventurer.Runtime; -using Core.Runtime; -using EventSystem.Runtime; -using Quests.Runtime; -using UnityEngine; -using UnityEngine.UI; - -namespace GameUI.Runtime -{ - public class AdventurerCardSelectionnable : BaseMonobehaviour - { - - #region Publics - - public Sprite m_selectedSprite; - public Sprite m_unselectedSprite; - public GameObject m_BGSprite; - - #endregion - - - #region Unity API - - void Start() - { - _adventurer = GetComponent().Adventurer; - } - - void Update() - { - if (_isSelected) - { - m_BGSprite.GetComponent().sprite = m_selectedSprite; - } - else - { - m_BGSprite.GetComponent().sprite = m_unselectedSprite; - } - } - - #endregion - - - #region Main Methods - - public void OnClick() - { - if (!QuestManager.Instance.CanSelectedAdventurers()) - { - gameObject.GetComponent