diff --git a/Assets/arts/atlas/icon/avatar.asset b/Assets/arts/atlas/icon/avatar.asset index e84ec5c82..3273927d9 100644 --- a/Assets/arts/atlas/icon/avatar.asset +++ b/Assets/arts/atlas/icon/avatar.asset @@ -36,7 +36,8 @@ MonoBehaviour: - {fileID: 21300000, guid: 0c3675a6e5f6143758111e4fc641eb89, type: 3} - {fileID: 21300000, guid: 284bd861b64d441ad89fd7b1f96d6d5e, type: 3} - {fileID: 21300000, guid: 23f8691ed89b279409896acfe8179617, type: 3} + - {fileID: 21300000, guid: 13e9ede71287a476b948c6c41fd9000e, type: 3} - {fileID: 21300000, guid: 1874e21fa155a4e6f8c0b85129da7f5d, type: 3} - {fileID: 21300000, guid: ec5cdc2536ff6435689e0e890b726ed4, type: 3} - {fileID: 21300000, guid: 92a720554c7154c7c94cd5a8736006d0, type: 3} - spriteNameList: 69664fdac8da4fda274f50da284f50da86c350daea7d5dda49f25ddaa8665edaa9665eda07db5eda6b956bdaca096cda297e6cda2a7e6cdaecac79da4b217adaaa957adaab957ada6dc487dacc3888da2bad88da2cad88daf90c0ae67d9837db2465b8eb34e5a5e9 + spriteNameList: 69664fdac8da4fda274f50da284f50da86c350daea7d5dda49f25ddaa8665edaa9665eda07db5eda6b956bdaca096cda297e6cda2a7e6cdaecac79da4b217adaaa957adaab957ada6dc487dacc3888da2bad88da2cad88daf90c0ae6fa0c0ae67d9837db2465b8eb34e5a5e9 diff --git a/Assets/arts/atlas/icon/avatar.spriteatlas b/Assets/arts/atlas/icon/avatar.spriteatlas index 7035a371b..52dcd00fb 100644 --- a/Assets/arts/atlas/icon/avatar.spriteatlas +++ b/Assets/arts/atlas/icon/avatar.spriteatlas @@ -74,6 +74,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0c3675a6e5f6143758111e4fc641eb89, type: 3} - {fileID: 21300000, guid: d29f06f6c38d44c4ba242b546ac889fb, type: 3} - {fileID: 21300000, guid: 62071307c47df48a186199139d3d75ca, type: 3} + - {fileID: 21300000, guid: 13e9ede71287a476b948c6c41fd9000e, type: 3} - {fileID: 21300000, guid: f6f725b8fc60d41bba2bca74fec4833a, type: 3} - {fileID: 21300000, guid: 397b90b929b524ecea4186769b822847, type: 3} - {fileID: 21300000, guid: a58b3f1a444704d11b5641961eea3005, type: 3} @@ -101,6 +102,7 @@ SpriteAtlas: - avatar_55001 - avatar_34001 - avatar_16001 + - avatar_frame_2 - avatar_35002 - avatar_33001 - avatar_13001 diff --git a/Assets/arts/atlas/ui/arena.asset b/Assets/arts/atlas/ui/arena.asset index ec387d678..e9a047327 100644 --- a/Assets/arts/atlas/ui/arena.asset +++ b/Assets/arts/atlas/ui/arena.asset @@ -28,6 +28,7 @@ MonoBehaviour: - {fileID: 21300000, guid: 97665fa60bd5f48a99ed973f02d53b1c, type: 3} - {fileID: 21300000, guid: 03f4ca66f28104539abd9dc3369109b2, type: 3} - {fileID: 21300000, guid: 60b7bc01d81f94672bc6cf2ba5134d5a, type: 3} + - {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} - {fileID: 21300000, guid: a356b36deef7a1b4a9558d6a724921e1, type: 3} - {fileID: 21300000, guid: 00e143fef26720b478e2733de42dd12c, type: 3} - {fileID: 21300000, guid: 91f1d08e1ed8edf45a0a6368f8c30a19, type: 3} @@ -55,4 +56,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 369ef0e04cb680441baa4814f5e7ec28, type: 3} - {fileID: 21300000, guid: aa1e20165075b4269a4b0ba00f1f2e33, type: 3} - {fileID: 21300000, guid: 38b0d1351156343c48dc0ae70b00916d, type: 3} - spriteNameList: 70b6df2d16d658f517d658f5cdd30808f7ed40fbced30808566241fbcfd30808ef5c00f821410b0822410b0823410b0824410b0825410b0826410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608 + spriteNameList: 70b6df2d16d658f517d658f5cdd30808f7ed40fbced30808566241fbcfd30808ef5c00f821410b0822410b0823410b0824410b0825410b0826410b0827410b08f05c00f8f15c00f8f25c00f8f35c00f8f45c00f8f55c00f8f65c00f8f75c00f8d6671108cbf32408ccf32408cdf32408fc9b2608b4e3acfcb5e3acfcb6e3acfcb7e3acfcb8e3acfcb9e3acfcfd9b2608fe9b2608ff9b2608009c2608019c2608029c2608039c2608049c2608 diff --git a/Assets/arts/atlas/ui/arena.spriteatlas b/Assets/arts/atlas/ui/arena.spriteatlas index b41dc65e1..a231bba0e 100644 --- a/Assets/arts/atlas/ui/arena.spriteatlas +++ b/Assets/arts/atlas/ui/arena.spriteatlas @@ -83,6 +83,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 02a079d6dd048e349a54f81f4d089eef, type: 3} - {fileID: 21300000, guid: 7874c7c7cdea0be468135b9ce02eae3b, type: 3} - {fileID: 21300000, guid: 69df5408fe81cbc44a6c5d8e31abbe27, type: 3} + - {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} - {fileID: 21300000, guid: 3a470558d6b0c8549b39a9169b15733d, type: 3} - {fileID: 21300000, guid: 601d39fa6902e514a8d29cbe8651a35c, type: 3} - {fileID: 21300000, guid: d3822c1b442d7b549afc110a984d25ff, type: 3} @@ -126,6 +127,7 @@ SpriteAtlas: - arena_bg_5 - arena_bar_1_bg - arena_bg_1 + - arena_bg_16 - arena_dec_1 - arena_bg_6 - arena_dec_3 diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_2.png b/Assets/arts/textures/icon/avatar/avatar_frame_2.png new file mode 100644 index 000000000..7e7de5633 Binary files /dev/null and b/Assets/arts/textures/icon/avatar/avatar_frame_2.png differ diff --git a/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta b/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta new file mode 100644 index 000000000..393df116a --- /dev/null +++ b/Assets/arts/textures/icon/avatar/avatar_frame_2.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 13e9ede71287a476b948c6c41fd9000e +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/arena/arena_bg_16.png b/Assets/arts/textures/ui/arena/arena_bg_16.png new file mode 100644 index 000000000..c46858b02 Binary files /dev/null and b/Assets/arts/textures/ui/arena/arena_bg_16.png differ diff --git a/Assets/arts/textures/ui/arena/arena_bg_16.png.meta b/Assets/arts/textures/ui/arena/arena_bg_16.png.meta new file mode 100644 index 000000000..4a1cd7d19 --- /dev/null +++ b/Assets/arts/textures/ui/arena/arena_bg_16.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 554a6028afcf5416dbfbc4b3d397ee54 +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_star_0.png b/Assets/arts/textures/ui/common/common_star_0.png index 481f8caa9..975b98d37 100644 Binary files a/Assets/arts/textures/ui/common/common_star_0.png and b/Assets/arts/textures/ui/common/common_star_0.png differ diff --git a/Assets/arts/textures/ui/common/common_star_1.png b/Assets/arts/textures/ui/common/common_star_1.png index c6038f219..31f0961aa 100644 Binary files a/Assets/arts/textures/ui/common/common_star_1.png and b/Assets/arts/textures/ui/common/common_star_1.png differ diff --git a/Assets/arts/textures/ui/common/common_star_2.png b/Assets/arts/textures/ui/common/common_star_2.png index c1a748e56..9613257d8 100644 Binary files a/Assets/arts/textures/ui/common/common_star_2.png and b/Assets/arts/textures/ui/common/common_star_2.png differ diff --git a/Assets/arts/textures/ui/common/common_star_3.png b/Assets/arts/textures/ui/common/common_star_3.png index b1d6fe053..40df40f6f 100644 Binary files a/Assets/arts/textures/ui/common/common_star_3.png and b/Assets/arts/textures/ui/common/common_star_3.png differ diff --git a/Assets/arts/textures/ui/common/common_tettle_6.png b/Assets/arts/textures/ui/common/common_tettle_6.png index 7f9a5ac05..97d86d20d 100644 Binary files a/Assets/arts/textures/ui/common/common_tettle_6.png and b/Assets/arts/textures/ui/common/common_tettle_6.png differ diff --git a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes index 7c0423b87..335b80821 100644 Binary files a/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_match_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes b/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes index 833f6411a..4ef58ffcd 100644 Binary files a/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/player_head_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index 40513c7e3..1b38da6fe 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -4197,6 +4197,18 @@ PrefabInstance: propertyPath: m_Name value: hero_formation_comp objectReference: {fileID: 0} + - target: {fileID: 1196646610808540863, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 1312225021886429757, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 2734010607580387617, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4281,6 +4293,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8052356613659429978, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 8657089186147166507, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} --- !u!224 &1083973466778229555 stripped @@ -4304,6 +4324,18 @@ PrefabInstance: propertyPath: m_Name value: hero_formation_comp objectReference: {fileID: 0} + - target: {fileID: 1196646610808540863, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 1312225021886429757, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 2734010607580387617, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} - target: {fileID: 6010638354984419522, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4388,6 +4420,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8052356613659429978, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} + - target: {fileID: 8657089186147166507, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 554a6028afcf5416dbfbc4b3d397ee54, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 74e52787fb3052a4bb5d283fa3f0294a, type: 3} --- !u!224 &3600034413154020453 stripped