diff --git a/Assets/arts/spines/characters/p0001/p0001.skel.bytes b/Assets/arts/spines/characters/p0001/p0001.skel.bytes index e7a53fd81..6bead4433 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/p0004/p0004.skel.bytes b/Assets/arts/spines/characters/p0004/p0004.skel.bytes index 84aa0b8fc..7b1b6d0d4 100644 Binary files a/Assets/arts/spines/characters/p0004/p0004.skel.bytes and b/Assets/arts/spines/characters/p0004/p0004.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0004/p0004_material.mat b/Assets/arts/spines/characters/p0004/p0004_material.mat index 6034b039c..c4cbc2ce4 100644 --- a/Assets/arts/spines/characters/p0004/p0004_material.mat +++ b/Assets/arts/spines/characters/p0004/p0004_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: p0004_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 diff --git a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta b/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta index 790780e10..ac875a57e 100644 --- a/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta +++ b/Assets/arts/spines/characters/p0004/p0004_skeletondata.asset.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 guid: 946b79f032c464846aa86eba53ab2626 +labels: +- Al_max NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/characters/p0005/p0005.atlas.txt b/Assets/arts/spines/characters/p0005/p0005.atlas.txt index 7308f1bcd..f5b7d8bed 100644 --- a/Assets/arts/spines/characters/p0005/p0005.atlas.txt +++ b/Assets/arts/spines/characters/p0005/p0005.atlas.txt @@ -1,47 +1,106 @@ p0005.png -size:512,512 +size:2048,2048 filter:Linear,Linear -eye_L -bounds:30,19,12,24 -eye_R -bounds:81,254,12,25 -eye_xuanyun -bounds:372,488,22,22 -gutou -bounds:2,107,70,53 -hand L -bounds:101,282,44,30 -hand R -bounds:2,45,47,60 -hand R_2 -bounds:101,314,45,62 -offsets:0,0,47,62 -head_1 -bounds:2,281,97,95 -head_2 -bounds:2,378,145,132 -hit_yan1 -bounds:203,402,16,18 -hit_yan2 -bounds:51,85,20,20 -kulou -bounds:2,217,77,62 -offsets:0,1,77,63 -leg_ L_1 -bounds:292,475,35,52 +bing +bounds:2,1483,760,548 +dang +bounds:190,769,104,82 +offsets:1,1,106,85 rotate:90 -leg_R_1 -bounds:149,384,36,52 +eye_l +bounds:137,161,27,40 +offsets:1,1,29,42 +eye_r +bounds:247,1261,26,40 +offsets:1,1,28,42 +rotate:90 +eye_yun +bounds:1208,1564,51,51 +fair2_1 +bounds:1566,1815,46,16 +offsets:1,1,48,18 +rotate:90 +fair2_2 +bounds:1852,1868,38,54 +offsets:1,2,40,57 +rotate:90 +fair2_3 +bounds:1852,1908,92,123 +offsets:0,0,92,124 +fx1/fx1_01 +bounds:1589,1870,161,261 +offsets:172,0,500,281 +rotate:90 +fx1/fx1_03 +bounds:2,203,164,264 +offsets:171,0,500,281 +fx1/fx1_05 +bounds:1061,1865,166,265 +offsets:170,0,500,281 +rotate:90 +fx1/fx1_07 +bounds:2,469,175,260 +offsets:162,0,500,281 +fx1/fx1_09 +bounds:1312,1687,174,252 +offsets:159,0,500,281 +rotate:90 +fx1/fx1_11 +bounds:764,1602,181,260 +offsets:158,0,500,281 +fx1/fx1_13 +bounds:2,988,188,263 +offsets:157,0,500,281 +fx1/fx1_15 +bounds:247,1289,192,257 +offsets:156,0,500,281 +rotate:90 +fx1/fx1_17 +bounds:506,1287,194,242 +offsets:155,0,500,281 +rotate:90 +fx1/fx1_19 +bounds:1123,1617,187,246 +offsets:153,0,500,281 +fx1/fx1_21 +bounds:947,1609,174,253 +offsets:160,0,500,281 +fx1/fx1_23 +bounds:1328,1863,168,259 +offsets:167,0,500,281 +rotate:90 +hair_1 +bounds:2,1253,243,228 +hand_l_1 +bounds:886,1507,93,93 +hand_l_2 +bounds:1076,1524,65,83 +offsets:1,2,67,86 +hand_r_1 +bounds:981,1526,93,81 +hand_r_2 +bounds:1143,1530,63,85 +offsets:1,2,66,89 +head +bounds:2,10,191,133 +offsets:2,2,195,137 +rotate:90 +leg_l +bounds:764,1512,88,120 +rotate:90 +leg_r +bounds:1946,1915,85,116 +maozi +bounds:764,1864,295,167 +qundi +bounds:1312,1565,251,120 +spine +bounds:2,731,255,186 +rotate:90 +xx +bounds:1261,1567,38,48 +offsets:1,1,40,50 +yingzi +bounds:192,875,376,43 +offsets:1,1,378,45 rotate:90 -spine1 -bounds:149,422,70,61 -spine_2 -bounds:2,162,77,53 -upperarm_L_01 -bounds:2,2,26,41 -weapon_1 -bounds:221,434,65,49 -yinying -bounds:149,485,141,25 -zui -bounds:346,478,24,32 diff --git a/Assets/arts/spines/characters/p0005/p0005.png b/Assets/arts/spines/characters/p0005/p0005.png index 5e37c9dbb..5321df266 100644 Binary files a/Assets/arts/spines/characters/p0005/p0005.png and b/Assets/arts/spines/characters/p0005/p0005.png differ diff --git a/Assets/arts/spines/characters/p0005/p0005.skel.bytes b/Assets/arts/spines/characters/p0005/p0005.skel.bytes index c45e16ca1..3a77cddeb 100644 Binary files a/Assets/arts/spines/characters/p0005/p0005.skel.bytes and b/Assets/arts/spines/characters/p0005/p0005.skel.bytes differ diff --git a/Assets/arts/spines/characters/p0005/p0005_skeletondata.asset b/Assets/arts/spines/characters/p0005/p0005_skeletondata.asset index 83f49b62a..00fa8e9e4 100644 --- a/Assets/arts/spines/characters/p0005/p0005_skeletondata.asset +++ b/Assets/arts/spines/characters/p0005/p0005_skeletondata.asset @@ -27,5 +27,5 @@ MonoBehaviour: fromAnimation: [] toAnimation: [] duration: [] - defaultMix: 0.2 + defaultMix: 0 controller: {fileID: 0}