From 09b534b44f84eca78b15691acb3e04cbdf0a5b88 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 3 Mar 2021 15:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/BattleBestPopup.prefab | 10 +- .../Prefabs/UI/Main/MainPanel.prefab | 360 +++++++++--------- .../UI/Mission/MissionDailyPanel.prefab | 211 +++++----- .../UI/Ranking/RankingListMainPanel.prefab | 86 +---- .../Modules/Ranking/RankingListMainPanel.lua | 2 +- 5 files changed, 280 insertions(+), 389 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab index 391f9e1354..5e46af37bb 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/BattleBestPopup.prefab @@ -460,8 +460,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: -85.99999, y: 33.50006} - m_SizeDelta: {x: 160, y: 60} + m_AnchoredPosition: {x: -86.38, y: 33.50006} + m_SizeDelta: {x: 251.16, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2053962335801347069 CanvasRenderer: @@ -495,13 +495,13 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 47 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 90 + m_MaxSize: 50 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5929\u547D\u5929\u547D" diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index e4b22db1fb..ac63e5906e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -805,7 +805,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1284456144 RectTransform: m_ObjectHideFlags: 0 @@ -821,10 +821,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 20 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -647} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1284456148 CanvasRenderer: @@ -1084,7 +1084,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4420810243047435922 RectTransform: m_ObjectHideFlags: 0 @@ -1101,10 +1101,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 21 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -137, y: -647} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2186769594291666715 CanvasRenderer: @@ -1711,10 +1711,10 @@ RectTransform: m_Father: {fileID: 6419840721799854247} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &2243200887571532657 CanvasRenderer: @@ -1870,7 +1870,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8603546461945178059 CanvasRenderer: @@ -2858,7 +2858,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1119625718747168782 RectTransform: m_ObjectHideFlags: 0 @@ -2876,10 +2876,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 5 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -209} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6287752951030855709 MonoBehaviour: @@ -7798,7 +7798,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6787388701410384334 RectTransform: m_ObjectHideFlags: 0 @@ -7814,10 +7814,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -285, y: -63} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7360419264509299017 CanvasRenderer: @@ -7949,10 +7949,10 @@ RectTransform: m_Father: {fileID: 3688023055646272231} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1268970657792450912 CanvasRenderer: @@ -8351,7 +8351,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1627465187347916165 CanvasRenderer: @@ -8608,10 +8608,10 @@ RectTransform: m_Father: {fileID: 1870440635766874171} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8530898858195508159 CanvasRenderer: @@ -9702,7 +9702,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -0.2999878, y: -55} - m_SizeDelta: {x: 147.4, y: 0} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3959941055274550044 CanvasRenderer: @@ -10127,7 +10127,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &522288132675905498 RectTransform: m_ObjectHideFlags: 0 @@ -10145,10 +10145,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 6 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -137, y: -209} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2479300408203382036 MonoBehaviour: @@ -17118,7 +17118,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6280837455742747269 RectTransform: m_ObjectHideFlags: 0 @@ -17135,10 +17135,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 11 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -137, y: -355} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1558277469549356462 MonoBehaviour: @@ -17804,10 +17804,10 @@ RectTransform: m_Father: {fileID: 1621174062755899614} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &5592710164384657672 CanvasRenderer: @@ -18185,10 +18185,10 @@ RectTransform: m_Father: {fileID: 1417323164300544329} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3415617354808624207 CanvasRenderer: @@ -24915,7 +24915,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6367674790706314828 CanvasRenderer: @@ -25157,7 +25157,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &344866115668377814 RectTransform: m_ObjectHideFlags: 0 @@ -25174,10 +25174,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 8 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -433, y: -209} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7336279358730734314 MonoBehaviour: @@ -25753,7 +25753,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5712519647769185233 RectTransform: m_ObjectHideFlags: 0 @@ -25769,10 +25769,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 9 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -581, y: -209} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3438001626827331599 CanvasRenderer: @@ -25891,7 +25891,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1506583068678842339 RectTransform: m_ObjectHideFlags: 0 @@ -25909,10 +25909,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 13 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -433, y: -355} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4639330549965109979 MonoBehaviour: @@ -32600,7 +32600,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &631083111964447579 RectTransform: m_ObjectHideFlags: 0 @@ -32618,10 +32618,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 12 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -285, y: -355} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4334068205332484872 MonoBehaviour: @@ -37735,7 +37735,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1945969955803399582 RectTransform: m_ObjectHideFlags: 0 @@ -37753,10 +37753,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -355} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &974437068104248567 MonoBehaviour: @@ -42569,7 +42569,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6598415300611191079 RectTransform: m_ObjectHideFlags: 0 @@ -42585,10 +42585,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 14 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -581, y: -355} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6345253502049567551 CanvasRenderer: @@ -43003,7 +43003,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6037573607238918216 RectTransform: m_ObjectHideFlags: 0 @@ -43019,10 +43019,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 16 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -137, y: -501} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7768811986546223534 CanvasRenderer: @@ -43141,7 +43141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &125154823310492287 RectTransform: m_ObjectHideFlags: 0 @@ -43159,10 +43159,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 24 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -581, y: -647} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3690151266652226154 CanvasRenderer: @@ -43433,10 +43433,10 @@ RectTransform: m_Father: {fileID: 8111798017477241387} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &284278284755736322 CanvasRenderer: @@ -43559,10 +43559,10 @@ RectTransform: m_Father: {fileID: 7159603640790110168} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4534534108441785857 CanvasRenderer: @@ -49185,10 +49185,10 @@ RectTransform: m_Father: {fileID: 337061409266086077} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1063885069970267266 CanvasRenderer: @@ -54769,7 +54769,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9193860963406042167 RectTransform: m_ObjectHideFlags: 0 @@ -54787,10 +54787,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 18 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -433, y: -501} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4680598596924174236 CanvasRenderer: @@ -54878,7 +54878,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6483504497594541548 RectTransform: m_ObjectHideFlags: 0 @@ -54896,10 +54896,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 7 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -285, y: -209} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4105940452316708500 MonoBehaviour: @@ -60257,7 +60257,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4941688078859846456 RectTransform: m_ObjectHideFlags: 0 @@ -60275,10 +60275,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 23 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -433, y: -647} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4795482968323619546 CanvasRenderer: @@ -71204,7 +71204,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3177708336310852620 CanvasRenderer: @@ -71448,7 +71448,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &166346830052768593 RectTransform: m_ObjectHideFlags: 0 @@ -71465,10 +71465,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -581, y: -63} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &733495525651231946 MonoBehaviour: @@ -72101,7 +72101,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7244909312172512846 CanvasRenderer: @@ -73607,10 +73607,10 @@ RectTransform: m_Father: {fileID: 782553175840245747} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3057177767259699410 CanvasRenderer: @@ -79188,7 +79188,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2551141485308354454 RectTransform: m_ObjectHideFlags: 0 @@ -79204,10 +79204,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 17 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -285, y: -501} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1436987435535949183 CanvasRenderer: @@ -79790,10 +79790,10 @@ RectTransform: m_Father: {fileID: 2985456468767503272} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4417568477381748941 CanvasRenderer: @@ -79954,7 +79954,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2525464878000403347 CanvasRenderer: @@ -81258,7 +81258,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1302974640154238480 CanvasRenderer: @@ -81900,7 +81900,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4252240598690295061 RectTransform: m_ObjectHideFlags: 0 @@ -81916,10 +81916,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -137, y: -63} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3653866774872552 MonoBehaviour: @@ -82576,7 +82576,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1910231625098563490 CanvasRenderer: @@ -82986,7 +82986,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7210892518690731705 CanvasRenderer: @@ -83155,7 +83155,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4983623036232270673 RectTransform: m_ObjectHideFlags: 0 @@ -83172,10 +83172,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 22 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -285, y: -647} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1153722762668388965 CanvasRenderer: @@ -83544,7 +83544,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2820537115036279626 RectTransform: m_ObjectHideFlags: 0 @@ -83560,10 +83560,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 0 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -63} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2658954599818822341 CanvasRenderer: @@ -90854,7 +90854,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3949487347773389800 RectTransform: m_ObjectHideFlags: 0 @@ -90872,10 +90872,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 19 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -581, y: -501} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5853232199602849243 CanvasRenderer: @@ -96237,7 +96237,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -55} - m_SizeDelta: {x: 148, y: 0} + m_SizeDelta: {x: 148, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7019503792418097359 CanvasRenderer: @@ -96419,10 +96419,10 @@ RectTransform: m_Father: {fileID: 5132357938743655504} m_RootOrder: 0 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_SizeDelta: {x: 147.4, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -30} + m_SizeDelta: {x: 147.4, y: 30} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8071057702058946007 CanvasRenderer: @@ -101297,7 +101297,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2134672343239436784 RectTransform: m_ObjectHideFlags: 0 @@ -101313,10 +101313,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 15 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -501} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2133535799529718895 CanvasRenderer: @@ -102470,7 +102470,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3856153418765928160 RectTransform: m_ObjectHideFlags: 0 @@ -102487,10 +102487,10 @@ RectTransform: m_Father: {fileID: 1612271237950830011} m_RootOrder: 3 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -433, y: -63} + m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &186549464138162808 MonoBehaviour: diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index 775ef783c8..f11263a373 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -2680,8 +2680,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: 262.4, y: -41.3} - m_SizeDelta: {x: 483.2, y: 44} + m_AnchoredPosition: {x: 262.4, y: -36.55} + m_SizeDelta: {x: 483.2, y: 53.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3300251358601615473 CanvasRenderer: @@ -2875,10 +2875,10 @@ RectTransform: m_Father: {fileID: 4090152033796247733} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 369.21997, y: -45.71} + m_SizeDelta: {x: 234.4, y: 82.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3275098193225773980 CanvasRenderer: @@ -3206,7 +3206,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &956434821998691110 RectTransform: m_ObjectHideFlags: 0 @@ -3593,8 +3593,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: 375, y: -41.3} - m_SizeDelta: {x: 667.24, y: 44} + m_AnchoredPosition: {x: 313.6, y: -36.548} + m_SizeDelta: {x: 544.4, y: 53.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3536158137970419474 CanvasRenderer: @@ -3628,15 +3628,15 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 - m_MaxSize: 40 + m_MaxSize: 30 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 0.8 m_Text: LanguageIndex: 0 --- !u!1 &1779514884859494024 @@ -4287,7 +4287,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1918779212793027703 RectTransform: m_ObjectHideFlags: 0 @@ -4925,10 +4925,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} m_RootOrder: 0 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120.88501, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1918779213686181055 CanvasRenderer: @@ -5141,8 +5141,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 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_AnchoredPosition: {x: -1.5299988, y: -0.7599983} + m_SizeDelta: {x: -38.22, y: -22.93} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2938828125138058558 CanvasRenderer: @@ -5372,7 +5372,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -248.69995, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &462056855713613971 MonoBehaviour: @@ -5648,8 +5648,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 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_AnchoredPosition: {x: -1.2099991, y: -0.41999817} + m_SizeDelta: {x: -38.63, y: -25.48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5522059312927602180 CanvasRenderer: @@ -7064,10 +7064,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} 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: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 358.285, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580382491728856826 CanvasRenderer: @@ -7283,10 +7283,10 @@ RectTransform: m_Father: {fileID: 4090152033796247733} m_RootOrder: 0 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 132.37, y: -45.71} + m_SizeDelta: {x: 234.4, y: 82.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4885987568793261615 CanvasRenderer: @@ -8936,8 +8936,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.48999786, y: -1.2200012} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -1.18, y: 2.57} + m_SizeDelta: {x: -13.69, y: -12.97} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6930754774576985904 CanvasRenderer: @@ -9929,7 +9929,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &327137578093138444 MonoBehaviour: @@ -10228,9 +10228,7 @@ GameObject: m_Component: - component: {fileID: 8268192078016589109} - component: {fileID: 7701535949295788202} - - component: {fileID: 3797136472002181414} - component: {fileID: 3535019304166434728} - - component: {fileID: 5725965551608901653} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -10252,10 +10250,10 @@ RectTransform: m_Father: {fileID: 736784790941946065} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 291.99997, y: -42} - m_SizeDelta: {x: 0, y: 39.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000030517578, y: 0} + m_SizeDelta: {x: 450, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7701535949295788202 CanvasRenderer: @@ -10265,19 +10263,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7695553338565847985} m_CullTransparentMesh: 0 ---- !u!114 &3797136472002181414 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7695553338565847985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -1 --- !u!114 &3535019304166434728 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10302,31 +10287,17 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 2 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A3\u59299\u5C0F\u65F6" LanguageIndex: 11708 ---- !u!114 &5725965551608901653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7695553338565847985} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &7726308767590587497 GameObject: m_ObjectHideFlags: 0 @@ -12271,6 +12242,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224561372281646096} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -12376,16 +12357,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &4872209854286583787 stripped @@ -12676,6 +12647,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224289953797446988} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -12781,16 +12762,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &2163867337063453488 stripped @@ -12936,6 +12907,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 224623299494557198} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -13041,16 +13022,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &1726775213066898649 stripped @@ -13211,6 +13182,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1918779212270220639} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -13331,16 +13312,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.3 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &1005885811528912547 stripped @@ -13356,6 +13327,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3893804749911227612} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -13476,16 +13457,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.3 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &1097062216341710278 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab index abe6f0747b..6cceb05845 100644 --- a/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab @@ -387,85 +387,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1498025270421803047 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1486139597085657624} - - component: {fileID: 1170962442207333972} - - component: {fileID: 5842002970383264063} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1486139597085657624 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498025270421803047} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 1} - m_Children: [] - m_Father: {fileID: 8354247193223060076} - 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: 44.1, y: 0.6} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1170962442207333972 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498025270421803047} - m_CullTransparentMesh: 0 ---- !u!114 &5842002970383264063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1498025270421803047} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.92156863, b: 0.7921569, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 50 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 50 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 123 --- !u!1 &1510407261246250903 GameObject: m_ObjectHideFlags: 0 @@ -1808,7 +1729,7 @@ RectTransform: 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.00001513958, y: 0.00000201427} + m_AnchoredPosition: {x: 0.00001513958, y: 0.00008345365} m_SizeDelta: {x: 1003, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &4770267391901505225 @@ -2347,7 +2268,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8354247193223060076 RectTransform: m_ObjectHideFlags: 0 @@ -2358,8 +2279,7 @@ RectTransform: 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_Children: - - {fileID: 1486139597085657624} + m_Children: [] m_Father: {fileID: 6499392947023679896} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index d6a2d1cdc9..e0c0e8f6d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -185,7 +185,7 @@ function this.SetInfoShow(go,data,rankType,nameText) if nameText then nameText:GetComponent("Text").text = data.userName end - Util.GetGameObject(go,"trial/Text"):GetComponent("Text").text = data.rankInfo.param1 + Util.GetGameObject(go,"trial"):GetComponent("Text").text = GetLanguageStrById(Language[11689])..data.rankInfo.param1 end end