chore(merge): 合并 develop 并整合 Day2 梦境剧情与演出

2026-07-19 21:25:30 +08:00
parent 5408fd5320 71d248c2e6
commit 06d6127c69
291 changed files with 60545 additions and 5128 deletions
@@ -16,9 +16,13 @@ namespace AibisDream
        [YarnCommand("NextYarn")]
        public static void NextYarn(string exitName = null)
        {
+            if (!GameManager.Instance.TryAdvanceChapterFromYarn(exitName))
+            {
+                return;
+            }
+
            EnumEventSystem.Global.Send(EventEnum.NextYarn);
            YarnVariableStorage.Instance.ClearLocal();
-            DialogController.Instance.StartCoroutine(GameManager.Instance.NextSceneSo(exitName));
        }

        [YarnCommand("OpenEndMenu")]
@@ -30,14 +34,13 @@ namespace AibisDream
        [YarnCommand("load_scene")]
        public static IEnumerator LoadScene(string sceneName, float _unusedFadeDuration = 0f)
        {
-            HideDialog();
-            yield return SceneLoader.Instance.LoadSceneAsync(sceneName);
+            yield return GameManager.Instance.LoadSceneFromYarn(sceneName);
        }

        [YarnCommand("unload_scene")]
        public static IEnumerator UnloadScene()
        {
-            yield return SceneLoader.Instance.UnloadSceneAsync();
+            yield return GameManager.Instance.UnloadSceneFromYarn();
        }

        [YarnCommand("set_volume_weight")]