From 54fc7ff7e33368a324322ff712a0156d5255fa33 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Mon, 15 May 2023 16:21:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/arts/atlas/ui/battle.asset | 13 ++++++++++++- Assets/arts/atlas/ui/battle.spriteatlas | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Assets/arts/atlas/ui/battle.asset b/Assets/arts/atlas/ui/battle.asset index 5d36c443e..62108e419 100644 --- a/Assets/arts/atlas/ui/battle.asset +++ b/Assets/arts/atlas/ui/battle.asset @@ -68,11 +68,22 @@ MonoBehaviour: - {fileID: 21300000, guid: e53d6e8ee4f256040a5d26aa8233520b, type: 3} - {fileID: 21300000, guid: 634f8eff83cb4cd4780e6afae3bc6c65, type: 3} - {fileID: 21300000, guid: d135766030d953b4bbb3ca2404fe28da, type: 3} + - {fileID: 21300000, guid: 42dfc3a8f5eda504abbaad83525865f1, type: 3} + - {fileID: 21300000, guid: 6dbdc0ebfecc85b4fa92d9ba6daeff71, type: 3} + - {fileID: 21300000, guid: b2f310782ddb4844b8cce60785415fa5, type: 3} - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} - {fileID: 21300000, guid: b11c2f63c86e22644bbe1d930815c6c8, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} + - {fileID: 21300000, guid: 97b4e14627583bc4999dcbe5eec17a9e, type: 3} + - {fileID: 21300000, guid: 87057dffa9a1a5845a920a694008eb48, type: 3} + - {fileID: 21300000, guid: 9b9c2c350f044674099b0adef495d39d, type: 3} + - {fileID: 21300000, guid: 8d4b8d154edf8074baae6ca59f21d3ff, type: 3} + - {fileID: 21300000, guid: 68ed38ec5bbdf4d41a1bb3ce8e0788b6, type: 3} + - {fileID: 21300000, guid: 2911e099b97c96e4cae408c5afcba617, type: 3} + - {fileID: 21300000, guid: 65b3e4d9836417646882f2b62892e2a7, type: 3} - {fileID: 21300000, guid: 423cf212d1afa6a4aa5874da25e9b30e, type: 3} - {fileID: 21300000, guid: 79656e8810168454eabe93c524a9878a, type: 3} + - {fileID: 21300000, guid: b3bd50f185f228e4dbaadba439fc9fd7, type: 3} - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9108b9601006e14a268a0bc6ec803e47506d77eae8fd87eae8faa3b37002623b5b6 + spriteNameList: 73ef7596df354ed3919850e8929850e8939850e8949850e8959850e8969850e8979850e8947eef9a6672136537aa723a01d54ed3ede09396eee09396efe09396f0e09396bd9b0e69be9b0e69bf9b0e69c09b0e69c19b0e69c29b0e69c39b0e690d7ccc49132253d386d89f5487d89f5488d89f5489d89f5442e685d543e685d5ccb53bb2cdb53bb2d120b00dd220b00d50fb2eba51fb2eba73ea16e874ea16e81e5457221f5457222bf929362cf92936cf0775471557dd4782b8592383b8592383b74c9784b74c978c8d63ad107222fd627da494f525e9108b960100de4705065e9f32002bc532006e14a268a0bc6ec803e475062dbb75a5923679a5f1fc030ae6cb80424208558f4308558f4408558fd77eae8fd87eae8fd97eae8faa3b37002623b5b6 diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index 016712000..0d8efb4d2 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -71,14 +71,18 @@ SpriteAtlas: - {fileID: 21300000, guid: fe271741bc843c8438da54d6990e17c0, type: 3} - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - {fileID: 21300000, guid: 09dc5de1bb43f8e4fb620fdf5c1fdd9e, type: 3} + - {fileID: 21300000, guid: b3bd50f185f228e4dbaadba439fc9fd7, type: 3} - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} - {fileID: 21300000, guid: 423cf212d1afa6a4aa5874da25e9b30e, type: 3} - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3} - {fileID: 21300000, guid: 8a3687a2ce1b5fd44baaea4d5688ae34, type: 3} - {fileID: 21300000, guid: b11c2f63c86e22644bbe1d930815c6c8, type: 3} - {fileID: 21300000, guid: ea9f61c48549694489d855a4a5f0bf77, type: 3} + - {fileID: 21300000, guid: 8d4b8d154edf8074baae6ca59f21d3ff, type: 3} + - {fileID: 21300000, guid: 9b9c2c350f044674099b0adef495d39d, type: 3} - {fileID: 21300000, guid: b1230a75f4f278246854472f8e66182f, type: 3} - {fileID: 21300000, guid: 6977af166b59e254a869ca5639e56bec, type: 3} + - {fileID: 21300000, guid: 97b4e14627583bc4999dcbe5eec17a9e, type: 3} - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} - {fileID: 21300000, guid: 2ac6685652497304e92e5d80a0e2b523, type: 3} - {fileID: 21300000, guid: fe047417c1765ae408c718cdde9c74a8, type: 3} @@ -88,21 +92,27 @@ SpriteAtlas: - {fileID: 21300000, guid: 8dac4cd77ddbe4544b8a44602bb5c9be, type: 3} - {fileID: 21300000, guid: fe261bf7aa095154c959b88cc97168f3, type: 3} - {fileID: 21300000, guid: c2461f38eb50425419e412a32e1b2a64, type: 3} + - {fileID: 21300000, guid: b2f310782ddb4844b8cce60785415fa5, type: 3} - {fileID: 21300000, guid: 79656e8810168454eabe93c524a9878a, type: 3} - {fileID: 21300000, guid: 90cd8a98ab36f5f429ca27d808dc664f, type: 3} + - {fileID: 21300000, guid: 42dfc3a8f5eda504abbaad83525865f1, type: 3} - {fileID: 21300000, guid: 331e6bd86c6815246bbdc3582757afde, type: 3} - {fileID: 21300000, guid: f37b1779751e6de42b14f4d4c8f52609, type: 3} - {fileID: 21300000, guid: 3d4e7f797f9e52a428caf685cb9d945d, type: 3} + - {fileID: 21300000, guid: 2911e099b97c96e4cae408c5afcba617, type: 3} + - {fileID: 21300000, guid: 65b3e4d9836417646882f2b62892e2a7, type: 3} - {fileID: 21300000, guid: 2deaa61a5f1d4fd44b611e3d5819ce7a, type: 3} - {fileID: 21300000, guid: a9fd7e9a8eb4d1c488fd097ca4956501, type: 3} - {fileID: 21300000, guid: 816486ca69b027b4bb3438882fd42f2b, type: 3} - {fileID: 21300000, guid: d860c7ea2dcad1c4a804fe48f07fcdf3, type: 3} - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3} - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} + - {fileID: 21300000, guid: 6dbdc0ebfecc85b4fa92d9ba6daeff71, type: 3} - {fileID: 21300000, guid: a497edeb9fd18b34f945e6ad0a980058, type: 3} - {fileID: 21300000, guid: 6e0fd41cbc1e6f44e82bedc0d5a92b54, type: 3} - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3} - {fileID: 21300000, guid: 67bbbb8c1478fd2499c68c245a3aadcf, type: 3} + - {fileID: 21300000, guid: 68ed38ec5bbdf4d41a1bb3ce8e0788b6, type: 3} - {fileID: 21300000, guid: f866c72d7ff31d84580d50b5b6cbb679, type: 3} - {fileID: 21300000, guid: 744dbd3d5c288644c8a8b96958a0e89b, type: 3} - {fileID: 21300000, guid: 045a5a4df9f45a748851f849cac3f835, type: 3} @@ -122,6 +132,7 @@ SpriteAtlas: - {fileID: 21300000, guid: e8a869bf5b5b1a2469b54cc718b6642e, type: 3} - {fileID: 21300000, guid: be484dcfccac44f48bece88cc9294c8f, type: 3} - {fileID: 21300000, guid: 4883eddf5771c424c964bc2e32f2cb09, type: 3} + - {fileID: 21300000, guid: 87057dffa9a1a5845a920a694008eb48, type: 3} - {fileID: 21300000, guid: 634f8eff83cb4cd4780e6afae3bc6c65, type: 3} m_PackedSpriteNamesToIndex: - battle_progress_3 @@ -134,14 +145,18 @@ SpriteAtlas: - battle_board_4 - yellow_1 - battle_hinder_2 + - stone_3 - battle_skill_line_8 - stone_1 - battle_skill_bg_blue_2 - battle_skill_colorful - purple_1_1 - battle_hinder_4 + - rocket_up + - rocket_right - battle_bag_1 - battle_progress_4 + - rocket_down - battle_progress_1 - battle_skill_bg_purple_2 - battle_board_1 @@ -151,21 +166,27 @@ SpriteAtlas: - battle_skill_bg_green_1 - battle_skill_bg_red_1 - battle_circle + - lock - stone_2 - red_1 + - jelly - battle_progress_bg_1 - battle_board_7 - battle_hinder_5 + - stick_2 + - stick_3 - battle_line_1 - battle_mask - battle_skill_line_9 - battle_dec_1 - blue_1 - battle_title_2 + - leaf - battle_skill_bg_blue_1 - battle_skill_line_10 - vine - battle_skill_bg_red_2 + - stick_1 - battle_crit - battle_board_5 - battle_skill_bg_green_2 @@ -185,6 +206,7 @@ SpriteAtlas: - battle_skill_bg_1 - combo_ban_1 - purple_1 + - rocket_left - green_1 m_RenderDataMap: {} m_Tag: battle