diff --git a/Assets/arts/atlas/icon/hero.asset b/Assets/arts/atlas/icon/hero.asset index 559fc3c3c..bee339ebb 100644 --- a/Assets/arts/atlas/icon/hero.asset +++ b/Assets/arts/atlas/icon/hero.asset @@ -116,4 +116,4 @@ MonoBehaviour: - {fileID: 21300000, guid: f2e805a98206eb34da53fa101aa5593c, type: 3} - {fileID: 21300000, guid: 71728bda29442ce40b864aff45c2fcf9, type: 3} - {fileID: 21300000, guid: cec071c1b8a4b41b6a7f2921e42f4bef, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af0303f0230403360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe30dcedbe40dcedbe31d440be41d440be51d440be61d440be71d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec0633009f078dbf37881e3238881e3239881e323a881e323b881e323c881e32 + spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af030392af0303360000003700000029da00003800000039000000cbda876accda876a08e5a305e00dcedbe10dcedbe20dcedbe30dcedbe40dcedbe31d440be41d440be51d440be61d440be71d440b68d8146369d814636ad81463270ec371280ec371290ec3712a0ec3712b0ec37184439896f59c08cb6ec53cb7ec0633009f078dbf37881e3238881e3239881e323a881e323b881e323c881e32 diff --git a/Assets/arts/atlas/icon/hero.spriteatlas b/Assets/arts/atlas/icon/hero.spriteatlas index 26c02c328..c364250c1 100644 --- a/Assets/arts/atlas/icon/hero.spriteatlas +++ b/Assets/arts/atlas/icon/hero.spriteatlas @@ -226,7 +226,7 @@ SpriteAtlas: - 16001 - 15 - 2 - - 56001 + - 55002 - 3 - 12 - frame_6 diff --git a/Assets/arts/atlas/icon/hero_2.asset b/Assets/arts/atlas/icon/hero_2.asset index 35ba56221..b74e9114a 100644 --- a/Assets/arts/atlas/icon/hero_2.asset +++ b/Assets/arts/atlas/icon/hero_2.asset @@ -84,4 +84,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 7eee036582b045e449aa206d20540119, type: 3} - {fileID: 21300000, guid: 64a08f786204a98499066d1c13de7273, type: 3} - {fileID: 21300000, guid: e418dc2ac39d0c84cab1807decaaba9b, type: 3} - spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af0303f0230403360000003700000029da00003800000039000000 + spriteNameList: 310000001f06000011061700200600002106000022060000cf68ca02230600002eddca02240600008d51cb028e51cb0225060000971c1700ecc5cb02260600005820170027060000192417001a24170028060000da271700320000003e060000707a17003f0600004006000041060000b38517005080d80242060000aff4d80243060000358d17000e69d9020f69d90244060000f69017006dddd902450600004606000047060000330000005d060000cfee17005e0600005f06000060060000d197e60261060000300ce702620600008f80e7029080e70263060000550518003400000052aff402b123f5021098f5021198f50235000000d3c60203323b030391af030392af0303360000003700000029da00003800000039000000 diff --git a/Assets/arts/atlas/icon/hero_2.spriteatlas b/Assets/arts/atlas/icon/hero_2.spriteatlas index 741af4304..4edfd72fd 100644 --- a/Assets/arts/atlas/icon/hero_2.spriteatlas +++ b/Assets/arts/atlas/icon/hero_2.spriteatlas @@ -164,7 +164,7 @@ SpriteAtlas: - 20 - 14 - 10_1 - - 56001 + - 55002 - 25 - 24 - 7_1 diff --git a/Assets/arts/atlas/icon/hero_summon.asset b/Assets/arts/atlas/icon/hero_summon.asset index 7a7213cff..d4eb7a839 100644 --- a/Assets/arts/atlas/icon/hero_summon.asset +++ b/Assets/arts/atlas/icon/hero_summon.asset @@ -47,4 +47,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 696a69094cbd149db8de36132c9e61ee, type: 3} - {fileID: 21300000, guid: 52e93a0a7eb2d40e280782aba32345e5, type: 3} - {fileID: 21300000, guid: cbf4d3d19584f463799132baaccd4b1b, type: 3} - spriteNameList: 31000000cf68ca022eddca028d51cb028e51cb02ecc5cb025080d802aff4d8020e69d9020f69d9026dddd902d197e602300ce7028f80e7029080e70252aff402b123f5021098f5021198f502d3c60203323b030391af0303f0230403e12f0b4ee22f0b4ee32f0b4ee42f0b4ee52f0b4ef1d8c6def2d8c6def3d8c6def4d8c6def5d8c6deab312b59 + spriteNameList: 31000000cf68ca022eddca028d51cb028e51cb02ecc5cb025080d802aff4d8020e69d9020f69d9026dddd902d197e602300ce7028f80e7029080e70252aff402b123f5021098f5021198f502d3c60203323b030391af030392af0303e12f0b4ee22f0b4ee32f0b4ee42f0b4ee52f0b4ef1d8c6def2d8c6def3d8c6def4d8c6def5d8c6deab312b59 diff --git a/Assets/arts/atlas/icon/hero_summon.spriteatlas b/Assets/arts/atlas/icon/hero_summon.spriteatlas index 3f355361b..7f32ddc56 100644 --- a/Assets/arts/atlas/icon/hero_summon.spriteatlas +++ b/Assets/arts/atlas/icon/hero_summon.spriteatlas @@ -125,7 +125,7 @@ SpriteAtlas: - 45002 - summon_card_mark_4 - 55001 - - 56001 + - 55002 - 24001 - 25002 - 33001 diff --git a/Assets/arts/textures/icon/hero/56001.png b/Assets/arts/textures/icon/hero/55002.png similarity index 100% rename from Assets/arts/textures/icon/hero/56001.png rename to Assets/arts/textures/icon/hero/55002.png diff --git a/Assets/arts/textures/icon/hero/56001.png.meta b/Assets/arts/textures/icon/hero/55002.png.meta similarity index 100% rename from Assets/arts/textures/icon/hero/56001.png.meta rename to Assets/arts/textures/icon/hero/55002.png.meta diff --git a/Assets/arts/textures/icon/hero_2/56001.png b/Assets/arts/textures/icon/hero_2/55002.png similarity index 100% rename from Assets/arts/textures/icon/hero_2/56001.png rename to Assets/arts/textures/icon/hero_2/55002.png diff --git a/Assets/arts/textures/icon/hero_2/56001.png.meta b/Assets/arts/textures/icon/hero_2/55002.png.meta similarity index 100% rename from Assets/arts/textures/icon/hero_2/56001.png.meta rename to Assets/arts/textures/icon/hero_2/55002.png.meta diff --git a/Assets/arts/textures/icon/hero_summon/56001.png b/Assets/arts/textures/icon/hero_summon/55002.png similarity index 100% rename from Assets/arts/textures/icon/hero_summon/56001.png rename to Assets/arts/textures/icon/hero_summon/55002.png diff --git a/Assets/arts/textures/icon/hero_summon/56001.png.meta b/Assets/arts/textures/icon/hero_summon/55002.png.meta similarity index 100% rename from Assets/arts/textures/icon/hero_summon/56001.png.meta rename to Assets/arts/textures/icon/hero_summon/55002.png.meta diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 2eb5c54ed..a20243231 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes index 6f36671d0..bba8a081a 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_reward_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab index 659e43132..8218b2676 100644 --- a/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab +++ b/Assets/prefabs/ui/summon/cell/summon_reward_cell.prefab @@ -35,8 +35,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 153, y: 198} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 144, y: 155} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2157296761274861257 CanvasRenderer: @@ -66,7 +66,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Sprite: {fileID: 21300000, guid: d7dc22ec3c7964b6c88a2ea772ab6764, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1