From 34cf55155c2b27a3a21deb8e07d7a31600076cf9 Mon Sep 17 00:00:00 2001
From: JA <1323160571@qq.com>
Date: Mon, 6 Jul 2026 00:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unity/Assets/Scenes/Gameplay.unity       |  2 +-
 unity/Assets/Scenes/MainMenu.unity       | 24 +++---
 unity/Assets/UI/MainMenuUIController.cs  | 96 ++++++++++++++----------
 unity/Assets/UI/PersistentEventSystem.cs | 37 ++++-----
 unity/Assets/UI/SceneLoader.cs           | 43 ++---------
 5 files changed, 88 insertions(+), 114 deletions(-)

diff --git a/unity/Assets/Scenes/Gameplay.unity b/unity/Assets/Scenes/Gameplay.unity
index fc2d259..680d3e1 100644
--- a/unity/Assets/Scenes/Gameplay.unity
+++ b/unity/Assets/Scenes/Gameplay.unity
@@ -371,7 +371,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   darknessMaterial: {fileID: 2100000, guid: 6dd18d2379aff3040813ab8005b1898a, type: 2}
-  debugShowAll: 1
+  debugShowAll: 0
   minBrightness: 0
   darknessColor: {r: 0.01, g: 0.01, b: 0.02, a: 1}
   lightSoftness: 1
diff --git a/unity/Assets/Scenes/MainMenu.unity b/unity/Assets/Scenes/MainMenu.unity
index 5b1ca31..ecfde39 100644
--- a/unity/Assets/Scenes/MainMenu.unity
+++ b/unity/Assets/Scenes/MainMenu.unity
@@ -885,8 +885,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 897692926}
+  m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &574406657
@@ -1355,20 +1354,20 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 897692925}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1022684515}
   - {fileID: 1048541269}
-  m_Father: {fileID: 574406656}
+  m_Father: {fileID: 1036666439}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 960, y: 540}
+  m_SizeDelta: {x: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &897692927
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1918,10 +1917,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfb474cbd721479419d2ce88a2701448, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  titleText: {fileID: 0}
-  titleImage: {fileID: 63499461}
   startButton: {fileID: 1036827528}
-  storyReplayButton: {fileID: 977847656}
+  settingsButton: {fileID: 0}
   creditsButton: {fileID: 995992462}
   quitButton: {fileID: 0}
   settingsPanel: {fileID: 0}
@@ -2006,6 +2003,7 @@ RectTransform:
   - {fileID: 1535145891}
   - {fileID: 63499463}
   - {fileID: 1440709690}
+  - {fileID: 897692926}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -2344,10 +2342,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfb474cbd721479419d2ce88a2701448, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  titleText: {fileID: 0}
-  titleImage: {fileID: 0}
   startButton: {fileID: 0}
-  storyReplayButton: {fileID: 0}
+  settingsButton: {fileID: 0}
   creditsButton: {fileID: 0}
   quitButton: {fileID: 0}
   settingsPanel: {fileID: 2013394273}
diff --git a/unity/Assets/UI/MainMenuUIController.cs b/unity/Assets/UI/MainMenuUIController.cs
index 2bce3d2..f7355fc 100644
--- a/unity/Assets/UI/MainMenuUIController.cs
+++ b/unity/Assets/UI/MainMenuUIController.cs
@@ -4,22 +4,19 @@ using UnityEngine.UI;
 namespace GameFramework
 {
     /// <summary>
-    /// 主菜单 UI 控制器（游戏封面）。
-    /// 包含游戏标题 + 开始游戏/剧情回放/制作人员按钮。
+    /// 主菜单 UI 控制器。
+    /// 支持开始游戏、设置、制作人员、退出游戏。
+    /// 修复：场景重载后自动重新查找 UI 引用，避免 DontDestroyOnLoad 导致的空引用问题。
     /// </summary>
     public class MainMenuUIController : MonoBehaviour
     {
-        [Header("标题")]
-        [SerializeField] Text titleText;
-        [SerializeField] Image titleImage;
-
         [Header("Buttons")]
         [SerializeField] Button startButton;
-        [SerializeField] Button storyReplayButton;
+        [SerializeField] Button settingsButton;
         [SerializeField] Button creditsButton;
         [SerializeField] Button quitButton;
 
-        [Header("Settings Panel (placeholder)")]
+        [Header("Settings Panel")]
         [SerializeField] GameObject settingsPanel;
         [SerializeField] Button settingsBackButton;
 
@@ -29,23 +26,38 @@ namespace GameFramework
 
         void Start()
         {
-            Debug.Log("[MainMenu] creditsButton=" + (creditsButton != null ? creditsButton.name : "NULL") + " creditsPanel=" + (creditsPanel != null ? creditsPanel.name : "NULL"));
+            // 自动查找（解决场景重载后引用失效问题）
+            if (startButton == null)
+                startButton = FindButton("StartButton");
+            if (settingsButton == null)
+                settingsButton = FindButton("SettingsButton");
+            if (creditsButton == null)
+                creditsButton = FindButton("CreditsButton");
+            if (quitButton == null)
+                quitButton = FindButton("QuitButton");
+
+            if (settingsPanel == null)
+                settingsPanel = GameObject.Find("SettingsPanel");
+            if (settingsBackButton == null && settingsPanel != null)
+                settingsBackButton = settingsPanel.GetComponentInChildren<Button>();
+
+            if (creditsPanel == null)
+                creditsPanel = GameObject.Find("CreditsPanel");
+            if (creditsCloseButton == null && creditsPanel != null)
+                creditsCloseButton = creditsPanel.GetComponentInChildren<Button>();
+
             // 绑定按钮事件
             if (startButton != null)
                 startButton.onClick.AddListener(OnStartClick);
-
-            if (storyReplayButton != null)
-                storyReplayButton.onClick.AddListener(OnStoryReplayClick);
-
+            if (settingsButton != null)
+                settingsButton.onClick.AddListener(OnSettingsClick);
             if (creditsButton != null)
                 creditsButton.onClick.AddListener(OnCreditsClick);
-
             if (quitButton != null)
                 quitButton.onClick.AddListener(OnQuitClick);
 
             if (settingsBackButton != null)
                 settingsBackButton.onClick.AddListener(OnSettingsBackClick);
-
             if (creditsCloseButton != null)
                 creditsCloseButton.onClick.AddListener(OnCreditsCloseClick);
 
@@ -56,29 +68,22 @@ namespace GameFramework
                 creditsPanel.SetActive(false);
         }
 
+        Button FindButton(string name)
+        {
+            var btn = GameObject.Find(name);
+            return btn != null ? btn.GetComponent<Button>() : null;
+        }
+
         void OnStartClick()
         {
             if (SceneLoader.Instance != null)
                 SceneLoader.Instance.LoadGameplayScene();
         }
 
-        void OnStoryReplayClick()
+        void OnSettingsClick()
         {
-            // TODO: 实现剧情回放功能
-            Debug.Log("[MainMenu] 剧情回放 - 待实现");
-        }
-
-        void OnCreditsClick()
-        {
-            Debug.Log("[MainMenu] OnCreditsClick called! creditsPanel=" + (creditsPanel != null ? creditsPanel.name : "NULL"));
-            if (creditsPanel != null)
-                creditsPanel.SetActive(true);
-        }
-
-        void OnCreditsCloseClick()
-        {
-            if (creditsPanel != null)
-                creditsPanel.SetActive(false);
+            if (settingsPanel != null)
+                settingsPanel.SetActive(true);
         }
 
         void OnSettingsBackClick()
@@ -87,6 +92,25 @@ namespace GameFramework
                 settingsPanel.SetActive(false);
         }
 
+        void OnCreditsClick()
+        {
+            if (creditsPanel != null)
+            {
+                creditsPanel.SetActive(true);
+                Debug.Log($"[MainMenu] Showing credits panel: {creditsPanel.name}");
+            }
+            else
+            {
+                Debug.LogWarning("[MainMenu] creditsPanel not found! Make sure a GameObject named 'CreditsPanel' exists in the scene.");
+            }
+        }
+
+        void OnCreditsCloseClick()
+        {
+            if (creditsPanel != null)
+                creditsPanel.SetActive(false);
+        }
+
         void OnQuitClick()
         {
 #if UNITY_EDITOR
@@ -95,15 +119,5 @@ namespace GameFramework
             Application.Quit();
 #endif
         }
-
-        void OnDestroy()
-        {
-            if (startButton != null) startButton.onClick.RemoveAllListeners();
-            if (storyReplayButton != null) storyReplayButton.onClick.RemoveAllListeners();
-            if (creditsButton != null) creditsButton.onClick.RemoveAllListeners();
-            if (quitButton != null) quitButton.onClick.RemoveAllListeners();
-            if (settingsBackButton != null) settingsBackButton.onClick.RemoveAllListeners();
-            if (creditsCloseButton != null) creditsCloseButton.onClick.RemoveAllListeners();
-        }
     }
 }
diff --git a/unity/Assets/UI/PersistentEventSystem.cs b/unity/Assets/UI/PersistentEventSystem.cs
index 39f32fa..ac5133d 100644
--- a/unity/Assets/UI/PersistentEventSystem.cs
+++ b/unity/Assets/UI/PersistentEventSystem.cs
@@ -1,6 +1,5 @@
 using UnityEngine;
 using UnityEngine.EventSystems;
-using UnityEngine.SceneManagement;
 
 namespace GameFramework
 {
@@ -9,33 +8,29 @@ namespace GameFramework
     /// 让 EventSystem 通过 DontDestroyOnLoad 跨场景存活。
     /// 这样 Gameplay、Scoring 等场景的按钮都能正常响应点击。
     ///
-    /// 场景切换时如果新场景自带 EventSystem，会自动销毁重复的那个，
-    /// 始终保证场景中只有一个 EventSystem。
+    /// 修复：当场景重复加载时（如从 Scoring 回到 MainMenu），
+    /// 销毁多余的 EventSystem，保证全局只有一个。
     /// </summary>
     public class PersistentEventSystem : MonoBehaviour
     {
         void Awake()
         {
-            // 让 EventSystem 跨场景存活
-            DontDestroyOnLoad(gameObject);
+            var allSystems = FindObjectsOfType<EventSystem>();
 
-            // 监听场景加载，清理重复的 EventSystem
-            SceneManager.sceneLoaded += OnSceneLoaded;
-        }
-
-        void OnDestroy()
-        {
-            SceneManager.sceneLoaded -= OnSceneLoaded;
-        }
-
-        void OnSceneLoaded(Scene scene, LoadSceneMode mode)
-        {
-            // 新场景加载后，找到所有 EventSystem，保留自己所在的，销毁其余的
-            var allES = FindObjectsOfType<EventSystem>();
-            foreach (var es in allES)
+            if (allSystems.Length == 0)
             {
-                if (es.gameObject != gameObject)
-                    Destroy(es.gameObject);
+                // 场景里没有 EventSystem —— 创建一个
+                var go = new GameObject("EventSystem");
+                go.AddComponent<EventSystem>();
+                go.AddComponent<StandaloneInputModule>();
+                DontDestroyOnLoad(go);
+            }
+            else
+            {
+                // 保留第一个 EventSystem，销毁重复的
+                DontDestroyOnLoad(allSystems[0].gameObject);
+                for (int i = 1; i < allSystems.Length; i++)
+                    Destroy(allSystems[i].gameObject);
             }
         }
     }
diff --git a/unity/Assets/UI/SceneLoader.cs b/unity/Assets/UI/SceneLoader.cs
index a6bf386..777be48 100644
--- a/unity/Assets/UI/SceneLoader.cs
+++ b/unity/Assets/UI/SceneLoader.cs
@@ -9,9 +9,7 @@ namespace GameFramework
     /// 场景异步加载器（持久化单例）。带黑色淡入淡出过渡。
     /// 场景名可在 Inspector 配置，默认 MainMenu / Gameplay / Scoring。
     ///
-    /// 搭建：把 SceneLoader 挂到一个空物体上（放第一个场景 MainMenu 里），
-    /// 它会 DontDestroyOnLoad。transitionImage 是它子物体 Canvas 上的 Image（全屏黑），
-    /// Canvas 设为 Screen Space - Overlay、sortingOrder 设很高（如 9999）。
+    /// 修复：协程结束后将 isLoading 重置为 false，允许后续加载。
     /// </summary>
     public class SceneLoader : PersistentSingleton<SceneLoader>
     {
@@ -19,7 +17,7 @@ namespace GameFramework
         [SerializeField] private Image transitionImage;
         [SerializeField] private float fadeTime = 1.5f;
 
-        [Header("场景名（按你工程里的实际名称填）")]
+        [Header("场景名（按你工程中的实际名称填）")]
         [SerializeField] private string mainMenuScene = "MainMenu";
         [SerializeField] private string gameplayScene = "Gameplay";
         [SerializeField] private string scoringScene = "Scoring";
@@ -27,34 +25,14 @@ namespace GameFramework
         private Color color;
         private bool isLoading = false;
 
-        public void LoadGameplayScene()
-        {
-            // 重置 GameManager 状态
-            if (GameManager.Instance != null)
-            {
-                GameManager.GameState = GameState.Playing;
-                GameManager.onGameOver = null;
-                GameManager.onGameWin = null;
-            }
-            // 重置 ScoreManager
-            if (ScoreManager.Instance != null)
-                ScoreManager.Instance.ResetScore();
-            // 清理静态事件残留订阅
-            IndianOceanAssets.Engine2_5D.HealthSystem.onPlayerDamaged = null;
-
-            Load(gameplayScene);
-        }
+        public void LoadGameplayScene() => Load(gameplayScene);
         public void LoadMainMenuScene() => Load(mainMenuScene);
         public void LoadScoringScene() => Load(scoringScene);
         public void Load(string sceneName)
         {
-            if (isLoading)
-            {
-                Debug.LogWarning($"[SceneLoader] 上次加载未完成，强制重置并加载: {sceneName}");
-                StopAllCoroutines();
-                isLoading = false;
-            }
+            if (isLoading) return;
             isLoading = true;
+            StopAllCoroutines();
             StartCoroutine(LoadingCoroutine(sceneName));
         }
 
@@ -67,16 +45,7 @@ namespace GameFramework
                     "拖到 SceneLoader 的 transitionImage 字段。");
             }
 
-            Debug.Log($"[SceneLoader] 开始加载场景: {sceneName}");
             var loadingOperation = SceneManager.LoadSceneAsync(sceneName);
-
-            if (loadingOperation == null)
-            {
-                Debug.LogError($"[SceneLoader] 场景 '{sceneName}' 加载失败！请检查 Build Settings 中是否包含该场景。");
-                isLoading = false;
-                yield break;
-            }
-
             loadingOperation.allowSceneActivation = false;
 
             if (transitionImage != null)
@@ -123,7 +92,7 @@ namespace GameFramework
                 transitionImage.gameObject.SetActive(false);
             }
 
-            Debug.Log($"[SceneLoader] 场景加载完成: {sceneName}");
+            // 加载完成，重置标志，允许下一次加载
             isLoading = false;
         }
     }