通了一版

Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset

@@ -23,7 +23,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318720
-    m_Localized: "???: \u533B\u751F\uFF0C\u6211\u8111\u888B\u91CC\u7684\u90A3\u4E2A\u58F0\u97F3\u2026\u8D8A\u6765\u8D8A\u5927\u4E86\u3002"
+    m_Localized: "???: \u533B\u751F\uFF0C<waitfor=0.2>\u6211\u8111\u888B\u91CC\u7684\u90A3\u4E2A\u58F0\u97F3\u2026<waitfor=0.2>\u8D8A\u6765\u8D8A\u5927\u4E86\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318721
@@ -99,7 +99,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318739
-    m_Localized: "???: \u6B63\u5728\u3002\u91CD\u65B0\u3002\u63A5\u7BA1\u3002"
+    m_Localized: "??: \u6B63\u5728\u3002\u91CD\u65B0\u3002\u63A5\u7BA1\u3002"
     m_Metadata:
       m_Items: []
   - m_Id: 371765548318740
@@ -330,6 +330,82 @@ MonoBehaviour:
     m_Localized: "Task: \u5207\u9664\u60C5\u7EEA\u6A21\u5757"
     m_Metadata:
       m_Items: []
+  - m_Id: 5414597048827904
+    m_Localized: "\u8BBE\u7F6E\u4E3A\u7D27\u6025"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159552
+    m_Localized: "\u8FD4\u56DE"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159553
+    m_Localized: "\u8BBE\u7F6E\u4E3A\u8B66\u544A"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159554
+    m_Localized: "\u8FD4\u56DE"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159555
+    m_Localized: "\u8BBE\u7F6E\u4E3A\u6B63\u5E38"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159556
+    m_Localized: "\u8FD4\u56DE"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159557
+    m_Localized: "Task: \u68C0\u67E5\u60C5\u7EEA\u6A21\u5757"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159558
+    m_Localized: '>>'
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159559
+    m_Localized: "me:\u770B\u8D77\u6765\u7A33\u5B9A\u4E9B\u4E86\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159560
+    m_Localized: "???: \u554A\u2026\u597D\u75BC\uFF01"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159561
+    m_Localized: "???: \u5B8C\u6210\u2026\u6307\u4EE4\u2026\u6307\u4EE4\u5FC5\u987B\u5B8C\u6210\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159562
+    m_Localized: "???: \u5FC5\u987B\u5B8C\u6210\u2026\u2026/exc\u03BBute_core\u20AD\u20AD"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159563
+    m_Localized: "???: \u554A\u2026\u554A!"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159564
+    m_Localized: "me:\u8F6C\u79FB\u5230\u903B\u8F91\u6A21\u5757\u4E86\u4E48\u2026"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159565
+    m_Localized: "me:\u5F97\u5148\u8BA9\u4ED6\u7A33\u5B9A\u4E0B\u6765"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159566
+    m_Localized: "Task:\u68C0\u67E5\u8BB0\u5FC6\u6A21\u5757"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159567
+    m_Localized: "me:\u8FD8\u4E0D\u884C\u4E48\uFF1F\u518D\u8BD5\u4E00\u6B21"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159568
+    m_Localized: "me:\u7EE7\u7EED"
+    m_Metadata:
+      m_Items: []
+  - m_Id: 5414597099159569
+    m_Localized: "me:\u600E\u4E48\u56DE\u4E8B?"
+    m_Metadata:
+      m_Items: []
   references:
     version: 2
     RefIds: []

Assets/Resources/Yarn/FP_Prologue/Stage2-5_切割.yarn

@@ -34,17 +34,17 @@ tags:
 group: 入口
 position: 250,-2612
 ---
-->设置为紧急
+->设置为紧急 #line:0238d8f 
     <<set_light_state "Emergency">>
-    返回
+    返回 #line:0c332b8 
     <<jump 灯光>>
-->设置为警告
+->设置为警告 #line:01803fe 
     <<set_light_state "Warning">>
-    返回
+    返回 #line:0d9a126 
     <<jump 灯光>>
-->设置为正常
+->设置为正常 #line:07c564c 
     <<set_light_state "Normal">>
-    返回
+    返回 #line:0cd0c41 
     <<jump 灯光>>
 
 // <<jump 手术准备>>
@@ -61,7 +61,7 @@ position: 251,-1917
 ---
 ???: 它就在情绪模块…我能感觉到。<br>让它停下…求求你了，医生。 #line:02cb425 
 // <<add_task TaskManager "检查情绪模块">>
-Task: 检查情绪模块
+Task: 检查情绪模块 #line:002672d 
 // <<task_moveIn TaskManager>>
 <<hide_dialog>>
 <<wait 1>>
@@ -119,15 +119,15 @@ position: 907,-2702
 // ???: 什么？不…你错了。<br>不不不…我不能这么做。 #line:0509e8b 
 // ???: 我必须完成指令…我必须完成指令。 #line:0fda55a 
 // ???: 医生。它没有消失。它转移了…<br>逻辑模块…它在那儿。 #line:099e8a3 
-<<set_light_state Normal>>>>
+<<set_light_state Normal>>>> #line:01c16dc 
 <<switch_fix_system_to "BodyModule" "Head">>
-me:看起来稳定些了…
-???: 啊…好疼！
-???: 完成…指令…指令必须完成…
+me:看起来稳定些了… #line:0b1dd52 
+???: 啊…好疼！ #line:0ab8d02 
+???: 完成…指令…指令必须完成… #line:08ffc78 
 <<set_light_state warning>>
-???: 必须完成……/excλute_core₭₭
-???: 啊…啊!
-me:转移到逻辑模块了么…
+???: 必须完成……/excλute_core₭₭ #line:083eaa8 
+???: 啊…啊! #line:0efd344 
+me:转移到逻辑模块了么… #line:015afd3 
 // <<add_task TaskManager "检查逻辑模块">>
 <<ModuleHightLight Logic true>>
 <<set $gameStage = 4>>
@@ -172,7 +172,7 @@ position: 907,-2702
 错误声音: 你以为你在做什么？医生。你以为我是什么？ #line:027615e 
 错误声音: 我不是个错误。我才是这个身体的主人……<br>你无权杀死我！你不能这么做…你……#auto_next #line:006512a 
 <<set_light_state Emergency>>
-me:得先让他稳定下来
+me:得先让他稳定下来 #line:0dad10a 
 <<start_shock>>
 
 ===
@@ -191,7 +191,7 @@ position: 907,-2702
     ???: ……<br>记忆模块。正在。发生。坏死。<br>必须。处理。…完成。指令。 #line:024f2de 
     <<stop_shock>>
     <<ModuleHightLight Memory true>>
-    Task:检查记忆模块
+    Task:检查记忆模块 #line:0b2facf 
     <<set $gameStage = 5>>
 <<elseif $flashCount==1>>
     <<play_shock_flash>>
@@ -199,12 +199,12 @@ position: 907,-2702
     <<wait 1>>
     <<set_light_state Emergency>>
     <<set $flashCount=$flashCount+1>>
-    me:还不行么？再试一次
+    me:还不行么？再试一次 #line:0ba461f 
 <<elseif $flashCount==2>>
     <<play_shock_flash>>
     <<set_light_state Emergency>>
     <<set $flashCount=$flashCount+1>>
-    me:继续
+    me:继续 #line:075ce88 
 <<elseif $flashCount==3>>
     <<play_shock_flashback 开场1>>
     <<set $flashCount=$flashCount+1>>
@@ -212,37 +212,11 @@ position: 907,-2702
 <<elseif $flashCount==4>>
     <<play_shock_flashback 开场2>>
     <<set $flashCount=$flashCount+1>>
-    <<auto_charge_and_release 1>>
-<<elseif $flashCount==5>>
-    <<play_shock_flashback 开场3>>
-    <<set $flashCount=$flashCount+1>>
-    <<auto_charge_and_release 0.8>>
-<<elseif $flashCount==6>>
-    <<play_shock_flashback 开场4>>
-    <<set $flashCount=$flashCount+1>>
-    <<auto_charge_and_release 0.6>>
-<<elseif $flashCount==7>>
-    <<play_shock_flashback 开场5>>
-    <<set $flashCount=$flashCount+1>>
-    <<auto_charge_and_release 0.4>>
-<<elseif $flashCount==8>>
-    <<play_shock_flashback 开场6>>
-    <<set $flashCount=$flashCount+1>>
-    <<auto_charge_and_release 0.2>>
-<<elseif $flashCount==9>>
-    <<trigger_ending 开场7>> 
-    <<wait 2>>
-    <<trigger_ending 开场9>>
-    <<wait 2>>
-    <<trigger_ending 开场11>>  
-    <<wait 2>>
-    <<trigger_ending 开场13>> 
+    <<set $gameStage = 6>>
+    <<jump Center>>
 <<endif>>
 ===
 
-
-
-
 title: 切除记忆
 tags: 
 colorID: 8
@@ -268,7 +242,7 @@ position: 907,-2702
 ???: 呃呃呃呃呃呃呃呃#auto_next #line:0cf6d36 
 <<switch_fix_system_to "BodyModule" "Head">>
 <<set_light_state Emergency>>
-me:怎么回事?
+me:怎么回事? #line:0c23843 
 <<start_shock>>
 // <<hide_dialog>>
 // <<wait 1>>
@@ -282,7 +256,7 @@ me:怎么回事?
 // <<hide_dialog>>
 // <<wait 1>>
 // <<set $gameStage = 6>>
-<<jump Center>>
+// <<jump Center>>
 ===
 
 
@@ -328,10 +302,10 @@ position: 1382,-2706
 ---
 <<ModuleHightLight Logic false>>
 <<if $gameStage == 2>>
-    <<complete_task TaskManager "检查逻辑模块">>
+    // <<complete_task TaskManager "检查逻辑模块">>
 <<endif>>
 <<wait 0.1>>
-<<open_screen Logic>>
+// <<open_screen Logic>>
 Linking: 正在建立连接… #line:02b2195 
 <<wait 0.2>>
 LogicModule: 已与逻辑处理模块建立连接！ #line:0ff21b3 
@@ -365,10 +339,10 @@ position: 1149,-2703
 --- 
 <<ModuleHightLight Memory false>>
 <<if $emoRemoved == true>>
-    <<complete_task TaskManager "检查记忆模块">>
+    // <<complete_task TaskManager "检查记忆模块">>
 <<endif>>
 <<wait 0.1>>
-<<open_screen Memory>>
+// <<open_screen Memory>>
 Linking: 正在建立连接… #line:0d127c8 
 <<wait 0.2>>
 <<clear_screen>>

Assets/Resources/Yarn/FP_Prologue/Stage6_螺旋.yarn

@@ -4,10 +4,52 @@ colorID: 8
 group:插线检查
 position: 906,-585
 ---
-<<enable_cut "HeadCover">>
+// <<enable_cut "HeadCover">>
+// <<jump end>>
+<<jump AutoChargeAndRelease>>
 ===
 
-
+title:AutoChargeAndRelease
+tags: 
+colorID: 8
+group:插线检查
+position: 906,-585
+---
+    <<auto_charge_and_release 1>>
+    <<play_shock_flashback 开场1>>
+    <<auto_charge_and_release 0.8>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.6>>
+    <<play_shock_flashback 开场4>>
+    <<auto_charge_and_release 0.4>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.4>>
+    <<play_shock_flashback 开场4>>
+    <<auto_charge_and_release 0.2>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.2>>
+    <<play_shock_flashback 开场4>>
+    <<auto_charge_and_release 0.1>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.1>>
+    <<play_shock_flashback 开场6>>
+    <<auto_charge_and_release 0.1>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.1>>
+    <<play_shock_flashback 开场6>>
+    <<auto_charge_and_release 0.1>>
+    <<play_shock_flashback 开场2>>
+    <<auto_charge_and_release 0.1>>
+    <<trigger_ending 开场7>> 
+    <<wait 2>>
+    <<trigger_ending 开场9>>
+    <<wait 2>>
+    <<trigger_ending 开场11>>  
+    <<wait 2>>
+    <<trigger_ending 开场13>> 
+    <<wait  2>>
+    <<jump end>>
+===
 
 title: 背板切除后
 tags: 
@@ -33,18 +75,18 @@ title: end
 group: 出口
 position: 248,443
 ---
-【我猛地从床上坐起】（背景的墙上有面镜子，也许？） #line:07f6601 
-me: 啊！ #line:07401ee 
-<<hide_dialog>>
-<<wait 1>>
-me: 啊…… #line:05c76b0 
-【我低头用手捧住脑袋】 #line:0c3c692 
-【顶部居中白字】我讨厌这种感觉。 #line:0a72930 
-<<fade_in 1>>
-<<hide_dialog>>
-<<wait 1>>
-火山: 你看清那张脸了吗？ #line:02f64d8 
-【声音桥，转场到地铁】 #line:002d60b 
+// 【我猛地从床上坐起】（背景的墙上有面镜子，也许？） #line:07f6601 
+// me: 啊！ #line:07401ee 
+// <<hide_dialog>>
+// <<wait 1>>
+// me: 啊…… #line:05c76b0 
+// 【我低头用手捧住脑袋】 #line:0c3c692 
+// 【顶部居中白字】我讨厌这种感觉。 #line:0a72930 
+// <<fade_in 1>>
+// <<hide_dialog>>
+// <<wait 1>>
+// 火山: 你看清那张脸了吗？ #line:02f64d8 
+// 【声音桥，转场到地铁】 #line:002d60b 
 <<set $gameStage = 999>>
 <<jump Center>>
 ===

Assets/Scripts/FixSystemNew/Open/ShockSystem.cs

@@ -31,6 +31,7 @@ public class ShockSystem : MonoBehaviour
     [SerializeField] private Vector3 leftShockDeviceStartPos; // 左电击装置起始位置
     [SerializeField] private Vector3 rightShockDeviceStartPos; // 右电击装置起始位置
     [SerializeField] private Vector3 operationPanelTargetPos; // 操作面板目标位置
+    [SerializeField] private Vector3 operationPanelStartPos; // 操作面板起始位置
     [SerializeField] private float moveDuration = 1f; // 移动动画时长
     [SerializeField] private float shockDelay = 0.5f; // 释放电击延迟
     [SerializeField] private float progressIncreaseSpeed = 1f; // 进度增加基础速度
@@ -97,6 +98,10 @@ public class ShockSystem : MonoBehaviour
         {
             rightDeviceOriginalPos = rightShockDevice.localPosition;
         }
+        if (operationPanel != null)
+        {
+            operationPanelStartPos = operationPanel.localPosition;
+        }
 
         // 初始化杆的位置
         if (lever != null)
@@ -216,7 +221,7 @@ public class ShockSystem : MonoBehaviour
     {
         var moveLeft = leftShockDevice.DOLocalMove(leftDeviceOriginalPos, moveDuration);
         var moveRight = rightShockDevice.DOLocalMove(rightDeviceOriginalPos, moveDuration);
-        var movePanel = operationPanel.DOLocalMove(operationPanelTargetPos, moveDuration);
+        var movePanel = operationPanel.DOLocalMove(operationPanelStartPos, moveDuration);
         
         yield return moveLeft.WaitForCompletion();
         yield return moveRight.WaitForCompletion();
@@ -400,29 +405,40 @@ public class ShockSystem : MonoBehaviour
     // 自动充能并释放
     public IEnumerator AutoChargeAndRelease(float duration = 1f)
     {
+        // 禁用玩家输入
+        bool originalIsDraggingLever = isDraggingLever;
+        isDraggingLever = false;
+
         // 设置杆的角度
         targetLeverAngle = maxLeverAngle;
+        currentLeverAngle = maxLeverAngle;
+        lever.localRotation = Quaternion.Euler(0, 0, -maxLeverAngle);
         
+        // 开始充能
+        isCharging = true;
+        StartCharging();
+
         // 计算需要的充能速度
         float targetProgress = progressBar.MaxValue;
         float chargeSpeed = targetProgress / duration;
+        float originalProgressIncreaseSpeed = progressIncreaseSpeed;
+        progressIncreaseSpeed = chargeSpeed;
         
         // 等待充能完成
         float startTime = Time.time;
         while (Time.time - startTime < duration)
         {
-            // 使用计算出的充能速度
-            currentProgress += chargeSpeed * Time.deltaTime;
-            progressBar.CurrentValue = Mathf.FloorToInt(currentProgress);
+            UpdateCharging();
             yield return null;
         }
 
-        // 确保进度达到最大值
-        currentProgress = progressBar.MaxValue;
-        progressBar.CurrentValue = Mathf.FloorToInt(currentProgress);
+        // 恢复原始设置
+        progressIncreaseSpeed = originalProgressIncreaseSpeed;
+        isCharging = false;
+        isDraggingLever = originalIsDraggingLever;
 
         // 触发 Yarn 节点来决定使用哪种效果
-        DialogController.Instance.StartDialogNode(shockEffectNode);
+        // DialogController.Instance.StartDialogNode(shockEffectNode);
 
         // 重置杆的角度
         targetLeverAngle = 0f;