diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index 7dfde65fa1..d2e343688d 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -112,9 +112,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 471.4, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &95245971 @@ -150,10 +150,10 @@ RectTransform: m_Father: {fileID: 136085602} 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: 31, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &95245974 CanvasRenderer: @@ -15274,10 +15274,10 @@ RectTransform: m_Father: {fileID: 136085602} 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: 97.52, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506673911 CanvasRenderer: @@ -20526,9 +20526,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 193.8, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &862902003 @@ -20644,9 +20644,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} 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: 55, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &907713333 @@ -45139,9 +45139,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 749, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1719915318 @@ -45218,9 +45218,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 332.6, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1787225927 @@ -50080,9 +50080,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 610.2, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1856229260 @@ -59880,7 +59880,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3414655680617284804 RectTransform: m_ObjectHideFlags: 0 @@ -64477,7 +64477,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: -150, y: 1.8675} + m_AnchoredPosition: {x: -100, y: 1.8675} m_SizeDelta: {x: 298.3, y: 96.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4640662901540355575 @@ -64518,7 +64518,7 @@ MonoBehaviour: m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5F00\u542F\u5012\u8BA1\u65F6\uFF1A" @@ -67720,7 +67720,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8756775217935235499 RectTransform: m_ObjectHideFlags: 0 @@ -83298,9 +83298,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261139886263 @@ -83375,9 +83375,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261196340906 @@ -83963,9 +83963,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261390384789 @@ -85400,9 +85400,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261777695568 @@ -85778,9 +85778,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261844073132 @@ -86333,9 +86333,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262002252256 @@ -87068,9 +87068,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262256548568 @@ -87282,9 +87282,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262325622925 @@ -89100,9 +89100,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262791904998 @@ -89766,9 +89766,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262916179914 @@ -90189,9 +90189,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263129528938 @@ -90504,9 +90504,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263232579479 @@ -103405,7 +103405,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: 119.48, y: -0.000012159} + m_AnchoredPosition: {x: 169.47998, y: -0.000012159} m_SizeDelta: {x: 238.95, y: 96.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4952521646837648348 @@ -105961,10 +105961,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} 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: 221.4, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2414242672251041193 CanvasRenderer: @@ -111921,10 +111921,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} 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: 154.87999, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &79708565718575260 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index d134cb9596..b1b5e06956 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -35985,9 +35985,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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: 0, y: -548.86} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5602079545849984728 @@ -36275,9 +36275,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -767.29} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1515287188817918812 @@ -76507,9 +76507,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -1422.5798} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3253678623016334174 @@ -89092,7 +89092,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1599836007939752052} - m_RootOrder: 2 + 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} @@ -89167,11 +89167,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1599836006760387995} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2.5, y: 2.5, z: 1} m_Children: [] - m_Father: {fileID: 1599836007939752052} + m_Father: {fileID: 1188323177024200088} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -89242,11 +89242,11 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1599836007671335414} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.6, y: 0.6, z: 1} m_Children: [] - m_Father: {fileID: 1599836007939752052} + m_Father: {fileID: 1188323177024200088} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -89338,15 +89338,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1599836007671335417} - - {fileID: 1599836006760387994} + - {fileID: 1188323177024200088} - {fileID: 1599836006271323890} m_Father: {fileID: 78449122} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 240, y: -502} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -354, y: 554} m_SizeDelta: {x: 228, y: 958} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1599836007939752054 @@ -118197,9 +118196,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -2077.8696} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &352105450593286701 @@ -139539,9 +139538,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -330.43} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &4183130594691691997 @@ -194694,10 +194693,10 @@ RectTransform: m_Father: {fileID: 4953878265078755386} 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: 594.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 297.1, y: -17.5} + m_SizeDelta: {x: 594.2, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3978817061654922696 CanvasRenderer: @@ -200556,9 +200555,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -1641.0098} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &1514830361088202235 @@ -207867,9 +207866,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -1859.4397} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8657082432405232145 @@ -208712,7 +208711,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172.3, y: 674.7} - m_SizeDelta: {x: 594.2, y: 0} + m_SizeDelta: {x: 594.2, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4953878265078755380 CanvasRenderer: @@ -208833,7 +208832,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0.0000019073, y: 0} - m_SizeDelta: {x: 838.1, y: 0} + m_SizeDelta: {x: 838.1, y: 2189.8696} m_Pivot: {x: 0.5, y: 1} --- !u!114 &385353760370003947 MonoBehaviour: @@ -226443,9 +226442,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -112} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &347261519494395572 @@ -241639,9 +241638,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -985.72} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &8818913707777223369 @@ -247579,7 +247578,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5633248320576759341 RectTransform: m_ObjectHideFlags: 0 @@ -253349,6 +253348,43 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5DF2\u9886\u53D6" LanguageIndex: 10002 +--- !u!1 &6629396095575679929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1188323177024200088} + m_Layer: 5 + m_Name: obj + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1188323177024200088 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6629396095575679929} + 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: 1599836007671335417} + - {fileID: 1599836006760387994} + m_Father: {fileID: 1599836007939752052} + 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: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6632034429970747655 GameObject: m_ObjectHideFlags: 0 @@ -253843,7 +253879,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 172.3, y: 674.7} - m_SizeDelta: {x: 594.2, y: 0} + m_SizeDelta: {x: 594.2, y: 52} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7097480920010974223 CanvasRenderer: @@ -254310,10 +254346,10 @@ RectTransform: m_Father: {fileID: 2597592455288846907} 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: 594.2, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 297.1, y: -17.5} + m_SizeDelta: {x: 594.2, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2777627761568600087 CanvasRenderer: @@ -283691,9 +283727,9 @@ RectTransform: m_Father: {fileID: 4953878265400482319} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -1204.1499} m_SizeDelta: {x: 910, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7792564941164481903 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua index f96983a7b6..eefb7a4839 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_RewardView.lua @@ -6,7 +6,6 @@ local this = ATM_RewardView function ATM_RewardView:InitComponent() this.itemPre=Util.GetGameObject(self.gameObject,"ItemPre") this.scorllRoot=Util.GetGameObject(self.gameObject,"ScorllRoot") - this.myRank = Util.GetGameObject(self.gameObject,"MyRank") local rootHight = this.scorllRoot.transform.rect.height local rootWidth=this.scorllRoot.transform.rect.width this.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scorllRoot.transform, @@ -65,7 +64,6 @@ end --刷新奖励信息 function this.RefreshRewardInfo() - this.myRank:SetActive(false) local rewardData=ArenaTopMatchManager.GetRewardData() this.scrollView:SetData(rewardData,function(index,root) this.SetNodeShow(root,rewardData[index]) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua index e37d48648c..e2f48965cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua @@ -21,15 +21,18 @@ function ContinuityRechargePage:ctor(mainPanel, gameObject) self.continuityTaskContent = Util.GetGameObject(self.gameObject, "taskList/viewPort/content") self.continuityTaskItem = Util.GetGameObject(self.continuityTaskContent, "itemPro") self.effect = Util.GetGameObject(self.gameObject, "UI_effect_OperatingPanel_normal") - local image = Util.GetGameObject(self.gameObject, "Image") - self.title1 = Util.GetGameObject(image, "title1"):GetComponent("Text") + self.image = Util.GetGameObject(self.gameObject, "Image") + self.title1 = Util.GetGameObject(self.image, "title1"):GetComponent("Text") self.continuityTaskItem:SetActive(false) + self.obj = Util.GetGameObject(self.image, "obj") end function ContinuityRechargePage:OnShow(_sortingOrder) if GetCurLanguage() == 1 then SetTextVerTial(self.title1,Vector3.New(38.295,152,0)) + self.image.transform.localPosition = Vector2.New(-354,403) elseif GetCurLanguage() == 2 then SetTextVerTial(self.title1,Vector3.New(172.5,152,0)) + self.obj.transform.localPosition = Vector2.New(-60,0) end isPlayAnim = true Util.AddParticleSortLayer( self.effect, _sortingOrder - sortingOrder)