Merge branch 'develop' into feature/签字功能

2025-12-25 22:02:33 +08:00
parent cf1d020b99 012ba3b5a4
commit 40756fff95
579 changed files with 121714 additions and 13685 deletions
@@ -25,20 +25,6 @@ namespace AibisDream
            UIManager.Instance.ShowPanel<EndPanel>();
        }

-        [Obsolete]
-        [YarnCommand("switch_tv")]
-        public static void SwitchTV(string picName)
-        {
-            Debug.Log("switch_tv 已废弃");
-        }
-
-        [Obsolete]
-        [YarnCommand("show_tv_scene")]
-        public static void ShowTVScene(float duration)
-        {
-            Debug.Log("show_tv_scene 已废弃");
-        }
-
        [YarnCommand("load_scene")]
        public static IEnumerator LoadScene(string sceneName, float duration = 1)
        {
@@ -99,6 +99,10 @@ namespace AibisDream
            {
                _dialogueRunner.StartDialogue(nodeName);
            }
+            else
+            {
+                Debug.LogWarning($"节点 {nodeName} 不存在！");
+            }
        }

        private bool CheckIfNodeExistInCurrentYarnProject(string nodeName)
@@ -115,6 +115,28 @@ namespace AibisDream
            if (token.state == LineSyncState.WaitForAutoAdvance)
            {
                token.TryAdvance();
+                return;
+            }
+
+            if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
+            {
+                HandleInput(token);
+            }
+        }
+
+        private void HandleInput(LineSyncToken token)
+        {
+            switch (token.state)
+            {
+                case LineSyncState.PlayText:
+                    token.TrySkip();
+                    break;
+                case LineSyncState.WaitForAdvance:
+                    token.TryAdvance();
+                    break;
+                case LineSyncState.WaitForAutoAdvance:
+                    token.TryAdvance();
+                    break;
            }
        }
    }
@@ -17,6 +17,7 @@ namespace AibisDream
        public override void RunLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
        {
            LineSyncToken lineSyncEvent;
+            Debug.Log($"RunLine: {dialogueLine.TextWithoutCharacterName.Text}");
            if (dialogueLine.GetCharacterVo().dialogViewType == DialogViewType.Screen)
            {
                // 自动推进视图
@@ -61,6 +61,8 @@ namespace AibisDream
        {
            if (state == LineSyncState.WaitForAdvance || state == LineSyncState.WaitForAutoAdvance)
            {
+                AdvanceDelayToken?.Cancel();
+
                Advance();
                Dispose();
            }