diff --git a/Assets/arts/atlas/ui/common.asset b/Assets/arts/atlas/ui/common.asset index f27264c81..095c1358a 100644 --- a/Assets/arts/atlas/ui/common.asset +++ b/Assets/arts/atlas/ui/common.asset @@ -252,6 +252,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 756e82bf5365819469e645ec8f1c04f6, type: 3} - {fileID: 21300000, guid: 39a6a51bc7e052c43b1b410c95dd6120, type: 3} - {fileID: 21300000, guid: 08cc8f9d65fd24cf2a347c24c264f15f, type: 3} + - {fileID: 21300000, guid: 03e9d37b2ef2848b4a255055395013dd, type: 3} - {fileID: 21300000, guid: 8674bea5658936f42a406b8b4655a7cd, type: 3} - {fileID: 21300000, guid: 5263b9a86b77b2148823254343718685, type: 3} - {fileID: 21300000, guid: e307a649d1c444bb89c5fc94044f2b41, type: 3} @@ -290,4 +291,4 @@ MonoBehaviour: - {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} - {fileID: 21300000, guid: 56c233d89e320ac4891f34a6706ffc0c, type: 3} - {fileID: 21300000, guid: d1a0b8eb4c42f7748acb13df7b748132, type: 3} - spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220558aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 + spriteNameList: e9a43d8deba43d8deca43d8d0ae27a1a2757a7712857a7712957a7712a57a7712b57a7712c57a7712d57a771b1ff831a37ebefa68b243e8d056d861a066d861a076d861a086d861a096d861a0a6d861a0b6d861a0c6d861a0d6d861a0e6d861a8c243e8d246d861a256d861a266d861a276d861a286d861a2b6d861a2c6d861a2d6d861a8d243e8d436d861a446d861a456d861a466d861a476d861a486d861a496d861a8e243e8d8f243e8d90243e8d91243e8d92243e8d93243e8d5ff0dec4c48e80a0ec49916fc5f39782c6f39782c7f39782c8f39782c9f39782caf39782cbf39782ccf39782cdf39782ed49916fe3f39782e4f39782e5f39782e6f39782e7f39782e8f39782e9f39782eaf39782ebf39782ecf39782ee49916f02f4978203f4978204f4978205f4978206f4978207f4978208f4978209f497820af497820bf49782ef49916f21f4978222f4978223f4978224f4978225f49782f049916ff149916ff249916ff349916ff449916ff549916fc58e80a00b4a916f0c4a916f0d4a916f0e4a916f0f4a916f104a916f114a916f124a916f134a916fc68e80a02f4a916f304a916fc78e80a0c88e80a0c98e80a0ca8e80a0cb8e80a0cc8e80a085d402ef86d402ef87d402eff7dba86df8dba86df9dba86dfadba86dbed8328da3c7820ca4c7820ca5c7820ca8c7820c3220c78d01853b1974546eb8c22f500f90c9348dbe2eb195bf2eb195c02eb195f92eb195e8945815e9945815ea9458158538368dfbcc388d8cc2e922b76e26590c8b0b1a0d8b0b1a0e8b0b1aa49b7ac547776d277d33eeca7e33eeca7f33eeca8133eeca8233eecab833eecab415951a1fecadc920ecadc922ecadc9a4a1213856d43fb6e0c7a11a50349739513497395234973953349739543497395534973956349739573497395834973959349739e1c7a11a6f349739703497397134973972349739733497397434973975349739763497397734973978349739e2c7a11ae3c7a11ae4c7a11ae5c7a11ae6c7a11ae7c7a11ae8c7a11a34e166e68eb7ba30922baf4357abe63dbff20842160398e369606d8f83e25472704398e36c4b965e4ac4708f826e418db4e19f42b5e19f427a737b477b737b477c737b477d737b477e737b477f737b4780737b4781737b47ffce428df116cb47f216cb47252af848262af848272af8484c159f46fefd2e1ba07f7c4ea17f7c4ea27f7c4e3c864f1beef28685eff286857351fb6991c62c357451fb69f03a2d357551fb694faf2d357651fb69ae232e357751fb699d83f5979e83f5979f83f597a083f597a183f5976e3feee1794eaac0611e220557aa025458aa025459aa02545aaa0254b36a811bb46a811bb56a811bed355bf9f022f4ccf122f4ccf222f4ccf322f4cce44e1d55a15c468d14c42155be552355bf552355c0552355b6ad7c4f3a0919a03b0919a03c0919a03d0919a03e0919a03f0919a0400919a0410919a0420919a0430919a0b7ad7c4fb8ad7c4fb9ad7c4fbaad7c4fbbad7c4fbcad7c4fbdad7c4fbead7c4fc569b158c669b158 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 5a529a9d6..b4c1499b3 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -266,6 +266,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 39a6a51bc7e052c43b1b410c95dd6120, type: 3} - {fileID: 21300000, guid: a1a80e4b948777a4bbf8049335a445ce, type: 3} - {fileID: 21300000, guid: 2291c25b18fd6754190d771721c004c6, type: 3} + - {fileID: 21300000, guid: 03e9d37b2ef2848b4a255055395013dd, type: 3} - {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} - {fileID: 21300000, guid: 591f658b8a0414c2bab105afddb629fc, type: 3} - {fileID: 21300000, guid: 0bf8a7cbeee241d429745b8e3af4b0b3, type: 3} @@ -544,6 +545,7 @@ SpriteAtlas: - common_refresh_1 - common_board_124 - common_new_1 + - common_star_0 - common_bg_3 - common_bg_13 - common_btn_green_1 diff --git a/Assets/arts/textures/ui/common/common_star_0.png b/Assets/arts/textures/ui/common/common_star_0.png new file mode 100644 index 000000000..481f8caa9 Binary files /dev/null and b/Assets/arts/textures/ui/common/common_star_0.png differ diff --git a/Assets/arts/textures/ui/common/common_star_0.png.meta b/Assets/arts/textures/ui/common/common_star_0.png.meta new file mode 100644 index 000000000..06b312301 --- /dev/null +++ b/Assets/arts/textures/ui/common/common_star_0.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 03e9d37b2ef2848b4a255055395013dd +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/lua/app/global/global_func.lua.bytes b/Assets/lua/app/global/global_func.lua.bytes index 9780104a1..84dd47f24 100644 Binary files a/Assets/lua/app/global/global_func.lua.bytes and b/Assets/lua/app/global/global_func.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/cell/star_cell.lua.bytes b/Assets/lua/app/ui/hero/cell/star_cell.lua.bytes index 624757768..6a0ee08a3 100644 Binary files a/Assets/lua/app/ui/hero/cell/star_cell.lua.bytes and b/Assets/lua/app/ui/hero/cell/star_cell.lua.bytes differ