diff --git a/Assets/arts/textures/background/battle/battle_dec_3.png b/Assets/arts/textures/background/battle/battle_dec_3.png index 5c62572d1..8c3bbe905 100644 Binary files a/Assets/arts/textures/background/battle/battle_dec_3.png and b/Assets/arts/textures/background/battle/battle_dec_3.png differ diff --git a/Assets/arts/textures/icon/item/18.png b/Assets/arts/textures/icon/item/18.png index 9b9404040..91c77854b 100644 Binary files a/Assets/arts/textures/icon/item/18.png and b/Assets/arts/textures/icon/item/18.png differ diff --git a/Assets/arts/textures/icon/item/19.png b/Assets/arts/textures/icon/item/19.png index b1821ed3a..75ec6f066 100644 Binary files a/Assets/arts/textures/icon/item/19.png and b/Assets/arts/textures/icon/item/19.png differ diff --git a/Assets/arts/textures/icon/item/20.png b/Assets/arts/textures/icon/item/20.png index 60c97bae5..f282ed791 100644 Binary files a/Assets/arts/textures/icon/item/20.png and b/Assets/arts/textures/icon/item/20.png differ diff --git a/Assets/arts/textures/icon/item/4.png b/Assets/arts/textures/icon/item/4.png index 16e21d4bc..b69e74c12 100644 Binary files a/Assets/arts/textures/icon/item/4.png and b/Assets/arts/textures/icon/item/4.png differ diff --git a/Assets/arts/textures/icon/item/8.png b/Assets/arts/textures/icon/item/8.png index 151eb41cb..2cb9558ec 100644 Binary files a/Assets/arts/textures/icon/item/8.png and b/Assets/arts/textures/icon/item/8.png differ diff --git a/Assets/arts/textures/ui/task/task_bg_2.png.meta b/Assets/arts/textures/ui/task/task_bg_2.png.meta index 6baa0c0c6..f92ab7191 100644 --- a/Assets/arts/textures/ui/task/task_bg_2.png.meta +++ b/Assets/arts/textures/ui/task/task_bg_2.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 125, y: 40, z: 21, w: 40} + spriteBorder: {x: 124, y: 40, z: 20, w: 40} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/Assets/arts/textures/ui/task/task_bg_3.png b/Assets/arts/textures/ui/task/task_bg_3.png index fdfb1137d..2d1df8097 100644 Binary files a/Assets/arts/textures/ui/task/task_bg_3.png and b/Assets/arts/textures/ui/task/task_bg_3.png differ diff --git a/Assets/arts/textures/ui/task/task_bg_3.png.meta b/Assets/arts/textures/ui/task/task_bg_3.png.meta index a00895d5d..0f9787ff8 100644 --- a/Assets/arts/textures/ui/task/task_bg_3.png.meta +++ b/Assets/arts/textures/ui/task/task_bg_3.png.meta @@ -48,7 +48,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 124, y: 40, z: 20, w: 40} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -132,7 +132,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 5e70e5490..2eb5c54ed 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/cell/activity_task_cell.lua.bytes b/Assets/lua/app/ui/activity/cell/activity_task_cell.lua.bytes index b3c9b0fd6..7e5bff7c5 100644 Binary files a/Assets/lua/app/ui/activity/cell/activity_task_cell.lua.bytes and b/Assets/lua/app/ui/activity/cell/activity_task_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/arena_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_ui.lua.bytes index 95a29cb2f..88726105f 100644 Binary files a/Assets/lua/app/ui/arena/arena_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes index ea79b7c8d..e73cca2d1 100644 Binary files a/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes and b/Assets/lua/app/ui/arena/cell/arena_grading_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes index 3e84b8a1d..3f62af02a 100644 Binary files a/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_result_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/task/cell/daily_task_cell.lua.bytes b/Assets/lua/app/ui/task/cell/daily_task_cell.lua.bytes index 1175ecd47..222e397e2 100644 Binary files a/Assets/lua/app/ui/task/cell/daily_task_cell.lua.bytes and b/Assets/lua/app/ui/task/cell/daily_task_cell.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index 1e2dfe844..da92f2f3d 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -3639,7 +3639,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: c99806828e2f03a4ba15821e5ab32eda, type: 2} + objectReference: {fileID: 11400000, guid: ad7ca7f318f2e5a42af8c4f28c988e44, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 diff --git a/Assets/prefabs/ui/arena/arena_ui.prefab b/Assets/prefabs/ui/arena/arena_ui.prefab index 3cf2fb823..4bf09ad0b 100644 --- a/Assets/prefabs/ui/arena/arena_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_ui.prefab @@ -2238,7 +2238,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: 72} + m_AnchoredPosition: {x: 0, y: 50} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3846937964241207759 diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 4584ac66c..29056f414 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -3438,7 +3438,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -4} - m_SizeDelta: {x: 720, y: 666} + m_SizeDelta: {x: 699, y: 607} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6292286561578627806 CanvasRenderer: diff --git a/Assets/prefabs/ui/task/cell/task_cell.prefab b/Assets/prefabs/ui/task/cell/task_cell.prefab index dfe8558bb..24d6cfad6 100644 --- a/Assets/prefabs/ui/task/cell/task_cell.prefab +++ b/Assets/prefabs/ui/task/cell/task_cell.prefab @@ -247,7 +247,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: -223, y: 8} + m_AnchoredPosition: {x: -223, y: 13} m_SizeDelta: {x: 50, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1037825136275880145 diff --git a/Assets/prefabs/ui/task/task_main_ui.prefab b/Assets/prefabs/ui/task/task_main_ui.prefab index 07bc6c2cf..41e8c9f8c 100644 --- a/Assets/prefabs/ui/task/task_main_ui.prefab +++ b/Assets/prefabs/ui/task/task_main_ui.prefab @@ -280,8 +280,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -883,8 +883,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1144,7 +1144,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: 180} + m_AnchoredPosition: {x: 0, y: 164} m_SizeDelta: {x: 300, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7334851358353611464 @@ -1383,8 +1383,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2073,11 +2073,11 @@ RectTransform: m_Father: {fileID: 1717350982681933471} m_RootOrder: 3 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: -115} - m_SizeDelta: {x: 590, y: 544} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 26} + m_SizeDelta: {x: 590, y: 514} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &8186829031135396793 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2582,7 +2582,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: -236, y: 8} + m_AnchoredPosition: {x: -236, y: 13} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8628707609862298991 @@ -2640,8 +2640,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2948,8 +2948,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -3286,11 +3286,11 @@ RectTransform: m_Father: {fileID: 1717350982681933471} m_RootOrder: 0 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: -115} - m_SizeDelta: {x: 590, y: 564} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 16} + m_SizeDelta: {x: 590, y: 534} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &406661778615083129 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3422,8 +3422,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 26 + m_fontSizeBase: 26 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18