diff --git a/Assets/arts/atlas/icon/skill_buff.spriteatlas b/Assets/arts/atlas/icon/skill_buff.spriteatlas index f47f52514..333bbabce 100644 --- a/Assets/arts/atlas/icon/skill_buff.spriteatlas +++ b/Assets/arts/atlas/icon/skill_buff.spriteatlas @@ -54,8 +54,7 @@ SpriteAtlas: enableTightPacking: 0 secondaryTextureSettings: {} variantMultiplier: 1 - packables: - - {fileID: 102900000, guid: fb056d6a88b06684b9bbfb2f771acc46, type: 3} + packables: [] bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} diff --git a/Assets/arts/atlas/icon/skill_rogue.spriteatlas b/Assets/arts/atlas/icon/skill_rogue.spriteatlas index ec45a456c..c6ab9f2c3 100644 --- a/Assets/arts/atlas/icon/skill_rogue.spriteatlas +++ b/Assets/arts/atlas/icon/skill_rogue.spriteatlas @@ -60,8 +60,122 @@ SpriteAtlas: isAtlasV2: 0 cachedData: {fileID: 0} m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: f8c1c4005a7947442aa16c0bec579c00, type: 3} + - {fileID: 21300000, guid: df70566076eb28945978fea59ac48903, type: 3} + - {fileID: 21300000, guid: f78485a065d984e41970c0c78b32b6ad, type: 3} + - {fileID: 21300000, guid: eef0f731cdbfc1a41a0487dcd6c8b4ca, type: 3} + - {fileID: 21300000, guid: d978f961a2c17b5419cb24be9fbfa4b9, type: 3} + - {fileID: 21300000, guid: 6885bd82049a7e7478593e554a423b38, type: 3} + - {fileID: 21300000, guid: bcd7f303c38f0f84b85b762f4f83cf68, type: 3} + - {fileID: 21300000, guid: b4733d13d9db39e49aabca5334b0f8df, type: 3} + - {fileID: 21300000, guid: c8f16053ac61ef3479792f69249e6dc2, type: 3} + - {fileID: 21300000, guid: 8b416f9378daca84096ce87560ee0ac7, type: 3} + - {fileID: 21300000, guid: f8ba52b3ce03b5842a9ef4feac912df1, type: 3} + - {fileID: 21300000, guid: f339a744c57bf7c42b60d4790a285ef3, type: 3} + - {fileID: 21300000, guid: e46578541e23b974e842ac30bf826514, type: 3} + - {fileID: 21300000, guid: a9c146b404b7bcc498060e0bbfa73eb4, type: 3} + - {fileID: 21300000, guid: 148532d447ab5824697dd4a96750cfd9, type: 3} + - {fileID: 21300000, guid: f01879e455023584aa60bc5563780641, type: 3} + - {fileID: 21300000, guid: 5704f815ae557a148b7916f8aaa488cf, type: 3} + - {fileID: 21300000, guid: 139bd635f9f8d604ca0e53a6a8e1856f, type: 3} + - {fileID: 21300000, guid: 6c06ca554e40b3546b5123aff9c2051e, type: 3} + - {fileID: 21300000, guid: 4a9b63f5208ae5949aa9ba1b1a8b44f0, type: 3} + - {fileID: 21300000, guid: d2b3831690f37fb48a74c8cc3a067d22, type: 3} + - {fileID: 21300000, guid: 1bc2a6469eb4c3d448cc9daf8457ead4, type: 3} + - {fileID: 21300000, guid: e7b1b0e66e29561418798099c3c15ab9, type: 3} + - {fileID: 21300000, guid: a0f6f8f61f12bb940b165237640d8681, type: 3} + - {fileID: 21300000, guid: ca90362784c46e540821ee50c483f6cd, type: 3} + - {fileID: 21300000, guid: d2bf84879087d224597236e9364c905f, type: 3} + - {fileID: 21300000, guid: 8a6bd6c77c71d8b40ac15bba24f65c0c, type: 3} + - {fileID: 21300000, guid: d8a42258440cb054eba3baf461eca53f, type: 3} + - {fileID: 21300000, guid: 8742d6882ea6b4b498b99dd1d0840f21, type: 3} + - {fileID: 21300000, guid: f7c322b8615a0e24dab284e586fdd75f, type: 3} + - {fileID: 21300000, guid: 23a74cd8c11a2a8478e19a1a04bd1b60, type: 3} + - {fileID: 21300000, guid: 2955261977297da4e9895fca97c64a27, type: 3} + - {fileID: 21300000, guid: 9e704c1977061544dbdebcec14e4160b, type: 3} + - {fileID: 21300000, guid: b428c1494a8c5ac4a90bcc2c15475a81, type: 3} + - {fileID: 21300000, guid: 5afe7ac94c9e47643b3afd2804e7fe1c, type: 3} + - {fileID: 21300000, guid: 899a0bc949813494e9906e095a78e353, type: 3} + - {fileID: 21300000, guid: 768ac1cadb4db1f41842cfae81e7201b, type: 3} + - {fileID: 21300000, guid: 635bb68ba84f38244af65c3d5a644c11, type: 3} + - {fileID: 21300000, guid: abcb50fb24fbbdf45897cc4af03ae9b6, type: 3} + - {fileID: 21300000, guid: 2b8807fbd2193c54085ecae6be7da5e7, type: 3} + - {fileID: 21300000, guid: c682a9bc59273fb488145ca76649c25e, type: 3} + - {fileID: 21300000, guid: 69cc3afcbdcc822489dab9202171cc13, type: 3} + - {fileID: 21300000, guid: 033f9efc88df3c648bb95c9b5de46a8f, type: 3} + - {fileID: 21300000, guid: 2a16631d36fa54a42890dd8d6bf53965, type: 3} + - {fileID: 21300000, guid: 486e6c6d315c05046b3e2df280a1f877, type: 3} + - {fileID: 21300000, guid: b2bae5bde1e09194f94c64dd3e607cb4, type: 3} + - {fileID: 21300000, guid: f2fb020e14ca0c044a6bb1d7035cbd58, type: 3} + - {fileID: 21300000, guid: 68aa2c5ee191bf3438501f39ab84fd27, type: 3} + - {fileID: 21300000, guid: bced619ebbdf7a643971225050162712, type: 3} + - {fileID: 21300000, guid: 5024a3ceeda654448a9b766cf8735a9e, type: 3} + - {fileID: 21300000, guid: 8c6b71de2e9c41c4987ce6ce28e2e91e, type: 3} + - {fileID: 21300000, guid: c84d39dec4cf2444fa42ebb7b3cb1a67, type: 3} + - {fileID: 21300000, guid: 03dfbcde740cb4c448c991eef4dc9663, type: 3} + - {fileID: 21300000, guid: b235143fde3fb274faee9dd12654a779, type: 3} + - {fileID: 21300000, guid: 65dbb99f4c826a54788f1aae0a141281, type: 3} + - {fileID: 21300000, guid: 201cc8bfb07bd9e458442e46e5bf11c2, type: 3} + - {fileID: 21300000, guid: f0b85fdfbcb5f9e47b1dc958a04023dd, type: 3} + m_PackedSpriteNamesToIndex: + - 45 + - frame_2 + - 12 + - 31 + - 22 + - 46 + - 18 + - 14 + - 30 + - 47 + - 48 + - 44 + - 49 + - 1 + - 37 + - 25 + - 51 + - 32 + - 7 + - 3 + - 4 + - frame_3 + - 20 + - 29 + - 17 + - 27 + - 39 + - 50 + - frame_4 + - 34 + - 52 + - 11 + - 54 + - 2 + - 8 + - 24 + - 42 + - 53 + - 23 + - 21 + - 9 + - 35 + - 5 + - 13 + - 19 + - 28 + - 15 + - 6 + - 43 + - 16 + - 38 + - 41 + - 40 + - 36 + - 33 + - 26 + - 10 m_RenderDataMap: {} m_Tag: skill_rogue m_IsVariant: 0 diff --git a/Assets/arts/textures/icon/skill_buff.meta b/Assets/arts/textures/icon/skill_buff.meta deleted file mode 100644 index 278489602..000000000 --- a/Assets/arts/textures/icon/skill_buff.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb056d6a88b06684b9bbfb2f771acc46 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/arts/textures/ui/common/common_chest_1.png b/Assets/arts/textures/ui/common/common_chest_1.png index 911f6a23b..013a905c8 100644 Binary files a/Assets/arts/textures/ui/common/common_chest_1.png and b/Assets/arts/textures/ui/common/common_chest_1.png differ diff --git a/Assets/arts/textures/ui/common/common_chest_4.png b/Assets/arts/textures/ui/common/common_chest_4.png index 0b439f208..df399adc2 100644 Binary files a/Assets/arts/textures/ui/common/common_chest_4.png and b/Assets/arts/textures/ui/common/common_chest_4.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_1.png b/Assets/arts/textures/ui/common/common_dec_1.png index 4f2ca4813..40698629f 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_1.png and b/Assets/arts/textures/ui/common/common_dec_1.png differ diff --git a/Assets/arts/textures/ui/common/common_dec_3.png b/Assets/arts/textures/ui/common/common_dec_3.png index a01d4f5a9..0624eaa04 100644 Binary files a/Assets/arts/textures/ui/common/common_dec_3.png and b/Assets/arts/textures/ui/common/common_dec_3.png differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index c79411497..5333f1d01 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -104,7 +104,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -92.46918, y: 128} - m_SizeDelta: {x: 75.0617, y: 74} + m_SizeDelta: {x: 62, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1618187034406966015 CanvasRenderer: @@ -134,8 +134,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dc05a38a7a24b1e46be66fd07ad92ef8, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 8b5d8f985..cf9ff31a1 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -2147,7 +2147,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd8cf65d131e4bf44a2d7c37bfe60080, type: 3} + m_Sprite: {fileID: 21300000, guid: 7fd4f0c3c01d5b74da31ef5c8844b95d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1