diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index 1d14ef8b1..b3af3c211 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -17,10 +17,10 @@ MonoBehaviour: - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3} + - {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3} - {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3} - {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3} - {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3} - - {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3} - {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3} - {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3} - {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3} diff --git a/Assets/arts/atlas/icon/item.spriteatlas b/Assets/arts/atlas/icon/item.spriteatlas index e9a47ae2f..5d7faace3 100644 --- a/Assets/arts/atlas/icon/item.spriteatlas +++ b/Assets/arts/atlas/icon/item.spriteatlas @@ -61,11 +61,11 @@ SpriteAtlas: cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} m_PackedSprites: + - {fileID: 21300000, guid: 2b6d8940c0d20d14ab03aced34e9ceb2, type: 3} - {fileID: 21300000, guid: 9f6e60819e9e45c41aa56a9e4325a233, type: 3} - {fileID: 21300000, guid: c6dd28813849c724b9393c5dba8d8932, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} - {fileID: 21300000, guid: 27ca2b254c606cd47b1599a680b470de, type: 3} - - {fileID: 21300000, guid: 17507965a5b66704cb51bf0be72b64a6, type: 3} - {fileID: 21300000, guid: f6e082a68016b8b4ea32bf4edf9bba42, type: 3} - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: 2aabeb48a7c79bb4592fd97f648de0bf, type: 3} @@ -73,17 +73,17 @@ SpriteAtlas: - {fileID: 21300000, guid: d025347b20ad92a42bd93b934dc3b13c, type: 3} - {fileID: 21300000, guid: 1c26d77ff4f175f48884f901f60af665, type: 3} m_PackedSpriteNamesToIndex: + - frame_1 - 5 - - frame_2 + - frame_3 - 4 - frame_mask - - frame_4 - - frame_1 + - frame_2 - 3 - frame_select - 1 - frame_5 - - frame_3 + - frame_4 m_RenderDataMap: {} m_Tag: item m_IsVariant: 0 diff --git a/Assets/arts/atlas/ui/login.asset b/Assets/arts/atlas/ui/login.asset index 99111732c..0afc5e47a 100644 --- a/Assets/arts/atlas/ui/login.asset +++ b/Assets/arts/atlas/ui/login.asset @@ -14,4 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: spriteList: - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} - spriteNameList: 01dd9078 + - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} + - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} + spriteNameList: 01dd90783fdd9078c4df9078 diff --git a/Assets/arts/atlas/ui/login.spriteatlas b/Assets/arts/atlas/ui/login.spriteatlas index d8db6f7be..73836542f 100644 --- a/Assets/arts/atlas/ui/login.spriteatlas +++ b/Assets/arts/atlas/ui/login.spriteatlas @@ -62,8 +62,12 @@ SpriteAtlas: m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + - {fileID: 21300000, guid: 4c8cc7cd53e3b2846a4626abf9c5a69d, type: 3} + - {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} m_PackedSpriteNamesToIndex: - login_cn + - login_zh + - login_en m_RenderDataMap: {} m_Tag: login m_IsVariant: 0 diff --git a/Assets/prefabs/ui/common/item_cell.prefab b/Assets/prefabs/ui/common/item_cell.prefab index c9d480f97..10654fc3e 100644 --- a/Assets/prefabs/ui/common/item_cell.prefab +++ b/Assets/prefabs/ui/common/item_cell.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -16, y: 28} + m_AnchoredPosition: {x: -16, y: 16} m_SizeDelta: {x: 89, y: 31} m_Pivot: {x: 1, y: 0} --- !u!222 &5182211465376288980 diff --git a/Assets/prefabs/ui/common/reward_cell.prefab b/Assets/prefabs/ui/common/reward_cell.prefab index 2d2152083..95e7f3135 100644 --- a/Assets/prefabs/ui/common/reward_cell.prefab +++ b/Assets/prefabs/ui/common/reward_cell.prefab @@ -545,7 +545,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -16, y: 28} + m_AnchoredPosition: {x: -16, y: 16} m_SizeDelta: {x: 89, y: 31} m_Pivot: {x: 1, y: 0} --- !u!222 &2899151997899005891 diff --git a/Assets/prefabs/ui/login/login_ui.prefab b/Assets/prefabs/ui/login/login_ui.prefab index f8cb08d12..f6100d671 100644 --- a/Assets/prefabs/ui/login/login_ui.prefab +++ b/Assets/prefabs/ui/login/login_ui.prefab @@ -441,7 +441,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f5d8239cd8995a745bdc76064dae90c7, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index b67e2682f..bff9ad0ae 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -1016,7 +1016,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0cd13a5ea8777fb4684a713c9c239ba4, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1