From 2488d97ce623835b41d5d566f9df63fbf949f826 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 20 May 2024 20:26:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Carbon/DailyCarbonPanel.prefab | 8 +- .../UI/Carbon/XuanYuanMirrorPanelList.prefab | 12 +-- .../UI/GMPanel/ActivityChongRank.prefab | 28 +++---- .../Prefabs/UI/NewActivity/ExpertPage.prefab | 6 +- .../SevenDayCarnivalPanelV2.prefab | 84 +++++++++---------- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab index e71821b9e0..47bb5a20a3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/DailyCarbonPanel.prefab @@ -3427,7 +3427,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3523491915352469780} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -4778,10 +4778,10 @@ RectTransform: m_Father: {fileID: 3233073780574710381} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -43} - m_SizeDelta: {x: 1155, y: 650} + m_SizeDelta: {x: 75, y: 650} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6616730211952462319 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index 23e109fe22..0a8890d7c0 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -537,7 +537,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 35, y: -105.1} + m_AnchoredPosition: {x: 57.099976, y: -105.1} m_SizeDelta: {x: 0, y: 55.696} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2447711847399843584 @@ -673,7 +673,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: 388.7, y: -26} + m_AnchoredPosition: {x: 367, y: -26} m_SizeDelta: {x: 222.5, y: 81.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2256811987525152314 @@ -1053,7 +1053,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: -824.7} + m_AnchoredPosition: {x: 0, y: -824.69995} m_SizeDelta: {x: 1085, y: 1161.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1336265199340948667 @@ -2245,7 +2245,7 @@ MonoBehaviour: m_Top: -7 m_Bottom: 0 m_ChildAlignment: 3 - m_Spacing: 11.21 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2764,7 +2764,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 29.900002, y: -54.8} + m_AnchoredPosition: {x: 52, y: -54.8} m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1570570105998041136 @@ -3266,7 +3266,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 876, y: -38} + m_AnchoredPosition: {x: 867, y: -38} m_SizeDelta: {x: 0, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &5476576972710045244 diff --git a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab index 81a0cab804..571006fbef 100644 --- a/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GMPanel/ActivityChongRank.prefab @@ -595,10 +595,10 @@ RectTransform: m_Father: {fileID: 1928608338} 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} - m_AnchoredPosition: {x: 0, y: -823} - m_SizeDelta: {x: 1082, y: 293} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 137} + m_SizeDelta: {x: 2, y: 293} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &451325689 CanvasRenderer: @@ -1202,9 +1202,9 @@ RectTransform: m_Father: {fileID: 1928608338} m_RootOrder: 15 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: -501, y: -860} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 39, y: 100} m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &642658352 @@ -2138,10 +2138,10 @@ RectTransform: m_Father: {fileID: 1197411485} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9184796488566292076 CanvasRenderer: @@ -3673,10 +3673,10 @@ RectTransform: m_Father: {fileID: 1928608338} m_RootOrder: 20 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: 917} - m_SizeDelta: {x: 1080, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -43} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1523531319899599773 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab index 344ae8d733..3a0917b615 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab @@ -14880,9 +14880,9 @@ RectTransform: m_Father: {fileID: 2542118471955123022} 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} - m_AnchoredPosition: {x: 0, y: 909} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -51} m_SizeDelta: {x: 1080, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1228702176543234053 diff --git a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab index bd9f7ee3e6..bac36328cd 100644 --- a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab @@ -154,11 +154,11 @@ RectTransform: m_Children: - {fileID: 1691051353584476211} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 6 + m_RootOrder: 5 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: 471.1, y: 899.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -68.8999, y: -60.5} m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8521256431482996821 @@ -288,7 +288,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: 53, y: -5} + m_AnchoredPosition: {x: 14.100002, y: -5} m_SizeDelta: {x: 210, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3867764039374612831 @@ -422,7 +422,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 189.42996, y: 92} + m_AnchoredPosition: {x: 189.42993, y: 92} m_SizeDelta: {x: 378.8, y: 194} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &8142660194349352119 @@ -559,12 +559,12 @@ RectTransform: - {fileID: 6398584159410948594} - {fileID: 5779000839773756674} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -126.9, y: -870.3} - m_SizeDelta: {x: 586, y: 125.3} + m_AnchoredPosition: {x: 155, y: 107} + m_SizeDelta: {x: 22.3, y: 125.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &298473542953710229 GameObject: @@ -2890,7 +2890,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 53, y: -5} + m_AnchoredPosition: {x: 14.100002, y: -5} m_SizeDelta: {x: 210, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7811644701639032768 @@ -3028,7 +3028,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: 54.9, y: -5} + m_AnchoredPosition: {x: 16, y: -5} m_SizeDelta: {x: 213, y: 83} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1807391353390601718 @@ -3158,7 +3158,7 @@ RectTransform: m_Children: - {fileID: 1644795583109413213} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3655,7 +3655,7 @@ RectTransform: - {fileID: 4411377979739167117} - {fileID: 8380168036664832961} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 4 + 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} @@ -9725,11 +9725,11 @@ RectTransform: m_Children: - {fileID: 1303070459850900045} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -1539, y: 63.68} + m_AnchoredPosition: {x: -1539, y: 63.679688} m_SizeDelta: {x: 1080, y: 205.34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8825940050051557541 @@ -10047,7 +10047,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 129.6, y: 71.600006} + m_AnchoredPosition: {x: 129.59998, y: 71.600006} m_SizeDelta: {x: 498.5, y: 194} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6542194591260529183 @@ -10125,9 +10125,9 @@ RectTransform: m_Father: {fileID: 8135872788807024978} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 541.5, y: 143} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 1.5, y: 143} m_SizeDelta: {x: 1082, y: 293} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &862000527931299439 @@ -14896,7 +14896,6 @@ RectTransform: m_Children: - {fileID: 8135872788807024978} - {fileID: 5693838753270794143} - - {fileID: 762867592285353421} - {fileID: 2654139522639703472} - {fileID: 8610324574182069860} - {fileID: 2458749214559679316} @@ -14910,8 +14909,8 @@ RectTransform: m_Father: {fileID: 6087505042477108718} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -15059,11 +15058,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2934317362628987935} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -499, y: -861} + m_AnchoredPosition: {x: 38, y: 120} m_SizeDelta: {x: 79, y: 175} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6833701449598648800 @@ -20308,7 +20307,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2934317362628987935} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -20761,11 +20760,11 @@ RectTransform: - {fileID: 3910714294023810507} - {fileID: 5747827550147222916} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 466, y: 575} + m_AnchoredPosition: {x: -79, y: 585} m_SizeDelta: {x: 78, y: 328} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7780252569668227109 @@ -20919,7 +20918,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: 53, y: -5} + m_AnchoredPosition: {x: 14.100002, y: -5} m_SizeDelta: {x: 210, y: 85} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &369632328614603661 @@ -21281,13 +21280,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 2934317362628987935} - m_RootOrder: 2 + m_Father: {fileID: 8135872788807024978} + 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: 916.05} - m_SizeDelta: {x: 1080, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -38} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6271328765417968944 CanvasRenderer: @@ -21906,7 +21905,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 49, y: -76} + m_AnchoredPosition: {x: 63.600006, y: -76} m_SizeDelta: {x: 0, y: 135} m_Pivot: {x: 0, y: 1} --- !u!222 &7923757368174960024 @@ -22828,13 +22827,14 @@ RectTransform: - {fileID: 6608149067626775731} - {fileID: 379450060497243777} - {fileID: 3631015540684838588} + - {fileID: 762867592285353421} m_Father: {fileID: 2934317362628987935} 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: -1.0075, y: -1.95} - m_SizeDelta: {x: 1082, y: 1912.9} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3701844886937628268 CanvasRenderer: @@ -24812,7 +24812,7 @@ RectTransform: m_Children: - {fileID: 9054709434670610905} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -24971,7 +24971,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: -233, y: 65} + m_AnchoredPosition: {x: -220, y: 65} m_SizeDelta: {x: 521.7, y: 42.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1026649777752022922 @@ -25235,7 +25235,7 @@ RectTransform: m_Children: - {fileID: 1336780007070587617} m_Father: {fileID: 2934317362628987935} - m_RootOrder: 3 + 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}