From f3b30fbc283331366f13695178c778e9eb81a549 Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Sun, 8 Mar 2026 22:12:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(framework):=20=E4=BF=AE=E5=A4=8D=20ActionKi?=
 =?UTF-8?q?t=20=E5=92=8C=20TimelineKit=20=E7=9B=B8=E5=85=B3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Framework/ActionKit/Action/Lerp.cs    | 10 +---------
 .../Scripts/Framework/ActionKit/Action/Parallel.cs   | 10 +---------
 Assets/Scripts/Framework/AudioKit/AudioManager.cs    |  4 ++--
 .../SceneManagement/TimelineKit/DirectorHandler.cs   |  6 ++++++
 .../SceneManagement/TimelineKit/TimelineAssetRef.cs  | 12 ++++++++----
 Assets/Scripts/Utility/YarnUtil.cs                   |  8 +++++++-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/Assets/Scripts/Framework/ActionKit/Action/Lerp.cs b/Assets/Scripts/Framework/ActionKit/Action/Lerp.cs
index 155615723..e395c501a 100644
--- a/Assets/Scripts/Framework/ActionKit/Action/Lerp.cs
+++ b/Assets/Scripts/Framework/ActionKit/Action/Lerp.cs
@@ -1,12 +1,4 @@
-/****************************************************************************
- * Copyright (c) 2016 - 2024 liangxiegame UNDER MIT License
- *
- * https://qframework.cn
- * https://github.com/liangxiegame/QFramework
- * https://gitee.com/liangxiegame/QFramework
- ****************************************************************************/
-
-using System;
+using System;
 using UnityEngine;
 
 namespace AibisDream.Kit
diff --git a/Assets/Scripts/Framework/ActionKit/Action/Parallel.cs b/Assets/Scripts/Framework/ActionKit/Action/Parallel.cs
index f01937bf4..a378f8cb1 100644
--- a/Assets/Scripts/Framework/ActionKit/Action/Parallel.cs
+++ b/Assets/Scripts/Framework/ActionKit/Action/Parallel.cs
@@ -1,12 +1,4 @@
-/****************************************************************************
- * Copyright (c) 2015 - 2024 liangxiegame UNDER MIT License
- *
- * https://qframework.cn
- * https://github.com/liangxiegame/QFramework
- * https://gitee.com/liangxiegame/QFramework
- ****************************************************************************/
-
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace AibisDream.Kit
diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs
index 4b82c7473..15884d217 100644
--- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs
+++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using AibisDream.FixSystem;
@@ -335,7 +335,7 @@ namespace AibisDream.Kit
         {
             return key switch
             {
-                "ExpressFixScene" => AmbState.Clinic,
+                "Scene/ExpressFixScene" => AmbState.Clinic,
                 "ShitouHeadiFixScene" => AmbState.Clinic,
                 "PeipeiFixScene" => AmbState.Clinic,
                 "Bridge" => AmbState.Footbridge,
diff --git a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs
index d81f01a17..e1880a4c7 100644
--- a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs
+++ b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs
@@ -197,6 +197,12 @@ namespace AibisDream
             }
 
             director.Play();
+
+            // 等待播放完成
+            while (director.state == PlayState.Playing)
+            {
+                yield return null;
+            }
         }
 
         /// <summary>
diff --git a/Assets/Scripts/SceneManagement/TimelineKit/TimelineAssetRef.cs b/Assets/Scripts/SceneManagement/TimelineKit/TimelineAssetRef.cs
index 17be8d55d..25bde037a 100644
--- a/Assets/Scripts/SceneManagement/TimelineKit/TimelineAssetRef.cs
+++ b/Assets/Scripts/SceneManagement/TimelineKit/TimelineAssetRef.cs
@@ -3,9 +3,13 @@
     public static class TimelineAssetRef
     {
         // ------------------- 维修面板相关 -------------------
-        public const string BlockPuzzleEnter = "维修面板/引擎仓面板开启";
-        public const string BlockPuzzleExit = "维修面板/引擎仓面板关闭";
-        public const string CablePanelEnter = "维修面板/插线面板开启";
-        public const string CablePanelExit = "维修面板/插线面板关闭";
+        public const string BlockPuzzleEnter = "引擎仓面板/引擎仓面板开启";
+        public const string BlockPuzzleExit = "引擎仓面板/引擎仓面板关闭";
+        public const string CablePanelEnter = "插线面板/插线面板开启";
+        public const string CablePanelExit = "插线面板/插线面板关闭";
+
+        // ------------------- 插线模块相关 -------------------
+        public const string EngineModuleEnter = "引擎模块/引擎开盖";
+        public const string EngineModuleExit = "引擎模块/引擎合盖";
     }
 }
diff --git a/Assets/Scripts/Utility/YarnUtil.cs b/Assets/Scripts/Utility/YarnUtil.cs
index 1a6301a70..b17d3d4ef 100644
--- a/Assets/Scripts/Utility/YarnUtil.cs
+++ b/Assets/Scripts/Utility/YarnUtil.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using AibisDream.Kit;
@@ -116,6 +116,12 @@ namespace AibisDream.Utility
             return visitedState == (1 << totalOptionNum) - 1;
         }
 
+        [YarnFunction("str_contains")]
+        public static bool StrContains(string str, string substring)
+        {
+            return str.Contains(substring);
+        }
+
         #endregion
     }
 }
\ No newline at end of file