diff --git a/Assets/arts/spines/characters/m10001/m10001.atlas.txt b/Assets/arts/spines/characters/m10001/m10001.atlas.txt index 9c6d36cee..9955edbc8 100644 --- a/Assets/arts/spines/characters/m10001/m10001.atlas.txt +++ b/Assets/arts/spines/characters/m10001/m10001.atlas.txt @@ -10,8 +10,6 @@ rotate:90 eye bounds:163,148,47,23 rotate:90 -eye_xuanyun -bounds:224,169,20,20 gutou bounds:124,197,70,53 hair diff --git a/Assets/arts/spines/characters/m10001/m10001.png b/Assets/arts/spines/characters/m10001/m10001.png index 76d85e965..b7c28fee0 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.png and b/Assets/arts/spines/characters/m10001/m10001.png differ diff --git a/Assets/arts/spines/characters/m10001/m10001.skel.bytes b/Assets/arts/spines/characters/m10001/m10001.skel.bytes index 9ab3cbf81..baeccffd8 100644 Binary files a/Assets/arts/spines/characters/m10001/m10001.skel.bytes and b/Assets/arts/spines/characters/m10001/m10001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10002/m10002.atlas.txt b/Assets/arts/spines/characters/m10002/m10002.atlas.txt index 3f822d538..d0fe68e83 100644 --- a/Assets/arts/spines/characters/m10002/m10002.atlas.txt +++ b/Assets/arts/spines/characters/m10002/m10002.atlas.txt @@ -9,8 +9,6 @@ bounds:86,61,61,30 rotate:90 eye bounds:2,10,47,23 -eye_xuanyun -bounds:218,134,20,20 gutou bounds:123,201,70,53 hair diff --git a/Assets/arts/spines/characters/m10002/m10002.png b/Assets/arts/spines/characters/m10002/m10002.png index 5ee1670c5..f135e7100 100644 Binary files a/Assets/arts/spines/characters/m10002/m10002.png and b/Assets/arts/spines/characters/m10002/m10002.png differ diff --git a/Assets/arts/spines/characters/m10002/m10002.skel.bytes b/Assets/arts/spines/characters/m10002/m10002.skel.bytes index 78447ffb6..00d008cb3 100644 Binary files a/Assets/arts/spines/characters/m10002/m10002.skel.bytes and b/Assets/arts/spines/characters/m10002/m10002.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10003/m10003.atlas.txt b/Assets/arts/spines/characters/m10003/m10003.atlas.txt index 84987fb7f..ee1b4f0e0 100644 --- a/Assets/arts/spines/characters/m10003/m10003.atlas.txt +++ b/Assets/arts/spines/characters/m10003/m10003.atlas.txt @@ -10,8 +10,6 @@ rotate:90 eye bounds:169,152,47,23 rotate:90 -eye_xuanyun -bounds:92,40,20,20 gutou bounds:123,201,70,53 hair diff --git a/Assets/arts/spines/characters/m10003/m10003.png b/Assets/arts/spines/characters/m10003/m10003.png index 7bfd9c334..69b721d8a 100644 Binary files a/Assets/arts/spines/characters/m10003/m10003.png and b/Assets/arts/spines/characters/m10003/m10003.png differ diff --git a/Assets/arts/spines/characters/m10003/m10003.skel.bytes b/Assets/arts/spines/characters/m10003/m10003.skel.bytes index 8db685272..a48ba95f9 100644 Binary files a/Assets/arts/spines/characters/m10003/m10003.skel.bytes and b/Assets/arts/spines/characters/m10003/m10003.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10004/m10004.atlas.txt b/Assets/arts/spines/characters/m10004/m10004.atlas.txt index 443b8c372..119427cb1 100644 --- a/Assets/arts/spines/characters/m10004/m10004.atlas.txt +++ b/Assets/arts/spines/characters/m10004/m10004.atlas.txt @@ -9,8 +9,6 @@ bounds:2,2,61,30 eye bounds:62,71,48,23 rotate:90 -eye_xuanyun -bounds:62,49,20,20 gutou bounds:123,201,70,53 hair diff --git a/Assets/arts/spines/characters/m10004/m10004.png b/Assets/arts/spines/characters/m10004/m10004.png index e17838ed7..ed937f95d 100644 Binary files a/Assets/arts/spines/characters/m10004/m10004.png and b/Assets/arts/spines/characters/m10004/m10004.png differ diff --git a/Assets/arts/spines/characters/m10004/m10004.skel.bytes b/Assets/arts/spines/characters/m10004/m10004.skel.bytes index 06732e2fd..b719d205a 100644 Binary files a/Assets/arts/spines/characters/m10004/m10004.skel.bytes and b/Assets/arts/spines/characters/m10004/m10004.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10005/m10005.atlas.txt b/Assets/arts/spines/characters/m10005/m10005.atlas.txt index d2f825db4..b483c229e 100644 --- a/Assets/arts/spines/characters/m10005/m10005.atlas.txt +++ b/Assets/arts/spines/characters/m10005/m10005.atlas.txt @@ -66,8 +66,6 @@ bounds:275,476,34,40 rotate:90 ear_r bounds:134,359,30,35 -eye_xuanyun -bounds:57,115,20,20 gutou bounds:2,97,70,53 rotate:90 diff --git a/Assets/arts/spines/characters/m10005/m10005.png b/Assets/arts/spines/characters/m10005/m10005.png index a56eade50..9eab3fa74 100644 Binary files a/Assets/arts/spines/characters/m10005/m10005.png and b/Assets/arts/spines/characters/m10005/m10005.png differ diff --git a/Assets/arts/spines/characters/m10005/m10005.skel.bytes b/Assets/arts/spines/characters/m10005/m10005.skel.bytes index ededcdcd4..4afe62784 100644 Binary files a/Assets/arts/spines/characters/m10005/m10005.skel.bytes and b/Assets/arts/spines/characters/m10005/m10005.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10006/m10006.atlas.txt b/Assets/arts/spines/characters/m10006/m10006.atlas.txt index eb9a5ecfb..e87d85342 100644 --- a/Assets/arts/spines/characters/m10006/m10006.atlas.txt +++ b/Assets/arts/spines/characters/m10006/m10006.atlas.txt @@ -67,8 +67,6 @@ ear_l bounds:2,2,36,36 ear_r bounds:81,322,31,35 -eye_xuanyun -bounds:70,206,20,20 gutou bounds:2,97,70,53 rotate:90 diff --git a/Assets/arts/spines/characters/m10006/m10006.png b/Assets/arts/spines/characters/m10006/m10006.png index 2bd3382d7..3b5b9bd44 100644 Binary files a/Assets/arts/spines/characters/m10006/m10006.png and b/Assets/arts/spines/characters/m10006/m10006.png differ diff --git a/Assets/arts/spines/characters/m10006/m10006.skel.bytes b/Assets/arts/spines/characters/m10006/m10006.skel.bytes index f8279f098..567d48f74 100644 Binary files a/Assets/arts/spines/characters/m10006/m10006.skel.bytes and b/Assets/arts/spines/characters/m10006/m10006.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10007/m10007.atlas.txt b/Assets/arts/spines/characters/m10007/m10007.atlas.txt index 0c462c171..7c96bb63d 100644 --- a/Assets/arts/spines/characters/m10007/m10007.atlas.txt +++ b/Assets/arts/spines/characters/m10007/m10007.atlas.txt @@ -67,8 +67,6 @@ rotate:90 ear_r bounds:217,413,32,31 rotate:90 -eye_xuanyun -bounds:272,451,20,20 gutou bounds:2,97,70,53 rotate:90 diff --git a/Assets/arts/spines/characters/m10007/m10007.png b/Assets/arts/spines/characters/m10007/m10007.png index 468d1a118..31f10b629 100644 Binary files a/Assets/arts/spines/characters/m10007/m10007.png and b/Assets/arts/spines/characters/m10007/m10007.png differ diff --git a/Assets/arts/spines/characters/m10007/m10007.skel.bytes b/Assets/arts/spines/characters/m10007/m10007.skel.bytes index 87eeb6cf0..f38c71557 100644 Binary files a/Assets/arts/spines/characters/m10007/m10007.skel.bytes and b/Assets/arts/spines/characters/m10007/m10007.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10008/m10008.atlas.txt b/Assets/arts/spines/characters/m10008/m10008.atlas.txt index 2744b9404..c4b324f9c 100644 --- a/Assets/arts/spines/characters/m10008/m10008.atlas.txt +++ b/Assets/arts/spines/characters/m10008/m10008.atlas.txt @@ -66,8 +66,6 @@ bounds:2,2,36,37 rotate:90 ear_r bounds:165,361,31,33 -eye_xuanyun -bounds:81,295,20,20 gutou bounds:2,97,70,53 rotate:90 diff --git a/Assets/arts/spines/characters/m10008/m10008.png b/Assets/arts/spines/characters/m10008/m10008.png index bed350b05..59d2de98b 100644 Binary files a/Assets/arts/spines/characters/m10008/m10008.png and b/Assets/arts/spines/characters/m10008/m10008.png differ diff --git a/Assets/arts/spines/characters/m10008/m10008.skel.bytes b/Assets/arts/spines/characters/m10008/m10008.skel.bytes index bad5b6b28..007a7f18a 100644 Binary files a/Assets/arts/spines/characters/m10008/m10008.skel.bytes and b/Assets/arts/spines/characters/m10008/m10008.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10009/m10009.skel.bytes b/Assets/arts/spines/characters/m10009/m10009.skel.bytes index e4df8382b..9913a5aec 100644 Binary files a/Assets/arts/spines/characters/m10009/m10009.skel.bytes and b/Assets/arts/spines/characters/m10009/m10009.skel.bytes differ diff --git a/Assets/arts/spines/characters/m10010/m10010.skel.bytes b/Assets/arts/spines/characters/m10010/m10010.skel.bytes index f96e3ee0d..0982cd963 100644 Binary files a/Assets/arts/spines/characters/m10010/m10010.skel.bytes and b/Assets/arts/spines/characters/m10010/m10010.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20001/m20001.atlas.txt b/Assets/arts/spines/characters/m20001/m20001.atlas.txt index 1c54367cb..c5167bcdb 100644 --- a/Assets/arts/spines/characters/m20001/m20001.atlas.txt +++ b/Assets/arts/spines/characters/m20001/m20001.atlas.txt @@ -3,35 +3,22 @@ size:512,512 filter:Linear,Linear clothes_1 bounds:364,423,110,81 -eye_xuanyun -bounds:154,162,22,22 -gutou -bounds:203,278,70,53 -rotate:90 hair bounds:2,84,62,51 rotate:90 hand_L bounds:154,186,42,44 hand_R -bounds:66,46,73,61 +bounds:2,9,73,61 +rotate:90 head_1 bounds:244,410,118,94 head_2 bounds:55,133,97,97 -hit_yan1 -bounds:122,26,16,18 -hit_yan2 -bounds:476,454,20,20 hit_yan3 bounds:476,476,28,28 -kulou -bounds:2,5,77,62 -offsets:0,1,77,63 -rotate:90 leg_L -bounds:66,5,39,54 -rotate:90 +bounds:203,294,39,54 leg_R bounds:130,232,38,55 rotate:90 diff --git a/Assets/arts/spines/characters/m20001/m20001.png b/Assets/arts/spines/characters/m20001/m20001.png index dcdec948a..95476419b 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.png and b/Assets/arts/spines/characters/m20001/m20001.png differ diff --git a/Assets/arts/spines/characters/m20001/m20001.skel.bytes b/Assets/arts/spines/characters/m20001/m20001.skel.bytes index 55118be58..6714afef7 100644 Binary files a/Assets/arts/spines/characters/m20001/m20001.skel.bytes and b/Assets/arts/spines/characters/m20001/m20001.skel.bytes differ diff --git a/Assets/arts/spines/characters/m20002/m20002.atlas.txt b/Assets/arts/spines/characters/m20002/m20002.atlas.txt index a0364d54e..7f1d4718d 100644 --- a/Assets/arts/spines/characters/m20002/m20002.atlas.txt +++ b/Assets/arts/spines/characters/m20002/m20002.atlas.txt @@ -2,52 +2,39 @@ m20002.png size:512,512 filter:Linear,Linear clothes_1 -bounds:364,423,110,81 -eye_xuanyun -bounds:130,248,22,22 -gutou -bounds:203,278,70,53 +bounds:55,228,109,81 rotate:90 hair -bounds:2,83,62,51 -rotate:90 +bounds:138,234,63,51 hand_L -bounds:301,366,42,45 -rotate:90 +bounds:77,46,42,45 hand_R -bounds:66,45,74,62 +bounds:138,287,74,62 head_1 -bounds:244,410,118,94 +bounds:245,411,117,94 head_2 -bounds:55,133,97,97 -hit_yan1 -bounds:123,25,16,18 -hit_yan2 -bounds:154,250,20,20 +bounds:364,409,96,97 +rotate:90 hit_yan3 -bounds:476,476,28,28 -kulou -bounds:2,4,77,62 -offsets:0,1,77,63 -rotate:90 +bounds:214,321,28,28 leg_L -bounds:66,4,39,55 -rotate:90 +bounds:77,93,38,55 leg_R -bounds:244,369,39,55 +bounds:2,2,39,55 rotate:90 pelvis -bounds:129,350,105,43 +bounds:129,351,105,43 spine -bounds:129,395,113,109 +bounds:129,396,114,109 upperarm_L_1 -bounds:130,272,71,76 +bounds:55,150,71,76 upperarm_R_2 -bounds:55,232,73,104 +bounds:2,43,73,104 weapon_1 -bounds:2,147,189,51 +bounds:2,149,188,51 rotate:90 weapon_2 -bounds:2,338,125,166 +bounds:2,339,125,166 yinying -bounds:55,109,93,22 +bounds:463,412,93,22 +rotate:90 diff --git a/Assets/arts/spines/characters/m20002/m20002.png b/Assets/arts/spines/characters/m20002/m20002.png index 06144bc54..0e81bb47c 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.png and b/Assets/arts/spines/characters/m20002/m20002.png differ diff --git a/Assets/arts/spines/characters/m20002/m20002.skel.bytes b/Assets/arts/spines/characters/m20002/m20002.skel.bytes index c6996dfd9..674fea920 100644 Binary files a/Assets/arts/spines/characters/m20002/m20002.skel.bytes and b/Assets/arts/spines/characters/m20002/m20002.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt index e4b408029..9e4a385dd 100644 --- a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.atlas.txt @@ -1,11 +1,13 @@ ui_main_button_1.png size:256,256 filter:Linear,Linear -1 -bounds:2,127,116,91 -offsets:1,1,118,93 -2 -bounds:2,46,94,79 -offsets:1,1,96,81 +ck +bounds:2,86,103,107 +offsets:1,0,104,107 +shop1 +bounds:2,20,103,64 +offsets:1,0,104,64 shop2 -bounds:120,202,98,16 +bounds:2,2,98,16 +shop3 +bounds:107,151,81,42 diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png index 77d029b25..1e0233e07 100644 Binary files a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png and b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.png differ diff --git a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes index f7c71215b..aefcea3f1 100644 Binary files a/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes and b/Assets/arts/spines/ui/ui_main_button_1/ui_main_button_1.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt index 24d651562..7029e618e 100644 --- a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.atlas.txt @@ -2,31 +2,22 @@ ui_main_button_3.png size:256,256 filter:Linear,Linear p1 -bounds:1,44,85,97 -offsets:1,1,87,99 +bounds:1,48,87,99 p2 -bounds:100,147,84,96 -offsets:1,1,86,98 +bounds:102,153,86,98 p3 -bounds:1,143,97,100 -offsets:1,1,99,102 +bounds:1,149,99,102 y1_1 -bounds:186,203,12,20 -offsets:1,1,14,22 +bounds:190,207,14,22 y1_2 -bounds:204,231,12,20 -offsets:1,1,14,22 +bounds:210,237,14,22 rotate:90 y2_1 -bounds:1,1,12,21 -offsets:1,1,14,23 +bounds:1,1,14,23 y2_2 -bounds:19,30,12,21 -offsets:1,1,14,23 +bounds:21,32,14,23 rotate:90 y3_1 -bounds:1,24,16,18 -offsets:1,1,18,20 +bounds:1,26,18,20 y3_2 -bounds:186,225,16,18 -offsets:1,1,18,20 +bounds:190,231,18,20 diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png index b60f1dcc9..ba0ad04cd 100644 Binary files a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png and b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.png differ diff --git a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes index 53518087d..eb552e100 100644 Binary files a/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes and b/Assets/arts/spines/ui/ui_main_button_3/ui_main_button_3.skel.bytes differ