diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 62464bece..b25459080 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -68,7 +68,6 @@ MonoBehaviour: - {fileID: 21300000, guid: eb993031b1a39cf44aeff35169dcd3a1, type: 3} - {fileID: 21300000, guid: 0d77993f1d67edd4ab4209eb2ad595a8, type: 3} - {fileID: 21300000, guid: c5b2f243e6af18240b8f02297d60a98e, type: 3} - - {fileID: 21300000, guid: c9a36986c2a7dd94ab49abc5c5423df2, type: 3} - {fileID: 21300000, guid: 8bc7b70c783d5f140b4ddcfbb35f365e, type: 3} - {fileID: 21300000, guid: e3b0a44647820e145a2a3d4bd235fed9, type: 3} - {fileID: 21300000, guid: 0c10d727a2c54294cb9083889f6ae5a7, type: 3} @@ -113,4 +112,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 73ef7596df354ed3e0354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab029d3752c3ac0680c4ac0680c5ac0680958cd3a2415abdf4495bbdf4c767bdf4948dbdf421ee3df3a45a15e809d618e85a4c581b1ddd9f90e7007ff4c7a6c0f42f42c0b73042c0b73142c0b7ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f487156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9106e14a26803e475062623b5b6 + spriteNameList: 73ef7596df354ed3e0354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3525806155358061504b9a932ede09396eee09396efe09396f0e09396f1e09396f2e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d3c33f686cc43f686cc53f686ca4afbba06a2996ce6b2996ce6c2996ce6d2996cef90ee7ab029d3752c3ac0680c4ac0680c5ac0680958cd3a2415abdf4495bbdf4c767bdf4948dbdf421ee3df3a45a15e809d618e85a4c581b1ddd9f90c7a6c0f42f42c0b73042c0b73142c0b7ce71fe31cf71fe31d071fe31c0b35232c1b35232c2b35232cd4fd4681304c2f487156e7a86d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9106e14a26803e475062623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index a31efd9c5..8e617ac61 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -97,7 +97,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} - {fileID: 21300000, guid: e3b0a44647820e145a2a3d4bd235fed9, type: 3} - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3} - - {fileID: 21300000, guid: c9a36986c2a7dd94ab49abc5c5423df2, type: 3} - {fileID: 21300000, guid: e78671f68c4b4d14290a6a01b66c6f3e, type: 3} - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} - {fileID: 21300000, guid: 0c10d727a2c54294cb9083889f6ae5a7, type: 3} @@ -198,7 +197,6 @@ SpriteAtlas: - battle_progress_1 - battle_obstacle_stalactite_1 - battle_skill_bg_purple_2 - - battle_obstacle_rongyan - battle_obstacle_stone_3 - battle_board_1 - battle_obstacle_stalactite_2 diff --git a/Assets/arts/atlas/ui/common.spriteatlas b/Assets/arts/atlas/ui/common.spriteatlas index 24a11cd6c..30850878c 100644 --- a/Assets/arts/atlas/ui/common.spriteatlas +++ b/Assets/arts/atlas/ui/common.spriteatlas @@ -67,15 +67,12 @@ SpriteAtlas: - {fileID: 21300000, guid: a5649cd0bacb4934bbe6a22dca87cf40, type: 3} - {fileID: 21300000, guid: 608361016deab9a4993d756f0a187d74, type: 3} - {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} - - {fileID: 21300000, guid: 6b012a01a7d83f84ea6cc2dccc53c44d, type: 3} - {fileID: 21300000, guid: 8557e6412e7e6464495c2efa8f5f2f78, type: 3} - - {fileID: 21300000, guid: c9db3361f34a72e41a99271a3d948f6b, type: 3} - {fileID: 21300000, guid: 330be4d1490173b4a8a049003427d8fb, type: 3} - {fileID: 21300000, guid: 1a4363e1856808e4ea0a078472b03c75, type: 3} - {fileID: 21300000, guid: 55feeb1282994f248bebbf10510de820, type: 3} - {fileID: 21300000, guid: b3ebf3220061a824c8f4a3919ee39a33, type: 3} - {fileID: 21300000, guid: b9543992e195f2f47a68966feb242e7a, type: 3} - - {fileID: 21300000, guid: 37054b5303f09174898f6b6881491964, type: 3} - {fileID: 21300000, guid: 1a3eea633d6dc9249b5caf2aee32cdfa, type: 3} - {fileID: 21300000, guid: 1bc3c283a34da0449809b61f0f78ec7a, type: 3} - {fileID: 21300000, guid: 15b627938e203f545ac49661789d7351, type: 3} @@ -86,7 +83,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 9abaaf4457b41ea46ba4f998c247ddb6, type: 3} - {fileID: 21300000, guid: c0d66e84bb441904390a26e5f00c0b59, type: 3} - {fileID: 21300000, guid: b7ec10a4771dc744eba18a4cc4491c01, type: 3} - - {fileID: 21300000, guid: 8be981b47d388b34b8661cdba90c16f6, type: 3} - {fileID: 21300000, guid: 4f0b41158f74bfd4a9b0ee0116ff6bb0, type: 3} - {fileID: 21300000, guid: bf5180354d324cb4685dcfb6480b6a65, type: 3} - {fileID: 21300000, guid: 070fd6553e0b5bf4a816757085221bda, type: 3} @@ -120,7 +116,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 7f07ec09931338d42bf26e2d0eb26677, type: 3} - {fileID: 21300000, guid: 37058029318370c46be63c3fbe4d1758, type: 3} - {fileID: 21300000, guid: 1bf9c73960324d3439e0db7c0390d805, type: 3} - - {fileID: 21300000, guid: f0cec35938ebb4c4895ff4729ecb71e8, type: 3} - {fileID: 21300000, guid: 15a10479bd4a42c459af0778f0f3c004, type: 3} - {fileID: 21300000, guid: 7dcb5c792e21d83488db1e0ef85036c8, type: 3} - {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} @@ -159,7 +154,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 1dedff3e909ee054b874a2fbaff044c0, type: 3} - {fileID: 21300000, guid: d19a454e30a654347bc427e316fa1cbf, type: 3} - {fileID: 21300000, guid: 09f9c16e1cfc25c49a29ff0c74978b2e, type: 3} - - {fileID: 21300000, guid: 4d65e57e58d281c41bba92eb2151996b, type: 3} - {fileID: 21300000, guid: 3285af8e91260c847a0fdb96770d5c96, type: 3} - {fileID: 21300000, guid: 4120bbee8eb48d641ad3d46398bb3fa4, type: 3} - {fileID: 21300000, guid: a3e18e0ffb96a7249ac39a5edf69b469, type: 3} @@ -175,15 +169,12 @@ SpriteAtlas: - common_board_19 - common_ad_3 - common_btn_yellow_3 - - common_board_25 - common_menu_2 - - common_dec_12 - common_dec_6 - common_btn_yellow_1 - common_progress_3 - common_btn_yellow_2 - common_title_6 - - common_board_24 - common_board_2 - common_board_25 - common_board_16 @@ -194,7 +185,6 @@ SpriteAtlas: - common_menu_3 - common_btn_red_1 - common_btn_grey_3 - - common_title_9 - common_ad_1 - common_lock - common_line_4 @@ -228,7 +218,6 @@ SpriteAtlas: - common_btn_blue_2 - common_board_15 - common_bg_2 - - common_board_23 - common_dec_11 - common_line_1 - common_check @@ -267,7 +256,6 @@ SpriteAtlas: - common_dec_4 - common_title_7 - common_board_6 - - common_toast_2 - common_board_9 - common_board_14 - common_chest_1 diff --git a/Assets/arts/textures/ui/common/common_board_25.png.meta b/Assets/arts/textures/ui/common/common_board_25.png.meta index 9432ac6a3..5e643c148 100644 --- a/Assets/arts/textures/ui/common/common_board_25.png.meta +++ b/Assets/arts/textures/ui/common/common_board_25.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 23, y: 28, z: 23, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/common/common_title_9.png.meta b/Assets/arts/textures/ui/common/common_title_9.png.meta index c45ea2183..de3432f55 100644 --- a/Assets/arts/textures/ui/common/common_title_9.png.meta +++ b/Assets/arts/textures/ui/common/common_title_9.png.meta @@ -47,7 +47,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 70, y: 0, z: 70, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab b/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab index 65276e303..0ca99fc60 100644 --- a/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab +++ b/Assets/prefabs/ui/main_city/daily_challenge_comp.prefab @@ -953,7 +953,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8be981b47d388b34b8661cdba90c16f6, type: 3} + m_Sprite: {fileID: 21300000, guid: bb8268a6f00cf454181fe75a9832cdff, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/tips/rewards_tips.prefab b/Assets/prefabs/ui/tips/rewards_tips.prefab index 29dbcbbf5..2eb737073 100644 --- a/Assets/prefabs/ui/tips/rewards_tips.prefab +++ b/Assets/prefabs/ui/tips/rewards_tips.prefab @@ -342,7 +342,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c9db3361f34a72e41a99271a3d948f6b, type: 3} + m_Sprite: {fileID: 21300000, guid: b580961da7927cb45b605286d0a73c48, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1013,7 +1013,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6b012a01a7d83f84ea6cc2dccc53c44d, type: 3} + m_Sprite: {fileID: 21300000, guid: 1bc3c283a34da0449809b61f0f78ec7a, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1