diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index 2abf905e1..ed1f0bf5b 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -40,6 +40,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} - {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3} - {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} + - {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3} - {fileID: 21300000, guid: cf89f3bc92056c548b62a7278c2c6522, type: 3} - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} @@ -70,6 +71,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} - {fileID: 21300000, guid: a2d6692a383652f4fad43c69cc9f6d83, type: 3} - {fileID: 21300000, guid: 7372681aea33b7b4099e3685b7ee975e, type: 3} + - {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} - {fileID: 21300000, guid: 5758461464520334caa2a2487dca2fc6, type: 3} - {fileID: 21300000, guid: 883d58dd339d5e346b504cdff1be6351, type: 3} @@ -136,4 +138,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19be2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 8b76b4f74..9b59bf0fb 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -135,6 +135,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3} - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} - {fileID: 21300000, guid: 15dba989362b02149bdcef5c42ca474c, type: 3} + - {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3} - {fileID: 21300000, guid: 4ab1c4c9276157d4e9a5c3b3c29ccfab, type: 3} - {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} - {fileID: 21300000, guid: 3867c71afb1f02049b1fee7399381aaa, type: 3} @@ -183,6 +184,7 @@ SpriteAtlas: - {fileID: 21300000, guid: b5366e3fbfd5bde4c85d58b28af1a050, type: 3} - {fileID: 21300000, guid: 70658f5f22e6038469c551a1665ae009, type: 3} - {fileID: 21300000, guid: 2e3a1fdfbb599ba4babe604659b6e1df, type: 3} + - {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3} - {fileID: 21300000, guid: d4fc31efb520b904dbc964028c78b257, type: 3} m_PackedSpriteNamesToIndex: - common_board_24 @@ -259,6 +261,7 @@ SpriteAtlas: - common_dec_11 - common_line_1 - common_dec_13 + - common_board_114 - common_plus_2 - common_check - common_board_20 @@ -307,6 +310,7 @@ SpriteAtlas: - common_board_17 - common_dec_5 - common_dec_7 + - common_btn_dark_4 - common_info m_RenderDataMap: {} m_Tag: common diff --git a/Assets/arts/textures/ui/common/common_board_114.png b/Assets/arts/textures/ui/common/common_board_114.png new file mode 100644 index 000000000..2d39ffe80 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_114.png differ diff --git a/Assets/arts/textures/ui/common/common_board_114.png.meta b/Assets/arts/textures/ui/common/common_board_114.png.meta new file mode 100644 index 000000000..b48ffd5c9 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_114.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: f90c4f99f71e3154e84b7c859c58a6cb +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 31, y: 31, z: 31, w: 2} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_btn_dark_4.png b/Assets/arts/textures/ui/common/common_btn_dark_4.png new file mode 100644 index 000000000..42fca331b Binary files /dev/null and b/Assets/arts/textures/ui/common/common_btn_dark_4.png differ diff --git a/Assets/arts/textures/ui/common/common_btn_dark_4.png.meta b/Assets/arts/textures/ui/common/common_btn_dark_4.png.meta new file mode 100644 index 000000000..6f9c5b6f6 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_btn_dark_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: f006cfdf7637acd4daa55cc3f743ac29 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 19, y: 19, z: 19, w: 19} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/setting/language_ui.prefab b/Assets/prefabs/ui/setting/language_ui.prefab index 05f740e43..0b0bbfd0c 100644 --- a/Assets/prefabs/ui/setting/language_ui.prefab +++ b/Assets/prefabs/ui/setting/language_ui.prefab @@ -34,8 +34,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: 0, y: 4} - m_SizeDelta: {x: 263, y: 30} + m_AnchoredPosition: {x: 0, y: -15} + m_SizeDelta: {x: 263, y: 60} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1572974857966272460 CanvasRenderer: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 38 - m_fontSizeBase: 38 + m_fontSize: 35 + m_fontSizeBase: 35 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -199,7 +199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3} + m_Sprite: {fileID: 21300000, guid: f006cfdf7637acd4daa55cc3f743ac29, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -294,8 +294,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: 0, y: 18} - m_SizeDelta: {x: 666, y: 76} + m_AnchoredPosition: {x: 0, y: -81} + m_SizeDelta: {x: 588, y: 4} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7367952473038335167 CanvasRenderer: @@ -325,8 +325,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1f0e6d68246796849961cb0680d4f226, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -373,7 +373,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -55} + m_AnchoredPosition: {x: 0, y: -166} m_SizeDelta: {x: 560, y: 641} m_Pivot: {x: 0.5, y: 1} --- !u!114 &7791765319350537533 @@ -502,10 +502,10 @@ RectTransform: m_Father: {fileID: 6532261956592226185} m_RootOrder: 3 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: -402} - m_SizeDelta: {x: 110, y: 112} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -22} + m_SizeDelta: {x: 92, y: 98} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1394063912138427145 CanvasRenderer: @@ -616,7 +616,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} + m_Color: {r: 0, g: 0, b: 0, a: 0.972549} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -674,7 +674,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 38} - m_SizeDelta: {x: 604, y: 724} + m_SizeDelta: {x: 610, y: 950} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5192491331257177057 CanvasRenderer: @@ -704,7 +704,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dd9f53f83308a3a4799e84f5ccc9fd79, type: 3} + m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -797,7 +797,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: 0} + m_AnchoredPosition: {x: 0, y: 2} m_SizeDelta: {x: 280, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6025049629819227328 @@ -984,8 +984,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 580, y: 700} + m_AnchoredPosition: {x: 0, y: -37} + m_SizeDelta: {x: 588, y: 854} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &322732028285703719 CanvasRenderer: @@ -1015,7 +1015,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} + m_Sprite: {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1