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/p24001/p24001.atlas.txt b/Assets/arts/spines/characters/p24001/p24001.atlas.txt index f178d9a5e..f7369dbd0 100644 --- a/Assets/arts/spines/characters/p24001/p24001.atlas.txt +++ b/Assets/arts/spines/characters/p24001/p24001.atlas.txt @@ -13,7 +13,7 @@ offsets:1,1,101,88 cy bounds:210,788,257,225 dankong -bounds:840,830,22,23 +bounds:988,884,22,23 eye bounds:988,909,104,25 offsets:1,1,106,27 @@ -74,6 +74,9 @@ rotate:90 wuqi bounds:2,721,206,292 offsets:1,1,208,294 +xx +bounds:840,810,42,43 +offsets:3,2,47,47 yan bounds:2,79,18,64 yingzi diff --git a/Assets/arts/spines/characters/p24001/p24001.png b/Assets/arts/spines/characters/p24001/p24001.png index 018b8cabe..ef820b0ef 100644 Binary files a/Assets/arts/spines/characters/p24001/p24001.png and b/Assets/arts/spines/characters/p24001/p24001.png differ diff --git a/Assets/arts/spines/characters/p24001/p24001.skel.bytes b/Assets/arts/spines/characters/p24001/p24001.skel.bytes index 169ab231a..dd6636378 100644 Binary files a/Assets/arts/spines/characters/p24001/p24001.skel.bytes and b/Assets/arts/spines/characters/p24001/p24001.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/characters/p43001/p43001.skel.bytes b/Assets/arts/spines/characters/p43001/p43001.skel.bytes index 938e05322..95e374cc8 100644 Binary files a/Assets/arts/spines/characters/p43001/p43001.skel.bytes and b/Assets/arts/spines/characters/p43001/p43001.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 diff --git a/Assets/arts/textures/ui/battle/battle_title_1.png b/Assets/arts/textures/ui/battle/battle_title_1.png index 16064c7c4..c69fea191 100644 Binary files a/Assets/arts/textures/ui/battle/battle_title_1.png and b/Assets/arts/textures/ui/battle/battle_title_1.png differ diff --git a/Assets/arts/textures/ui/battle/battle_title_2.png b/Assets/arts/textures/ui/battle/battle_title_2.png index 18def2f73..5524db233 100644 Binary files a/Assets/arts/textures/ui/battle/battle_title_2.png and b/Assets/arts/textures/ui/battle/battle_title_2.png differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index f57cb3920..b6b053c63 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -1648,7 +1648,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 28} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7449504550375705862 @@ -2094,7 +2094,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 595361820078002785} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3439,6 +3439,7 @@ GameObject: m_Component: - component: {fileID: 4710100049825492546} - component: {fileID: 4181552087915593989} + - component: {fileID: 972633237129117051} m_Layer: 5 m_Name: title_bg m_TagString: Untagged @@ -3464,8 +3465,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 398} - m_SizeDelta: {x: 500, y: 84} + m_AnchoredPosition: {x: 0, y: 380} + m_SizeDelta: {x: 358, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4181552087915593989 CanvasRenderer: @@ -3475,6 +3476,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6684480207332659927} m_CullTransparentMesh: 1 +--- !u!114 &972633237129117051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6684480207332659927} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 1421585b364b1fb4ab0d951bb5d0f35d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6745489024550847820 GameObject: m_ObjectHideFlags: 0 @@ -4113,8 +4144,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7870804908802134986} - - {fileID: 1178603058965124914} - {fileID: 1062877572076605182} + - {fileID: 1178603058965124914} - {fileID: 2055814062249542618} - {fileID: 4958566666409478410} m_Father: {fileID: 4165930251451731960} @@ -4947,7 +4978,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 28} m_SizeDelta: {x: 200, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &507906359981443689 @@ -5268,6 +5299,7 @@ GameObject: m_Component: - component: {fileID: 4958566666409478410} - component: {fileID: 8699042973596539339} + - component: {fileID: 1021032489538231067} m_Layer: 5 m_Name: title_bg m_TagString: Untagged @@ -5293,8 +5325,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 398} - m_SizeDelta: {x: 500, y: 84} + m_AnchoredPosition: {x: 0, y: 380} + m_SizeDelta: {x: 358, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8699042973596539339 CanvasRenderer: @@ -5304,6 +5336,36 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8259602477203786035} m_CullTransparentMesh: 1 +--- !u!114 &1021032489538231067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8259602477203786035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 77026c4d6ad5e0f4d941920a0ef3f272, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8283736472652806603 GameObject: m_ObjectHideFlags: 0 @@ -6284,7 +6346,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchorMax.x