From 355042fc8464da0990925e4569b9ff7f3c841eb7 Mon Sep 17 00:00:00 2001 From: "ALIENJACK\\alien" Date: Tue, 7 Jan 2025 11:23:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=99=9A=E6=8B=9F=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E9=87=8D=E8=BD=BD=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?,=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5=E5=9C=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=97=B6,?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=20=E4=B8=BB=E8=8F=9C=E5=8D=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=94=BB=E9=9D=A2=E6=AF=94=E4=BE=8B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?,=E5=9C=A8=E5=BC=B9=E5=87=BA=E6=97=B6=E4=BC=9A=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E4=B8=AD=E5=BD=93=E5=89=8D=E5=B7=B2=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Resources/IMPORTENT.prefab | 228 ++++++++++++++++++ .../GlobalFilter_Template.prefab | 2 +- .../ScreenScaler_Template.prefab | 2 +- .../Manager/AppSettings/ScreenScaler.cs | 3 +- .../UI/BgSettingsUI/BackgroundListMenuItem.cs | 6 +- .../BgSettingsUI/GlobalFilterListMenuItem.cs | 4 +- .../BgSettingsUI/ScreenScalerListMenuItem.cs | 8 +- .../AppMain/UI/GamesUI/RomListMenuItem.cs | 4 +- .../AppMain/UI/ItemPresent/ItemPresent.cs | 6 +- .../AppMain/UI/ItemPresent/ItemProxy.cs | 3 +- .../Script/AppMain/UI/MenuItemController.cs | 4 +- .../AppMain/UI/RoomUI/RoomListMenuItem.cs | 6 +- .../Assets/Script/AppMain/UI/ThirdMenuRoot.cs | 6 +- .../Script/AppMain/UI/VirtualSubMenuItem.cs | 12 +- 14 files changed, 265 insertions(+), 29 deletions(-) diff --git a/AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab b/AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab index daddb18a..89847668 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/IMPORTENT.prefab @@ -1388,6 +1388,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 193475523204617150, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 193475523204617150, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1436,6 +1440,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 449160040343683211, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 449160040343683211, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1508,6 +1516,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 833899971404383597, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1532,6 +1548,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1029475975899771591, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1029475975899771591, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1552,6 +1572,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1055836741060224427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1588,6 +1616,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1258174585615042852, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1608,6 +1644,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1579312852857843245, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1792,6 +1836,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1748522118614936523, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1748522118614936523, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1816,6 +1864,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1749692929982472183, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1749692929982472183, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1848,6 +1900,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2078164669047027966, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2078164669047027966, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -1976,6 +2032,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2511120698149964204, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2511120698149964204, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2032,6 +2092,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2579334080811426254, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2579334080811426254, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2084,6 +2148,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3095773685132211997, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2108,6 +2180,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3399532356687036599, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3399532356687036599, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2128,6 +2204,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3441853701272737755, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2148,6 +2232,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3554980154840165367, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3554980154840165367, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2168,6 +2256,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3583643212238109851, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2296,6 +2392,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3829360616745704338, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2316,6 +2420,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3876161320726367486, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3876161320726367486, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2472,6 +2580,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5928623329274860706, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5928623329274860706, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2496,6 +2608,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6256155029986723735, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6256155029986723735, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2516,6 +2632,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6487249402547224379, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2536,6 +2660,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6591991037354951281, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2620,6 +2752,10 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 8365089343948286075, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8365089343948286075, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2644,6 +2780,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9003803253190325092, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9003803253190325092, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2664,6 +2804,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9163141629633368263, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2684,6 +2832,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 9206624128085952427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9206624128085952427, guid: 450328d5a907c8249a60bc3980ba66f6, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2743,6 +2895,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1108503213262670097, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1108503213262670097, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2783,6 +2939,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1710183501897154830, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1710183501897154830, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2803,6 +2963,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1746243318642131728, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2827,6 +2995,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1777012203952456443, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2847,6 +3019,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2005113594707322973, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -2939,6 +3119,14 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2921874279820016524, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2921874279820016524, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2940710093054777883, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2995,6 +3183,10 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3201409976408832832, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3201409976408832832, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_LocalPosition.y value: 0 @@ -3079,6 +3271,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4195056312044822544, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -3099,6 +3299,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4541943946029862829, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -3159,6 +3367,14 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4894793418161725275, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -3303,6 +3519,14 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5681144522345305637, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5681144522345305637, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6064974212694732928, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3523,6 +3747,10 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7158194035478552859, guid: 3b211f31b55a35e44a8fa38666f63383, type: 3} propertyPath: m_AnchoredPosition.x value: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab index b2050b38..70a047f5 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/GlobalFilter_Template.prefab @@ -681,7 +681,7 @@ GameObject: - component: {fileID: 4672405243908051711} - component: {fileID: 3086674949377227884} m_Layer: 5 - m_Name: RomGroupScroll + m_Name: SubGroupScroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/ScreenScaler_Template.prefab b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/ScreenScaler_Template.prefab index edf93daa..f308d4a1 100644 --- a/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/ScreenScaler_Template.prefab +++ b/AxibugEmuOnline.Client/Assets/Resources/UIPrefabs/SubMenuItemTemplates/ScreenScaler_Template.prefab @@ -681,7 +681,7 @@ GameObject: - component: {fileID: 4672405243908051711} - component: {fileID: 3086674949377227884} m_Layer: 5 - m_Name: RomGroupScroll + m_Name: SubItemScroll m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/ScreenScaler.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/ScreenScaler.cs index 065712f1..0c04834a 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/ScreenScaler.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/ScreenScaler.cs @@ -1,5 +1,4 @@ -using System; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; namespace AxibugEmuOnline.Client diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/BackgroundListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/BackgroundListMenuItem.cs index a5e9422d..b0a55925 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/BackgroundListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/BackgroundListMenuItem.cs @@ -1,4 +1,4 @@ -using AxibugEmuOnline.Client.ClientCore; +using AxibugEmuOnline.Client.ClientCore; using System; using System.Collections.Generic; @@ -6,13 +6,13 @@ namespace AxibugEmuOnline.Client { public class BackgroundListMenuItem : VirtualSubMenuItem { - protected override void GetVirtualListDatas(Action datas) + protected override void GetVirtualListDatas(VirtualListDataHandle callback) { List list = new List() { App.settings.BgColor, }; - datas.Invoke(list); + callback.Invoke(list, 0); } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs index 9b50a0e6..2205ef6b 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/GlobalFilterListMenuItem.cs @@ -22,12 +22,12 @@ namespace AxibugEmuOnline.Client return base.OnExitItem(); } - protected override void GetVirtualListDatas(Action datas) + protected override void GetVirtualListDatas(VirtualListDataHandle callback) { List list = new List(); list.Add(null); list.AddRange(App.settings.Filter.Filters.Select(f => (object)f)); - datas.Invoke(list); + callback.Invoke(list, 0); } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs index 8c706642..b57268a4 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/BgSettingsUI/ScreenScalerListMenuItem.cs @@ -20,11 +20,15 @@ namespace AxibugEmuOnline.Client return base.OnExitItem(); } - protected override void GetVirtualListDatas(Action datas) + protected override void GetVirtualListDatas(VirtualListDataHandle callback) { List list = new List(); foreach (var enumValue in Enum.GetValues(typeof(ScreenScaler.EnumScalerMode))) list.Add(enumValue); - datas.Invoke(list); + + var select = list.IndexOf(App.settings.ScreenScaler.GlobalMode); + if (select == -1) select = 0; + + callback.Invoke(list, select); } } } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs index e9c91f5a..37c54e10 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/GamesUI/RomListMenuItem.cs @@ -38,9 +38,9 @@ namespace AxibugEmuOnline.Client } public string SearchKey; - protected override void GetVirtualListDatas(Action datas) + protected override void GetVirtualListDatas(VirtualListDataHandle callback) { - RomLib.FetchRomCount((roms) => datas.Invoke(roms), SearchKey); + RomLib.FetchRomCount((roms) => callback.Invoke(roms, 0), SearchKey); } public override bool OnEnterItem() diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs index e270899d..a4b4cb53 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemPresent.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -470,7 +470,7 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout } - public void SetData(object dataList) + public void SetData(IEnumerable dataList) { Clear(); @@ -493,7 +493,7 @@ public class ItemPresent : GridLayoutGroup, IVirtualLayout } else { - Debug.LogException(new Exception("ItemPresent SetData ݵIJͲ֧"), gameObject); + Debug.LogException(new Exception("ItemPresent SetData 传递的参数类型不受支持"), gameObject); return; } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs index 1a43d62e..36416433 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ItemPresent/ItemProxy.cs @@ -1,3 +1,4 @@ +using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; @@ -16,7 +17,7 @@ public interface IVirtualLayout void UpdateProxyVisualState(); void UpdateDependencyProperty(object dp); - void SetData(object dataList); + void SetData(IEnumerable dataList); void MoveToScrollViewCenter(ScrollRect scrollRect, int dataIndex); } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/MenuItemController.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/MenuItemController.cs index c64e4b18..841bad89 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/MenuItemController.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/MenuItemController.cs @@ -1,4 +1,4 @@ -using AxibugEmuOnline.Client.UI; +using AxibugEmuOnline.Client.UI; using System.Collections.Generic; using UnityEngine; @@ -39,7 +39,7 @@ namespace AxibugEmuOnline.Client } Canvas.ForceUpdateCanvases(); - SelectIndex = 0; + if (m_selectIndex == -1) SelectIndex = 0; } protected virtual MenuItem GetItemUIByIndex(int index) diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs index 2c0a8739..3d506775 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/RoomUI/RoomListMenuItem.cs @@ -1,4 +1,4 @@ -using AxibugEmuOnline.Client.ClientCore; +using AxibugEmuOnline.Client.ClientCore; using AxibugEmuOnline.Client.Event; using System; @@ -61,10 +61,10 @@ namespace AxibugEmuOnline.Client } } - protected override void GetVirtualListDatas(Action datas) + protected override void GetVirtualListDatas(VirtualListDataHandle callback) { var roomList = App.roomMgr.GetRoomList(); - datas.Invoke(roomList); + callback.Invoke(roomList, 0); } } diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ThirdMenuRoot.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ThirdMenuRoot.cs index de6a8d6d..0a615d61 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ThirdMenuRoot.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/ThirdMenuRoot.cs @@ -1,4 +1,4 @@ -using AxibugEmuOnline.Client.UI; +using AxibugEmuOnline.Client.UI; using DG.Tweening; using System.Collections.Generic; using UnityEngine; @@ -39,10 +39,10 @@ namespace AxibugEmuOnline.Client } } - public void ResetToFirst() + public void ResetToIndex(int selectIndex) { m_selectIndex = -1; - SelectIndex = 0; + SelectIndex = selectIndex; } protected override MenuItem GetItemUIByIndex(int index) diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/VirtualSubMenuItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/VirtualSubMenuItem.cs index 32831a44..c16ecccf 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/VirtualSubMenuItem.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/VirtualSubMenuItem.cs @@ -1,8 +1,9 @@ -using AxibugEmuOnline.Client.UI; +using AxibugEmuOnline.Client.UI; using DG.Tweening; using DG.Tweening.Core; using DG.Tweening.Plugins.Options; using System; +using System.Collections; using UnityEngine; namespace AxibugEmuOnline.Client @@ -64,19 +65,22 @@ namespace AxibugEmuOnline.Client return true; } + public delegate void VirtualListDataHandle(IEnumerable data, int initialIndex); + + protected void RefreshUI() { - GetVirtualListDatas((datas) => + GetVirtualListDatas((datas, initialIndex) => { var thirdMenuGroup = SubMenuItemGroup as ThirdMenuRoot; thirdMenuGroup.itemGroup.UpdateDependencyProperty(thirdMenuGroup); thirdMenuGroup.itemGroup.SetData(datas); thirdMenuGroup.itemGroup.UpdateProxyVisualState(); - thirdMenuGroup.ResetToFirst(); + thirdMenuGroup.ResetToIndex(initialIndex); }); } - protected abstract void GetVirtualListDatas(Action datas); + protected abstract void GetVirtualListDatas(VirtualListDataHandle callback); public override bool OnExitItem() {