diff --git a/Assets/arts/atlas/ui/battle.spriteatlas b/Assets/arts/atlas/ui/battle.spriteatlas index cdb719116..2781cc908 100644 --- a/Assets/arts/atlas/ui/battle.spriteatlas +++ b/Assets/arts/atlas/ui/battle.spriteatlas @@ -71,6 +71,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 9f4d825138b34164cb6e9e64406dd12a, type: 3} - {fileID: 21300000, guid: 63805602ca8fdd74b9a1696bbe71d217, type: 3} - {fileID: 21300000, guid: 35d30742d8a5d0641a6e7b0b18f323a1, type: 3} + - {fileID: 21300000, guid: 8a3687a2ce1b5fd44baaea4d5688ae34, type: 3} - {fileID: 21300000, guid: d03a08a450d45584cb6dfb67dd6df6ba, type: 3} - {fileID: 21300000, guid: 6977af166b59e254a869ca5639e56bec, type: 3} - {fileID: 21300000, guid: 260a5446c0f52084da7a05ddc0cecae8, type: 3} @@ -92,7 +93,6 @@ SpriteAtlas: - {fileID: 21300000, guid: 9bb2f10b15aa44a4fa22ec0655146511, type: 3} - {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} - {fileID: 21300000, guid: a497edeb9fd18b34f945e6ad0a980058, type: 3} - - {fileID: 21300000, guid: 9489210c7237dd9449df9d46343ebe77, type: 3} - {fileID: 21300000, guid: 6e0fd41cbc1e6f44e82bedc0d5a92b54, type: 3} - {fileID: 21300000, guid: 52ac764cef5804147aa8efe734be0a01, type: 3} - {fileID: 21300000, guid: 67bbbb8c1478fd2499c68c245a3aadcf, type: 3} @@ -121,6 +121,7 @@ SpriteAtlas: - yellow_1 - battle_skill_line_8 - battle_skill_bg_blue_2 + - battle_skill_colorful - snow_2 - battle_progress_4 - battle_progress_1 @@ -142,7 +143,6 @@ SpriteAtlas: - blue_1 - battle_title_2 - battle_skill_bg_blue_1 - - battle_skill_bg_3 - battle_skill_line_10 - vine - battle_skill_bg_red_2 diff --git a/Assets/arts/spines/characters/p0001/p0001.atlas.txt b/Assets/arts/spines/characters/p0001/p0001.atlas.txt index 4c94d7116..6fbb05242 100644 --- a/Assets/arts/spines/characters/p0001/p0001.atlas.txt +++ b/Assets/arts/spines/characters/p0001/p0001.atlas.txt @@ -2,49 +2,42 @@ p0001.png size:512,512 filter:Linear,Linear canying -bounds:2,237,420,273 -offsets:15,10,445,297 -dao1 -bounds:2,141,143,94 -dao2 -bounds:2,4,129,29 +bounds:2,350,180,146 +offsets:5,0,190,149 +dun +bounds:184,370,90,126 +gutou +bounds:2,109,70,53 +rotate:90 hit_yan1 -bounds:200,91,16,18 -rotate:90 -pifeng1 -bounds:424,305,63,99 -pifeng2 -bounds:424,406,83,104 -pifeng3 -bounds:2,35,126,104 +bounds:184,350,16,18 +hit_yan2 +bounds:144,221,20,20 +lian +bounds:384,458,68,38 shenti -bounds:352,156,79,66 -rotate:90 -tou -bounds:266,153,84,82 -toufa1 -bounds:147,137,117,98 -yaodai -bounds:489,329,75,21 -rotate:90 +bounds:276,421,106,75 +toukui +bounds:71,243,96,105 +wuqi +bounds:2,181,67,167 +xiabai +bounds:349,385,30,34 youbi -bounds:171,91,27,44 -youerhuan -bounds:130,45,25,26 +bounds:2,55,41,52 youshou -bounds:200,109,41,26 +bounds:384,429,30,27 youtui -bounds:424,235,68,60 +bounds:71,198,43,71 rotate:90 youyan -bounds:171,73,16,20 -rotate:90 +bounds:57,157,7,22 zuobi -bounds:130,73,39,62 -zuoerhuan -bounds:243,109,25,26 +bounds:2,2,41,51 +zuoshou +bounds:454,469,29,27 zuotui -bounds:420,165,68,60 +bounds:276,376,43,71 rotate:90 zuoyan -bounds:489,307,17,20 +bounds:169,326,8,22 diff --git a/Assets/arts/spines/characters/p0001/p0001.png b/Assets/arts/spines/characters/p0001/p0001.png index 590fab7d0..932898b1e 100644 Binary files a/Assets/arts/spines/characters/p0001/p0001.png and b/Assets/arts/spines/characters/p0001/p0001.png differ diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes index 7d1745bce..af8e07534 100644 Binary files a/Assets/arts/spines/characters/p0001/p0001.skel.bytes and b/Assets/arts/spines/characters/p0001/p0001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0002/p0002.atlas.txt b/Assets/arts/spines/characters/p0002/p0002.atlas.txt index 819b651d3..18c049a4f 100644 --- a/Assets/arts/spines/characters/p0002/p0002.atlas.txt +++ b/Assets/arts/spines/characters/p0002/p0002.atlas.txt @@ -1,55 +1,53 @@ p0002.png -size:1024,1024 +size:512,512 filter:Linear,Linear -dun -bounds:2,162,90,126 -gutou -bounds:432,621,70,53 +canying +bounds:2,29,88,57 +offsets:3,2,93,63 +rotate:90 +canying2 +bounds:2,399,160,111 +offsets:2,1,163,113 +dao1 +bounds:2,303,143,94 +dao2 +bounds:164,375,129,29 hit_yan1 -bounds:94,163,16,18 -jinfanzei_skill1-animation_00 -bounds:2,290,348,113 -offsets:134,60,484,222 -jinfanzei_skill1-animation_01 -bounds:2,405,393,211 -offsets:42,6,484,222 -jinfanzei_skill1-animation_02 -bounds:2,831,466,175 -offsets:16,25,484,222 -jinfanzei_skill1-animation_03 -bounds:2,618,428,211 -offsets:7,6,484,222 -jinfanzei_skill1-animation_04 -bounds:470,831,422,175 -offsets:16,25,484,222 -jinfanzei_skill1-animation_05 -bounds:432,676,371,153 -offsets:7,34,484,222 -lian -bounds:2,122,68,38 +bounds:88,137,16,18 +hit_yan2 +bounds:61,97,20,20 +pifeng1 +bounds:377,411,63,99 +pifeng2 +bounds:292,406,83,104 +pifeng3 +bounds:164,406,126,104 shenti -bounds:805,723,106,75 +bounds:147,307,79,66 +tou +bounds:2,119,84,82 +toufa1 +bounds:2,203,117,98 +yaodai +bounds:121,226,75,21 rotate:90 -toukui -bounds:94,183,96,105 -wuqi -bounds:894,839,67,167 -xiabai -bounds:397,582,30,34 youbi -bounds:192,236,41,52 -youshou -bounds:504,647,30,27 -youtui -bounds:352,332,43,71 -youyan -bounds:963,911,7,22 -zuobi -bounds:805,680,41,51 +bounds:88,157,27,44 +youerhuan +bounds:2,2,25,26 +rotate:90 +youshou +bounds:295,378,41,26 +youtui +bounds:442,450,68,60 +youyan +bounds:121,204,16,20 +zuobi +bounds:228,311,39,62 +zuoerhuan +bounds:30,2,25,26 rotate:90 -zuoshou -bounds:352,303,29,27 zuotui -bounds:963,935,43,71 +bounds:442,388,68,60 zuoyan -bounds:882,807,8,22 +bounds:269,353,17,20 diff --git a/Assets/arts/spines/characters/p0002/p0002.png b/Assets/arts/spines/characters/p0002/p0002.png index 64acf1136..8c700cf43 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.png and b/Assets/arts/spines/characters/p0002/p0002.png differ diff --git a/Assets/arts/spines/characters/p0002/p0002.skel.bytes b/Assets/arts/spines/characters/p0002/p0002.skel.bytes index 230617418..29ac50d2f 100644 Binary files a/Assets/arts/spines/characters/p0002/p0002.skel.bytes and b/Assets/arts/spines/characters/p0002/p0002.skel.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 34754e5b0..dc0c10363 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes index 310ad516e..f8bec946d 100644 Binary files a/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes and b/Assets/lua/app/module/battle/controller/battle_controller.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index cf044a854..7988db05c 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_data.lua.bytes b/Assets/lua/app/userdata/battle/battle_data.lua.bytes index b6277124b..29c3d0a9f 100644 Binary files a/Assets/lua/app/userdata/battle/battle_data.lua.bytes and b/Assets/lua/app/userdata/battle/battle_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes index 469042c2b..83bff7603 100644 Binary files a/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes and b/Assets/lua/app/userdata/battle/skill/battle_skill_entity.lua.bytes differ