diff --git a/Assets/arts/atlas/ui/main.asset b/Assets/arts/atlas/ui/main.asset index 833b03c0a..becad7b34 100644 --- a/Assets/arts/atlas/ui/main.asset +++ b/Assets/arts/atlas/ui/main.asset @@ -25,5 +25,7 @@ MonoBehaviour: - {fileID: 21300000, guid: ac95da3d35af16f42a23be26f95d5242, type: 3} - {fileID: 21300000, guid: 296a6182d7f78e94383c45f11c4c6fdb, type: 3} - {fileID: 21300000, guid: 97c8eba9132d32246ae08c3cbc05c7cb, type: 3} + - {fileID: 21300000, guid: 4acb7dd045b38d445adbf073200bd73a, type: 3} + - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3} - {fileID: 21300000, guid: df3282ede5d4e6740b33cbb893059cb3, type: 3} - spriteNameList: 7d7901f1348a45df3b208104d5cfde8b80658304a5b4b1319b75338ce7ad997bb87f34fa4e9586042e11492f2f11492f61a4d796 + spriteNameList: 7d7901f1348a45df3b208104d5cfde8b80658304a5b4b1319b75338ce7ad997bb87f34fa4e9586042e11492f2f11492f3011492f3111492f61a4d796 diff --git a/Assets/arts/atlas/ui/main.spriteatlas b/Assets/arts/atlas/ui/main.spriteatlas index 65017aa02..34e4c84f0 100644 --- a/Assets/arts/atlas/ui/main.spriteatlas +++ b/Assets/arts/atlas/ui/main.spriteatlas @@ -61,11 +61,13 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 4acb7dd045b38d445adbf073200bd73a, type: 3} - {fileID: 21300000, guid: 9801a63125a239349aa621a6aaf6b164, type: 3} - {fileID: 21300000, guid: d74a30412c3dd324ea5bfc19f387fc3c, type: 3} - {fileID: 21300000, guid: 296a6182d7f78e94383c45f11c4c6fdb, type: 3} - {fileID: 21300000, guid: 3b5c4427fd9d7e14b936f1d25b28aa07, type: 3} - {fileID: 21300000, guid: ddc829b8adf444b43a57f7ddbd279aa9, type: 3} + - {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3} - {fileID: 21300000, guid: 97c8eba9132d32246ae08c3cbc05c7cb, type: 3} - {fileID: 21300000, guid: 6a471cbadff649e429c3ca4a54c0fd4b, type: 3} - {fileID: 21300000, guid: a11d2ecba6359b7449faa1c86929e65b, type: 3} @@ -75,11 +77,13 @@ SpriteAtlas: - {fileID: 21300000, guid: 2ae50aed0182729429de176b08707a75, type: 3} - {fileID: 21300000, guid: 42b38fed8c8d3464c925bb559928d444, type: 3} m_PackedSpriteNamesToIndex: + - main_dec_3 - main_btn_ligth - main_btn_setting - main_dec_1 - main_btn_sevenday - main_btn_bounty + - main_dec_4 - main_dec_2 - main_bg_1 - main_btn_pig diff --git a/Assets/arts/atlas/ui/setting.asset b/Assets/arts/atlas/ui/setting.asset index ae925f0ce..49fae8195 100644 --- a/Assets/arts/atlas/ui/setting.asset +++ b/Assets/arts/atlas/ui/setting.asset @@ -28,7 +28,6 @@ MonoBehaviour: - {fileID: 21300000, guid: cb6f3df0ba4bf6a43b496997afeef3c5, type: 3} - {fileID: 21300000, guid: 8f13ecccc6ac0924a95c9dfcaf551559, type: 3} - {fileID: 21300000, guid: 7a35843cc154240459d64df8b972b216, type: 3} - - {fileID: 21300000, guid: e79d1c28fcd79504aaa0afe9f0d0b00f, type: 3} - {fileID: 21300000, guid: d703af51910191049ae5c12a82cf1753, type: 3} - {fileID: 21300000, guid: e5eed40ad8ee078429e388683e9754a9, type: 3} - {fileID: 21300000, guid: dc4c490c976ae854f97b4d48a876936c, type: 3} @@ -37,4 +36,4 @@ MonoBehaviour: - {fileID: 21300000, guid: f275782590a645a4e887cb6d59347429, type: 3} - {fileID: 21300000, guid: 0fca758d81ccdbd43acc5cf84da21238, type: 3} - {fileID: 21300000, guid: 86405979c45010c428e99e4fe0965b90, type: 3} - spriteNameList: b2fee9b9c8fee9b9f0fee9b913ffe9b962ffe9b98dffe9b9abffe9b94b00eab98a00eab9bb00eab9fa00eab97501eab94637c61e4737c61e293e7c4a5fd806ba87c0ad22850c1cba860c1cba870c1cba880c1cba65e6f5f675c3499776c34997 + spriteNameList: b2fee9b9c8fee9b9f0fee9b913ffe9b962ffe9b98dffe9b9abffe9b94b00eab98a00eab9bb00eab9fa00eab97501eab94637c61e4737c61e293e7c4a87c0ad22850c1cba860c1cba870c1cba880c1cba65e6f5f675c3499776c34997 diff --git a/Assets/arts/textures/ui/main/main_dec_3.png b/Assets/arts/textures/ui/main/main_dec_3.png new file mode 100644 index 000000000..473b538b1 Binary files /dev/null and b/Assets/arts/textures/ui/main/main_dec_3.png differ diff --git a/Assets/arts/textures/ui/main/main_dec_3.png.meta b/Assets/arts/textures/ui/main/main_dec_3.png.meta new file mode 100644 index 000000000..515cf9721 --- /dev/null +++ b/Assets/arts/textures/ui/main/main_dec_3.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 4acb7dd045b38d445adbf073200bd73a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/ui/main/main_dec_4.png b/Assets/arts/textures/ui/main/main_dec_4.png new file mode 100644 index 000000000..29458c3a9 Binary files /dev/null and b/Assets/arts/textures/ui/main/main_dec_4.png differ diff --git a/Assets/arts/textures/ui/main/main_dec_4.png.meta b/Assets/arts/textures/ui/main/main_dec_4.png.meta new file mode 100644 index 000000000..881e1a5ee --- /dev/null +++ b/Assets/arts/textures/ui/main/main_dec_4.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 64f989e8b40a3fc4ea138aa6d314d7be +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes b/Assets/lua/app/ui/game_setting/select_other_btn_ui.lua.bytes index 37282261d..53cb5a7c1 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/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index e39cba9d3..a4914e33b 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -85, y: 7} - m_SizeDelta: {x: 56, y: 56} + m_SizeDelta: {x: 56, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &313892473971810460 CanvasRenderer: @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 4acb7dd045b38d445adbf073200bd73a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -110,7 +110,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -85, y: 7} - m_SizeDelta: {x: 56, y: 56} + m_SizeDelta: {x: 56, y: 55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8209206685049566069 CanvasRenderer: @@ -140,7 +140,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 64f989e8b40a3fc4ea138aa6d314d7be, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -898,6 +898,10 @@ MonoBehaviour: hashName: 3235023218 objectType: 0 gameObject: {fileID: 3275157678371083214} + - name: select_other_btn_ui.mask + hashName: 2659865585 + objectType: 0 + gameObject: {fileID: 3582769104536134055} --- !u!114 &838584963112415459 MonoBehaviour: m_ObjectHideFlags: 0