diff --git a/Assets/arts/spines/characters/p25001/p25001.atlas.txt b/Assets/arts/spines/characters/p25001/p25001.atlas.txt index 05c08ba68..edb7b5199 100644 --- a/Assets/arts/spines/characters/p25001/p25001.atlas.txt +++ b/Assets/arts/spines/characters/p25001/p25001.atlas.txt @@ -2,20 +2,19 @@ p25001.png size:2048,2048 filter:Linear,Linear baoshi -bounds:1782,1270,61,61 +bounds:869,642,61,61 cy bounds:2,1630,612,416 eye_death -bounds:683,37,49,42 +bounds:906,286,49,42 eye_hit -bounds:575,37,42,53 -rotate:90 +bounds:906,330,42,53 eye_l -bounds:1782,1233,42,35 +bounds:1827,1375,42,35 eye_r bounds:2,2,36,32 eye_yun -bounds:630,28,51,51 +bounds:901,233,51,51 fx1_00 bounds:519,1237,300,169 fx1_01 @@ -87,10 +86,10 @@ bounds:564,383,213,248 gutou bounds:519,1568,39,60 hair_1 -bounds:840,51,70,83 +bounds:575,9,70,83 rotate:90 hair_2 -bounds:840,295,75,100 +bounds:845,99,75,100 hand_l_1 bounds:1053,1287,145,108 hand_l_2 @@ -110,31 +109,27 @@ jiandai bounds:779,449,182,135 rotate:90 kulou -bounds:840,123,83,76 +bounds:660,3,83,76 kuzi bounds:735,991,244,74 rotate:90 leg_l -bounds:840,201,87,92 +bounds:842,5,87,92 leg_r -bounds:1674,1243,106,88 +bounds:798,295,106,88 leg_run_1 bounds:821,1243,163,75 rotate:90 leg_run_l_1 -bounds:746,181,97,92 -rotate:90 +bounds:746,107,97,92 leg_run_l_2 -bounds:746,280,101,92 -rotate:90 +bounds:798,201,101,92 leg_run_r_2 -bounds:746,280,101,92 -rotate:90 +bounds:798,201,101,92 leg_run_r_1 -bounds:746,85,94,92 -rotate:90 +bounds:746,13,94,92 mei_l -bounds:1982,1688,65,54 +bounds:869,705,65,54 rotate:90 mei_r bounds:560,1571,57,53 @@ -143,24 +138,27 @@ mouth bounds:519,1156,79,26 rotate:90 nose -bounds:1982,1646,40,23 -rotate:90 +bounds:746,212,40,23 spine bounds:735,772,217,156 rotate:90 ya -bounds:2007,1662,29,24 +bounds:40,10,29,24 yaodai bounds:898,1241,152,37 +yingzi +bounds:1982,1668,378,45 +rotate:90 zhi_l_1 -bounds:1982,1755,50,145 +bounds:1674,1281,50,145 +rotate:90 zhi_l_2 -bounds:1982,1902,62,144 +bounds:1674,1333,62,144 +rotate:90 zhi_r_1 -bounds:1674,1333,62,143 +bounds:779,385,62,143 rotate:90 zhi_r_2 -bounds:779,397,50,144 -rotate:90 +bounds:746,237,50,144 zhuan bounds:2,1156,515,472 diff --git a/Assets/arts/spines/characters/p25001/p25001.png b/Assets/arts/spines/characters/p25001/p25001.png index b8e8134f3..c9c3e6195 100644 Binary files a/Assets/arts/spines/characters/p25001/p25001.png and b/Assets/arts/spines/characters/p25001/p25001.png differ diff --git a/Assets/arts/spines/characters/p25001/p25001.skel.bytes b/Assets/arts/spines/characters/p25001/p25001.skel.bytes index bcf17ad37..785d46df2 100644 Binary files a/Assets/arts/spines/characters/p25001/p25001.skel.bytes and b/Assets/arts/spines/characters/p25001/p25001.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_summon/ui_summon.atlas.txt b/Assets/arts/spines/ui/ui_summon/ui_summon.atlas.txt index ea1b1b0ea..680f17296 100644 --- a/Assets/arts/spines/ui/ui_summon/ui_summon.atlas.txt +++ b/Assets/arts/spines/ui/ui_summon/ui_summon.atlas.txt @@ -1,5 +1,5 @@ ui_summon.png -size:1024,1024 +size:607,607 filter:Linear,Linear kuai -bounds:2,2,568,637 +bounds:2,2,533,603 diff --git a/Assets/arts/spines/ui/ui_summon/ui_summon.png b/Assets/arts/spines/ui/ui_summon/ui_summon.png index d7daa5704..6cb90e777 100644 Binary files a/Assets/arts/spines/ui/ui_summon/ui_summon.png and b/Assets/arts/spines/ui/ui_summon/ui_summon.png differ diff --git a/Assets/arts/spines/ui/ui_summon/ui_summon.skel.bytes b/Assets/arts/spines/ui/ui_summon/ui_summon.skel.bytes index 60c69ae49..c07b07a4c 100644 Binary files a/Assets/arts/spines/ui/ui_summon/ui_summon.skel.bytes and b/Assets/arts/spines/ui/ui_summon/ui_summon.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_summon/ui_summon_material.mat b/Assets/arts/spines/ui/ui_summon/ui_summon_material.mat index 5815a747c..d97580106 100644 --- a/Assets/arts/spines/ui/ui_summon/ui_summon_material.mat +++ b/Assets/arts/spines/ui/ui_summon/ui_summon_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_summon_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