diff --git a/Assets/arts/spines/characters/p23001/p23001.skel.bytes b/Assets/arts/spines/characters/p23001/p23001.skel.bytes index 8a12c1ad4..c6a8e942a 100644 Binary files a/Assets/arts/spines/characters/p23001/p23001.skel.bytes and b/Assets/arts/spines/characters/p23001/p23001.skel.bytes differ diff --git a/Assets/arts/spines/characters/p25002/p25002.skel.bytes b/Assets/arts/spines/characters/p25002/p25002.skel.bytes index e74ee8300..2595269a8 100644 Binary files a/Assets/arts/spines/characters/p25002/p25002.skel.bytes and b/Assets/arts/spines/characters/p25002/p25002.skel.bytes differ diff --git a/Assets/arts/spines/characters/p34001/p34001.skel.bytes b/Assets/arts/spines/characters/p34001/p34001.skel.bytes index e619b642b..30641551b 100644 Binary files a/Assets/arts/spines/characters/p34001/p34001.skel.bytes and b/Assets/arts/spines/characters/p34001/p34001.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.atlas.txt b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.atlas.txt index d04b376ca..2ecf2d9e5 100644 --- a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.atlas.txt +++ b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.atlas.txt @@ -2,22 +2,18 @@ ui_battle_result_fail.png size:2048,2048 filter:Linear,Linear g2 -bounds:2,120,696,565 +bounds:2,26,696,565 offsets:15,34,720,633 g3 -bounds:2,687,720,598 +bounds:2,593,720,598 offsets:0,33,720,650 -hengfu -bounds:724,1195,358,90 hf1 -bounds:700,609,76,22 +bounds:2,2,76,22 offsets:1,0,78,22 -rotate:90 hf2 -bounds:700,609,76,22 +bounds:2,2,76,22 offsets:1,0,78,22 -rotate:90 xx -bounds:724,1164,29,29 +bounds:724,1044,29,29 yuan -bounds:2,2,116,116 +bounds:724,1075,116,116 diff --git a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.png b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.png index e9a2dee70..fdab65265 100644 Binary files a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.png and b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.png differ diff --git a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.skel.bytes b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.skel.bytes index 2cddf1b54..84044a5c8 100644 Binary files a/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.skel.bytes and b/Assets/arts/spines/ui/ui_battle_result_fail/ui_battle_result_fail.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.atlas.txt b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.atlas.txt index 64a3ef980..ab3be8127 100644 --- a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.atlas.txt +++ b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.atlas.txt @@ -2,29 +2,18 @@ ui_battle_result_win.png size:2048,2048 filter:Linear,Linear g1 -bounds:2,724,727,769 -offsets:0,9,728,786 +bounds:2,712,728,786 g2 -bounds:731,928,696,565 -offsets:16,35,722,635 +bounds:732,863,722,635 g3 -bounds:2,124,720,598 -offsets:1,34,722,652 -hengfu -bounds:2,32,358,90 -offsets:1,1,360,92 +bounds:2,58,722,652 hf1 -bounds:731,904,76,22 -offsets:2,1,80,24 +bounds:2,32,80,24 hf2 -bounds:731,904,76,22 -offsets:2,1,80,24 +bounds:2,32,80,24 lizi1 -bounds:2,2,28,28 -offsets:3,3,34,34 +bounds:1456,1464,34,34 lizi2 -bounds:362,98,24,24 -offsets:2,2,28,28 +bounds:2,2,28,28 lizi3 -bounds:1429,1458,35,35 -offsets:2,2,39,39 +bounds:732,822,39,39 diff --git a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.png b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.png index 9c583b74c..938580814 100644 Binary files a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.png and b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.png differ diff --git a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.skel.bytes b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.skel.bytes index 7c7095e2d..b50dffe09 100644 Binary files a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.skel.bytes and b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win_material.mat b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win_material.mat index 078d27315..b078d6bfe 100644 --- a/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win_material.mat +++ b/Assets/arts/spines/ui/ui_battle_result_win/ui_battle_result_win_material.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_battle_result_win_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