diff --git a/AssetBundles/Android/ui_rankpage.ab b/AssetBundles/Android/ui_rankpage.ab index 1c898e9..1c0f31c 100644 Binary files a/AssetBundles/Android/ui_rankpage.ab and b/AssetBundles/Android/ui_rankpage.ab differ diff --git a/AssetBundles/Android/ui_rankpage.ab.manifest b/AssetBundles/Android/ui_rankpage.ab.manifest index 4594c6e..0945602 100644 --- a/AssetBundles/Android/ui_rankpage.ab.manifest +++ b/AssetBundles/Android/ui_rankpage.ab.manifest @@ -1,25 +1,21 @@ ManifestFileVersion: 0 -CRC: 1149705296 +CRC: 721688157 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c69019433ba3b5bca188845871872082 + Hash: eb5533fe0f4e966603333de97fabccd1 TypeTreeHash: serializedVersion: 2 - Hash: a8e2790f6e04d7f97338850ce92b4f6f + Hash: 1d177af04cfcafba01b7fe11f13e71ed IncrementalBuildHash: serializedVersion: 2 - Hash: c69019433ba3b5bca188845871872082 + Hash: eb5533fe0f4e966603333de97fabccd1 HashAppended: 0 ClassTypes: - Class: 1 Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} - Class: 28 Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - Class: 114 @@ -97,4 +93,5 @@ Assets: - Assets/Res/ui/rankPage/Mask group.png - Assets/Res/ui/rankPage/2222 1.png Dependencies: +- D:/unity_project/Kill/AssetBundles/Android/common.ab - D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/Assets/Res/ui/deviceinfopage/LCD.prefab b/Assets/Res/ui/deviceinfopage/LCD.prefab index 97ba045..7d0ad1b 100644 --- a/Assets/Res/ui/deviceinfopage/LCD.prefab +++ b/Assets/Res/ui/deviceinfopage/LCD.prefab @@ -469,8 +469,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 31, y: -392} - m_SizeDelta: {x: -62.000008, y: 40} + m_AnchoredPosition: {x: 31, y: -408} + m_SizeDelta: {x: -62.000008, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &2117641396765053786 CanvasRenderer: @@ -2192,7 +2192,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -449} + m_AnchoredPosition: {x: 0, y: -465} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8420766729132986852 @@ -2855,8 +2855,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 30.99999, y: -182.00002} - m_SizeDelta: {x: -62, y: 40} + m_AnchoredPosition: {x: 30.99999, y: -200} + m_SizeDelta: {x: -62, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &7541195427610386524 CanvasRenderer: @@ -2949,7 +2949,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -247} + m_AnchoredPosition: {x: 0, y: -263} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4971047373404048133 diff --git a/Assets/Res/ui/deviceinfopage/RGB.prefab b/Assets/Res/ui/deviceinfopage/RGB.prefab index 9f7fb9b..bfcf49a 100644 --- a/Assets/Res/ui/deviceinfopage/RGB.prefab +++ b/Assets/Res/ui/deviceinfopage/RGB.prefab @@ -2522,7 +2522,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 300} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8528650688514234292 diff --git a/Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab b/Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab index 95c8cb0..a275c21 100644 --- a/Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab +++ b/Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab @@ -1210,7 +1210,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -762} + m_AnchoredPosition: {x: 0, y: -772} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7675192394301102632 @@ -1581,7 +1581,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -638} + m_AnchoredPosition: {x: 0, y: -648} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7735897185071609595 @@ -1834,7 +1834,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -862} + m_AnchoredPosition: {x: 0, y: -872} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4083848902062309785 @@ -3192,7 +3192,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -414} + m_AnchoredPosition: {x: 0, y: -424} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5767381712955404138 @@ -3694,7 +3694,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6561823270356859304 @@ -4105,7 +4105,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -638} + m_AnchoredPosition: {x: 0, y: -648} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3220338351682834017 @@ -5199,7 +5199,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5226434002636902289 @@ -5732,7 +5732,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -986} + m_AnchoredPosition: {x: 0, y: -996} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1309801434207737373 @@ -6267,7 +6267,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -414} + m_AnchoredPosition: {x: 0, y: -424} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5362636487605228709 diff --git a/Assets/Res/ui/deviceinfopage/固件更新.prefab b/Assets/Res/ui/deviceinfopage/固件更新.prefab index 2046400..6dea43d 100644 --- a/Assets/Res/ui/deviceinfopage/固件更新.prefab +++ b/Assets/Res/ui/deviceinfopage/固件更新.prefab @@ -892,7 +892,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7424058075352865159 @@ -1352,7 +1352,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: 660, y: -212.5} + m_AnchoredPosition: {x: 660, y: -268.5} m_SizeDelta: {x: 630, y: 0} m_Pivot: {x: 1, y: 0.5} --- !u!222 &2453520056608504307 diff --git a/Assets/Res/ui/deviceinfopage/视频和音效.prefab b/Assets/Res/ui/deviceinfopage/视频和音效.prefab index 3ad200c..b531c22 100644 --- a/Assets/Res/ui/deviceinfopage/视频和音效.prefab +++ b/Assets/Res/ui/deviceinfopage/视频和音效.prefab @@ -2706,7 +2706,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -771} + m_AnchoredPosition: {x: 0, y: -781} m_SizeDelta: {x: -60, y: 377} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3915562555664963647 @@ -4161,7 +4161,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 31.000015, y: 0} - m_SizeDelta: {x: 50, y: 40} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1028988269031532626 CanvasRenderer: @@ -4895,7 +4895,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 561} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5794328490837387651 @@ -5895,7 +5895,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: -31.000015, y: 0} - m_SizeDelta: {x: 50, y: 40} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1979464561090742990 CanvasRenderer: diff --git a/Assets/Res/ui/deviceinfopage/设备分享页面.prefab b/Assets/Res/ui/deviceinfopage/设备分享页面.prefab index bdf7220..f12cc48 100644 --- a/Assets/Res/ui/deviceinfopage/设备分享页面.prefab +++ b/Assets/Res/ui/deviceinfopage/设备分享页面.prefab @@ -662,7 +662,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2678636069615213205 diff --git a/Assets/Res/ui/deviceinfopage/设备用户管理.prefab b/Assets/Res/ui/deviceinfopage/设备用户管理.prefab index 80f87f1..1fe9d2c 100644 --- a/Assets/Res/ui/deviceinfopage/设备用户管理.prefab +++ b/Assets/Res/ui/deviceinfopage/设备用户管理.prefab @@ -903,7 +903,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 30, y: -182.00002} + m_AnchoredPosition: {x: 30, y: -200} m_SizeDelta: {x: -60, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &8054373993398652999 @@ -996,8 +996,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: -111} - m_SizeDelta: {x: -60, y: -262} + m_AnchoredPosition: {x: 0, y: -119} + m_SizeDelta: {x: -60, y: -278} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &196291696332333663 CanvasRenderer: diff --git a/Assets/Res/ui/deviceinfopage/重命名.prefab b/Assets/Res/ui/deviceinfopage/重命名.prefab index 20e45e5..ea14258 100644 --- a/Assets/Res/ui/deviceinfopage/重命名.prefab +++ b/Assets/Res/ui/deviceinfopage/重命名.prefab @@ -324,7 +324,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4541939060570921038 diff --git a/Assets/Res/ui/homepage/homePage.prefab b/Assets/Res/ui/homepage/homePage.prefab index 2c6e64f..ad431ab 100644 --- a/Assets/Res/ui/homepage/homePage.prefab +++ b/Assets/Res/ui/homepage/homePage.prefab @@ -8587,7 +8587,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -15, y: 10} - m_SizeDelta: {x: -70, y: 42} + m_SizeDelta: {x: -70, y: 55} m_Pivot: {x: 0.5, y: 0} --- !u!222 &7123903637595035126 CanvasRenderer: @@ -8624,7 +8624,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -9471,7 +9471,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -15, y: 10} - m_SizeDelta: {x: -70, y: 42} + m_SizeDelta: {x: -70, y: 55} m_Pivot: {x: 0.5, y: 0} --- !u!222 &1124205440138334032 CanvasRenderer: @@ -9508,7 +9508,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -14049,7 +14049,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -15, y: 10} - m_SizeDelta: {x: -70, y: 42} + m_SizeDelta: {x: -70, y: 55} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8669842775260531347 CanvasRenderer: @@ -14086,7 +14086,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -14129,7 +14129,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -15, y: 10} - m_SizeDelta: {x: -70, y: 42} + m_SizeDelta: {x: -70, y: 55} m_Pivot: {x: 0.5, y: 0} --- !u!222 &3186938245855593830 CanvasRenderer: @@ -14166,7 +14166,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 6 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 diff --git a/Assets/Res/ui/homepage/安全设置.prefab b/Assets/Res/ui/homepage/安全设置.prefab index 673b916..88d8640 100644 --- a/Assets/Res/ui/homepage/安全设置.prefab +++ b/Assets/Res/ui/homepage/安全设置.prefab @@ -885,7 +885,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -557} + m_AnchoredPosition: {x: 0, y: -575} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7206825407861553577 @@ -987,8 +987,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 31, y: -712} - m_SizeDelta: {x: -62, y: 40} + m_AnchoredPosition: {x: 31, y: -730} + m_SizeDelta: {x: -62, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &5779369673615689626 CanvasRenderer: @@ -2065,8 +2065,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 31, y: -497} - m_SizeDelta: {x: -62, y: 40} + m_AnchoredPosition: {x: 31, y: -515} + m_SizeDelta: {x: -62, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &8558756023236501492 CanvasRenderer: @@ -2715,7 +2715,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -242} + m_AnchoredPosition: {x: 0, y: -260} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4755520380048648677 @@ -3865,7 +3865,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -772} + m_AnchoredPosition: {x: 0, y: -790} m_SizeDelta: {x: -60, y: 100} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8129439879434834266 @@ -4315,8 +4315,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 31, y: -182} - m_SizeDelta: {x: -62, y: 40} + m_AnchoredPosition: {x: 31, y: -200} + m_SizeDelta: {x: -62, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &6660641630729942278 CanvasRenderer: diff --git a/Assets/Res/ui/homepage/定时任务.prefab b/Assets/Res/ui/homepage/定时任务.prefab index 720de8f..c2af0a7 100644 --- a/Assets/Res/ui/homepage/定时任务.prefab +++ b/Assets/Res/ui/homepage/定时任务.prefab @@ -2422,8 +2422,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: -190} - m_SizeDelta: {x: 0, y: -290} + m_AnchoredPosition: {x: 0, y: -200} + m_SizeDelta: {x: 0, y: -300} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4879464022694041273 CanvasRenderer: @@ -3077,7 +3077,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 400} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8443627870157881726 diff --git a/Assets/Res/ui/homepage/消息列表.prefab b/Assets/Res/ui/homepage/消息列表.prefab index 61f00a7..fdbf570 100644 --- a/Assets/Res/ui/homepage/消息列表.prefab +++ b/Assets/Res/ui/homepage/消息列表.prefab @@ -771,7 +771,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 120} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4808839797381505315 diff --git a/Assets/Res/ui/homepage/补光灯设置.prefab b/Assets/Res/ui/homepage/补光灯设置.prefab index 7540094..cb93ad1 100644 --- a/Assets/Res/ui/homepage/补光灯设置.prefab +++ b/Assets/Res/ui/homepage/补光灯设置.prefab @@ -4174,7 +4174,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -190} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 300} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6960000531219859956 diff --git a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab index 6bf3083..78c3191 100644 --- a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab +++ b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab @@ -1808,7 +1808,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, y: -299} + m_AnchoredPosition: {x: 0, y: -275} m_SizeDelta: {x: 690, y: 388} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2486202350423732841 @@ -2406,7 +2406,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: 30, y: -225} + m_AnchoredPosition: {x: 30, y: -200} m_SizeDelta: {x: 300, y: 42} m_Pivot: {x: 0, y: 1} --- !u!222 &9035674645850894892 @@ -4392,7 +4392,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8950211836065330726 RectTransform: m_ObjectHideFlags: 0 @@ -4452,7 +4452,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -60, y: 30} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4434113769957374433 CanvasRenderer: @@ -5728,7 +5728,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3344115969272692373 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/selfpage/FAQ页面.prefab b/Assets/Res/ui/selfpage/FAQ页面.prefab index 76a2aed..326cfc6 100644 --- a/Assets/Res/ui/selfpage/FAQ页面.prefab +++ b/Assets/Res/ui/selfpage/FAQ页面.prefab @@ -35,7 +35,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2769523346584268984 CanvasRenderer: @@ -840,7 +840,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3164372765964807619 CanvasRenderer: @@ -1847,7 +1847,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3677135228880615095 CanvasRenderer: @@ -2293,7 +2293,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -410} - m_SizeDelta: {x: 690, y: 40} + m_SizeDelta: {x: 690, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7274746608644199994 CanvasRenderer: @@ -2832,7 +2832,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: 345, y: -64} + m_AnchoredPosition: {x: 345, y: -74} m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &518543789839894373 @@ -3517,7 +3517,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: 345, y: -544} + m_AnchoredPosition: {x: 345, y: -564} m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &854871756318895437 @@ -4655,7 +4655,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -1984} - m_SizeDelta: {x: 690, y: 40} + m_SizeDelta: {x: 690, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7647973359819307091 CanvasRenderer: @@ -5827,7 +5827,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -1002} - m_SizeDelta: {x: 690, y: 40} + m_SizeDelta: {x: 690, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3223360406911153965 CanvasRenderer: @@ -6632,7 +6632,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &514937502267546699 CanvasRenderer: @@ -7015,7 +7015,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -20} - m_SizeDelta: {x: 690, y: 40} + m_SizeDelta: {x: 690, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7346151320703363901 CanvasRenderer: @@ -10811,7 +10811,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: 345, y: -2358} + m_AnchoredPosition: {x: 345, y: -2408} m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6739308067368723960 @@ -11002,7 +11002,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -1594} - m_SizeDelta: {x: 690, y: 40} + m_SizeDelta: {x: 690, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6377254526705511636 CanvasRenderer: @@ -11868,7 +11868,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: 345, y: -1878} + m_AnchoredPosition: {x: 345, y: -1918} m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5027863063353656364 @@ -12732,7 +12732,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: 345, y: -1256} + m_AnchoredPosition: {x: 345, y: -1286} m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4389568299256833371 @@ -18210,7 +18210,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3628224970952807930 CanvasRenderer: diff --git a/Assets/Res/ui/selfpage/个人信息页.prefab b/Assets/Res/ui/selfpage/个人信息页.prefab index 6d3253f..abe267c 100644 --- a/Assets/Res/ui/selfpage/个人信息页.prefab +++ b/Assets/Res/ui/selfpage/个人信息页.prefab @@ -1299,7 +1299,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -247} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 400} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3376027943477643505 diff --git a/Assets/Res/ui/selfpage/反馈页面.prefab b/Assets/Res/ui/selfpage/反馈页面.prefab index d4664e0..e0ce481 100644 --- a/Assets/Res/ui/selfpage/反馈页面.prefab +++ b/Assets/Res/ui/selfpage/反馈页面.prefab @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -754} - m_SizeDelta: {x: -62, y: 40} + m_SizeDelta: {x: -62, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8099233068923905515 CanvasRenderer: @@ -1501,7 +1501,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -132, y: -182} - m_SizeDelta: {x: -326, y: 40} + m_SizeDelta: {x: -326, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8896453211021530482 CanvasRenderer: diff --git a/Assets/Res/ui/selfpage/语言设置页面.prefab b/Assets/Res/ui/selfpage/语言设置页面.prefab index 0f0d8dd..600779f 100644 --- a/Assets/Res/ui/selfpage/语言设置页面.prefab +++ b/Assets/Res/ui/selfpage/语言设置页面.prefab @@ -831,7 +831,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -247.00003} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: -60, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7416869777392508952 diff --git a/Assets/Res/ui/videopage/videoPage.prefab b/Assets/Res/ui/videopage/videoPage.prefab index 954ef5f..769ef09 100644 --- a/Assets/Res/ui/videopage/videoPage.prefab +++ b/Assets/Res/ui/videopage/videoPage.prefab @@ -603,8 +603,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: -286} - m_SizeDelta: {x: -60, y: -471} + m_AnchoredPosition: {x: 0, y: -290} + m_SizeDelta: {x: -60, y: -475} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4409854487099125989 CanvasRenderer: @@ -2910,7 +2910,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, y: -196} + m_AnchoredPosition: {x: 0, y: -200} m_SizeDelta: {x: 688, y: 60} m_Pivot: {x: 0.5, y: 1} --- !u!222 &76054174154722392 diff --git a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs index 3c47b9b..20f4df2 100644 --- a/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs +++ b/Assets/Scripts/UI/Pages/HomePage/HomePageCtrl.cs @@ -499,6 +499,7 @@ namespace Kill.UI.Pages { Loom.QueueOnMainThread(() => { + LoadingUI.Hide(); if (success) { Debug.Log($"[HomePageCtrl] 工作模式设置成功: {setting.Mode}"); @@ -514,7 +515,7 @@ namespace Kill.UI.Pages else { Debug.LogError("[HomePageCtrl] 工作模式设置失败"); - LoadingUI.Hide(); + } }); });