diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index ed1ea545d..d2059259e 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -29,6 +29,7 @@ MonoBehaviour: - {fileID: 21300000, guid: d86f0a17c7ac418449c13c7630c24a6e, type: 3} - {fileID: 21300000, guid: 7473e55ef6f1f884b8a1716e8b8d50b8, type: 3} - {fileID: 21300000, guid: 5985facae59bd3a468c8c10f36e27130, type: 3} + - {fileID: 21300000, guid: cd1cb2b7e4fbee04ca040a123b1c81b1, type: 3} - {fileID: 21300000, guid: 4904464892cc82b40b7ecb8d19777c89, type: 3} - {fileID: 21300000, guid: 5c6bf200d40af1645928a69f5be74689, type: 3} - {fileID: 21300000, guid: 05b2835c2f1cab94d9a683b1b224bf9f, type: 3} @@ -85,4 +86,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb4e7dbdf89792644a8941a7e107e9ce, type: 3} - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe31d440be41d440be51d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec06330037881e3238881e3239881e323a881e323b881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index 844a61c92..b6bc5b47e 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -91,6 +91,7 @@ SpriteAtlas: - {fileID: 21300000, guid: ea4d65d6d3df27d46b554d322c49fd49, type: 3} - {fileID: 21300000, guid: d86f0a17c7ac418449c13c7630c24a6e, type: 3} - {fileID: 21300000, guid: f67782678a259484f9bbcc1fd47de7cb, type: 3} + - {fileID: 21300000, guid: cd1cb2b7e4fbee04ca040a123b1c81b1, type: 3} - {fileID: 21300000, guid: 8c7b75b71d6b7fc47acf21aa7b21f722, type: 3} - {fileID: 21300000, guid: c042c1c7c85392e449166b4197c07526, type: 3} - {fileID: 21300000, guid: 89a047e7326d70042aacb397a171b4c4, type: 3} @@ -164,6 +165,7 @@ SpriteAtlas: - hero_arrow - 18_1 - 6 + - 19_1 - 36_1 - 22 - 11 diff --git a/Assets/arts/atlas/icon/hero_2.asset b/Assets/arts/atlas/icon/hero_2.asset index 25236c6b5..73e06b693 100644 --- a/Assets/arts/atlas/icon/hero_2.asset +++ b/Assets/arts/atlas/icon/hero_2.asset @@ -29,6 +29,7 @@ MonoBehaviour: - {fileID: 21300000, guid: b0fa3f60d34974540a238b8f2b49bd4c, type: 3} - {fileID: 21300000, guid: 38670590eda286f43ae4f04b2ce191ce, type: 3} - {fileID: 21300000, guid: 5123256b8feda2145a9350bee87ad74f, type: 3} + - {fileID: 21300000, guid: 5343c8e4e2380374cb32eafe14882fb1, type: 3} - {fileID: 21300000, guid: cdb1b44ac61889b41826aba17bfb5dc3, type: 3} - {fileID: 21300000, guid: 569a7ae4f0309ce46a688882510a606f, type: 3} - {fileID: 21300000, guid: 9fde6fd89f5f157489577ca993023671, type: 3} @@ -59,4 +60,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3} - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3} - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 + spriteNameList: 310000001f06000011061700200600002106000022060000230600002406000025060000971c1700260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517004206000043060000358d170044060000450600004606000047060000330000005d0600005e0600005f06000060060000610600006206000063060000550518003400000035000000360000003700000029da00003800000039000000 diff --git a/Assets/arts/atlas/icon/hero_2.spriteatlas b/Assets/arts/atlas/icon/hero_2.spriteatlas index dddd473bb..c7ba6f716 100644 --- a/Assets/arts/atlas/icon/hero_2.spriteatlas +++ b/Assets/arts/atlas/icon/hero_2.spriteatlas @@ -79,6 +79,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1017ce1418f44884081066c1094a629d, type: 3} - {fileID: 21300000, guid: 46e5b8d421d35b544af8eb86918b50a3, type: 3} - {fileID: 21300000, guid: 8905f5e482ea373429968d1d855c0cd7, type: 3} + - {fileID: 21300000, guid: 5343c8e4e2380374cb32eafe14882fb1, type: 3} - {fileID: 21300000, guid: 569a7ae4f0309ce46a688882510a606f, type: 3} - {fileID: 21300000, guid: 65c8c6f4f823a3843abdc978b0882f78, type: 3} - {fileID: 21300000, guid: 22fd2b05e943c2f458395973fa43eacd, type: 3} @@ -126,6 +127,7 @@ SpriteAtlas: - 22 - 15 - 12 + - 19_1 - 20 - 14 - 10_1 diff --git a/Assets/arts/atlas/ui/bounty.asset b/Assets/arts/atlas/ui/bounty.asset index 4dbf7f503..04c6c15d6 100644 --- a/Assets/arts/atlas/ui/bounty.asset +++ b/Assets/arts/atlas/ui/bounty.asset @@ -48,4 +48,5 @@ MonoBehaviour: - {fileID: 21300000, guid: facb5049d5816b34cbb8c75535f9d1c8, type: 3} - {fileID: 21300000, guid: ae9200875d914c44e960200e3375a623, type: 3} - {fileID: 21300000, guid: a8b2925bff8a069449c3aa9824357e2a, type: 3} - spriteNameList: 684af2e4694af2e46a4af2e46b4af2e4cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87b833ae87b843ae87b853ae87b863ae87bdffaa1dee0faa1dee1faa1dee2faa1dee3faa1dea086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235cddc37bed4f4c9a7d504c9a7d514c9a7d + - {fileID: 21300000, guid: 377ebcaae893d354fa0c18cf6af1df53, type: 3} + spriteNameList: 684af2e4694af2e46a4af2e46b4af2e4cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87b833ae87b843ae87b853ae87b863ae87bdffaa1dee0faa1dee1faa1dee2faa1dee3faa1dea086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235cddc37bed4f4c9a7d504c9a7d514c9a7d524c9a7d diff --git a/Assets/arts/atlas/ui/bounty.spriteatlas b/Assets/arts/atlas/ui/bounty.spriteatlas index 96fd40ae6..069a15dd3 100644 --- a/Assets/arts/atlas/ui/bounty.spriteatlas +++ b/Assets/arts/atlas/ui/bounty.spriteatlas @@ -85,6 +85,7 @@ SpriteAtlas: - {fileID: 21300000, guid: facb5049d5816b34cbb8c75535f9d1c8, type: 3} - {fileID: 21300000, guid: ffeb26b9449fa474b8118b83464df63f, type: 3} - {fileID: 21300000, guid: 8c92742a7afdf6b46881adea0c4b5846, type: 3} + - {fileID: 21300000, guid: 377ebcaae893d354fa0c18cf6af1df53, type: 3} - {fileID: 21300000, guid: ada861ca87f0269478847b6c463e77ec, type: 3} - {fileID: 21300000, guid: 6b4c13fa6c8a1074e936610079fb615f, type: 3} - {fileID: 21300000, guid: 797a213bc738f704daa6b0bfa1cd23ad, type: 3} @@ -121,6 +122,7 @@ SpriteAtlas: - ui_arena_bounty_banner_1 - bounty_btn_main_4 - bounty_chest_4 + - ui_arena_bounty_banner_4 - bounty_progress_1 - bounty_dec_5 - bounty_arena_dec_3 diff --git a/Assets/arts/textures/icon/hero/19_1.png b/Assets/arts/textures/icon/hero/19_1.png new file mode 100644 index 000000000..8e76e39b5 Binary files /dev/null and b/Assets/arts/textures/icon/hero/19_1.png differ diff --git a/Assets/arts/textures/icon/hero/19_1.png.meta b/Assets/arts/textures/icon/hero/19_1.png.meta new file mode 100644 index 000000000..b150fe95d --- /dev/null +++ b/Assets/arts/textures/icon/hero/19_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: cd1cb2b7e4fbee04ca040a123b1c81b1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/hero_2/19_1.png b/Assets/arts/textures/icon/hero_2/19_1.png new file mode 100644 index 000000000..1745bf19d Binary files /dev/null and b/Assets/arts/textures/icon/hero_2/19_1.png differ diff --git a/Assets/arts/textures/icon/hero_2/19_1.png.meta b/Assets/arts/textures/icon/hero_2/19_1.png.meta new file mode 100644 index 000000000..b834d55dd --- /dev/null +++ b/Assets/arts/textures/icon/hero_2/19_1.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 5343c8e4e2380374cb32eafe14882fb1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png b/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png new file mode 100644 index 000000000..8721a4fba Binary files /dev/null and b/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png differ diff --git a/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png.meta b/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png.meta new file mode 100644 index 000000000..01aef4316 --- /dev/null +++ b/Assets/arts/textures/ui/bounty/ui_arena_bounty_banner_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 377ebcaae893d354fa0c18cf6af1df53 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 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: 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: