diff --git a/Assets/AddressableAssetsData/AssetGroups/BlokkemonCards.asset b/Assets/AddressableAssetsData/AssetGroups/BlokkemonCards.asset index a13c2f31..e5f366a3 100644 --- a/Assets/AddressableAssetsData/AssetGroups/BlokkemonCards.asset +++ b/Assets/AddressableAssetsData/AssetGroups/BlokkemonCards.asset @@ -15,8 +15,38 @@ MonoBehaviour: m_GroupName: BlokkemonCards m_GUID: 0d5d36d6da388314b92b9c6967d23f39 m_SerializeEntries: - - m_GUID: 28dbfbd7a6b2cd84b8274bd1126b220b - m_Address: Assets/Data/Cards/Card_Test example card 2 (Copy).asset + - m_GUID: 1fe09914d65c6d2429e917359ed54122 + m_Address: Assets/Data/Cards/Card_HR PimpSten (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 20ad613524eea614aacfc7d87629dfdc + m_Address: Assets/Data/Cards/Card_Brosten (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 2c9a605210e7f1b48bc66baef17f18cf + m_Address: Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3e507a1198083f747bf8f14f1dfc9daa + m_Address: Assets/Data/Cards/Card_Mormor Marmor (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 3f4654d849af5ef4d81e0bccacfe03e8 + m_Address: Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 42b258acaccec1c4c8a271b34f5c0ba9 + m_Address: Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset m_ReadOnly: 0 m_SerializedLabels: - BlokkemonCard @@ -27,38 +57,32 @@ MonoBehaviour: m_SerializedLabels: - BlokkemonCard FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 5d8121cdf52bfe9488b40ed22d649209 - m_Address: Assets/Data/Cards/Card_New Card 1.asset - m_ReadOnly: 0 - m_SerializedLabels: - - BlokkemonCard - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 6afed7a67f64404418f905e7808bf5cb - m_Address: Assets/Data/Cards/Card_Test example card 3 (Copy).asset - m_ReadOnly: 0 - m_SerializedLabels: - - BlokkemonCard - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 8f02c3699de87014bac8c03b96772a4b - m_Address: Assets/Data/Cards/Card_Test example card (Copy).asset - m_ReadOnly: 0 - m_SerializedLabels: - - BlokkemonCard - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 8fdeae7881d130f408e0f31c101ab41f - m_Address: Assets/Data/Cards/Card_Test example card (Copy) 1.asset - m_ReadOnly: 0 - m_SerializedLabels: - - BlokkemonCard - FlaggedDuringContentUpdateRestriction: 0 - m_GUID: 91031de62f795884e8e2ccbaebeebf9b m_Address: Assets/Data/Cards/Card_New Card.asset m_ReadOnly: 0 m_SerializedLabels: - BlokkemonCard FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: dec49537f6ae6d241acf8275eaa6c653 - m_Address: Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset + - m_GUID: 935dc5e5a05e0d443b263cceb57df300 + m_Address: Assets/Data/Cards/Card_New Card 4.asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: b7c519c4abc0edf4897168c699d9f250 + m_Address: Assets/Data/Cards/Card_HRKvarts (Copy).asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: ba36d0f7b72437d46aef231a1ed79110 + m_Address: Assets/Data/Cards/Card_New Card 3.asset + m_ReadOnly: 0 + m_SerializedLabels: + - BlokkemonCard + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: e1af518c607db864498329308e3dcc76 + m_Address: Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset m_ReadOnly: 0 m_SerializedLabels: - BlokkemonCard diff --git a/Assets/Art/Textures/Cards.meta b/Assets/Art/Textures/Cards.meta new file mode 100644 index 00000000..4f14d2b9 --- /dev/null +++ b/Assets/Art/Textures/Cards.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1f1b26b0fd417b4a97f36e50b142510 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/Booster.png b/Assets/Art/Textures/Cards/Booster.png new file mode 100644 index 00000000..e511e1a3 Binary files /dev/null and b/Assets/Art/Textures/Cards/Booster.png differ diff --git a/Assets/Art/Textures/Cards/Booster.png.meta b/Assets/Art/Textures/Cards/Booster.png.meta new file mode 100644 index 00000000..9fa798cd --- /dev/null +++ b/Assets/Art/Textures/Cards/Booster.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 9dac643e78ad86e4988c11a92f9c7a6d +TextureImporter: + internalIDToNameTable: + - first: + 213: 4365544765984126881 + second: Booster_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: Booster_0 + rect: + serializedVersion: 2 + x: 11 + y: 17 + width: 411 + height: 729 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 1a7bc83c5d7859c30800000000000000 + internalID: 4365544765984126881 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Booster_0: 4365544765984126881 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/Brosten.png b/Assets/Art/Textures/Cards/Brosten.png new file mode 100644 index 00000000..a5cdb20f Binary files /dev/null and b/Assets/Art/Textures/Cards/Brosten.png differ diff --git a/Assets/Art/Textures/Cards/Brosten.png.meta b/Assets/Art/Textures/Cards/Brosten.png.meta new file mode 100644 index 00000000..578ee4c5 --- /dev/null +++ b/Assets/Art/Textures/Cards/Brosten.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 88427f554aebb2a49a9bc9705bb0f7bf +TextureImporter: + internalIDToNameTable: + - first: + 213: -6028342126936659889 + second: Brosten 1_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: Brosten 1_0 + rect: + serializedVersion: 2 + x: 42 + y: 202 + width: 504 + height: 174 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f48ea6b66c6075ca0800000000000000 + internalID: -6028342126936659889 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Brosten 1_0: -6028342126936659889 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/HRKvarts.png b/Assets/Art/Textures/Cards/HRKvarts.png new file mode 100644 index 00000000..479ab3d9 Binary files /dev/null and b/Assets/Art/Textures/Cards/HRKvarts.png differ diff --git a/Assets/Art/Textures/Cards/HRKvarts.png.meta b/Assets/Art/Textures/Cards/HRKvarts.png.meta new file mode 100644 index 00000000..f5709632 --- /dev/null +++ b/Assets/Art/Textures/Cards/HRKvarts.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 57aacc442c45ede49af137c00df8f2da +TextureImporter: + internalIDToNameTable: + - first: + 213: 7622336620039435694 + second: HRKvarts 1_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: HRKvarts 1_0 + rect: + serializedVersion: 2 + x: 5 + y: 4 + width: 567 + height: 566 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ea5f6e365caf7c960800000000000000 + internalID: 7622336620039435694 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + HRKvarts 1_0: 7622336620039435694 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/HRPimpsten.png b/Assets/Art/Textures/Cards/HRPimpsten.png new file mode 100644 index 00000000..38992237 Binary files /dev/null and b/Assets/Art/Textures/Cards/HRPimpsten.png differ diff --git a/Assets/Art/Textures/Cards/HRPimpsten.png.meta b/Assets/Art/Textures/Cards/HRPimpsten.png.meta new file mode 100644 index 00000000..c7fcc3c5 --- /dev/null +++ b/Assets/Art/Textures/Cards/HRPimpsten.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: ab39d3c28640d3646ada092af9b639e6 +TextureImporter: + internalIDToNameTable: + - first: + 213: 2928974366146460655 + second: HRPimpsten 1_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: HRPimpsten 1_0 + rect: + serializedVersion: 2 + x: 44 + y: 114 + width: 529 + height: 419 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: feb726aeaaec5a820800000000000000 + internalID: 2928974366146460655 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + HRPimpsten 1_0: 2928974366146460655 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/MormorMarmor.png b/Assets/Art/Textures/Cards/MormorMarmor.png new file mode 100644 index 00000000..acb38112 Binary files /dev/null and b/Assets/Art/Textures/Cards/MormorMarmor.png differ diff --git a/Assets/Art/Textures/Cards/MormorMarmor.png.meta b/Assets/Art/Textures/Cards/MormorMarmor.png.meta new file mode 100644 index 00000000..46f7e685 --- /dev/null +++ b/Assets/Art/Textures/Cards/MormorMarmor.png.meta @@ -0,0 +1,208 @@ +fileFormatVersion: 2 +guid: c28c2d55edc2fbc4baf57d2672c0c3df +TextureImporter: + internalIDToNameTable: + - first: + 213: 8096915581896476643 + second: MormorMarmor 1_0 + - first: + 213: -1061958557215928755 + second: MormorMarmor 1_1 + - first: + 213: 8399826700379746764 + second: MormorMarmor 1_2 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: MormorMarmor 1_0 + rect: + serializedVersion: 2 + x: 127 + y: 102 + width: 330 + height: 446 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 3e7c34b82d50e5070800000000000000 + internalID: 8096915581896476643 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MormorMarmor 1_1 + rect: + serializedVersion: 2 + x: 520 + y: 417 + width: 7 + height: 10 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: d4e45f6915a2341f0800000000000000 + internalID: -1061958557215928755 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: MormorMarmor 1_2 + rect: + serializedVersion: 2 + x: 262 + y: 89 + width: 15 + height: 7 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: cc1f9fa31ed229470800000000000000 + internalID: 8399826700379746764 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + MormorMarmor 1_0: 8096915581896476643 + MormorMarmor 1_1: -1061958557215928755 + MormorMarmor 1_2: 8399826700379746764 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Textures/Cards/RareBackground.png b/Assets/Art/Textures/Cards/RareBackground.png new file mode 100644 index 00000000..8b2a922c Binary files /dev/null and b/Assets/Art/Textures/Cards/RareBackground.png differ diff --git a/Assets/Art/Textures/Cards/RareBackground.png.meta b/Assets/Art/Textures/Cards/RareBackground.png.meta new file mode 100644 index 00000000..3e70dfc6 --- /dev/null +++ b/Assets/Art/Textures/Cards/RareBackground.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 84f17bef73bbc2a45b42b5e6d16035a3 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5681091294098912270 + second: RareBackground_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: Android + 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: + - serializedVersion: 2 + name: RareBackground_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 593 + height: 801 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2fb8ba65195b821b0800000000000000 + internalID: -5681091294098912270 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + RareBackground_0: -5681091294098912270 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/CardVisualConfig.asset b/Assets/Data/Cards/CardVisualConfig.asset index 81ff7c03..875a28c3 100644 --- a/Assets/Data/Cards/CardVisualConfig.asset +++ b/Assets/Data/Cards/CardVisualConfig.asset @@ -14,28 +14,24 @@ MonoBehaviour: m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardVisualConfig rarityColors: - rarity: 0 - color: {r: 0.7132075, g: 0.4388013, b: 0, a: 1} - - rarity: 1 - color: {r: 0, g: 0.6603774, b: 0.10775841, a: 1} + color: {r: 0.9528302, g: 0.5321085, b: 0.30113026, a: 1} - rarity: 2 - color: {r: 0, g: 0.19755316, b: 1, a: 1} - - rarity: 3 - color: {r: 0.5849056, g: 0, b: 0.4619053, a: 1} + color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 1} - rarity: 4 - color: {r: 0.96563864, g: 1, b: 0.0056602955, a: 1} + color: {r: 1, g: 0.85694367, b: 0.0039215684, a: 1} zoneVisuals: - zone: 0 - color: {r: 0.8, g: 0.9, b: 0.8, a: 1} + color: {r: 0.9150943, g: 0.41006586, b: 0.65010196, a: 1} backgroundShape: {fileID: 8542402908941169558, guid: 84a9632f9bdc1ee4bab91cf4b764b5f7, type: 3} - - zone: 1 - color: {r: 0.85, g: 0.8, b: 0.7, a: 1} + - zone: 3 + color: {r: 0.49056602, g: 0.3064167, b: 0.22908506, a: 1} backgroundShape: {fileID: -1529071355430692878, guid: 84a9632f9bdc1ee4bab91cf4b764b5f7, type: 3} - zone: 2 - color: {r: 0.6, g: 0.8, b: 0.6, a: 1} + color: {r: 0.5695372, g: 0.8867924, b: 0.45594516, a: 1} backgroundShape: {fileID: 1152548570994208632, guid: 84a9632f9bdc1ee4bab91cf4b764b5f7, type: 3} - - zone: 3 - color: {r: 0.7, g: 0.7, b: 0.9, a: 1} + - zone: 1 + color: {r: 0.36561054, g: 0.59123904, b: 0.9811321, a: 1} backgroundShape: {fileID: 8542402908941169558, guid: 84a9632f9bdc1ee4bab91cf4b764b5f7, type: 3} - zone: 4 - color: {r: 0.9, g: 0.85, b: 0.7, a: 1} + color: {r: 0.5943396, g: 0.5943396, b: 0.58592916, a: 1} backgroundShape: {fileID: -1529071355430692878, guid: 84a9632f9bdc1ee4bab91cf4b764b5f7, type: 3} diff --git a/Assets/Data/Cards/Card_New Card 1.asset b/Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset similarity index 68% rename from Assets/Data/Cards/Card_New Card 1.asset rename to Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset index 62926c8d..1d0a69ae 100644 --- a/Assets/Data/Cards/Card_New Card 1.asset +++ b/Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_New Card 1 + m_Name: Card_Brosten (Copy) (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: f3faeebd-41fd-4a5c-b021-366ed5170f0c - Name: Test #1 + Id: 28b4b8b5-667c-49d0-9c4d-d9d513e9e689 + Name: Brosten Description: Description goes here Rarity: 4 - Zone: 2 - CardImage: {fileID: -4209461767521648114, guid: 95abe5ab485a1c64b977f3dd2aff5256, type: 3} - CollectionIndex: 6 + Zone: 1 + CardImage: {fileID: -6028342126936659889, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} + CollectionIndex: 8 diff --git a/Assets/Data/Cards/Card_Test example card (Copy).asset.meta b/Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset.meta similarity index 79% rename from Assets/Data/Cards/Card_Test example card (Copy).asset.meta rename to Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset.meta index 11307de5..31d4d246 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy).asset.meta +++ b/Assets/Data/Cards/Card_Brosten (Copy) (Copy).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f02c3699de87014bac8c03b96772a4b +guid: 2c9a605210e7f1b48bc66baef17f18cf NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset b/Assets/Data/Cards/Card_Brosten (Copy).asset similarity index 62% rename from Assets/Data/Cards/Card_Test example card 3 (Copy).asset rename to Assets/Data/Cards/Card_Brosten (Copy).asset index 65f340a6..927b9ffb 100644 --- a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset +++ b/Assets/Data/Cards/Card_Brosten (Copy).asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Test example card 3 (Copy) + m_Name: Card_Brosten (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 1afdfea7-ca85-45ae-bd2c-3814729e628d - Name: Test #7 - Description: Some example description + Id: c04b7d9c-bb6b-470c-a97c-fcf3d06c0172 + Name: Brosten + Description: Description goes here Rarity: 2 - Zone: 4 - CardImage: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3} - CollectionIndex: 0 + Zone: 1 + CardImage: {fileID: -6028342126936659889, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} + CollectionIndex: 8 diff --git a/Assets/Data/Cards/Card_New Card 1.asset.meta b/Assets/Data/Cards/Card_Brosten (Copy).asset.meta similarity index 79% rename from Assets/Data/Cards/Card_New Card 1.asset.meta rename to Assets/Data/Cards/Card_Brosten (Copy).asset.meta index b3b1dc4e..e6943a40 100644 --- a/Assets/Data/Cards/Card_New Card 1.asset.meta +++ b/Assets/Data/Cards/Card_Brosten (Copy).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d8121cdf52bfe9488b40ed22d649209 +guid: 20ad613524eea614aacfc7d87629dfdc NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset b/Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset similarity index 61% rename from Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset rename to Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset index bfc2c6bb..70f1a92e 100644 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset +++ b/Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Test example card 2 (Copy) 1 + m_Name: Card_HR PimpSten (Copy) (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: ee76a6fc-d86d-469f-9b0f-c19286228357 - Name: Test #5 - Description: Some example description - Rarity: 1 - Zone: 3 - CardImage: {fileID: -765527507412255412, guid: f70246e6148769846aaea223ec0c2a55, type: 3} - CollectionIndex: 0 + Id: 9bcf6a94-a61b-47ff-abb7-10e8d2b9e140 + Name: HR PimpSten + Description: Description goes hereeee + Rarity: 4 + Zone: 1 + CardImage: {fileID: 2928974366146460655, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} + CollectionIndex: 7 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset.meta b/Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset.meta similarity index 79% rename from Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset.meta rename to Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset.meta index 72e531a5..6407e5a4 100644 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy) 1.asset.meta +++ b/Assets/Data/Cards/Card_HR PimpSten (Copy) (Copy).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dec49537f6ae6d241acf8275eaa6c653 +guid: 42b258acaccec1c4c8a271b34f5c0ba9 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset b/Assets/Data/Cards/Card_HR PimpSten (Copy).asset similarity index 62% rename from Assets/Data/Cards/Card_Test example card 2 (Copy).asset rename to Assets/Data/Cards/Card_HR PimpSten (Copy).asset index d62d9ba2..89e0932a 100644 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset +++ b/Assets/Data/Cards/Card_HR PimpSten (Copy).asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Test example card 2 (Copy) + m_Name: Card_HR PimpSten (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: ee1e2aec-bdb6-4c68-8d7a-061c7f5e8583 - Name: Test #6 - Description: Some example description + Id: c2f63556-636d-4e05-bf97-332db4f5d4b5 + Name: HR PimpSten + Description: Description goes hereeee Rarity: 2 - Zone: 0 - CardImage: {fileID: -9213056636207805707, guid: 00354ded9d8f8d643acc14837a229544, type: 3} - CollectionIndex: 0 + Zone: 1 + CardImage: {fileID: 2928974366146460655, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} + CollectionIndex: 7 diff --git a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset.meta b/Assets/Data/Cards/Card_HR PimpSten (Copy).asset.meta similarity index 79% rename from Assets/Data/Cards/Card_Test example card (Copy) 1.asset.meta rename to Assets/Data/Cards/Card_HR PimpSten (Copy).asset.meta index 24ec7332..f56a9af3 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset.meta +++ b/Assets/Data/Cards/Card_HR PimpSten (Copy).asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8fdeae7881d130f408e0f31c101ab41f +guid: 1fe09914d65c6d2429e917359ed54122 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Data/Cards/Card_Test example card (Copy).asset b/Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset similarity index 61% rename from Assets/Data/Cards/Card_Test example card (Copy).asset rename to Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset index 113baaf2..4a51c2bd 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy).asset +++ b/Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Test example card (Copy) + m_Name: Card_HRKvarts (Copy) (Copy) m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 6aa0d454-47f5-4617-ae30-50614fd2fa94 - Name: Test #4 - Description: Some example description - Rarity: 1 - Zone: 0 - CardImage: {fileID: -765527507412255412, guid: f70246e6148769846aaea223ec0c2a55, type: 3} - CollectionIndex: 0 + Id: e032a426-91dd-4648-86b9-aed9b572e6a1 + Name: HRKvarts + Description: Description goes here + Rarity: 4 + Zone: 1 + CardImage: {fileID: 7622336620039435694, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset.meta b/Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset.meta new file mode 100644 index 00000000..18e23e10 --- /dev/null +++ b/Assets/Data/Cards/Card_HRKvarts (Copy) (Copy).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e1af518c607db864498329308e3dcc76 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_HRKvarts (Copy).asset b/Assets/Data/Cards/Card_HRKvarts (Copy).asset new file mode 100644 index 00000000..26ae4857 --- /dev/null +++ b/Assets/Data/Cards/Card_HRKvarts (Copy).asset @@ -0,0 +1,21 @@ +%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: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} + m_Name: Card_HRKvarts (Copy) + m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition + Id: 7918bee9-1b3a-4731-af4b-b6a5b4e5150e + Name: HRKvarts + Description: Description goes here + Rarity: 2 + Zone: 1 + CardImage: {fileID: 7622336620039435694, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_HRKvarts (Copy).asset.meta b/Assets/Data/Cards/Card_HRKvarts (Copy).asset.meta new file mode 100644 index 00000000..747169dd --- /dev/null +++ b/Assets/Data/Cards/Card_HRKvarts (Copy).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7c519c4abc0edf4897168c699d9f250 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset b/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset new file mode 100644 index 00000000..24fcdfbe --- /dev/null +++ b/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset @@ -0,0 +1,21 @@ +%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: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} + m_Name: Card_Mormor Marmor (Copy) (Copy) + m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition + Id: f7b0d422-a7fe-4ab4-a731-0ca83e5328d2 + Name: Mormor Marmor + Description: Description goes here + Rarity: 4 + Zone: 1 + CardImage: {fileID: 8096915581896476643, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset.meta b/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset.meta new file mode 100644 index 00000000..ebcfa929 --- /dev/null +++ b/Assets/Data/Cards/Card_Mormor Marmor (Copy) (Copy).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f4654d849af5ef4d81e0bccacfe03e8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset b/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset new file mode 100644 index 00000000..89d33047 --- /dev/null +++ b/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset @@ -0,0 +1,21 @@ +%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: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} + m_Name: Card_Mormor Marmor (Copy) + m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition + Id: 99e66b22-ea53-4d02-ae36-c9c9bf28c93c + Name: Mormor Marmor + Description: Description goes here + Rarity: 2 + Zone: 1 + CardImage: {fileID: 8096915581896476643, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset.meta b/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset.meta new file mode 100644 index 00000000..fc0e1acf --- /dev/null +++ b/Assets/Data/Cards/Card_Mormor Marmor (Copy).asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e507a1198083f747bf8f14f1dfc9daa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_New Card 2.asset b/Assets/Data/Cards/Card_New Card 2.asset index 4168fc2c..240ceb15 100644 --- a/Assets/Data/Cards/Card_New Card 2.asset +++ b/Assets/Data/Cards/Card_New Card 2.asset @@ -13,9 +13,9 @@ MonoBehaviour: m_Name: Card_New Card 2 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition Id: 7ea4fa95-5327-439b-ab7f-94f2656281f2 - Name: My New Addressable Card! + Name: HR PimpSten Description: Description goes hereeee Rarity: 0 - Zone: 0 - CardImage: {fileID: 0} + Zone: 1 + CardImage: {fileID: 2928974366146460655, guid: ab39d3c28640d3646ada092af9b639e6, type: 3} CollectionIndex: 7 diff --git a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset b/Assets/Data/Cards/Card_New Card 3.asset similarity index 63% rename from Assets/Data/Cards/Card_Test example card (Copy) 1.asset rename to Assets/Data/Cards/Card_New Card 3.asset index 1d14fcdf..dffecb4c 100644 --- a/Assets/Data/Cards/Card_Test example card (Copy) 1.asset +++ b/Assets/Data/Cards/Card_New Card 3.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} - m_Name: Card_Test example card (Copy) 1 + m_Name: Card_New Card 3 m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: 629423af-af60-495b-8c89-36709e063acd - Name: Test #3 - Description: Some example description + Id: 2848767a-e715-403f-a0a0-81cd54d1ab00 + Name: Brosten + Description: Description goes here Rarity: 0 - Zone: 0 - CardImage: {fileID: 2204075899874250563, guid: 0f7eeae107549d943b762c87ab0dc144, type: 3} - CollectionIndex: 0 + Zone: 1 + CardImage: {fileID: -6028342126936659889, guid: 88427f554aebb2a49a9bc9705bb0f7bf, type: 3} + CollectionIndex: 8 diff --git a/Assets/Data/Cards/Card_New Card 3.asset.meta b/Assets/Data/Cards/Card_New Card 3.asset.meta new file mode 100644 index 00000000..a5474497 --- /dev/null +++ b/Assets/Data/Cards/Card_New Card 3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba36d0f7b72437d46aef231a1ed79110 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_New Card 4.asset b/Assets/Data/Cards/Card_New Card 4.asset new file mode 100644 index 00000000..cfeb4cf7 --- /dev/null +++ b/Assets/Data/Cards/Card_New Card 4.asset @@ -0,0 +1,21 @@ +%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: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} + m_Name: Card_New Card 4 + m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition + Id: ec173e56-7759-46fe-9127-facdd91a460f + Name: Mormor Marmor + Description: Description goes here + Rarity: 0 + Zone: 1 + CardImage: {fileID: 8096915581896476643, guid: c28c2d55edc2fbc4baf57d2672c0c3df, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_New Card 4.asset.meta b/Assets/Data/Cards/Card_New Card 4.asset.meta new file mode 100644 index 00000000..57fda89d --- /dev/null +++ b/Assets/Data/Cards/Card_New Card 4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 935dc5e5a05e0d443b263cceb57df300 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/Cards/Card_New Card.asset b/Assets/Data/Cards/Card_New Card.asset index 6c4d6d2d..aba1c1f4 100644 --- a/Assets/Data/Cards/Card_New Card.asset +++ b/Assets/Data/Cards/Card_New Card.asset @@ -12,10 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a80cc88c9884512b8b633110d838780, type: 3} m_Name: Card_New Card m_EditorClassIdentifier: AppleHillsScripts::AppleHills.Data.CardSystem.CardDefinition - Id: c392baeb-f816-4482-8b9c-2e2b81e36527 - Name: Test #2 - Description: Some example description - Rarity: 4 - Zone: 4 - CardImage: {fileID: 2204075899874250563, guid: 0f7eeae107549d943b762c87ab0dc144, type: 3} - CollectionIndex: 0 + Id: 2e271648-c71a-4be1-b9d3-2eb4a3c87243 + Name: HRKvarts + Description: Description goes here + Rarity: 0 + Zone: 1 + CardImage: {fileID: 7622336620039435694, guid: 57aacc442c45ede49af137c00df8f2da, type: 3} + CollectionIndex: 9 diff --git a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset.meta b/Assets/Data/Cards/Card_Test example card 2 (Copy).asset.meta deleted file mode 100644 index e21a013b..00000000 --- a/Assets/Data/Cards/Card_Test example card 2 (Copy).asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 28dbfbd7a6b2cd84b8274bd1126b220b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset.meta b/Assets/Data/Cards/Card_Test example card 3 (Copy).asset.meta deleted file mode 100644 index c76502a1..00000000 --- a/Assets/Data/Cards/Card_Test example card 3 (Copy).asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6afed7a67f64404418f905e7808bf5cb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/External/Placeholders/card_back.png b/Assets/External/Placeholders/card_back.png index 2edcb4dc..1f8a08bb 100644 Binary files a/Assets/External/Placeholders/card_back.png and b/Assets/External/Placeholders/card_back.png differ diff --git a/Assets/External/Placeholders/card_back.png~ b/Assets/External/Placeholders/card_back.png~ new file mode 100644 index 00000000..2edcb4dc Binary files /dev/null and b/Assets/External/Placeholders/card_back.png~ differ diff --git a/Assets/External/Placeholders/red_arrow.png b/Assets/External/Placeholders/red_arrow.png index 5708e6ce..88967942 100644 Binary files a/Assets/External/Placeholders/red_arrow.png and b/Assets/External/Placeholders/red_arrow.png differ diff --git a/Assets/External/Placeholders/red_arrow.png~ b/Assets/External/Placeholders/red_arrow.png~ new file mode 100644 index 00000000..5708e6ce Binary files /dev/null and b/Assets/External/Placeholders/red_arrow.png~ differ diff --git a/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab b/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab index 78590e43..23803846 100644 --- a/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab +++ b/Assets/Prefabs/UI/Cards/AlbumViewPage.prefab @@ -250,8 +250,8 @@ MonoBehaviour: m_Calls: [] m_text: Option A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -978,7 +978,7 @@ MonoBehaviour: m_Calls: [] m_text: Option A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1044,7 +1044,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &3579083049650426377 @@ -1458,8 +1458,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1732,10 +1732,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Button + m_text: Reset m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1991,8 +1991,8 @@ MonoBehaviour: m_Calls: [] m_text: Option A m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab b/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab index 8b34baa1..edfcca2f 100644 --- a/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab +++ b/Assets/Prefabs/UI/Cards/BoosterOpeningPage.prefab @@ -475,7 +475,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8469994470973392768 CanvasRenderer: @@ -505,8 +505,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -3172522754301639175, guid: 8be45455b29f80241a3b8aae36291752, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -596,7 +596,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 200, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4221802982940069114 CanvasRenderer: @@ -626,8 +626,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -4331849829665928538, guid: 8be45455b29f80241a3b8aae36291752, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -714,8 +714,8 @@ RectTransform: 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: 150, y: 200} + m_AnchoredPosition: {x: 0, y: 28.897217} + m_SizeDelta: {x: 150, y: 257.7944} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5011813453065157523 CanvasRenderer: @@ -745,7 +745,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 4365544765984126881, guid: 9dac643e78ad86e4988c11a92f9c7a6d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -824,15 +824,15 @@ MonoBehaviour: ' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -849,8 +849,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 55 + m_fontSizeBase: 55 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -960,15 +960,15 @@ MonoBehaviour: m_Calls: [] m_text: Continue! m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -985,8 +985,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 55 + m_fontSizeBase: 55 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Prefabs/UI/Cards/CardSystem.prefab b/Assets/Prefabs/UI/Cards/CardSystem.prefab index a863ca97..fdececb2 100644 --- a/Assets/Prefabs/UI/Cards/CardSystem.prefab +++ b/Assets/Prefabs/UI/Cards/CardSystem.prefab @@ -677,6 +677,30 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4224770106652410837} m_Modifications: + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251253458592001762, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2088943967680250180, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -757,6 +781,62 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2512803946073319574, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4184772998354705068, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5995069628669089193, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5995069628669089193, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} + propertyPath: m_AnchoredPosition.y + value: -263.0796 + objectReference: {fileID: 0} - target: {fileID: 8841772996182652387, guid: 88a05fdd940194543ade1cc2bcdada5f, type: 3} propertyPath: m_Name value: AlbumViewPage diff --git a/Assets/Prefabs/UI/Cards/MainMenuPage.prefab b/Assets/Prefabs/UI/Cards/MainMenuPage.prefab index c9c428b2..023b16a9 100644 --- a/Assets/Prefabs/UI/Cards/MainMenuPage.prefab +++ b/Assets/Prefabs/UI/Cards/MainMenuPage.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -150} - m_SizeDelta: {x: 300, y: 80} + m_AnchoredPosition: {x: 150, y: -204.84521} + m_SizeDelta: {x: 300, y: 108.56347} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8262356594320332946 CanvasRenderer: @@ -67,8 +67,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -3172522754301639175, guid: 8be45455b29f80241a3b8aae36291752, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -230,8 +230,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -260} - m_SizeDelta: {x: 300, y: 80} + m_AnchoredPosition: {x: 150, y: -343.4087} + m_SizeDelta: {x: 300, y: 108.56347} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3411861085081790681 CanvasRenderer: @@ -261,8 +261,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -3172522754301639175, guid: 8be45455b29f80241a3b8aae36291752, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -471,8 +471,8 @@ RectTransform: 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: 300, y: 300} + m_AnchoredPosition: {x: 0, y: -48.845215} + m_SizeDelta: {x: 300, y: 397.6904} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3233519832452188170 MonoBehaviour: @@ -537,8 +537,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 150, y: -40} - m_SizeDelta: {x: 300, y: 80} + m_AnchoredPosition: {x: 150, y: -60.281734} + m_SizeDelta: {x: 300, y: 120.56347} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3774508876281835580 CanvasRenderer: @@ -568,8 +568,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: -4331849829665928538, guid: 8be45455b29f80241a3b8aae36291752, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -689,15 +689,15 @@ MonoBehaviour: m_Calls: [] m_text: Browse cards m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -714,8 +714,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -792,7 +792,7 @@ RectTransform: 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: -37.599976} + m_AnchoredPosition: {x: 0, y: -80.839} m_SizeDelta: {x: 300, y: 75} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8051944533059996608 @@ -825,8 +825,8 @@ MonoBehaviour: m_Calls: [] m_text: New Text m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -850,8 +850,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 + m_fontSize: 65 + m_fontSizeBase: 65 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -961,8 +961,8 @@ MonoBehaviour: m_Calls: [] m_text: Change clothes m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -986,8 +986,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1097,15 +1097,15 @@ MonoBehaviour: m_Calls: [] m_text: Open boosters m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1122,8 +1122,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab b/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab index 607d78e6..2e4bf895 100644 --- a/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab +++ b/Assets/Prefabs/UI/Cards/SIngleCardDisplayUI.prefab @@ -208,8 +208,8 @@ MonoBehaviour: m_Calls: [] m_text: Test example card 3 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} + m_sharedMaterial: {fileID: -1441574381962284772, guid: 4aca0db6ec111b5418bdc747168f9474, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -233,7 +233,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 31.75 + m_fontSize: 34.4 m_fontSizeBase: 15 m_fontWeight: 400 m_enableAutoSizing: 1