From 8437cd1f92615a4731791e05ac1e2bd2de7b1998 Mon Sep 17 00:00:00 2001 From: Blank Date: Mon, 23 Dec 2024 14:59:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]1.=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84FUI=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/PackageUICommonAvatar.cs | 8 ++------ .../UILoading/Components/PackageUILoading.cs | 8 ++------ .../FairyGUI/UILogin/Components/PackageUILogin.cs | 15 ++------------- .../FairyGUI/UILogin/Components/UIAnnouncement.cs | 7 ++++--- .../UILogin/Components/UIAnnouncementContent.cs | 7 ++++--- .../UI/FairyGUI/UILogin/Components/UILogin.cs | 7 ++++--- .../FairyGUI/UILogin/Components/UIPlayerCreate.cs | 7 ++++--- .../FairyGUI/UILogin/Components/UIPlayerList.cs | 7 ++++--- .../UILogin/Components/UIPlayerListItem.cs | 7 ++++--- .../Components/UIPlayerListItemLoginButton.cs | 7 ++++--- .../FairyGUI/UIMain/Components/PackageUIMain.cs | 9 ++------- .../UI/FairyGUI/UIMain/Components/UIMain.cs | 7 ++++--- .../UILauncher/Components/PackageUILauncher.cs | 10 ++-------- .../FairyGUI/UILauncher/Components/UILauncher.cs | 7 ++++--- .../UILauncher/Components/UILauncherUpgrade.cs | 7 ++++--- 15 files changed, 50 insertions(+), 70 deletions(-) diff --git a/Assets/Hotfix/UI/FairyGUI/UICommonAvatar/Components/PackageUICommonAvatar.cs b/Assets/Hotfix/UI/FairyGUI/UICommonAvatar/Components/PackageUICommonAvatar.cs index c56d232..29f42a6 100644 --- a/Assets/Hotfix/UI/FairyGUI/UICommonAvatar/Components/PackageUICommonAvatar.cs +++ b/Assets/Hotfix/UI/FairyGUI/UICommonAvatar/Components/PackageUICommonAvatar.cs @@ -1,16 +1,12 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ #if ENABLE_UI_FAIRYGUI -using FairyGUI; -using FairyGUI.Utils; -using Cysharp.Threading.Tasks; -using GameFrameX.Entity.Runtime; namespace Hotfix.UI { - public static partial class FUIPackage { + public static partial class FUIPackage + { public const string UICommonAvatar = "UICommonAvatar"; - } } #endif \ No newline at end of file diff --git a/Assets/Hotfix/UI/FairyGUI/UILoading/Components/PackageUILoading.cs b/Assets/Hotfix/UI/FairyGUI/UILoading/Components/PackageUILoading.cs index 1fe355d..b146607 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILoading/Components/PackageUILoading.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILoading/Components/PackageUILoading.cs @@ -1,16 +1,12 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ #if ENABLE_UI_FAIRYGUI -using FairyGUI; -using FairyGUI.Utils; -using Cysharp.Threading.Tasks; -using GameFrameX.Entity.Runtime; namespace Hotfix.UI { - public static partial class FUIPackage { + public static partial class FUIPackage + { public const string UILoading = "UILoading"; - } } #endif \ No newline at end of file diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/PackageUILogin.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/PackageUILogin.cs index 3e5e9b6..a8dde59 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/PackageUILogin.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/PackageUILogin.cs @@ -1,23 +1,12 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ #if ENABLE_UI_FAIRYGUI -using FairyGUI; -using FairyGUI.Utils; -using Cysharp.Threading.Tasks; -using GameFrameX.Entity.Runtime; namespace Hotfix.UI { - public static partial class FUIPackage { + public static partial class FUIPackage + { public const string UILogin = "UILogin"; - public const string UILogin_UIAnnouncement = "ui://UILogin/UIAnnouncement"; - public const string UILogin_UIAnnouncementContent = "ui://UILogin/UIAnnouncementContent"; - public const string UILogin_UIPlayerList = "ui://UILogin/UIPlayerList"; - public const string UILogin_UIPlayerListItem = "ui://UILogin/UIPlayerListItem"; - public const string UILogin_UIPlayerListItemLoginButton = "ui://UILogin/UIPlayerListItemLoginButton"; - public const string UILogin_UIPlayerCreate = "ui://UILogin/UIPlayerCreate"; - public const string UILogin_UILogin = "ui://UILogin/UILogin"; - } } #endif \ No newline at end of file diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncement.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncement.cs index c50cfb5..a33cbcc 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncement.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncement.cs @@ -65,11 +65,12 @@ public static UIAnnouncement Create(GObject go) /// public static UIAnnouncement GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -85,7 +86,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_MaskLayer = (GGraph)com.GetChild("MaskLayer"); m_TextContent = UIAnnouncementContent.Create(com.GetChild("TextContent")); diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncementContent.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncementContent.cs index df2e53f..15fe54a 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncementContent.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIAnnouncementContent.cs @@ -39,11 +39,12 @@ public static UIAnnouncementContent Create(GObject go) /// public static UIAnnouncementContent GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -59,7 +60,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_LabelContent = (GRichTextField)com.GetChild("LabelContent"); } diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UILogin.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UILogin.cs index 140eec5..5f2f142 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UILogin.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UILogin.cs @@ -66,11 +66,12 @@ public static UILogin Create(GObject go) /// public static UILogin GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -86,7 +87,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_ErrorText = (GTextField)com.GetChild("ErrorText"); m_enter = (GButton)com.GetChild("enter"); diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerCreate.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerCreate.cs index cdb3a79..7479ddd 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerCreate.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerCreate.cs @@ -65,11 +65,12 @@ public static UIPlayerCreate Create(GObject go) /// public static UIPlayerCreate GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -85,7 +86,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_UserName = (GTextInput)com.GetChild("UserName"); m_enter = (GButton)com.GetChild("enter"); diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerList.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerList.cs index 5595eed..e5bd018 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerList.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerList.cs @@ -68,11 +68,12 @@ public static UIPlayerList Create(GObject go) /// public static UIPlayerList GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -88,7 +89,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_IsSelected = com.GetController("IsSelected"); m_player_list = (GList)com.GetChild("player_list"); diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItem.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItem.cs index e376654..a9f28d8 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItem.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItem.cs @@ -66,11 +66,12 @@ public static UIPlayerListItem Create(GObject go) /// public static UIPlayerListItem GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -86,7 +87,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_icon = (GLoader)com.GetChild("icon"); m_name_text = (GRichTextField)com.GetChild("name_text"); diff --git a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItemLoginButton.cs b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItemLoginButton.cs index c780163..e7806d6 100644 --- a/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItemLoginButton.cs +++ b/Assets/Hotfix/UI/FairyGUI/UILogin/Components/UIPlayerListItemLoginButton.cs @@ -39,11 +39,12 @@ public static UIPlayerListItemLoginButton Create(GObject go) /// public static UIPlayerListItemLoginButton GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -59,7 +60,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_title = (GRichTextField)com.GetChild("title"); } diff --git a/Assets/Hotfix/UI/FairyGUI/UIMain/Components/PackageUIMain.cs b/Assets/Hotfix/UI/FairyGUI/UIMain/Components/PackageUIMain.cs index ec8af2a..e9b934e 100644 --- a/Assets/Hotfix/UI/FairyGUI/UIMain/Components/PackageUIMain.cs +++ b/Assets/Hotfix/UI/FairyGUI/UIMain/Components/PackageUIMain.cs @@ -1,17 +1,12 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ #if ENABLE_UI_FAIRYGUI -using FairyGUI; -using FairyGUI.Utils; -using Cysharp.Threading.Tasks; -using GameFrameX.Entity.Runtime; namespace Hotfix.UI { - public static partial class FUIPackage { + public static partial class FUIPackage + { public const string UIMain = "UIMain"; - public const string UIMain_UIMain = "ui://UIMain/UIMain"; - } } #endif \ No newline at end of file diff --git a/Assets/Hotfix/UI/FairyGUI/UIMain/Components/UIMain.cs b/Assets/Hotfix/UI/FairyGUI/UIMain/Components/UIMain.cs index 08f5740..3f1ac6d 100644 --- a/Assets/Hotfix/UI/FairyGUI/UIMain/Components/UIMain.cs +++ b/Assets/Hotfix/UI/FairyGUI/UIMain/Components/UIMain.cs @@ -67,11 +67,12 @@ public static UIMain Create(GObject go) /// public static UIMain GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -87,7 +88,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_bg = (GLoader)com.GetChild("bg"); m_bag_button = (GButton)com.GetChild("bag_button"); diff --git a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/PackageUILauncher.cs b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/PackageUILauncher.cs index 3f5b135..65d8ad9 100644 --- a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/PackageUILauncher.cs +++ b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/PackageUILauncher.cs @@ -1,18 +1,12 @@ /** This is an automatically generated class by FairyGUI. Please do not modify it. **/ #if ENABLE_UI_FAIRYGUI -using FairyGUI; -using FairyGUI.Utils; -using Cysharp.Threading.Tasks; -using GameFrameX.Entity.Runtime; namespace Unity.Startup { - public static partial class FUIPackage { + public static partial class FUIPackage + { public const string UILauncher = "UILauncher"; - public const string UILauncher_UILauncher = "ui://UILauncher/UILauncher"; - public const string UILauncher_UILauncherUpgrade = "ui://UILauncher/UILauncherUpgrade"; - } } #endif \ No newline at end of file diff --git a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncher.cs b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncher.cs index cf15a42..61fdca7 100644 --- a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncher.cs +++ b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncher.cs @@ -68,11 +68,12 @@ public static UILauncher Create(GObject go) /// public static UILauncher GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -88,7 +89,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_IsUpgrade = com.GetController("IsUpgrade"); m_IsDownload = com.GetController("IsDownload"); diff --git a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncherUpgrade.cs b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncherUpgrade.cs index 51ed9f6..990e2d8 100644 --- a/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncherUpgrade.cs +++ b/Assets/Scripts/Game/FairyGUI/UILauncher/Components/UILauncherUpgrade.cs @@ -41,11 +41,12 @@ public static UILauncherUpgrade Create(GObject go) /// public static UILauncherUpgrade GetFormPool(GObject go) { - var fui = go.Get(); - if(fui == null) + var fui = go.Get(); + if (fui == null) { fui = Create(go); } + fui.IsFromPool = true; return fui; } @@ -61,7 +62,7 @@ protected override void InitView() self.Add(this); var com = GObject.asCom; - if(com != null) + if (com != null) { m_bg = (GGraph)com.GetChild("bg"); m_EnterButton = (GButton)com.GetChild("EnterButton");