diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt index 9f446cd83..fac4d4cac 100644 --- a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.atlas.txt @@ -1,34 +1,28 @@ ui_main_btn_challenge.png size:256,256 filter:Linear,Linear -fang1 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang2 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang3 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang4 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang5 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang7 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang8 -bounds:98,196,6,6 -offsets:1,1,8,8 -fang6 -bounds:2,2,6,6 -offsets:1,1,8,8 -spine -bounds:2,107,94,95 -offsets:1,1,96,97 -tiao -bounds:98,188,5,6 +he_1 +bounds:2,2,114,45 +offsets:1,1,116,47 +he_2 +bounds:118,194,114,55 +offsets:1,1,116,57 +hero_1 +bounds:118,101,31,23 +offsets:1,1,33,25 +hero_2 +bounds:208,161,31,23 +offsets:1,1,33,25 +rotate:90 +hero_3 +bounds:118,77,31,22 +offsets:1,1,33,24 +ping +bounds:118,126,88,66 +offsets:1,1,90,68 +yingzi +bounds:2,150,114,99 +offsets:1,1,116,101 zhihui -bounds:2,10,94,95 +bounds:2,49,114,99 +offsets:1,1,116,101 diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png index e80761df6..9ea43c714 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png and b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes index 1466b3845..ada1678d0 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_challenge/ui_main_btn_challenge.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt index 59e6f8c98..45302e1fc 100644 --- a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.atlas.txt @@ -1,23 +1,48 @@ ui_main_btn_company.png size:256,256 filter:Linear,Linear -jz_1 -bounds:103,189,56,49 -offsets:1,1,58,51 -jz_2 -bounds:103,155,24,32 -offsets:1,1,26,34 -jz_3 -bounds:2,2,16,10 -offsets:1,1,18,12 -jz_4 -bounds:161,203,9,35 -offsets:1,1,11,37 -jz_5 -bounds:2,48,92,89 -offsets:1,1,94,91 -jz_6 -bounds:2,14,59,32 -offsets:1,1,61,34 +eye_l +bounds:37,30,15,6 +offsets:1,1,17,8 +eye_l_1 +bounds:198,175,6,15 +offsets:1,1,8,17 +eye_r_1 +bounds:198,175,6,15 +offsets:1,1,8,17 +eye_l_xx +bounds:124,48,16,18 +offsets:2,2,19,21 +eye_r_xx +bounds:124,48,16,18 +offsets:2,2,19,21 +eye_r +bounds:231,248,15,6 +offsets:1,1,17,8 +face_1 +bounds:198,192,62,31 +offsets:1,1,64,33 +rotate:90 +face_2 +bounds:124,68,82,49 +offsets:1,1,84,51 +rotate:90 +men +bounds:2,2,34,33 +offsets:1,1,36,35 +rotate:90 +spine_1 +bounds:124,152,72,102 +offsets:1,1,74,104 +spine_2 +bounds:175,77,57,73 +offsets:1,1,59,75 +spine_3 +bounds:175,2,57,73 +offsets:1,1,59,75 +yingzi +bounds:2,38,120,102 +offsets:1,1,122,104 zhihui -bounds:2,139,99,99 +bounds:2,142,120,112 +offsets:1,1,122,114 diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png index f15e81fc8..b676139df 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png and b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes index 675e7312f..220f092be 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_company/ui_main_btn_company.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt index b23f55ccb..ab331d497 100644 --- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.atlas.txt @@ -1,20 +1,21 @@ ui_main_btn_shop.png size:256,256 filter:Linear,Linear -cp_1 -bounds:92,93,40,12 -offsets:1,1,42,14 +ding +bounds:111,31,107,55 rotate:90 -cp_2 -bounds:110,147,41,21 +men +bounds:213,216,36,33 +offsets:1,1,38,35 +pengying +bounds:168,36,102,49 +offsets:1,1,104,51 rotate:90 -cp_3 -bounds:2,2,43,27 -cp_4 -bounds:110,190,40,47 -shouqiang -bounds:2,31,88,102 -offsets:1,1,90,104 +spine +bounds:111,140,100,109 +yingzi +bounds:2,25,107,108 +offsets:1,1,109,110 zhihui -bounds:2,135,106,102 -offsets:1,1,108,104 +bounds:2,135,107,114 +offsets:1,1,109,116 diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png index 0fa54a58b..3f0d66732 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png and b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.png differ diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes index 7dfc4a535..041c7eb0b 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat index db65d7fdf..19a4bf476 100644 --- a/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat +++ b/Assets/arts/spines/ui/ui_main_btn_shop/ui_main_btn_shop_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_main_btn_shop_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/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes b/Assets/arts/spines/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes index 302bcfff8..6f4041f07 100644 Binary files a/Assets/arts/spines/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes and b/Assets/arts/spines/ui/ui_main_btn_summon/ui_main_btn_summon.skel.bytes differ