diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index c0b1bb95a..9b5d708f1 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -42,6 +42,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 3cef9afc451ec9f4682eca5f161cd556, type: 3} - {fileID: 21300000, guid: f90c4f99f71e3154e84b7c859c58a6cb, type: 3} - {fileID: 21300000, guid: 9266dfc5adcc5aa4dbb3c4229d655543, type: 3} + - {fileID: 21300000, guid: 2c02dd0fac140614899bd855278c7f3c, type: 3} - {fileID: 21300000, guid: cf89f3bc92056c548b62a7278c2c6522, type: 3} - {fileID: 21300000, guid: baac6818c7f9ee248a78358bd8adf2ed, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} @@ -139,4 +140,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7718b243e8d8c243e8d8d243e8dc48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782ee49916fef49916ff049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a0c78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a0bed8328da3c7820ca4c7820ca5c7820c01853b19c22f500fbe2eb195bf2eb195c02eb195e8945815e9945815ea9458150c8b0b1a0d8b0b1a0e8b0b1a7d33eeca7e33eeca7f33eecab415951a1fecadc920ecadc922ecadc9a4a12138e0c7a11a5034973951349739523497395334973954349739e1c7a11ae2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a826e418d7a737b477b737b477c737b477d737b47ffce428d252af848262af848272af848a07f7c4ea17f7c4e3c864f1beef286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e35a15c468db6ad7c4f3a0919a03b0919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 9a08764c9..e42cb400e 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -179,6 +179,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3} - {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} + - {fileID: 21300000, guid: 2c02dd0fac140614899bd855278c7f3c, type: 3} - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3} - {fileID: 21300000, guid: c692df1f4d1dfed42a66007b4e4cb315, type: 3} - {fileID: 21300000, guid: c3e22e3f5adf9604295b23ca385609ee, type: 3} @@ -306,6 +307,7 @@ SpriteAtlas: - common_board_9 - common_board_112 - common_board_14 + - common_board_116 - common_chest_1 - common_btn_blue_1 - common_board_108 diff --git a/Assets/arts/textures/background/hero/hero_bg_1.png b/Assets/arts/textures/background/hero/hero_bg_1.png index ff97a3637..8916db68c 100644 Binary files a/Assets/arts/textures/background/hero/hero_bg_1.png and b/Assets/arts/textures/background/hero/hero_bg_1.png differ diff --git a/Assets/arts/textures/ui/common/common_board_116.png b/Assets/arts/textures/ui/common/common_board_116.png new file mode 100644 index 000000000..071e76e53 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_board_116.png differ diff --git a/Assets/arts/textures/ui/common/common_board_116.png.meta b/Assets/arts/textures/ui/common/common_board_116.png.meta new file mode 100644 index 000000000..1e86e9470 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_board_116.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 2c02dd0fac140614899bd855278c7f3c +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: 28, y: 28, z: 28, w: 28} + 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/hero/cell/hero_list_cell.lua.bytes b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes index 9c24a7bba..af2fe0c19 100644 Binary files a/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes and b/Assets/lua/app/ui/hero/cell/hero_list_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index f0785a830..219e80725 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -527,7 +527,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 254} - m_SizeDelta: {x: 398, y: 66} + m_SizeDelta: {x: 398, y: 58} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2949573756051292502 CanvasRenderer: @@ -557,7 +557,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a806bb907d2075d44a8ea0a190a92c52, type: 3} + m_Sprite: {fileID: 21300000, guid: 78476f8317662dd4bb348718015e3658, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -679,8 +679,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 372} - m_SizeDelta: {x: 0, y: -896} + m_AnchoredPosition: {x: 0, y: 381} + m_SizeDelta: {x: 0, y: -878} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4646135893159883983 GameObject: @@ -927,7 +927,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 20} m_SizeDelta: {x: 670, y: 220} m_Pivot: {x: 0.5, y: 0} --- !u!1 &4992365693003851834 @@ -964,7 +964,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 6} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2288057476840783197 @@ -1100,7 +1100,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -142} - m_SizeDelta: {x: 372, y: 74} + m_SizeDelta: {x: 372, y: 68} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8235367312161999114 CanvasRenderer: @@ -1130,7 +1130,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3df1f1c0900d28e48958abf63b77fd5e, type: 3} + m_Sprite: {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2295,7 +2295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_AnchoredPosition.y - value: -229.1 + value: -209.1 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: cfa61de4a14c0a74db02811a55d1a8c7, type: 3} propertyPath: m_LocalEulerAnglesHint.x