diff --git a/Assets/arts/atlas/ui/act_common.asset b/Assets/arts/atlas/ui/act_common.asset index fbb88a9c3..aee9636c5 100644 --- a/Assets/arts/atlas/ui/act_common.asset +++ b/Assets/arts/atlas/ui/act_common.asset @@ -160,6 +160,10 @@ MonoBehaviour: - {fileID: 21300000, guid: 1d616461ec4f24f2c88e030936b58f3f, type: 3} - {fileID: 21300000, guid: 6dac5eaa087704556b2af8f8ef63eb9d, type: 3} - {fileID: 21300000, guid: b092ba932c5804b02ac863e91cbde7df, type: 3} + - {fileID: 21300000, guid: a4b1bfbd421d14d868c26a0223f09eeb, type: 3} + - {fileID: 21300000, guid: c92531de0d1a2417fa6ae1472c8d9621, type: 3} + - {fileID: 21300000, guid: b8b5ab6a07cc44f238e5194e2978dc3d, type: 3} + - {fileID: 21300000, guid: e0c952785a1ad4fdea7bba695a1320cd, type: 3} - {fileID: 21300000, guid: bce8615ebdd237a49abdb978bba94a8a, type: 3} - {fileID: 21300000, guid: 1b73783090a0e7944b87850eced6776c, type: 3} - {fileID: 21300000, guid: 336d21f78d0bb0a448978dc6397deb21, type: 3} @@ -233,4 +237,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 9b0c72ee6bd91d64b9793aa8a2e4bfe4, type: 3} - {fileID: 21300000, guid: e0db0ada99791964bac9c02f92e6b04b, type: 3} - {fileID: 21300000, guid: 5cbb4c1d1c46f9d43870f838755ed134, type: 3} - spriteNameList: 81edc3405eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42df35bc42df45bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c11db430c11eb430c1deb730c1dfb730c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976c6b2a056d6b2a056e6b2a056db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b8e56fb9b380d789d390d789d3b7203c13c7203c13d7203c13e7203c10673dde60773dde60c73dde6589250040d73dde6b706510410f4d0f4c23b6404c33b6404e3fcb3a74059bf2e4159bf2e438d0701448d0701032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6246d861a974096eb984096eb + spriteNameList: 81edc3405eb071e0925bc42d935bc42d945bc42d955bc42d965bc42d975bc42d985bc42d995bc42d9a5bc42d5fb071e0b15bc42db25bc42db35bc42db45bc42db55bc42db65bc42db75bc42db85bc42db95bc42dba5bc42d60b071e0d05bc42dd15bc42dd25bc42dd35bc42dd45bc42dd55bc42dd65bc42dd75bc42dd85bc42dd95bc42d61b071e0ef5bc42df35bc42df45bc42d62b071e063b071e064b071e065b071e066b071e0110efddb3fb4a4a340b4a4a341b4a4a342b4a4a343b4a4a3120efddb130efddb140efddb150efddb160efddb170efddb180efddb190efddb449e01cf459e01cf469e01cf479e01cf489e01cf499e01cf4a9e01cf4782ca2d391833e53a1833e53b442fc13c442fc1fc472fc1fd472fc1bd4b2fc1be4b2fc17e4f2fc17f4f2fc13f532fc140532fc100572fc101572fc1c15a2fc1c25a2fc1825e2fc1835e2fc143622fc144622fc104662fc105662fc14882ca2dfa1b33e5fb1b33e59ab82fc19bb82fc15bbc2fc15cbc2fc11cc02fc11dc02fc1ddc32fc1dec32fc19ec72fc19fc72fc15fcb2fc160cb2fc120cf2fc121cf2fc1e1d22fc1e2d22fc1a2d62fc1a3d62fc163da2fc164da2fc1bb1f33e5bc1f33e5f92c30c1fa2c30c1ba3030c1bb3030c17b3430c17c3430c13c3830c13d3830c1fd3b30c1fe3b30c1be3f30c1bf3f30c17f4330c1804330c1404730c1414730c1014b30c1024b30c1c24e30c1c34e30c17c2333e57d2333e558a130c159a130c119a530c11aa530c1daa830c1dba830c19bac30c19cac30c15cb030c15db030c11db430c11eb430c1deb730c1dfb730c19fbb30c1a0bb30c160bf30c161bf30c13d2733e53e2733e5fe2a33e5ff2a33e5bf2e33e5c02e33e5803233e5813233e5413633e5423633e536e96489503cce976c6b2a056d6b2a056e6b2a056db6df2d6317178e6417178e6517178e6617178e6717178e6817178e6917178e6a17178e6b17178e6eb6df2d6fb6df2d70b6df2d71b6df2d72b6df2d73b6df2d74b6df2d75b6df2daf4ffb4ab04ffb4ab14ffb4aeb3a1f96740c33668d56fb9b8e56fb9b380d789d390d789d3b7203c13c7203c13d7203c13e7203c10673dde60773dde60c73dde6589250040d73dde6b706510410f4d0f4c23b6404c33b6404e3fcb3a74059bf2e4159bf2e438d0701448d0701032df98a82068b0583068b05fb068552fc068552fd068552ad279fe6ae279fe6af279fe6b0279fe6246d861a974096eb984096eb diff --git a/Assets/arts/atlas/ui/act_common.spriteatlas b/Assets/arts/atlas/ui/act_common.spriteatlas index ecb4b63fc..5542e97b9 100644 --- a/Assets/arts/atlas/ui/act_common.spriteatlas +++ b/Assets/arts/atlas/ui/act_common.spriteatlas @@ -178,6 +178,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 14ad4f38009bb6047b202a1be6186579, type: 3} - {fileID: 21300000, guid: e0af49586b6e08845a1449755f0a8bb6, type: 3} - {fileID: 21300000, guid: a84a6f6855741442a8b5e7d769217e2e, type: 3} + - {fileID: 21300000, guid: e0c952785a1ad4fdea7bba695a1320cd, type: 3} - {fileID: 21300000, guid: dfecd57828ee18c46933d2dcdce1a281, type: 3} - {fileID: 21300000, guid: 9a328e888a8359847b12ab46f8c747b0, type: 3} - {fileID: 21300000, guid: 8cddf7b8005049a4996fbb39ad8a0dd8, type: 3} @@ -203,6 +204,7 @@ SpriteAtlas: - {fileID: 21300000, guid: c323612a846c8d94792aa7a298572f53, type: 3} - {fileID: 21300000, guid: f7dc0f2ac712b974e9148ab5bebc6608, type: 3} - {fileID: 21300000, guid: 1eae554a7cbdd4d4d8d6518c6d3ce85f, type: 3} + - {fileID: 21300000, guid: b8b5ab6a07cc44f238e5194e2978dc3d, type: 3} - {fileID: 21300000, guid: e5307f7a5e397924685bfd288a0062df, type: 3} - {fileID: 21300000, guid: 4574219a6dc8a4a3e85ea570aa1809e3, type: 3} - {fileID: 21300000, guid: 01c48a9a70110314a9ed860b08d50735, type: 3} @@ -251,6 +253,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 7e57388d1437a9a4694006447fddcfc6, type: 3} - {fileID: 21300000, guid: 3bd2dbad307037c40b27e6dcc97a4b5e, type: 3} - {fileID: 21300000, guid: 719145bdab902a64ab307a95026f31e5, type: 3} + - {fileID: 21300000, guid: a4b1bfbd421d14d868c26a0223f09eeb, type: 3} - {fileID: 21300000, guid: a57708dd2731878438dd2ab5dac0412b, type: 3} - {fileID: 21300000, guid: 3f1601ed78df5734992699bafa4c108a, type: 3} - {fileID: 21300000, guid: 48cc55ed8b012344794775b7a255dbcb, type: 3} @@ -269,6 +272,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 28bff69e8500d4e4c9e6963303f02ca2, type: 3} - {fileID: 21300000, guid: 3e61c3bec5ac21b4da081b62d52b5515, type: 3} - {fileID: 21300000, guid: caa9f2ce69e435b4ca90780d2d9de31c, type: 3} + - {fileID: 21300000, guid: c92531de0d1a2417fa6ae1472c8d9621, type: 3} - {fileID: 21300000, guid: 482666de5d34b7044b35273d51d13aec, type: 3} - {fileID: 21300000, guid: 9b0c72ee6bd91d64b9793aa8a2e4bfe4, type: 3} - {fileID: 21300000, guid: 44b2a34f7e7404449a0cc98cb80739b4, type: 3} @@ -399,6 +403,7 @@ SpriteAtlas: - act_common_select - act_common_bg_2 - act_common_bg_45 + - act_common_btn_48_2 - act_common_btn_yellow_1 - act_common_btn_33_1 - act_common_btn_4_2 @@ -424,6 +429,7 @@ SpriteAtlas: - act_ranking_3 - act_common_btn_38_2 - act_common_point_3 + - act_common_btn_48_1 - act_common_bg_9 - act_common_btn_1_2 - act_common_btn_21_1 @@ -472,6 +478,7 @@ SpriteAtlas: - act_common_menu_1 - act_common_dec_13 - act_common_btn_6_2 + - act_common_btn_47_1 - act_common_bounty_bg_2 - act_common_progress_7_bg - act_common_bg_18 @@ -490,6 +497,7 @@ SpriteAtlas: - act_common_tab_2 - act_common_board_5 - act_common_bg_10 + - act_common_btn_47_2 - act_common_dec_14 - common_bg_20 - act_common_bg_35 diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png b/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png new file mode 100644 index 000000000..3bdb741f6 Binary files /dev/null and b/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png differ diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png.meta b/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png.meta new file mode 100644 index 000000000..9cf7d1518 --- /dev/null +++ b/Assets/arts/textures/ui/act_common/act_common_btn_47_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: a4b1bfbd421d14d868c26a0223f09eeb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png b/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png new file mode 100644 index 000000000..95fa95e86 Binary files /dev/null and b/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png differ diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png.meta b/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png.meta new file mode 100644 index 000000000..0ce28ae92 --- /dev/null +++ b/Assets/arts/textures/ui/act_common/act_common_btn_47_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: c92531de0d1a2417fa6ae1472c8d9621 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png b/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png new file mode 100644 index 000000000..5e4bce1de Binary files /dev/null and b/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png differ diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png.meta b/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png.meta new file mode 100644 index 000000000..db4f57dc9 --- /dev/null +++ b/Assets/arts/textures/ui/act_common/act_common_btn_48_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: b8b5ab6a07cc44f238e5194e2978dc3d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png b/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png new file mode 100644 index 000000000..60c27eabf Binary files /dev/null and b/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png differ diff --git a/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png.meta b/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png.meta new file mode 100644 index 000000000..982a3bbeb --- /dev/null +++ b/Assets/arts/textures/ui/act_common/act_common_btn_48_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: e0c952785a1ad4fdea7bba695a1320cd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - 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 + - 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: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/dungeon/dungeon_bg_1.png.meta b/Assets/arts/textures/ui/dungeon/dungeon_bg_1.png.meta index f609d2324..c45754d58 100644 --- a/Assets/arts/textures/ui/dungeon/dungeon_bg_1.png.meta +++ b/Assets/arts/textures/ui/dungeon/dungeon_bg_1.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 137, y: 0, z: 116, w: 0} + spriteBorder: {x: 150, y: 0, z: 28, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/dungeon/dungeon_bg_2.png.meta b/Assets/arts/textures/ui/dungeon/dungeon_bg_2.png.meta index 259950c36..b074fe9fa 100644 --- a/Assets/arts/textures/ui/dungeon/dungeon_bg_2.png.meta +++ b/Assets/arts/textures/ui/dungeon/dungeon_bg_2.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 136, y: 0, z: 118, w: 0} + spriteBorder: {x: 150, y: 0, z: 28, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/dungeon/dungeon_board_3.png.meta b/Assets/arts/textures/ui/dungeon/dungeon_board_3.png.meta index 973356d6e..f2ae87557 100644 --- a/Assets/arts/textures/ui/dungeon/dungeon_board_3.png.meta +++ b/Assets/arts/textures/ui/dungeon/dungeon_board_3.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 28, y: 28, z: 28, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/arts/textures/ui/dungeon/dungeon_board_4.png.meta b/Assets/arts/textures/ui/dungeon/dungeon_board_4.png.meta index 2ab20f15f..b4c727cf8 100644 --- a/Assets/arts/textures/ui/dungeon/dungeon_board_4.png.meta +++ b/Assets/arts/textures/ui/dungeon/dungeon_board_4.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 28, y: 28, z: 28, w: 28} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 543c14923..fbecd19eb 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 3ef36815b..2b7ebe197 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon/dungeon_daily_main_ui.lua.bytes b/Assets/lua/app/ui/dungeon/dungeon_daily_main_ui.lua.bytes index 1b0ad8a5c..8105f3dd8 100644 Binary files a/Assets/lua/app/ui/dungeon/dungeon_daily_main_ui.lua.bytes and b/Assets/lua/app/ui/dungeon/dungeon_daily_main_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab index 7349a10bb..7d0e6390b 100644 --- a/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab +++ b/Assets/prefabs/ui/dungeon/dungeon_daily_main_ui.prefab @@ -34,7 +34,7 @@ RectTransform: m_Children: - {fileID: 2213874123227966557} m_Father: {fileID: 2850962748073049797} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -156,7 +156,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &119029883927825960 @@ -190,7 +190,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -290,12 +290,12 @@ RectTransform: - {fileID: 8867541186770779680} - {fileID: 8374963305953012039} m_Father: {fileID: 2850962748073049797} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5357226886847026994 CanvasRenderer: @@ -383,7 +383,7 @@ 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: 20} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 126, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7915556146701121389 @@ -417,7 +417,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -441,12 +441,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -556,7 +556,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 68, y: -5} + m_AnchoredPosition: {x: 85, y: -3} m_SizeDelta: {x: 132, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &346598682328305937 @@ -641,12 +641,12 @@ RectTransform: m_Children: - {fileID: 1383963605980930275} m_Father: {fileID: 8441454847264546828} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -8} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1955630673442749857 MonoBehaviour: @@ -697,7 +697,7 @@ 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: -40} + m_AnchoredPosition: {x: 0, y: -38} m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4769070903054513109 @@ -738,7 +738,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4291095295 - m_fontColor: {r: 1, g: 0.91764706, b: 0.76862746, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -832,8 +832,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 16.5, y: 0} - m_SizeDelta: {x: -57, y: 0} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -72, y: -32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1474823055665145881 CanvasRenderer: @@ -865,15 +865,15 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4282705919 - m_fontColor: {r: 1, g: 0.90588236, b: 0.26666668, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -890,12 +890,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 28 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 28 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -967,8 +967,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: 224, y: 44} - m_SizeDelta: {x: 190, y: 40} + m_AnchoredPosition: {x: 219, y: 40} + m_SizeDelta: {x: 190, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5422565450592360913 CanvasRenderer: @@ -1102,7 +1102,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6595004894830531102 @@ -1136,7 +1136,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1237,7 +1237,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &583642984804192599 @@ -1271,7 +1271,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1369,14 +1369,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 209981585700469598} - {fileID: 7370106153935857730} m_Father: {fileID: 4798551695527847664} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -127} - m_SizeDelta: {x: 689, y: -534} + m_AnchoredPosition: {x: 0, y: -123} + m_SizeDelta: {x: 666, y: -588} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3497755315398649928 CanvasRenderer: @@ -1483,7 +1484,7 @@ GameObject: - component: {fileID: 2291175810729022440} - component: {fileID: 5098416880573366013} m_Layer: 5 - m_Name: gold_cell + m_Name: material_cell m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1503,9 +1504,9 @@ RectTransform: m_Children: - {fileID: 4364825636466760443} - {fileID: 3820128999191124854} + - {fileID: 952805072298453134} - {fileID: 5604742802341666262} - {fileID: 5803081573683739179} - - {fileID: 952805072298453134} - {fileID: 4274027551652828425} m_Father: {fileID: 7342601526565579272} m_RootOrder: 0 @@ -1513,7 +1514,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -22} - m_SizeDelta: {x: 656, y: 140} + m_SizeDelta: {x: 666, y: 140} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7977116734774955174 MonoBehaviour: @@ -1528,72 +1529,72 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: gold_cell.stage_tx - hashName: 1011214546 + - name: material_cell.stage_tx + hashName: 244933977 objectType: 0 gameObject: {fileID: 5209566074576096816} - - name: gold_cell.challenge_btn - hashName: 2599033651 + - name: material_cell.challenge_btn + hashName: 3284294412 objectType: 0 gameObject: {fileID: 4922822266461479381} - - name: gold_cell.challenge_btn.text - hashName: 334785288 + - name: material_cell.challenge_btn.text + hashName: 2780244687 objectType: 0 gameObject: {fileID: 331534103305965961} - - name: gold_cell.sweep_btn - hashName: 1424274108 + - name: material_cell.sweep_btn + hashName: 3439380245 objectType: 0 gameObject: {fileID: 4214469484173201495} - - name: gold_cell.sweep_btn.text - hashName: 466100511 + - name: material_cell.sweep_btn.text + hashName: 234347622 objectType: 0 gameObject: {fileID: 6403238387144392537} - - name: gold_cell.power_tx - hashName: 563581291 + - name: material_cell.power_tx + hashName: 4092268018 objectType: 0 gameObject: {fileID: 1174438388305426860} - - name: gold_cell.scrollrect - hashName: 61959262 + - name: material_cell.scrollrect + hashName: 2400707365 objectType: 0 gameObject: {fileID: 3845167984817215922} - - name: gold_cell.unlock_btn - hashName: 3430655246 + - name: material_cell.unlock_btn + hashName: 1474436053 objectType: 0 gameObject: {fileID: 6600707636200597553} - - name: gold_cell.unlock_btn.text - hashName: 1923469837 + - name: material_cell.unlock_btn.text + hashName: 3329064870 objectType: 0 gameObject: {fileID: 9204361753884790144} - - name: gold_cell.challenge_btn.item - hashName: 334471406 + - name: material_cell.challenge_btn.item + hashName: 2779930805 objectType: 0 gameObject: {fileID: 7144168975614573527} - - name: gold_cell.challenge_btn.item.text - hashName: 2847162925 + - name: material_cell.challenge_btn.item.text + hashName: 577062598 objectType: 0 gameObject: {fileID: 6080797624534797728} - - name: gold_cell.challenge_btn.item.icon - hashName: 2846833017 + - name: material_cell.challenge_btn.item.icon + hashName: 576732690 objectType: 0 gameObject: {fileID: 2198031113146469009} - - name: gold_cell.challenge_btn.item.num_tx - hashName: 72060637 + - name: material_cell.challenge_btn.item.num_tx + hashName: 349032758 objectType: 0 gameObject: {fileID: 5937682173638159473} - - name: gold_cell.sweep_btn.item - hashName: 465786629 + - name: material_cell.sweep_btn.item + hashName: 234033740 objectType: 0 gameObject: {fileID: 6042951061521347326} - - name: gold_cell.sweep_btn.item.text - hashName: 1191297654 + - name: material_cell.sweep_btn.item.text + hashName: 3986094991 objectType: 0 gameObject: {fileID: 1855655907183511475} - - name: gold_cell.sweep_btn.item.icon - hashName: 1190967746 + - name: material_cell.sweep_btn.item.icon + hashName: 3985765083 objectType: 0 gameObject: {fileID: 7688825898319512679} - - name: gold_cell.sweep_btn.item.num_tx - hashName: 2218402022 + - name: material_cell.sweep_btn.item.num_tx + hashName: 3664082879 objectType: 0 gameObject: {fileID: 6391037461769981460} --- !u!114 &3347615779368772547 @@ -1648,7 +1649,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f5e776f18fe59c145b2623dd472bb7d6, type: 3} + m_Sprite: {fileID: 21300000, guid: dda508f2936225743ad9c2e6d546c2fe, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1693,10 +1694,10 @@ RectTransform: m_Father: {fileID: 2850962748073049797} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6183705032507062486 CanvasRenderer: @@ -1784,7 +1785,7 @@ 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: 20} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 126, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &219578807081364687 @@ -1818,7 +1819,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1842,12 +1843,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1915,7 +1916,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4798551695527847664} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1992,8 +1993,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: -266, y: 0} - m_SizeDelta: {x: 100, y: 80} + m_AnchoredPosition: {x: -274, y: 0} + m_SizeDelta: {x: 90, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6626052090218907696 CanvasRenderer: @@ -2026,14 +2027,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.28235295, g: 0.23529412, b: 0.20784314, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2127,7 +2128,7 @@ 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: -30, y: -10} + m_AnchoredPosition: {x: -30, y: -14} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4953070292646384564 @@ -2158,7 +2159,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6486a0299fe3ee040a5113d6b9d4d231, type: 3} + m_Sprite: {fileID: 21300000, guid: 301967b6e52e1234cb623a81d9ff2e09, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2203,8 +2204,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: 224, y: 44} - m_SizeDelta: {x: 190, y: 40} + m_AnchoredPosition: {x: 219, y: 40} + m_SizeDelta: {x: 190, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8276119499275133499 CanvasRenderer: @@ -2341,7 +2342,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -76, y: 1} - m_SizeDelta: {x: 93, y: 93} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4572371861169387427 CanvasRenderer: @@ -2371,7 +2372,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: abd1a3b4cb8f5df4d8f4027561f7fca2, type: 3} + m_Sprite: {fileID: 21300000, guid: b8b5ab6a07cc44f238e5194e2978dc3d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2425,12 +2426,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 3 + m_RootOrder: 4 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: 141, y: -302} - m_SizeDelta: {x: 370, y: 100} + m_AnchoredPosition: {x: 190, y: -294} + m_SizeDelta: {x: 340, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2651992140120844941 CanvasRenderer: @@ -2561,14 +2562,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8389606572556730181} - {fileID: 5889589907545927334} m_Father: {fileID: 6532261956592226185} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -127} - m_SizeDelta: {x: 689, y: -534} + m_AnchoredPosition: {x: 0, y: -123} + m_SizeDelta: {x: 666, y: -588} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7904774491529034209 CanvasRenderer: @@ -2627,8 +2629,8 @@ MonoBehaviour: downRecoveryOffset: 10 direction: 0 reverse: 0 - cellWidth: 656 - cellHeight: 150 + cellWidth: 666 + cellHeight: 148 perLineNum: 1 --- !u!114 &3958404653523382790 MonoBehaviour: @@ -2699,7 +2701,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 124} + m_SizeDelta: {x: 0, y: 136} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4588540705370943637 CanvasRenderer: @@ -2729,8 +2731,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f8e9fe24a43b3694399fe2607c0a6d99, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6e494c792605640bdbdf9379172d9404, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2773,12 +2775,12 @@ RectTransform: - {fileID: 7267710133647132350} - {fileID: 6642443131914366307} m_Father: {fileID: 2850962748073049797} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2257958921824833086 CanvasRenderer: @@ -2865,7 +2867,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.00012207031} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!1 &3368234916352329133 @@ -2942,7 +2944,7 @@ 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: 20} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 126, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1037834922153649289 @@ -2976,7 +2978,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3000,12 +3002,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -3074,12 +3076,12 @@ RectTransform: m_Children: - {fileID: 824898319238744684} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 2 + m_RootOrder: 3 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: 143, y: -243} - m_SizeDelta: {x: 214, y: 58} + m_AnchoredPosition: {x: 188, y: -239} + m_SizeDelta: {x: 243, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4781944870719445708 CanvasRenderer: @@ -3109,8 +3111,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 438379085b5f94865aa21e11bb5fa6c1, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3151,12 +3153,12 @@ RectTransform: m_Children: - {fileID: 968389688779523279} m_Father: {fileID: 4798551695527847664} - m_RootOrder: 2 + m_RootOrder: 3 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: 143, y: -243} - m_SizeDelta: {x: 214, y: 58} + m_AnchoredPosition: {x: 188, y: -239} + m_SizeDelta: {x: 243, y: 77} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6373717134488516164 CanvasRenderer: @@ -3186,8 +3188,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 438379085b5f94865aa21e11bb5fa6c1, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3230,7 +3232,7 @@ RectTransform: m_Children: - {fileID: 7199521450736688115} m_Father: {fileID: 1670410626358476874} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -3368,7 +3370,7 @@ GameObject: - component: {fileID: 5192491331257177057} - component: {fileID: 5690049610330763116} m_Layer: 5 - m_Name: gold_comp + m_Name: material_comp m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3386,11 +3388,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5515010874612613827} - {fileID: 5104743235248061852} - {fileID: 3186254090055096316} - {fileID: 5340671538414840046} - {fileID: 1492313169972203259} - - {fileID: 5515010874612613827} - {fileID: 876614648820135388} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 @@ -3421,20 +3423,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: gold_comp.scrollrect - hashName: 3819235473 + - name: material_comp.scrollrect + hashName: 1863016280 objectType: 0 gameObject: {fileID: 2820441157487999418} - - name: gold_comp.desc_tx - hashName: 1505649810 + - name: material_comp.desc_tx + hashName: 2589309739 objectType: 0 gameObject: {fileID: 2444353451353071487} - - name: gold_comp.title_tx - hashName: 837812267 + - name: material_comp.title_tx + hashName: 71531698 objectType: 0 gameObject: {fileID: 9214927786922785059} - - name: gold_comp.img_bg.tx_power - hashName: 2332588599 + - name: material_comp.img_bg.tx_power + hashName: 3738183632 objectType: 0 gameObject: {fileID: 8407408852121994285} --- !u!1 &4214469484173201495 @@ -3471,12 +3473,12 @@ RectTransform: - {fileID: 6192753109710150416} - {fileID: 42882158965472339} m_Father: {fileID: 1670410626358476874} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2793684625388591482 CanvasRenderer: @@ -3601,7 +3603,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1064876723901299448 @@ -3635,7 +3637,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3713,7 +3715,7 @@ GameObject: - component: {fileID: 257251643405536155} - component: {fileID: 8775062502072090554} m_Layer: 5 - m_Name: material_comp + m_Name: gold_comp m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3731,11 +3733,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1880989699456733483} - {fileID: 5690917666205715728} - {fileID: 1458099548358783432} - {fileID: 3210842355830824831} - {fileID: 2312473493738561105} - - {fileID: 1880989699456733483} - {fileID: 8441454847264546828} m_Father: {fileID: 8461932745927490369} m_RootOrder: 1 @@ -3766,20 +3768,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: material_comp.scrollrect - hashName: 1863016280 + - name: gold_comp.scrollrect + hashName: 3819235473 objectType: 0 gameObject: {fileID: 1340538471956295370} - - name: material_comp.title_tx - hashName: 71531698 + - name: gold_comp.title_tx + hashName: 837812267 objectType: 0 gameObject: {fileID: 8012032256679699661} - - name: material_comp.img_bg.tx_power - hashName: 3738183632 + - name: gold_comp.img_bg.tx_power + hashName: 2332588599 objectType: 0 gameObject: {fileID: 1130984108654573481} - - name: material_comp.desc_tx - hashName: 2589309739 + - name: gold_comp.desc_tx + hashName: 1505649810 objectType: 0 gameObject: {fileID: 4611273736405185656} --- !u!1 &4611273736405185656 @@ -3813,12 +3815,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4798551695527847664} - m_RootOrder: 3 + m_RootOrder: 4 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: 141, y: -302} - m_SizeDelta: {x: 370, y: 100} + m_AnchoredPosition: {x: 190, y: -294} + m_SizeDelta: {x: 340, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3582189955552275379 CanvasRenderer: @@ -3952,7 +3954,7 @@ 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: -40} + m_AnchoredPosition: {x: 0, y: -38} m_SizeDelta: {x: 120, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2641721834817466575 @@ -3993,7 +3995,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4291095295 - m_fontColor: {r: 1, g: 0.91764706, b: 0.76862746, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4086,12 +4088,12 @@ RectTransform: - {fileID: 8260140089862090016} - {fileID: 2379941535714284205} m_Father: {fileID: 1670410626358476874} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6924442421944915245 CanvasRenderer: @@ -4179,7 +4181,7 @@ 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: -30, y: -10} + m_AnchoredPosition: {x: -30, y: -14} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7706208217435900284 @@ -4210,7 +4212,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6486a0299fe3ee040a5113d6b9d4d231, type: 3} + m_Sprite: {fileID: 21300000, guid: a6771db3cbdfc43128817853f6e6d43d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4251,12 +4253,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -169.5} - m_SizeDelta: {x: 0, y: -339} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2852322155958638801 CanvasRenderer: @@ -4286,7 +4288,83 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5175625cf706964188266aea6157d0f, type: 3} + m_Sprite: {fileID: 21300000, guid: b974e8a082c55444eafd84806b7109c5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5139677664704761289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 209981585700469598} + - component: {fileID: 1795390304216716777} + - component: {fileID: 8553861075022903440} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &209981585700469598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5139677664704761289} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8441454847264546828} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1795390304216716777 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5139677664704761289} + m_CullTransparentMesh: 1 +--- !u!114 &8553861075022903440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5139677664704761289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 390347f26458c4b19bc2ff1e43b6b039, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4331,8 +4409,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: -266, y: 0} - m_SizeDelta: {x: 100, y: 80} + m_AnchoredPosition: {x: -274, y: 0} + m_SizeDelta: {x: 90, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5206152024236612055 CanvasRenderer: @@ -4365,14 +4443,14 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.20784314, g: 0.23529412, b: 0.28235295, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4555,7 +4633,7 @@ 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: 20, y: -10} + m_AnchoredPosition: {x: 20, y: -14} m_SizeDelta: {x: 60, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3869090800788364278 @@ -4588,8 +4666,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4613,14 +4691,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -4802,13 +4880,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: dungeon_daily_main_ui.gold_comp - hashName: 1117387343 - objectType: 1 - gameObject: {fileID: 4117970956418931131} - name: dungeon_daily_main_ui.material_comp hashName: 1702801768 objectType: 1 + gameObject: {fileID: 4117970956418931131} + - name: dungeon_daily_main_ui.gold_comp + hashName: 1117387343 + objectType: 1 gameObject: {fileID: 4520400201132434853} - name: dungeon_daily_main_ui.bottom.close_btn hashName: 1742373297 @@ -4904,7 +4982,7 @@ 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: 20} + m_AnchoredPosition: {x: 0, y: 17} m_SizeDelta: {x: 126, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &439993651745829899 @@ -4938,7 +5016,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4962,12 +5040,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -5039,7 +5117,7 @@ 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: -30, y: -10} + m_AnchoredPosition: {x: -30, y: -14} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6638739135470871639 @@ -5070,7 +5148,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6486a0299fe3ee040a5113d6b9d4d231, type: 3} + m_Sprite: {fileID: 21300000, guid: a6771db3cbdfc43128817853f6e6d43d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5111,12 +5189,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4798551695527847664} - m_RootOrder: 4 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -169.5} - m_SizeDelta: {x: 0, y: -339} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8045701965692336101 CanvasRenderer: @@ -5146,8 +5224,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: d5175625cf706964188266aea6157d0f, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 063123d7484dd41f4a53a758c5fe76a2, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -5191,7 +5269,7 @@ 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: 20, y: -10} + m_AnchoredPosition: {x: 20, y: -14} m_SizeDelta: {x: 60, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2945771147751928678 @@ -5224,8 +5302,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5249,14 +5327,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -5326,7 +5404,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4314988352786649881 @@ -5360,7 +5438,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 3867a45abce498941a20e7bae19ceb9e, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5461,10 +5539,10 @@ RectTransform: m_Father: {fileID: 1670410626358476874} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -104, y: -16} - m_SizeDelta: {x: 142, y: 81} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 219, y: -12} + m_SizeDelta: {x: 174, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5803349974313299533 CanvasRenderer: @@ -5532,7 +5610,7 @@ GameObject: - component: {fileID: 7930997556948131058} - component: {fileID: 3551432912636510916} m_Layer: 5 - m_Name: material_cell + m_Name: gold_cell m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5552,17 +5630,17 @@ RectTransform: m_Children: - {fileID: 8196883664854241309} - {fileID: 4200332151945230274} + - {fileID: 3780918956129817593} - {fileID: 3517722553887805017} - {fileID: 1352649501410707169} - - {fileID: 3780918956129817593} - {fileID: 6417116352287055582} m_Father: {fileID: 1383963605980930275} m_RootOrder: 0 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: -21.999878} - m_SizeDelta: {x: 656, y: 140} + m_AnchoredPosition: {x: 0, y: -22} + m_SizeDelta: {x: 666, y: 140} m_Pivot: {x: 0.5, y: 1} --- !u!114 &9044434714043040193 MonoBehaviour: @@ -5577,72 +5655,72 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: material_cell.stage_tx - hashName: 244933977 + - name: gold_cell.stage_tx + hashName: 1011214546 objectType: 0 gameObject: {fileID: 1958096257792328823} - - name: material_cell.challenge_btn - hashName: 3284294412 + - name: gold_cell.challenge_btn + hashName: 2599033651 objectType: 0 gameObject: {fileID: 690517681053722271} - - name: material_cell.challenge_btn.text - hashName: 2780244687 + - name: gold_cell.challenge_btn.text + hashName: 334785288 objectType: 0 gameObject: {fileID: 1287404174700255444} - - name: material_cell.sweep_btn - hashName: 3439380245 + - name: gold_cell.sweep_btn + hashName: 1424274108 objectType: 0 gameObject: {fileID: 3095943518117503384} - - name: material_cell.sweep_btn.text - hashName: 234347622 + - name: gold_cell.sweep_btn.text + hashName: 466100511 objectType: 0 gameObject: {fileID: 1327022315979147845} - - name: material_cell.power_tx - hashName: 4092268018 + - name: gold_cell.power_tx + hashName: 563581291 objectType: 0 gameObject: {fileID: 2198444522913435725} - - name: material_cell.scrollrect - hashName: 2400707365 + - name: gold_cell.scrollrect + hashName: 61959262 objectType: 0 gameObject: {fileID: 312913116940887206} - - name: material_cell.unlock_btn - hashName: 1474436053 + - name: gold_cell.unlock_btn + hashName: 3430655246 objectType: 0 gameObject: {fileID: 1657030652758528897} - - name: material_cell.unlock_btn.text - hashName: 3329064870 + - name: gold_cell.unlock_btn.text + hashName: 1923469837 objectType: 0 gameObject: {fileID: 4504455828329906098} - - name: material_cell.challenge_btn.item - hashName: 2779930805 + - name: gold_cell.challenge_btn.item + hashName: 334471406 objectType: 0 gameObject: {fileID: 3867684951241395836} - - name: material_cell.challenge_btn.item.text - hashName: 577062598 + - name: gold_cell.challenge_btn.item.text + hashName: 2847162925 objectType: 0 gameObject: {fileID: 3385012695045375484} - - name: material_cell.challenge_btn.item.icon - hashName: 576732690 + - name: gold_cell.challenge_btn.item.icon + hashName: 2846833017 objectType: 0 gameObject: {fileID: 4937571792852242262} - - name: material_cell.challenge_btn.item.num_tx - hashName: 349032758 + - name: gold_cell.challenge_btn.item.num_tx + hashName: 72060637 objectType: 0 gameObject: {fileID: 8517883544160817959} - - name: material_cell.sweep_btn.item - hashName: 234033740 + - name: gold_cell.sweep_btn.item + hashName: 465786629 objectType: 0 gameObject: {fileID: 3368234916352329133} - - name: material_cell.sweep_btn.item.text - hashName: 3986094991 + - name: gold_cell.sweep_btn.item.text + hashName: 1191297654 objectType: 0 gameObject: {fileID: 747967270319472200} - - name: material_cell.sweep_btn.item.icon - hashName: 3985765083 + - name: gold_cell.sweep_btn.item.icon + hashName: 1190967746 objectType: 0 gameObject: {fileID: 6163904340068679509} - - name: material_cell.sweep_btn.item.num_tx - hashName: 3664082879 + - name: gold_cell.sweep_btn.item.num_tx + hashName: 2218402022 objectType: 0 gameObject: {fileID: 7122941822971268809} --- !u!114 &6246858180101514671 @@ -5697,7 +5775,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dda508f2936225743ad9c2e6d546c2fe, type: 3} + m_Sprite: {fileID: 21300000, guid: f5e776f18fe59c145b2623dd472bb7d6, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5738,12 +5816,12 @@ RectTransform: m_Children: - {fileID: 7342601526565579272} m_Father: {fileID: 876614648820135388} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -8} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5666126760856877472 MonoBehaviour: @@ -5794,7 +5872,7 @@ 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: 20, y: -10} + m_AnchoredPosition: {x: 20, y: -14} m_SizeDelta: {x: 60, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1683831113673748702 @@ -5828,7 +5906,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5852,14 +5930,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -6023,7 +6101,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: -199, y: 1} - m_SizeDelta: {x: 93, y: 93} + m_SizeDelta: {x: 94, y: 94} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2574762812467717572 CanvasRenderer: @@ -6053,7 +6131,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b776715d88f9930489b023d2d06443fa, type: 3} + m_Sprite: {fileID: 21300000, guid: c92531de0d1a2417fa6ae1472c8d9621, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6111,7 +6189,7 @@ 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: -30, y: -10} + m_AnchoredPosition: {x: -30, y: -14} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8726796170410419737 @@ -6142,7 +6220,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6486a0299fe3ee040a5113d6b9d4d231, type: 3} + m_Sprite: {fileID: 21300000, guid: 301967b6e52e1234cb623a81d9ff2e09, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6183,7 +6261,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -6256,12 +6334,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4798551695527847664} - m_RootOrder: 1 + m_RootOrder: 2 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: 134, y: -158} - m_SizeDelta: {x: 380, y: 200} + m_AnchoredPosition: {x: 134, y: -160} + m_SizeDelta: {x: 380, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3994342284462301193 CanvasRenderer: @@ -6294,7 +6372,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 577ef78bdf3df8a48876ae4d53be9bff, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6302,7 +6380,7 @@ MonoBehaviour: serializedVersion: 2 rgba: 4281154140 m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: topLeft: {r: 1, g: 0.94509804, b: 0.44313726, a: 1} @@ -6395,8 +6473,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 16.5, y: 0} - m_SizeDelta: {x: -57, y: 0} + m_AnchoredPosition: {x: 24, y: 0} + m_SizeDelta: {x: -72, y: -32} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &168312203356036805 CanvasRenderer: @@ -6428,15 +6506,15 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 rgba: 4282705919 - m_fontColor: {r: 1, g: 0.90588236, b: 0.26666668, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -6453,12 +6531,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 28 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 28 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -6530,7 +6608,7 @@ 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: 20, y: -10} + m_AnchoredPosition: {x: 20, y: -14} m_SizeDelta: {x: 60, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1478384511966117821 @@ -6563,8 +6641,8 @@ MonoBehaviour: m_Calls: [] m_text: m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6588,14 +6666,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 + m_fontSize: 22 m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 26 + m_fontSizeMax: 22 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -6630,6 +6708,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8587103556248464234 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8389606572556730181} + - component: {fileID: 7039039493754778564} + - component: {fileID: 1418744204975377906} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8389606572556730181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8587103556248464234} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 876614648820135388} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 24, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7039039493754778564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8587103556248464234} + m_CullTransparentMesh: 1 +--- !u!114 &1418744204975377906 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8587103556248464234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2c6b4627c8bb84319ad68fd0ba7cce7f, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &9204361753884790144 GameObject: m_ObjectHideFlags: 0 @@ -6665,7 +6819,7 @@ 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: 6} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 126, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8065891575049051991 @@ -6699,7 +6853,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6796,11 +6950,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 1 + m_RootOrder: 2 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: 134, y: -124} + m_AnchoredPosition: {x: 134, y: -160} m_SizeDelta: {x: 380, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5850345514784952475 @@ -6834,7 +6988,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: e9c2cedfa1977094eb9ac8d3b59f0173, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6842,7 +6996,7 @@ MonoBehaviour: serializedVersion: 2 rgba: 4294967295 m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 1 + m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: topLeft: {r: 1, g: 0.94509804, b: 0.44313726, a: 1} @@ -6866,7 +7020,7 @@ MonoBehaviour: m_fontSizeMax: 80 m_fontStyle: 0 m_HorizontalAlignment: 2 - m_VerticalAlignment: 1024 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0