代码合并

Assets/ModuleFunction/ModuleUIPage/UICuttingWorkshop.cs

@@ -15,7 +15,7 @@ public class UICuttingWorkshop : ModuleUIPage {
     private Button Button4 => root.Q<Button>("Button4");
     private Button Button5 => root.Q<Button>("Button5");
     protected override void Awake() {
-        base.Awake();
+        ModuleCore.FunctionRegister(this);
         Button1.clicked += Button1_clicked;
         Button2.clicked += Button2_clicked;
         Button3.clicked += Button3_clicked;
@@ -23,18 +23,18 @@ public class UICuttingWorkshop : ModuleUIPage {
         Button5.clicked += Button5_clicked;
     }
     private void Button1_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene1);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene1);
     }
     private void Button2_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene2);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene2);
     }
     private void Button3_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene3);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene3);
     }
     private void Button4_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
+        //ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
     }
     private void Button5_clicked() {
-        ModuleCore.LearningVideoPanel.Open(null);
+        //ModuleCore.LearningVideoPanel.Open(null);
     }
 }

Assets/ModuleFunction/ModuleUIPage/UIFactoryScenery.cs

@@ -15,7 +15,7 @@ public class UIFactoryScenery : ModuleUIPage {
     private Button Button4 => root.Q<Button>("Button4");
     private MUFoldout Foldout => root.Q<MUFoldout>("MUFoldout");
     protected override void Awake() {
-        base.Awake();
+        ModuleCore.FunctionRegister(this);
         Button1.clicked += Button1_clicked;
         Button2.clicked += Button2_clicked;
         Button3.clicked += Button3_clicked;
@@ -32,7 +32,7 @@ public class UIFactoryScenery : ModuleUIPage {
         Debug.Log("地图导航");
     }
     private void Button4_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
+        //ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
     }
     public void CreateUINavigationUnit(NavigationData data) {
         VisualElement element = NavigationUnitlAsset.Instantiate();
@@ -57,6 +57,6 @@ public class UINavigationUnit {
         Button.clicked += Button_clicked;
     }
     private void Button_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(value.scene);
+        //ModuleCore.ModuleScene.LoadSceneAsync(value.scene);
     }
 }

Assets/ModuleFunction/ModuleUIPage/UIGlobalPage.cs

@@ -3,5 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class UIGlobalPage : ModuleUIPage {
-
+    protected override void Awake() {
+        ModuleCore.FunctionRegister(this);
+    }
 }

Assets/ModuleFunction/ModuleUIPage/UILoginInterface.cs

@@ -3,5 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 
 public class UILoginInterface : ModuleUIPage {
-
+    protected override void Awake() {
+        ModuleCore.FunctionRegister(this);
+    }
 }

Assets/ModuleFunction/ModuleUIPage/UISewingWorkshop.cs

@@ -5,31 +5,31 @@ using UnityEngine.UIElements;
 using MuHua;
 
 public class UISewingWorkshop : ModuleUIPage {
-    [SceneName]public string scene1;
-    [SceneName]public string scene2;
-    [SceneName]public string scene3;
-    [SceneName]public string returnScene;
+    [SceneName] public string scene1;
+    [SceneName] public string scene2;
+    [SceneName] public string scene3;
+    [SceneName] public string returnScene;
     private Button Button1 => root.Q<Button>("Button1");
     private Button Button2 => root.Q<Button>("Button2");
     private Button Button3 => root.Q<Button>("Button3");
     private Button Button4 => root.Q<Button>("Button4");
     protected override void Awake() {
-        base.Awake();
+        ModuleCore.FunctionRegister(this);
         Button1.clicked += Button1_clicked;
         Button2.clicked += Button2_clicked;
         Button3.clicked += Button3_clicked;
         Button4.clicked += Button4_clicked;
     }
     private void Button1_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene1);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene1);
     }
     private void Button2_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene2);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene2);
     }
     private void Button3_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(scene3);
+        //ModuleCore.ModuleScene.LoadSceneAsync(scene3);
     }
     private void Button4_clicked() {
-        ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
+        //ModuleCore.ModuleScene.LoadSceneAsync(returnScene);
     }
 }