diff --git a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1.png b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1.png index 9d53358f7..064fd4cd2 100644 Binary files a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1.png and b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1.png differ diff --git a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1_1.png b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1_1.png index f1940b439..6e7e7c4c6 100644 Binary files a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1_1.png and b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_1_1.png differ diff --git a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2.png b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2.png index 064fd4cd2..9d53358f7 100644 Binary files a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2.png and b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2.png differ diff --git a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2_1.png b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2_1.png index 6e7e7c4c6..f1940b439 100644 Binary files a/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2_1.png and b/Assets/arts/textures/ui/act_firstcharge/act_firstcharge_btn_2_1.png differ diff --git a/Assets/arts/textures/ui/arena/arena_dec_1.png b/Assets/arts/textures/ui/arena/arena_dec_1.png index 3aed3d634..0fa8e52f6 100644 Binary files a/Assets/arts/textures/ui/arena/arena_dec_1.png and b/Assets/arts/textures/ui/arena/arena_dec_1.png differ diff --git a/Assets/arts/textures/ui/arena/arena_dec_2.png b/Assets/arts/textures/ui/arena/arena_dec_2.png index 28b3d0186..862d9fbf6 100644 Binary files a/Assets/arts/textures/ui/arena/arena_dec_2.png and b/Assets/arts/textures/ui/arena/arena_dec_2.png differ diff --git a/Assets/lua/app/module/shop/shop_const.lua.bytes b/Assets/lua/app/module/shop/shop_const.lua.bytes index c999cad47..bad0e273a 100644 Binary files a/Assets/lua/app/module/shop/shop_const.lua.bytes and b/Assets/lua/app/module/shop/shop_const.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/first_recharge_ui.lua.bytes b/Assets/lua/app/ui/shop/first_recharge_ui.lua.bytes index da1db1abb..27d65147d 100644 Binary files a/Assets/lua/app/ui/shop/first_recharge_ui.lua.bytes and b/Assets/lua/app/ui/shop/first_recharge_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab b/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab index 8ff51f6b8..fa1f0cd60 100644 --- a/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab @@ -111,7 +111,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: -65} + m_AnchoredPosition: {x: 0, y: -63} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2657342487817978725 @@ -174,7 +174,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 20 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -336,8 +336,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: 30} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 204, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1960849682537892411 CanvasRenderer: @@ -404,8 +404,8 @@ RectTransform: m_GameObject: {fileID: 3652563006717050702} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4099233909764425503} m_RootOrder: 5 @@ -413,7 +413,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -110} - m_SizeDelta: {x: 61, y: 54} + m_SizeDelta: {x: 86, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2477989125865946806 CanvasRenderer: @@ -443,7 +443,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -659,7 +659,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: 56, y: 2} + m_AnchoredPosition: {x: 38, y: -17} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &483007249788572871 @@ -717,8 +717,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 34 + m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -852,8 +852,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -937,7 +937,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -131, y: -36} - m_SizeDelta: {x: 206, y: 280} + m_SizeDelta: {x: 204, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8574240704491355725 CanvasRenderer: @@ -967,7 +967,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 07ea4006b8ffde04f97a0cc804fe5400, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1025,8 +1025,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: 30} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 204, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2793501486017861982 CanvasRenderer: @@ -1288,7 +1288,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: 14, y: -108} + m_AnchoredPosition: {x: 14, y: -110} m_SizeDelta: {x: 50, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1785719781992733354 @@ -1423,7 +1423,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: 56, y: 2} + m_AnchoredPosition: {x: 38, y: -17} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6042005375423695868 @@ -1481,8 +1481,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 + m_fontSize: 34 + m_fontSizeBase: 34 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1550,8 +1550,8 @@ RectTransform: m_GameObject: {fileID: 7431592622391823566} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 3903058654119117627} m_RootOrder: 5 @@ -1559,7 +1559,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -110} - m_SizeDelta: {x: 61, y: 54} + m_SizeDelta: {x: 86, y: 61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7608865603443428722 CanvasRenderer: @@ -1589,7 +1589,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6257321a157c2d24abce62bfdffa3d3b, type: 3} + m_Sprite: {fileID: 21300000, guid: 87f8bd23582a24c81a676a5b6d1e4e85, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1634,7 +1634,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: -65} + m_AnchoredPosition: {x: 0, y: -63} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9101980800129195918 @@ -1697,7 +1697,7 @@ MonoBehaviour: m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 20 + m_fontSizeMax: 22 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -1777,7 +1777,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 131, y: -36} - m_SizeDelta: {x: 206, y: 280} + m_SizeDelta: {x: 204, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7859531651847540236 CanvasRenderer: @@ -1807,7 +1807,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 20b8e9a471c37674680e009fcf0f5449, type: 3} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1941,7 +1941,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: 14, y: -108} + m_AnchoredPosition: {x: 14, y: -110} m_SizeDelta: {x: 50, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6466481555759741906 diff --git a/Assets/prefabs/ui/player_info/player_info_ui.prefab b/Assets/prefabs/ui/player_info/player_info_ui.prefab index a403e2869..8f8bbdd55 100644 --- a/Assets/prefabs/ui/player_info/player_info_ui.prefab +++ b/Assets/prefabs/ui/player_info/player_info_ui.prefab @@ -3775,15 +3775,15 @@ RectTransform: m_GameObject: {fileID: 6717793671885149293} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 437768945126952155} 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: 0} + m_AnchoredPosition: {x: 37, y: 37} m_SizeDelta: {x: 50, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1360847016354949803 @@ -4055,16 +4055,16 @@ RectTransform: m_GameObject: {fileID: 7163892613067964349} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5920434528018983517} 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: 0} - m_SizeDelta: {x: 40, y: 38} + m_AnchoredPosition: {x: 37, y: 37} + m_SizeDelta: {x: 50, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6439504290901959561 CanvasRenderer: diff --git a/Assets/prefabs/ui/shop/first_recharge_ui.prefab b/Assets/prefabs/ui/shop/first_recharge_ui.prefab index ed59ef33e..4b4e59585 100644 --- a/Assets/prefabs/ui/shop/first_recharge_ui.prefab +++ b/Assets/prefabs/ui/shop/first_recharge_ui.prefab @@ -1636,7 +1636,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7053345344205131943 RectTransform: m_ObjectHideFlags: 0 @@ -1653,9 +1653,9 @@ RectTransform: m_Father: {fileID: 5345465884390506964} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 592, y: -55} m_SizeDelta: {x: 212, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5585948558553724846