[更新]1. 更新导出的FUI代码

AlianBlank · AlianBlank · commit 8437cd1f9261 · 2024-12-23T14:59:47.000+08:00
diff --git 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
diff --git 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
diff --git 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
diff --git 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)
         /// </summary>
         public static UIAnnouncement GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIAnnouncement>();
-            if(fui == null)
+            var fui = go.Get<UIAnnouncement>();
+            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
@@ -39,11 +39,12 @@ public static UIAnnouncementContent Create(GObject go)
         /// </summary>
         public static UIAnnouncementContent GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIAnnouncementContent>();
-            if(fui == null)
+            var fui = go.Get<UIAnnouncementContent>();
+            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
@@ -66,11 +66,12 @@ public static UILogin Create(GObject go)
         /// </summary>
         public static UILogin GetFormPool(GObject go)
         {
-            var fui =  go.Get<UILogin>();
-            if(fui == null)
+            var fui = go.Get<UILogin>();
+            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
@@ -65,11 +65,12 @@ public static UIPlayerCreate Create(GObject go)
         /// </summary>
         public static UIPlayerCreate GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIPlayerCreate>();
-            if(fui == null)
+            var fui = go.Get<UIPlayerCreate>();
+            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
@@ -68,11 +68,12 @@ public static UIPlayerList Create(GObject go)
         /// </summary>
         public static UIPlayerList GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIPlayerList>();
-            if(fui == null)
+            var fui = go.Get<UIPlayerList>();
+            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
@@ -66,11 +66,12 @@ public static UIPlayerListItem Create(GObject go)
         /// </summary>
         public static UIPlayerListItem GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIPlayerListItem>();
-            if(fui == null)
+            var fui = go.Get<UIPlayerListItem>();
+            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
@@ -39,11 +39,12 @@ public static UIPlayerListItemLoginButton Create(GObject go)
         /// </summary>
         public static UIPlayerListItemLoginButton GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIPlayerListItemLoginButton>();
-            if(fui == null)
+            var fui = go.Get<UIPlayerListItemLoginButton>();
+            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
@@ -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
diff --git 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)
         /// </summary>
         public static UIMain GetFormPool(GObject go)
         {
-            var fui =  go.Get<UIMain>();
-            if(fui == null)
+            var fui = go.Get<UIMain>();
+            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
@@ -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
diff --git 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)
         /// </summary>
         public static UILauncher GetFormPool(GObject go)
         {
-            var fui =  go.Get<UILauncher>();
-            if(fui == null)
+            var fui = go.Get<UILauncher>();
+            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
@@ -41,11 +41,12 @@ public static UILauncherUpgrade Create(GObject go)
         /// </summary>
         public static UILauncherUpgrade GetFormPool(GObject go)
         {
-            var fui =  go.Get<UILauncherUpgrade>();
-            if(fui == null)
+            var fui = go.Get<UILauncherUpgrade>();
+            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");

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,12 @@`
`1`	`1`	`/ This is an automatically generated class by FairyGUI. Please do not modify it. /`
`2`	`2`
`3`	`3`	`#if ENABLE_UI_FAIRYGUI`
`4`		`-using FairyGUI;`
`5`		`-using FairyGUI.Utils;`
`6`		`-using Cysharp.Threading.Tasks;`
`7`		`-using GameFrameX.Entity.Runtime;`
`8`	`4`
`9`	`5`	`namespace Hotfix.UI`
`10`	`6`	`{`
`11`		`- public static partial class FUIPackage {`
	`7`	`+ public static partial class FUIPackage`
	`8`	`+ {`
`12`	`9`	`public const string UICommonAvatar = "UICommonAvatar";`
`13`		`-`
`14`	`10`	`}`
`15`	`11`	`}`
`16`	`12`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,12 @@ public static UIAnnouncement Create(GObject go)`
`65`	`65`	`/// </summary>`
`66`	`66`	`public static UIAnnouncement GetFormPool(GObject go)`
`67`	`67`	`{`
`68`		`- var fui = go.Get<UIAnnouncement>();`
`69`		`- if(fui == null)`
	`68`	`+ var fui = go.Get<UIAnnouncement>();`
	`69`	`+ if (fui == null)`
`70`	`70`	`{`
`71`	`71`	`fui = Create(go);`
`72`	`72`	`}`
	`73`	`+`
`73`	`74`	`fui.IsFromPool = true;`
`74`	`75`	`return fui;`
`75`	`76`	`}`
`@@ -85,7 +86,7 @@ protected override void InitView()`
`85`	`86`	`self.Add(this);`
`86`	`87`
`87`	`88`	`var com = GObject.asCom;`
`88`		`- if(com != null)`
	`89`	`+ if (com != null)`
`89`	`90`	`{`
`90`	`91`	`m_MaskLayer = (GGraph)com.GetChild("MaskLayer");`
`91`	`92`	`m_TextContent = UIAnnouncementContent.Create(com.GetChild("TextContent"));`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ public static UIAnnouncementContent Create(GObject go)`
`39`	`39`	`/// </summary>`
`40`	`40`	`public static UIAnnouncementContent GetFormPool(GObject go)`
`41`	`41`	`{`
`42`		`- var fui = go.Get<UIAnnouncementContent>();`
`43`		`- if(fui == null)`
	`42`	`+ var fui = go.Get<UIAnnouncementContent>();`
	`43`	`+ if (fui == null)`
`44`	`44`	`{`
`45`	`45`	`fui = Create(go);`
`46`	`46`	`}`
	`47`	`+`
`47`	`48`	`fui.IsFromPool = true;`
`48`	`49`	`return fui;`
`49`	`50`	`}`
`@@ -59,7 +60,7 @@ protected override void InitView()`
`59`	`60`	`self.Add(this);`
`60`	`61`
`61`	`62`	`var com = GObject.asCom;`
`62`		`- if(com != null)`
	`63`	`+ if (com != null)`
`63`	`64`	`{`
`64`	`65`	`m_LabelContent = (GRichTextField)com.GetChild("LabelContent");`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,12 @@ public static UILogin Create(GObject go)`
`66`	`66`	`/// </summary>`
`67`	`67`	`public static UILogin GetFormPool(GObject go)`
`68`	`68`	`{`
`69`		`- var fui = go.Get<UILogin>();`
`70`		`- if(fui == null)`
	`69`	`+ var fui = go.Get<UILogin>();`
	`70`	`+ if (fui == null)`
`71`	`71`	`{`
`72`	`72`	`fui = Create(go);`
`73`	`73`	`}`
	`74`	`+`
`74`	`75`	`fui.IsFromPool = true;`
`75`	`76`	`return fui;`
`76`	`77`	`}`
`@@ -86,7 +87,7 @@ protected override void InitView()`
`86`	`87`	`self.Add(this);`
`87`	`88`
`88`	`89`	`var com = GObject.asCom;`
`89`		`- if(com != null)`
	`90`	`+ if (com != null)`
`90`	`91`	`{`
`91`	`92`	`m_ErrorText = (GTextField)com.GetChild("ErrorText");`
`92`	`93`	`m_enter = (GButton)com.GetChild("enter");`
Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,12 @@ public static UIPlayerCreate Create(GObject go)`
`65`	`65`	`/// </summary>`
`66`	`66`	`public static UIPlayerCreate GetFormPool(GObject go)`
`67`	`67`	`{`
`68`		`- var fui = go.Get<UIPlayerCreate>();`
`69`		`- if(fui == null)`
	`68`	`+ var fui = go.Get<UIPlayerCreate>();`
	`69`	`+ if (fui == null)`
`70`	`70`	`{`
`71`	`71`	`fui = Create(go);`
`72`	`72`	`}`
	`73`	`+`
`73`	`74`	`fui.IsFromPool = true;`
`74`	`75`	`return fui;`
`75`	`76`	`}`
`@@ -85,7 +86,7 @@ protected override void InitView()`
`85`	`86`	`self.Add(this);`
`86`	`87`
`87`	`88`	`var com = GObject.asCom;`
`88`		`- if(com != null)`
	`89`	`+ if (com != null)`
`89`	`90`	`{`
`90`	`91`	`m_UserName = (GTextInput)com.GetChild("UserName");`
`91`	`92`	`m_enter = (GButton)com.GetChild("enter");`
Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,12 @@ public static UIPlayerList Create(GObject go)`
`68`	`68`	`/// </summary>`
`69`	`69`	`public static UIPlayerList GetFormPool(GObject go)`
`70`	`70`	`{`
`71`		`- var fui = go.Get<UIPlayerList>();`
`72`		`- if(fui == null)`
	`71`	`+ var fui = go.Get<UIPlayerList>();`
	`72`	`+ if (fui == null)`
`73`	`73`	`{`
`74`	`74`	`fui = Create(go);`
`75`	`75`	`}`
	`76`	`+`
`76`	`77`	`fui.IsFromPool = true;`
`77`	`78`	`return fui;`
`78`	`79`	`}`
`@@ -88,7 +89,7 @@ protected override void InitView()`
`88`	`89`	`self.Add(this);`
`89`	`90`
`90`	`91`	`var com = GObject.asCom;`
`91`		`- if(com != null)`
	`92`	`+ if (com != null)`
`92`	`93`	`{`
`93`	`94`	`m_IsSelected = com.GetController("IsSelected");`
`94`	`95`	`m_player_list = (GList)com.GetChild("player_list");`
Original file line number	Diff line number	Diff line change
`@@ -66,11 +66,12 @@ public static UIPlayerListItem Create(GObject go)`
`66`	`66`	`/// </summary>`
`67`	`67`	`public static UIPlayerListItem GetFormPool(GObject go)`
`68`	`68`	`{`
`69`		`- var fui = go.Get<UIPlayerListItem>();`
`70`		`- if(fui == null)`
	`69`	`+ var fui = go.Get<UIPlayerListItem>();`
	`70`	`+ if (fui == null)`
`71`	`71`	`{`
`72`	`72`	`fui = Create(go);`
`73`	`73`	`}`
	`74`	`+`
`74`	`75`	`fui.IsFromPool = true;`
`75`	`76`	`return fui;`
`76`	`77`	`}`
`@@ -86,7 +87,7 @@ protected override void InitView()`
`86`	`87`	`self.Add(this);`
`87`	`88`
`88`	`89`	`var com = GObject.asCom;`
`89`		`- if(com != null)`
	`90`	`+ if (com != null)`
`90`	`91`	`{`
`91`	`92`	`m_icon = (GLoader)com.GetChild("icon");`
`92`	`93`	`m_name_text = (GRichTextField)com.GetChild("name_text");`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ public static UIPlayerListItemLoginButton Create(GObject go)`
`39`	`39`	`/// </summary>`
`40`	`40`	`public static UIPlayerListItemLoginButton GetFormPool(GObject go)`
`41`	`41`	`{`
`42`		`- var fui = go.Get<UIPlayerListItemLoginButton>();`
`43`		`- if(fui == null)`
	`42`	`+ var fui = go.Get<UIPlayerListItemLoginButton>();`
	`43`	`+ if (fui == null)`
`44`	`44`	`{`
`45`	`45`	`fui = Create(go);`
`46`	`46`	`}`
	`47`	`+`
`47`	`48`	`fui.IsFromPool = true;`
`48`	`49`	`return fui;`
`49`	`50`	`}`
`@@ -59,7 +60,7 @@ protected override void InitView()`
`59`	`60`	`self.Add(this);`
`60`	`61`
`61`	`62`	`var com = GObject.asCom;`
`62`		`- if(com != null)`
	`63`	`+ if (com != null)`
`63`	`64`	`{`
`64`	`65`	`m_title = (GRichTextField)com.GetChild("title");`
`65`	`66`	`}`