diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes index 2a41edc4f..6ffecc6b9 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes b/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes index 1cd8c69d1..4677a940b 100644 Binary files a/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes and b/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/comp/act_score_task_comp_v1.lua.bytes b/Assets/lua/app/ui/activity/common/comp/act_score_task_comp_v1.lua.bytes index f9ed66da8..5a477cfe4 100644 Binary files a/Assets/lua/app/ui/activity/common/comp/act_score_task_comp_v1.lua.bytes and b/Assets/lua/app/ui/activity/common/comp/act_score_task_comp_v1.lua.bytes differ diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index f76170255..c1470f527 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -75,8 +75,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4282662702 + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -93,8 +93,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 - m_fontSizeBase: 20 + m_fontSize: 22 + m_fontSizeBase: 22 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1575,7 +1575,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 0.1764706, g: 0.20392157, b: 0.28627452, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/prefabs/ui/hero/hero_ui.prefab b/Assets/prefabs/ui/hero/hero_ui.prefab index 9510df745..1e6a8d2f4 100644 --- a/Assets/prefabs/ui/hero/hero_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_ui.prefab @@ -3313,10 +3313,10 @@ RectTransform: m_Father: {fileID: 8461932745927490369} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 844.8} + m_SizeDelta: {x: 0, y: 844.8} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4340914525094036941 CanvasRenderer: diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index 1da5043f0..efa4ed39f 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -248,82 +248,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &1145838697046063568 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2617844004920798486} - - component: {fileID: 2296537736435550197} - - component: {fileID: 6795071978768645940} - m_Layer: 5 - m_Name: line_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2617844004920798486 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145838697046063568} - 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_Children: [] - m_Father: {fileID: 551137172462971700} - m_RootOrder: 1 - 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: -416.3152} - m_SizeDelta: {x: 638, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2296537736435550197 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145838697046063568} - m_CullTransparentMesh: 1 ---- !u!114 &6795071978768645940 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145838697046063568} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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 &1352391136516823555 GameObject: m_ObjectHideFlags: 0 @@ -361,8 +285,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: -15.05} - m_SizeDelta: {x: 610, y: 819.9} + m_AnchoredPosition: {x: 0, y: -38} + m_SizeDelta: {x: 574, y: 650} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8399229529204681362 CanvasRenderer: @@ -891,11 +815,11 @@ RectTransform: m_Father: {fileID: 4992656467854107315} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -22} - m_SizeDelta: {x: 92, y: 98} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -32, y: -24} + m_SizeDelta: {x: 84, y: 68} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3394721044435980120 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1113,82 +1037,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 ---- !u!1 &4499609126062617948 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1030614013984921557} - - component: {fileID: 885008338180051237} - - component: {fileID: 6997479806264691654} - m_Layer: 5 - m_Name: line_1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1030614013984921557 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4499609126062617948} - 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_Children: [] - m_Father: {fileID: 551137172462971700} - 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: 415.6848} - m_SizeDelta: {x: 638, y: 4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &885008338180051237 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4499609126062617948} - m_CullTransparentMesh: 1 ---- !u!114 &6997479806264691654 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4499609126062617948} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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 &4805884536688914580 GameObject: m_ObjectHideFlags: 0 @@ -1309,16 +1157,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1030614013984921557} - - {fileID: 2617844004920798486} + m_Children: [] m_Father: {fileID: 4992656467854107315} 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: -20} - m_SizeDelta: {x: 638, y: 830} + m_AnchoredPosition: {x: 0, y: -38} + m_SizeDelta: {x: 574, y: 662} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4460242477756845376 CanvasRenderer: @@ -1348,8 +1194,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 182116de280b5e64884b108d91b70b93, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1391,11 +1237,11 @@ RectTransform: m_Father: {fileID: 4992656467854107315} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -52} - m_SizeDelta: {x: 640, y: 80} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 43, y: -40} + m_SizeDelta: {x: 300, y: 40} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &5165071066706353018 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1451,14 +1297,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 - m_fontSizeMax: 35 + m_fontSizeMax: 36 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1511,7 +1357,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5657556415819557235 RectTransform: m_ObjectHideFlags: 0 @@ -1623,8 +1469,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 28, y: -25} - m_SizeDelta: {x: 554, y: 50} + m_AnchoredPosition: {x: 21, y: -25} + m_SizeDelta: {x: 532, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &918929582334605762 CanvasRenderer: @@ -1664,7 +1510,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_fontColor: {r: 0.18039216, g: 0.24705882, b: 0.26666668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1681,8 +1527,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 26 - m_fontSizeBase: 26 + m_fontSize: 24 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2098,7 +1944,7 @@ RectTransform: 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: 660, y: 982} + m_SizeDelta: {x: 620, y: 786} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3932648663204379859 CanvasRenderer: @@ -2128,7 +1974,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fdf319adad718e34d90445fc9339fae8, type: 3} + m_Sprite: {fileID: 21300000, guid: d9c23e0c2fdbcda4ab03e9917f66a4d8, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2186,5 +2032,5 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 610, y: 830} + m_SizeDelta: {x: 574, y: 830} m_Pivot: {x: 0.5, y: 1}