diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 76e4c3ae9..3a2c1674f 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -65,6 +65,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} - {fileID: 21300000, guid: d716c5505f7f54fe4bdb624b55141012, type: 3} - {fileID: 21300000, guid: 0068587080dd0488dad9da673f466698, type: 3} + - {fileID: 21300000, guid: 878338804acdb449ea7a94ae5677bd9c, type: 3} - {fileID: 21300000, guid: 3dd545a09127741f68ada89e6e81ddaa, type: 3} - {fileID: 21300000, guid: f26e07a00be5c469c92ffb50eaf4482d, type: 3} - {fileID: 21300000, guid: 5ff1c8b0895334dfc8ae5fe59385a7e1, type: 3} @@ -91,6 +92,7 @@ SpriteAtlas: - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} - {fileID: 21300000, guid: 0c2e6622cf248458283cb7b15c8933fd, type: 3} - {fileID: 21300000, guid: 3cf1784287669db4f91e9b56d1ebc7e1, type: 3} + - {fileID: 21300000, guid: 6e137e52f578c4b72bebb4002d0ef804, type: 3} - {fileID: 21300000, guid: 09f534928469c4be8ab76af3a36e2984, type: 3} - {fileID: 21300000, guid: 189e9bc2ff60848509e40f961cf13e63, type: 3} - {fileID: 21300000, guid: 2d9502d243e5a496789ae54a3c0ba374, type: 3} @@ -101,6 +103,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} - {fileID: 21300000, guid: 6ef1b543fd626412fa2710c34227ad11, type: 3} - {fileID: 21300000, guid: 792ef1532be4a470aaf22dff9cde4e68, type: 3} + - {fileID: 21300000, guid: 0e9b0f533f4a24a2ebdbc79d49003ce6, type: 3} - {fileID: 21300000, guid: ba69d1639f9c54fcaa78295c5d38b76e, type: 3} - {fileID: 21300000, guid: bda09083248aa4684bbcb15346d7be8d, type: 3} - {fileID: 21300000, guid: 5140a3a33b636314fb3d07bdc4c9c0f3, type: 3} @@ -191,6 +194,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 03e9d37b2ef2848b4a255055395013dd, type: 3} - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - {fileID: 21300000, guid: 591f658b8a0414c2bab105afddb629fc, type: 3} + - {fileID: 21300000, guid: 40ecebbbd24b643d7881d0bde6b08d9b, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - {fileID: 21300000, guid: 5c537adb5c9044a849752091cf00ea58, type: 3} - {fileID: 21300000, guid: 19cb89eba1b174df4b091ee3984e7f9b, type: 3} @@ -227,6 +231,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} - {fileID: 21300000, guid: a6132c5e3e7a04518a1870bc230ee156, type: 3} - {fileID: 21300000, guid: 1382fc8e2fd70419eb51aaad5a5ec6d9, type: 3} + - {fileID: 21300000, guid: 1cb5c89eb74a8461f85bbdf88ea37c4e, type: 3} - {fileID: 21300000, guid: 5aa123eeba3874e96a77af3433b3f977, type: 3} - {fileID: 21300000, guid: d28ed00fffa11c7408e4c457ddab242c, type: 3} - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} @@ -238,6 +243,7 @@ SpriteAtlas: - common_bg_29 - common_bg_37 - common_btn_close_2 + - common_board_2 - common_bg_27 - common_bg_38 - common_btn_go @@ -264,6 +270,7 @@ SpriteAtlas: - common_btn_yellow_2 - common_btn_rewrite - common_bg_8 + - common_line_7 - common_quality_3 - common_bg_44 - common_bg_17 @@ -274,6 +281,7 @@ SpriteAtlas: - common_dec_tick - common_bg_30 - common_icon_record + - common_arrow_10 - common_btn_info - common_dec_11 - common_progress_2_bg @@ -364,6 +372,7 @@ SpriteAtlas: - common_star_0 - common_bg_3 - common_bg_13 + - common_board_1 - common_btn_green_1 - common_bg_39 - common_info_3 @@ -400,6 +409,7 @@ SpriteAtlas: - common_dec_4 - common_btn_option - common_bg_48 + - common_dec_tick_1 - common_tips_5 - common_menu_4 - common_btn_blue_1 diff --git a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png index b011db8a2..1058e614f 100644 Binary files a/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png and b/Assets/arts/textures/background/act_sevenday/act_sevenday_bg_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png index 3ff50c5cc..f49933b4c 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png index 6015abcd9..8b58ab272 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_2.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png index 20158cb57..7beee7925 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_3.png differ diff --git a/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png b/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png index 6608b6913..ace860768 100644 Binary files a/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png and b/Assets/arts/textures/ui/battle/battle_obstacle_chest_4.png differ diff --git a/Assets/arts/textures/ui/common/common_arrow_10.png b/Assets/arts/textures/ui/common/common_arrow_10.png new file mode 100644 index 000000000..2b6108263 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_arrow_10.png differ diff --git a/Assets/arts/textures/ui/common/common_arrow_10.png.meta b/Assets/arts/textures/ui/common/common_arrow_10.png.meta new file mode 100644 index 000000000..c30c93fe6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_arrow_10.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 0e9b0f533f4a24a2ebdbc79d49003ce6 +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/common/common_board_1.png b/Assets/arts/textures/ui/common/common_board_1.png new file mode 100644 index 000000000..bd63e57b9 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_1.png differ diff --git a/Assets/arts/textures/ui/common/common_board_1.png.meta b/Assets/arts/textures/ui/common/common_board_1.png.meta new file mode 100644 index 000000000..ea105663b --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 40ecebbbd24b643d7881d0bde6b08d9b +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/common/common_board_2.png b/Assets/arts/textures/ui/common/common_board_2.png new file mode 100644 index 000000000..ae85bc968 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_2.png differ diff --git a/Assets/arts/textures/ui/common/common_board_2.png.meta b/Assets/arts/textures/ui/common/common_board_2.png.meta new file mode 100644 index 000000000..c03e418d8 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 878338804acdb449ea7a94ae5677bd9c +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: 16, y: 16, z: 16, w: 16} + 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: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_btn_option.png b/Assets/arts/textures/ui/common/common_btn_option.png index e59299a21..bad047ae9 100644 Binary files a/Assets/arts/textures/ui/common/common_btn_option.png and b/Assets/arts/textures/ui/common/common_btn_option.png differ diff --git a/Assets/arts/textures/ui/common/common_chest_2.png b/Assets/arts/textures/ui/common/common_chest_2.png index 9e22ca29f..ea255a45d 100644 Binary files a/Assets/arts/textures/ui/common/common_chest_2.png and b/Assets/arts/textures/ui/common/common_chest_2.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_tick.png b/Assets/arts/textures/ui/common/common_dec_tick.png index 5e82179e4..56dd7232e 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_tick.png and b/Assets/arts/textures/ui/common/common_dec_tick.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_tick_1.png b/Assets/arts/textures/ui/common/common_dec_tick_1.png new file mode 100644 index 000000000..8f57d73a2 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_dec_tick_1.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_tick_1.png.meta b/Assets/arts/textures/ui/common/common_dec_tick_1.png.meta new file mode 100644 index 000000000..4ada515d6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_dec_tick_1.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 1cb5c89eb74a8461f85bbdf88ea37c4e +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/common/common_icon_bag.png b/Assets/arts/textures/ui/common/common_icon_bag.png index f02b7b990..f7a0b95c5 100644 Binary files a/Assets/arts/textures/ui/common/common_icon_bag.png and b/Assets/arts/textures/ui/common/common_icon_bag.png differ diff --git a/Assets/arts/textures/ui/common/common_icon_mail.png b/Assets/arts/textures/ui/common/common_icon_mail.png index 59b66db9f..d34d7e268 100644 Binary files a/Assets/arts/textures/ui/common/common_icon_mail.png and b/Assets/arts/textures/ui/common/common_icon_mail.png differ diff --git a/Assets/arts/textures/ui/common/common_icon_set.png b/Assets/arts/textures/ui/common/common_icon_set.png index c1834ec13..08232bde0 100644 Binary files a/Assets/arts/textures/ui/common/common_icon_set.png and b/Assets/arts/textures/ui/common/common_icon_set.png differ diff --git a/Assets/arts/textures/ui/common/common_icon_tool.png b/Assets/arts/textures/ui/common/common_icon_tool.png index 55eba8dce..37c4d56f9 100644 Binary files a/Assets/arts/textures/ui/common/common_icon_tool.png and b/Assets/arts/textures/ui/common/common_icon_tool.png differ diff --git a/Assets/arts/textures/ui/common/common_info_1.png b/Assets/arts/textures/ui/common/common_info_1.png index 6c167aa5b..52ef82c04 100644 Binary files a/Assets/arts/textures/ui/common/common_info_1.png and b/Assets/arts/textures/ui/common/common_info_1.png differ diff --git a/Assets/arts/textures/ui/common/common_info_3.png b/Assets/arts/textures/ui/common/common_info_3.png index 0b524fbd4..e8960aa4e 100644 Binary files a/Assets/arts/textures/ui/common/common_info_3.png and b/Assets/arts/textures/ui/common/common_info_3.png differ diff --git a/Assets/arts/textures/ui/common/common_line_7.png b/Assets/arts/textures/ui/common/common_line_7.png new file mode 100644 index 000000000..c27f2caf4 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_line_7.png differ diff --git a/Assets/arts/textures/ui/common/common_line_7.png.meta b/Assets/arts/textures/ui/common/common_line_7.png.meta new file mode 100644 index 000000000..d6a7d30fe --- /dev/null +++ b/Assets/arts/textures/ui/common/common_line_7.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 6e137e52f578c4b72bebb4002d0ef804 +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/common/common_selected_1.png b/Assets/arts/textures/ui/common/common_selected_1.png index 90f7d244c..09045e257 100644 Binary files a/Assets/arts/textures/ui/common/common_selected_1.png and b/Assets/arts/textures/ui/common/common_selected_1.png differ diff --git a/Assets/arts/textures/ui/main/main_bg_2.png b/Assets/arts/textures/ui/main/main_bg_2.png index be518d173..38f4ddc7f 100644 Binary files a/Assets/arts/textures/ui/main/main_bg_2.png and b/Assets/arts/textures/ui/main/main_bg_2.png differ diff --git a/Assets/arts/textures/ui/main/main_bg_3.png b/Assets/arts/textures/ui/main/main_bg_3.png index 22cc8f3e8..83379b3fe 100644 Binary files a/Assets/arts/textures/ui/main/main_bg_3.png and b/Assets/arts/textures/ui/main/main_bg_3.png differ diff --git a/Assets/arts/textures/ui/main/main_btn_2.png b/Assets/arts/textures/ui/main/main_btn_2.png index 045d2b294..07b82afd1 100644 Binary files a/Assets/arts/textures/ui/main/main_btn_2.png and b/Assets/arts/textures/ui/main/main_btn_2.png differ diff --git a/Assets/arts/textures/ui/main/main_btn_record.png b/Assets/arts/textures/ui/main/main_btn_record.png index 64e5e44f9..01d79b654 100644 Binary files a/Assets/arts/textures/ui/main/main_btn_record.png and b/Assets/arts/textures/ui/main/main_btn_record.png differ diff --git a/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes b/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes index 12336d9e6..a06be141e 100644 Binary files a/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes and b/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index a13104dd8..b22b7bad0 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab index cd7446613..282fedfa1 100644 --- a/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sevenday/act_sevenday_ui.prefab @@ -6839,8 +6839,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: 205, y: 308} - m_SizeDelta: {x: 591, y: 570} + m_AnchoredPosition: {x: 223, y: 440} + m_SizeDelta: {x: 512, y: 450} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6482230253465983722 CanvasRenderer: diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index 88a0d235f..9d07a4d20 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -172,7 +172,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8145175208313182464 CanvasRenderer: @@ -240,7 +240,7 @@ RectTransform: m_GameObject: {fileID: 396200962468067105} 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_LocalScale: {x: 0.94, y: 0.94, z: 0.94} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2491444941992480077} @@ -707,7 +707,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3772653462127904749 CanvasRenderer: @@ -1564,7 +1564,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3262121322967686265 CanvasRenderer: @@ -1801,7 +1801,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5356789801800176489 CanvasRenderer: @@ -3190,7 +3190,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5198468381013077967 CanvasRenderer: @@ -3465,7 +3465,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5431957220558539544 CanvasRenderer: @@ -3685,7 +3685,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -47} - m_SizeDelta: {x: 490, y: 64} + m_SizeDelta: {x: 490, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2591559675385586788 MonoBehaviour: @@ -3704,7 +3704,7 @@ MonoBehaviour: top: 0 bottom: 0 childAlignment: 4 - spacing: 34 + spacing: 18 verticalOrHorizontal: 0 --- !u!1 &5753048433946951030 GameObject: @@ -4169,7 +4169,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1253555213813863607 CanvasRenderer: @@ -4426,7 +4426,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &231839714198645584 CanvasRenderer: @@ -5062,7 +5062,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4510435810920442274 CanvasRenderer: @@ -5499,7 +5499,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8079969049810428639 CanvasRenderer: diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 6b11c6e1c..9cf51cf97 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -289,7 +289,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: 40, y: 35} + m_AnchoredPosition: {x: 46, y: 40} m_SizeDelta: {x: 32, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4358790806233977181 @@ -471,8 +471,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 296.5, y: -249} - m_SizeDelta: {x: 80, y: 80} + m_AnchoredPosition: {x: 296, y: -244} + m_SizeDelta: {x: 76, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3525642362359149774 CanvasRenderer: @@ -559,7 +559,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: 40, y: 35} + m_AnchoredPosition: {x: 46, y: 40} m_SizeDelta: {x: 32, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7057678347636094768 @@ -1646,7 +1646,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: 40, y: 35} + m_AnchoredPosition: {x: 46, y: 40} m_SizeDelta: {x: 32, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1928313962639110284 @@ -1828,8 +1828,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -304, y: -239} - m_SizeDelta: {x: 56, y: 68} + m_AnchoredPosition: {x: -296, y: -242} + m_SizeDelta: {x: 76, y: 86} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &343283185605169007 CanvasRenderer: @@ -1859,7 +1859,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fea559dfd4b4df044bdcc6e636ca8ce3, type: 3} + m_Sprite: {fileID: 21300000, guid: 06e523510c3474af2af102e6a49f88c1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2485,7 +2485,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: 40, y: 35} + m_AnchoredPosition: {x: 46, y: 40} m_SizeDelta: {x: 32, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7811276228670901579 diff --git a/Assets/prefabs/ui/main_city/side_bar_comp.prefab b/Assets/prefabs/ui/main_city/side_bar_comp.prefab index 04d036509..b12832741 100644 --- a/Assets/prefabs/ui/main_city/side_bar_comp.prefab +++ b/Assets/prefabs/ui/main_city/side_bar_comp.prefab @@ -38,7 +38,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60, y: 27} + m_AnchoredPosition: {x: 64, y: 27} m_SizeDelta: {x: 32, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8600956650411029961 @@ -232,7 +232,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 60, y: 0} + m_AnchoredPosition: {x: 64, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 1} --- !u!1 &3820768187207965670 @@ -268,7 +268,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: 0} + m_AnchoredPosition: {x: -64, y: 0} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 1} --- !u!1 &5640247941316809582 @@ -309,7 +309,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -60, y: 27} + m_AnchoredPosition: {x: -64, y: 27} m_SizeDelta: {x: 32, y: 52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1477322738975940508 @@ -450,7 +450,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -16, y: -6} - m_SizeDelta: {x: 26, y: 26} + m_SizeDelta: {x: 26, y: 27} m_Pivot: {x: 1, y: 1} --- !u!222 &5475205463705973885 CanvasRenderer: @@ -480,7 +480,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -526,7 +526,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -16, y: -6} - m_SizeDelta: {x: 26, y: 26} + m_SizeDelta: {x: 26, y: 27} m_Pivot: {x: 1, y: 1} --- !u!222 &7456240657750673429 CanvasRenderer: @@ -556,7 +556,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77492aece4267bb4cb623f0bcc4253de, type: 3} + m_Sprite: {fileID: 21300000, guid: 3eb24e516a508b34e95d18d01316747c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index bd571a355..f8d125fbf 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -31,13 +31,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1987694164396694498} - m_RootOrder: 1 + m_RootOrder: 2 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: -13, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 80, y: 24} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6936893058293274002 CanvasRenderer: m_ObjectHideFlags: 0 @@ -93,14 +93,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 + m_fontSize: 24 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 34 + m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -166,11 +166,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2198481086097669730} - m_RootOrder: 0 + m_RootOrder: 1 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: -38, y: 0} + m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &313892473971810460 @@ -242,12 +242,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3251564394244787417} - m_RootOrder: 0 + m_RootOrder: 1 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: -38, y: 0} - m_SizeDelta: {x: 34, y: 34} + m_AnchoredPosition: {x: -45, y: 0} + m_SizeDelta: {x: 46, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8209206685049566069 CanvasRenderer: @@ -318,15 +318,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7054754692889522765} - {fileID: 7478773028872524474} - {fileID: 1451918511630981069} m_Father: {fileID: 6532261956592226185} 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: -36} - m_SizeDelta: {x: 144, y: 52} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -33} + m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7773494474059222933 CanvasRenderer: @@ -356,7 +357,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -379,6 +380,82 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &1894689668138168608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 666044437463061668} + - component: {fileID: 6000683784693001762} + - component: {fileID: 1137381114600523313} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &666044437463061668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894689668138168608} + 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: 1987694164396694498} + m_RootOrder: 0 + 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: -45, y: 0} + m_SizeDelta: {x: 46, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6000683784693001762 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894689668138168608} + m_CullTransparentMesh: 1 +--- !u!114 &1137381114600523313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894689668138168608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 40ecebbbd24b643d7881d0bde6b08d9b, 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 &2764863666206421687 GameObject: m_ObjectHideFlags: 0 @@ -410,15 +487,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 8521504847160518453} - {fileID: 6334354001788662849} - {fileID: 5392157314889844364} m_Father: {fileID: 6532261956592226185} 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} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -92} - m_SizeDelta: {x: 144, y: 52} + m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &462833294880461213 CanvasRenderer: @@ -448,7 +526,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -502,13 +580,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3251564394244787417} - m_RootOrder: 1 + m_RootOrder: 2 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: -13, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 80, y: 24} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2937228301080521382 CanvasRenderer: m_ObjectHideFlags: 0 @@ -564,14 +642,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 + m_fontSize: 24 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 34 + m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -637,11 +715,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1987694164396694498} - m_RootOrder: 0 + m_RootOrder: 1 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: -38, y: 0} + m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5596838540487193616 @@ -682,6 +760,82 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3551974099043829301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5697118763878981349} + - component: {fileID: 3222250907235353453} + - component: {fileID: 8139629039858889393} + m_Layer: 5 + m_Name: line_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5697118763878981349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551974099043829301} + 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: 6532261956592226185} + m_RootOrder: 6 + 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: -178} + m_SizeDelta: {x: 156, y: 5} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3222250907235353453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551974099043829301} + m_CullTransparentMesh: 1 +--- !u!114 &8139629039858889393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551974099043829301} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 6e137e52f578c4b72bebb4002d0ef804, 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 &3961971343371962336 GameObject: m_ObjectHideFlags: 0 @@ -713,15 +867,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 666044437463061668} - {fileID: 2552928582792349357} - {fileID: 153955675827897022} m_Father: {fileID: 6532261956592226185} 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: 0, y: -148} - m_SizeDelta: {x: 144, y: 52} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -151} + m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4977715504965362469 CanvasRenderer: @@ -751,7 +906,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -809,13 +964,16 @@ RectTransform: - {fileID: 2198481086097669730} - {fileID: 1987694164396694498} - {fileID: 2001377662689540356} + - {fileID: 668576161485588059} + - {fileID: 840259504270920964} + - {fileID: 5697118763878981349} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -18, y: -286} - m_SizeDelta: {x: 162, y: 244} + m_SizeDelta: {x: 164, y: 244} m_Pivot: {x: 1, y: 1} --- !u!222 &5192491331257177057 CanvasRenderer: @@ -839,13 +997,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 6ef1b543fd626412fa2710c34227ad11, type: 3} + m_Sprite: {fileID: 21300000, guid: 878338804acdb449ea7a94ae5677bd9c, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -899,13 +1057,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2198481086097669730} - m_RootOrder: 1 + m_RootOrder: 2 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: -13, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 80, y: 24} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3662780689206770409 CanvasRenderer: m_ObjectHideFlags: 0 @@ -961,14 +1119,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 + m_fontSize: 24 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 34 + m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1034,11 +1192,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2001377662689540356} - m_RootOrder: 0 + m_RootOrder: 1 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: -38, y: 0} + m_AnchoredPosition: {x: -45, y: 0} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1033419904659376658 @@ -1079,6 +1237,158 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4288362515209879852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8521504847160518453} + - component: {fileID: 6300553071588659840} + - component: {fileID: 7895454961867531516} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8521504847160518453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288362515209879852} + 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: 2198481086097669730} + m_RootOrder: 0 + 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: -45, y: 0} + m_SizeDelta: {x: 46, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6300553071588659840 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288362515209879852} + m_CullTransparentMesh: 1 +--- !u!114 &7895454961867531516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4288362515209879852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 40ecebbbd24b643d7881d0bde6b08d9b, 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 &5584134049788788552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 668576161485588059} + - component: {fileID: 4126183630969222905} + - component: {fileID: 1338805145284427384} + m_Layer: 5 + m_Name: line_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &668576161485588059 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5584134049788788552} + 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: 6532261956592226185} + 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: 0, y: -60} + m_SizeDelta: {x: 156, y: 5} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4126183630969222905 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5584134049788788552} + m_CullTransparentMesh: 1 +--- !u!114 &1338805145284427384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5584134049788788552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 6e137e52f578c4b72bebb4002d0ef804, 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 &5997397792976241942 GameObject: m_ObjectHideFlags: 0 @@ -1218,6 +1528,18 @@ MonoBehaviour: hashName: 3406098260 objectType: 0 gameObject: {fileID: 8936600909121364069} + - name: select_other_btn_ui.bg.line_1 + hashName: 4213821066 + objectType: 0 + gameObject: {fileID: 5584134049788788552} + - name: select_other_btn_ui.bg.line_2 + hashName: 4213821067 + objectType: 0 + gameObject: {fileID: 6321893935969249289} + - name: select_other_btn_ui.bg.line_3 + hashName: 4213821068 + objectType: 0 + gameObject: {fileID: 3551974099043829301} --- !u!114 &838584963112415459 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1277,6 +1599,234 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 0 +--- !u!1 &6321893935969249289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 840259504270920964} + - component: {fileID: 4543508985918347857} + - component: {fileID: 6990360769684402140} + m_Layer: 5 + m_Name: line_2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &840259504270920964 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321893935969249289} + 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: 6532261956592226185} + m_RootOrder: 5 + 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: -119} + m_SizeDelta: {x: 156, y: 5} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4543508985918347857 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321893935969249289} + m_CullTransparentMesh: 1 +--- !u!114 &6990360769684402140 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321893935969249289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 6e137e52f578c4b72bebb4002d0ef804, 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 &6670479092034202778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6453734919822800895} + - component: {fileID: 1451822248613014534} + - component: {fileID: 5111655939620246864} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6453734919822800895 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6670479092034202778} + 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: 2001377662689540356} + m_RootOrder: 0 + 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: -45, y: 0} + m_SizeDelta: {x: 46, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1451822248613014534 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6670479092034202778} + m_CullTransparentMesh: 1 +--- !u!114 &5111655939620246864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6670479092034202778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 40ecebbbd24b643d7881d0bde6b08d9b, 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 &6921942393345996440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7054754692889522765} + - component: {fileID: 7696248897297974383} + - component: {fileID: 2844659493243301188} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7054754692889522765 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6921942393345996440} + 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: 3251564394244787417} + m_RootOrder: 0 + 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: -45, y: 0} + m_SizeDelta: {x: 46, y: 46} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7696248897297974383 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6921942393345996440} + m_CullTransparentMesh: 1 +--- !u!114 &2844659493243301188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6921942393345996440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 40ecebbbd24b643d7881d0bde6b08d9b, 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 &8025481195902169917 GameObject: m_ObjectHideFlags: 0 @@ -1308,15 +1858,16 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 6453734919822800895} - {fileID: 3721673134913646307} - {fileID: 3453695780814355293} m_Father: {fileID: 6532261956592226185} 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: 0, y: -204} - m_SizeDelta: {x: 144, y: 52} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -210} + m_SizeDelta: {x: 0, y: 46} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &642128366656363747 CanvasRenderer: @@ -1346,7 +1897,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3b7c1540baf6d4bb98a215e004ee42f1, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1400,13 +1951,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2001377662689540356} - m_RootOrder: 1 + m_RootOrder: 2 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: -13, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 28, y: 0} m_SizeDelta: {x: 80, y: 24} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8402964845939940735 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1462,14 +2013,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34 + m_fontSize: 24 m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 34 + m_fontSizeMax: 24 m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0