diff --git a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.atlas.txt b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.atlas.txt index 4763faee8..7ed813c02 100644 --- a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.atlas.txt +++ b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.atlas.txt @@ -1,175 +1,125 @@ ui_act_first_1.png -size:2048,2048 +size:1024,1024 filter:Linear,Linear -pma:true -bei -bounds:2,1459,683,587 -offsets:22,7,729,604 -di_1 -bounds:2,1116,404,134 -offsets:1,1,406,136 -di_2 -bounds:2,1252,496,205 -offsets:5,4,506,213 -di_3 -bounds:687,1876,466,170 -offsets:1,1,468,172 -erji_1 -bounds:631,1096,68,84 -offsets:1,1,70,86 +jianxian_1 +bounds:604,372,225,91 +offsets:3,2,231,96 rotate:90 -erji_2 -bounds:687,1468,174,125 -erji_3 -bounds:1965,1892,65,80 -offsets:1,1,67,82 +jianxian_10 +bounds:664,45,47,37 +offsets:1,1,49,39 rotate:90 -eye_l -bounds:935,1601,33,44 -offsets:1,1,35,46 +jianxian_11 +bounds:604,362,5,8 +offsets:1,1,7,10 +jianxian_12 +bounds:990,974,27,48 +offsets:1,1,29,50 +jianxian_13 +bounds:694,689,7,12 +offsets:1,1,9,14 +jianxian_14 +bounds:236,26,37,56 +offsets:1,1,39,58 rotate:90 -eye_r -bounds:1032,1589,40,45 -offsets:1,1,42,47 -fang_1 -bounds:621,1015,79,79 -offsets:1,1,81,81 -fang_10 -bounds:981,1585,49,49 -offsets:1,1,51,51 -fang_11 -bounds:981,1585,49,49 -offsets:1,1,51,51 -fang_12 -bounds:1155,1891,155,236 -offsets:1,1,157,238 +jianxian_15 +bounds:592,94,19,10 +offsets:1,1,21,12 rotate:90 -fang_13 -bounds:687,1595,246,279 -offsets:1,1,248,281 -fang_2 -bounds:1074,1597,37,37 -offsets:1,1,39,39 -fang_3 -bounds:1074,1597,37,37 -offsets:1,1,39,39 -fang_4 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -fang_5 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -fang_6 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -fang_7 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -fang_8 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -fang_9 -bounds:1113,1597,37,37 -offsets:1,1,39,39 -gu_l -bounds:342,772,72,71 -offsets:1,1,74,73 -gu_r -bounds:416,779,64,76 -offsets:1,1,66,78 +jianxian_16 +bounds:829,215,109,108 +offsets:1,1,111,110 +jianxian_17 +bounds:709,61,72,83 rotate:90 -hair_1 -bounds:2,6,148,100 -hair_2 -bounds:408,1092,158,90 -offsets:1,1,160,92 +jianxian_18 +bounds:829,150,64,63 +offsets:1,1,66,65 +jianxian_19 +bounds:839,500,159,131 +offsets:1,1,161,133 rotate:90 -hair_l -bounds:1809,1915,154,131 -hair_r -bounds:2,108,156,143 +jianxian_2 +bounds:709,661,259,116 +offsets:1,2,263,120 +jianxian_20 +bounds:794,55,78,71 +offsets:1,1,80,73 rotate:90 -hand_r -bounds:1628,1909,179,137 -hand_r_1 -bounds:863,1477,116,87 +jianxian_21 +bounds:697,385,138,119 +jianxian_22 +bounds:940,216,73,107 +offsets:1,1,75,109 +jianxian_23 +bounds:612,94,88,95 +offsets:1,1,90,97 rotate:90 -hand_r_2 -bounds:647,801,53,43 -offsets:1,1,55,45 -hand_r_3 -bounds:647,904,62,66 -offsets:1,1,64,68 -head -bounds:366,845,140,106 -offsets:1,1,142,108 -huatong_1 -bounds:647,846,56,56 -offsets:1,1,58,58 -huatong_2 -bounds:154,765,85,109 -offsets:1,1,87,111 -leg_l_1 -bounds:502,954,117,149 -leg_l_2 -bounds:150,359,75,40 -offsets:1,1,77,42 +jianxian_24 +bounds:472,358,239,130 rotate:90 -leg_r_1 -bounds:500,1105,129,148 -leg_r_2 -bounds:621,972,78,41 -offsets:1,1,80,43 -mouth -bounds:1155,1878,23,11 -offsets:1,1,25,13 -pingmu -bounds:1393,1907,139,233 -offsets:1,1,141,235 +jianxian_25 +bounds:837,325,132,76 +jianxian_26 +bounds:837,403,124,95 +jianxian_27 +bounds:592,39,70,53 +offsets:1,1,72,55 +jianxian_28 +bounds:697,506,140,153 +jianxian_29 +bounds:728,211,172,99 rotate:90 -spine -bounds:2,266,146,168 -xiang_l_1 -bounds:154,676,73,87 -offsets:1,1,75,89 -xiang_l_2 -bounds:2,640,150,234 -offsets:1,1,152,236 -xiang_l_3 -bounds:366,953,137,134 +jianxian_3 +bounds:299,357,240,171 +offsets:3,2,245,175 rotate:90 -xiang_r_1 -bounds:631,1166,73,87 -offsets:1,1,75,89 -xiang_r_2 -bounds:214,881,150,233 -offsets:1,1,152,235 -xiang_r_3 -bounds:508,819,137,133 -yin_l_1 -bounds:2,876,210,238 -offsets:7,8,224,254 -yin_l_2 -bounds:500,1255,181,202 -offsets:7,7,195,216 -yin_r_1 -bounds:935,1636,210,238 -offsets:7,8,224,254 -yin_r_2 -bounds:2,436,181,202 -offsets:7,7,195,216 -yinfu_1 -bounds:150,287,70,69 -offsets:5,5,81,78 +jianxian_30 +bounds:515,170,186,95 rotate:90 -yinfu_2 -bounds:1965,1959,87,81 -offsets:8,7,102,94 +jianxian_31 +bounds:299,2,227,95 +jianxian_32 +bounds:2,3,138,60 +jianxian_33 +bounds:299,99,256,122 rotate:90 -yinfu_3 -bounds:1965,1959,87,81 -offsets:8,7,102,94 +jianxian_34 +bounds:728,135,97,74 +offsets:1,1,99,76 +jianxian_35 +bounds:515,115,80,53 +offsets:1,1,82,55 +jianxian_36 +bounds:423,150,205,90 +offsets:3,3,211,95 rotate:90 -yinfu_4 -bounds:241,773,99,106 -offsets:6,5,108,116 +jianxian_37 +bounds:447,599,245,102 +offsets:3,2,251,106 +jianxian_38 +bounds:447,703,260,319 +jianxian_39 +bounds:2,599,443,423 +jianxian_4 +bounds:709,779,279,243 +offsets:2,2,284,247 +jianxian_40 +bounds:2,65,532,295 +rotate:90 +jianxian_5 +bounds:423,99,49,72 +offsets:1,1,51,74 +rotate:90 +jianxian_6 +bounds:528,43,70,62 +rotate:90 +jianxian_7 +bounds:612,184,186,114 +rotate:90 +jianxian_8 +bounds:142,15,48,92 +rotate:90 +jianxian_9 +bounds:528,4,47,37 +offsets:1,1,49,39 diff --git a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.png b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.png index e81471a2f..96cdfce31 100644 Binary files a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.png and b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.png differ diff --git a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.skel.bytes b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.skel.bytes index 25b0041eb..bd85066f5 100644 Binary files a/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.skel.bytes and b/Assets/arts/spines/ui/ui_act_first_1/ui_act_first_1.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.atlas.txt b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.atlas.txt index 69af0c1fe..f53fca797 100644 --- a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.atlas.txt +++ b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.atlas.txt @@ -1,125 +1,175 @@ ui_act_first_2.png -size:1024,1024 +size:2048,2048 filter:Linear,Linear -jianxian_1 -bounds:604,372,225,91 -offsets:3,2,231,96 +pma:true +bei +bounds:2,1459,683,587 +offsets:22,7,729,604 +di_1 +bounds:2,1116,404,134 +offsets:1,1,406,136 +di_2 +bounds:2,1252,496,205 +offsets:5,4,506,213 +di_3 +bounds:687,1876,466,170 +offsets:1,1,468,172 +erji_1 +bounds:631,1096,68,84 +offsets:1,1,70,86 rotate:90 -jianxian_10 -bounds:664,45,47,37 -offsets:1,1,49,39 +erji_2 +bounds:687,1468,174,125 +erji_3 +bounds:1965,1892,65,80 +offsets:1,1,67,82 rotate:90 -jianxian_11 -bounds:604,362,5,8 -offsets:1,1,7,10 -jianxian_12 -bounds:990,974,27,48 -offsets:1,1,29,50 -jianxian_13 -bounds:694,689,7,12 -offsets:1,1,9,14 -jianxian_14 -bounds:236,26,37,56 -offsets:1,1,39,58 +eye_l +bounds:935,1601,33,44 +offsets:1,1,35,46 rotate:90 -jianxian_15 -bounds:592,94,19,10 -offsets:1,1,21,12 +eye_r +bounds:1032,1589,40,45 +offsets:1,1,42,47 +fang_1 +bounds:621,1015,79,79 +offsets:1,1,81,81 +fang_10 +bounds:981,1585,49,49 +offsets:1,1,51,51 +fang_11 +bounds:981,1585,49,49 +offsets:1,1,51,51 +fang_12 +bounds:1155,1891,155,236 +offsets:1,1,157,238 rotate:90 -jianxian_16 -bounds:829,215,109,108 -offsets:1,1,111,110 -jianxian_17 -bounds:709,61,72,83 +fang_13 +bounds:687,1595,246,279 +offsets:1,1,248,281 +fang_2 +bounds:1074,1597,37,37 +offsets:1,1,39,39 +fang_3 +bounds:1074,1597,37,37 +offsets:1,1,39,39 +fang_4 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +fang_5 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +fang_6 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +fang_7 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +fang_8 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +fang_9 +bounds:1113,1597,37,37 +offsets:1,1,39,39 +gu_l +bounds:342,772,72,71 +offsets:1,1,74,73 +gu_r +bounds:416,779,64,76 +offsets:1,1,66,78 rotate:90 -jianxian_18 -bounds:829,150,64,63 -offsets:1,1,66,65 -jianxian_19 -bounds:839,500,159,131 -offsets:1,1,161,133 +hair_1 +bounds:2,6,148,100 +hair_2 +bounds:408,1092,158,90 +offsets:1,1,160,92 rotate:90 -jianxian_2 -bounds:709,661,259,116 -offsets:1,2,263,120 -jianxian_20 -bounds:794,55,78,71 -offsets:1,1,80,73 +hair_l +bounds:1809,1915,154,131 +hair_r +bounds:2,108,156,143 rotate:90 -jianxian_21 -bounds:697,385,138,119 -jianxian_22 -bounds:940,216,73,107 -offsets:1,1,75,109 -jianxian_23 -bounds:612,94,88,95 -offsets:1,1,90,97 +hand_r +bounds:1628,1909,179,137 +hand_r_1 +bounds:863,1477,116,87 rotate:90 -jianxian_24 -bounds:472,358,239,130 +hand_r_2 +bounds:647,801,53,43 +offsets:1,1,55,45 +hand_r_3 +bounds:647,904,62,66 +offsets:1,1,64,68 +head +bounds:366,845,140,106 +offsets:1,1,142,108 +huatong_1 +bounds:647,846,56,56 +offsets:1,1,58,58 +huatong_2 +bounds:154,765,85,109 +offsets:1,1,87,111 +leg_l_1 +bounds:502,954,117,149 +leg_l_2 +bounds:150,359,75,40 +offsets:1,1,77,42 rotate:90 -jianxian_25 -bounds:837,325,132,76 -jianxian_26 -bounds:837,403,124,95 -jianxian_27 -bounds:592,39,70,53 -offsets:1,1,72,55 -jianxian_28 -bounds:697,506,140,153 -jianxian_29 -bounds:728,211,172,99 +leg_r_1 +bounds:500,1105,129,148 +leg_r_2 +bounds:621,972,78,41 +offsets:1,1,80,43 +mouth +bounds:1155,1878,23,11 +offsets:1,1,25,13 +pingmu +bounds:1393,1907,139,233 +offsets:1,1,141,235 rotate:90 -jianxian_3 -bounds:299,357,240,171 -offsets:3,2,245,175 +spine +bounds:2,266,146,168 +xiang_l_1 +bounds:154,676,73,87 +offsets:1,1,75,89 +xiang_l_2 +bounds:2,640,150,234 +offsets:1,1,152,236 +xiang_l_3 +bounds:366,953,137,134 rotate:90 -jianxian_30 -bounds:515,170,186,95 +xiang_r_1 +bounds:631,1166,73,87 +offsets:1,1,75,89 +xiang_r_2 +bounds:214,881,150,233 +offsets:1,1,152,235 +xiang_r_3 +bounds:508,819,137,133 +yin_l_1 +bounds:2,876,210,238 +offsets:7,8,224,254 +yin_l_2 +bounds:500,1255,181,202 +offsets:7,7,195,216 +yin_r_1 +bounds:935,1636,210,238 +offsets:7,8,224,254 +yin_r_2 +bounds:2,436,181,202 +offsets:7,7,195,216 +yinfu_1 +bounds:150,287,70,69 +offsets:5,5,81,78 rotate:90 -jianxian_31 -bounds:299,2,227,95 -jianxian_32 -bounds:2,3,138,60 -jianxian_33 -bounds:299,99,256,122 +yinfu_2 +bounds:1965,1959,87,81 +offsets:8,7,102,94 rotate:90 -jianxian_34 -bounds:728,135,97,74 -offsets:1,1,99,76 -jianxian_35 -bounds:515,115,80,53 -offsets:1,1,82,55 -jianxian_36 -bounds:423,150,205,90 -offsets:3,3,211,95 +yinfu_3 +bounds:1965,1959,87,81 +offsets:8,7,102,94 rotate:90 -jianxian_37 -bounds:447,599,245,102 -offsets:3,2,251,106 -jianxian_38 -bounds:447,703,260,319 -jianxian_39 -bounds:2,599,443,423 -jianxian_4 -bounds:709,779,279,243 -offsets:2,2,284,247 -jianxian_40 -bounds:2,65,532,295 -rotate:90 -jianxian_5 -bounds:423,99,49,72 -offsets:1,1,51,74 -rotate:90 -jianxian_6 -bounds:528,43,70,62 -rotate:90 -jianxian_7 -bounds:612,184,186,114 -rotate:90 -jianxian_8 -bounds:142,15,48,92 -rotate:90 -jianxian_9 -bounds:528,4,47,37 -offsets:1,1,49,39 +yinfu_4 +bounds:241,773,99,106 +offsets:6,5,108,116 diff --git a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.png b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.png index 96cdfce31..e81471a2f 100644 Binary files a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.png and b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.png differ diff --git a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.skel.bytes b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.skel.bytes index 576b879bd..42881386a 100644 Binary files a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.skel.bytes and b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2_material.mat b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2_material.mat index 88e981e20..102833cf2 100644 --- a/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2_material.mat +++ b/Assets/arts/spines/ui/ui_act_first_2/ui_act_first_2_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_act_first_2_material m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3} - m_ValidKeywords: [] + m_ValidKeywords: + - _STRAIGHT_ALPHA_INPUT m_InvalidKeywords: - _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -36,7 +37,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 - _UseScreenSpaceOutlineWidth: 0