diff --git a/Assets/arts/atlas/ui/bounty.asset b/Assets/arts/atlas/ui/bounty.asset index 0ee8bd614..e52a6f248 100644 --- a/Assets/arts/atlas/ui/bounty.asset +++ b/Assets/arts/atlas/ui/bounty.asset @@ -26,6 +26,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 4393de5389e82684c9f54914198f42f9, type: 3} - {fileID: 21300000, guid: 2a33e3fdbc76fb9448c7f5cabe54602e, type: 3} - {fileID: 21300000, guid: 940e22e0f4acfe347ae064bebbd5eb9f, type: 3} + - {fileID: 21300000, guid: ffeb26b9449fa474b8118b83464df63f, type: 3} - {fileID: 21300000, guid: a388551653fe1a44f82f1e084eab8c93, type: 3} - {fileID: 21300000, guid: 731113889e14bf44a83563cf5c303077, type: 3} - {fileID: 21300000, guid: db2a9231ef00a9a49a5920a818c08e47, type: 3} @@ -44,4 +45,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 6767eb4bb7d152447bb08b909b34c239, type: 3} - {fileID: 21300000, guid: 2d793771401f74f4ca857a4257d3bba2, type: 3} - {fileID: 21300000, guid: facb5049d5816b34cbb8c75535f9d1c8, type: 3} - spriteNameList: 684af2e4694af2e46a4af2e46b4af2e4cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87b833ae87b843ae87bdffaa1dee0faa1dee1faa1dee2faa1dee3faa1dea086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235cddc37bed4f4c9a7d + spriteNameList: 684af2e4694af2e46a4af2e46b4af2e4cb8da21dcc8da21d849d74b5859d74b5869d74b5813ae87b823ae87b833ae87b843ae87b853ae87bdffaa1dee0faa1dee1faa1dee2faa1dee3faa1dea086ca96a186ca96a286ca96a386ca96a486ca96a586ca96ba8c6a50bb8c6a50bc8c6a50b3ca3bc71033235cddc37bed4f4c9a7d diff --git a/Assets/arts/atlas/ui/bounty.spriteatlas b/Assets/arts/atlas/ui/bounty.spriteatlas index e606867cf..83a367103 100644 --- a/Assets/arts/atlas/ui/bounty.spriteatlas +++ b/Assets/arts/atlas/ui/bounty.spriteatlas @@ -81,6 +81,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 2af436c80c32cb046bb90c11245ea4ed, type: 3} - {fileID: 21300000, guid: 4e4e9cc80d2948847b3f4b7b148a552e, type: 3} - {fileID: 21300000, guid: facb5049d5816b34cbb8c75535f9d1c8, type: 3} + - {fileID: 21300000, guid: ffeb26b9449fa474b8118b83464df63f, type: 3} - {fileID: 21300000, guid: 8c92742a7afdf6b46881adea0c4b5846, type: 3} - {fileID: 21300000, guid: ada861ca87f0269478847b6c463e77ec, type: 3} - {fileID: 21300000, guid: 6b4c13fa6c8a1074e936610079fb615f, type: 3} @@ -113,6 +114,7 @@ SpriteAtlas: - bounty_board_3 - bounty_board_2 - ui_arena_bounty_banner_1 + - bounty_btn_main_4 - bounty_chest_4 - bounty_progress_1 - bounty_dec_5 diff --git a/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png b/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png new file mode 100644 index 000000000..1fc33512d Binary files /dev/null and b/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png differ diff --git a/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png.meta b/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png.meta new file mode 100644 index 000000000..3cc4de262 --- /dev/null +++ b/Assets/arts/textures/ui/bounty/bounty_btn_main_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: ffeb26b9449fa474b8118b83464df63f +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/lua/app/module/runes/runes_manager.lua.bytes b/Assets/lua/app/module/runes/runes_manager.lua.bytes index 3dac0a96d..6bbb7779e 100644 Binary files a/Assets/lua/app/module/runes/runes_manager.lua.bytes and b/Assets/lua/app/module/runes/runes_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes b/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes index 0ed2d948a..08a233ff3 100644 Binary files a/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes and b/Assets/lua/app/ui/hero/runes_info_comp.lua.bytes differ