From 1017ff4e90aad0e54d98b7e4c56525d2f3be9b33 Mon Sep 17 00:00:00 2001
From: bottlefish <781230111@qq.com>
Date: Sat, 25 Jul 2026 15:57:24 +0800
Subject: [PATCH] =?UTF-8?q?yarn(huoshan):=20=E6=9B=B4=E6=96=B0Stage6?=
 =?UTF-8?q?=E4=B8=8EDay1=E5=BC=80=E5=9C=BA=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn |  1 +
 Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn       | 59 ++++++++++++--------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn
index 2df6cfd0c..bd4b96f70 100644
--- a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn
+++ b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn
@@ -220,6 +220,7 @@ me: 低温运行。 #line:011538c
 <<fade_out_actor "地铁火山" 1.5>>
 
 <<fade_in>>
+<<wait 3>>
 
 <<change_amb Clinic>>
 
diff --git a/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn
index ea5cc3a3b..701f7c873 100644
--- a/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn
+++ b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn
@@ -156,20 +156,23 @@ tags: content no_save
 colorID: 3
 position: 900,2400
 ---
-hs: <waitfor=0.4><speed=0.45>[[size d=0.12]]<shake a=0.9><wiggle a=0.18 s=0.02>我...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.45 3>>
+// 失败感全部写在聚合曲线里：strain 让字"锁上又崩开"地反复挣扎，
+// collapse 是"够到了又被拽回去"。全段无红色、无脸部报错——红留给 LOG3。
+hs: <waitfor=0.4><speed=0.45>[[size d=0.12]]<shake a=0.9><wiggle a=0.1 s=0.035>我...</wiggle></shake>[[/size]]<waitfor=1.2>
+<<expression_truth_strain 0.45 3 1>>
 <<wait 2>>
-// <<expression_actor_flash "没问题" 1 10.5 1.1 1.45 0.008 0.06 0.50 0>>
-hs: <waitfor=0.4><speed=0.5>[[size d=0.12]]<shake a=1><wiggle a=0.2 s=0.02>我感觉自己...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.65 2>>
+hs: <waitfor=0.4><speed=0.5>[[size d=0.12]]<shake a=1><wiggle a=0.12 s=0.035>我感觉自己...</wiggle></shake>[[/size]]<waitfor=1.2>
+<<expression_truth_strain 0.65 2.6 2>>
 <<wait 2>>
-// <<expression_actor_flash "冇问题" 1 11.2 1.1 1.85 0.008 0.06 0.72 0>>
-hs: <waitfor=0.4><speed=0.5>[[size d=0.1]]<shake a=1.1><wiggle a=0.22 s=0.018>我就是个...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.83 5>>
+hs: <waitfor=0.4><speed=0.5>[[size d=0.1]]<shake a=1.1><wiggle a=0.15 s=0.03>我就是个...</wiggle></shake>[[/size]]<waitfor=1.2>
+<<expression_truth_strain 0.86 3.2 3>>
 <<wait 2>>
-<<expression_focus_interference "in" 3 "帽问题冇问题" "#FF304D" -1 10>>
+<<expression_truth_collapse 0.45>>
+<<wait 0.6>>
+// 屏幕故障是档位不是脉冲：广告腔顶上来 → 压成低档憋着 → 路斯喊完才泄掉
+<<expression_screen_glitch 0.48 1.2>>
 hs: <shake a=1><wiggle a=0.26 s=0.015><rainb>我？<waitfor=0.4>*帽*问题？<waitfor=0.4>冇问题！<waitfor=0.4>*实实*牌帽子，让你成为嫡中嫡！</rainb></wiggle></shake><waitfor=1.2>
-// <<expression_face_error 0.55 0.9>>
+<<expression_screen_glitch 0.16 1.5>>
 // <<expression_actor_flash "帽问题" 1 12.0 1.1 2.20 0.010 0.08 1.00 0>>
 // <<expression_actor_word_hit "没" 0.45 18 1.70>>
 // <<expression_actor_word_hit "问" 0.45 18 1.70>>
@@ -191,17 +194,17 @@ hs: <shake a=1><wiggle a=0.26 s=0.015><rainb>我？<waitfor=0.4>*帽*问题？<w
 // <<expression_actor_flash "冇问题" 0.15 11.2 1.1 1.85 0.008 0.06 0.72 0>>
 // <<wait 0.3>>
 // <<expression_actor_flash_loop_start>>
-// <<wait 1>>
+<<wait 1>>
 me: 火山！说出来！
 hs: 我……
-<<expression_focus_interference "adjust" 4 "" "" 0.28 26 0.1>>
-<<wait 1>>
-// <<wait 3>>
-// <<expression_actor_flash_loop_stop>>
-// <<expression_actor_flash_in "没问题" 1 10.5 1.1 1.45 0.008 0.06 0.5 0>>
+// <<expression_focus_interference "adjust" 4 "" "" 0.28 26 0.1>>
+<<expression_truth_gather 0.8 3>>
+<<expression_screen_glitch 0.8 3>>
+<<wait 4.5>>
 <<start_timeline "火山Glitch/火山头痛2">>
 <<expression_truth_gather 1 0.5>>
-<<expression_focus_interference "out" 0.5>>
+<<expression_screen_glitch 0 0.5>>
+// 本段不再有 focus_interference "in"，配套的 "out" 一并移除
 <<expression_memory_cut>>
 <<expression_truth_snap 0 0.42>>
 <<wait_timeline "火山Glitch/火山头痛2">>
@@ -280,26 +283,31 @@ tags: content no_save
 colorID: 3
 position: 900,2850
 ---
+// 与 LOG1 同构：失败感走 strain/collapse，不用红色字符争夺。
+// "不要忘了发照片"的内容由紧随其后的彩虹台词交代，不需要再用红字覆盖一遍。
 hs: <waitfor=0.4><speed=0.45>[[size d=0.12]]<shake a=0.9><wiggle a=0.18 s=0.02>路斯...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.45 3>>
+<<expression_truth_strain 0.45 3 1>>
 <<wait 2>>
 hs: <waitfor=0.4><speed=0.5>[[size d=0.12]]<shake a=1><wiggle a=0.2 s=0.02>不要...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.65 2>>
+<<expression_truth_strain 0.65 2.6 2>>
 <<wait 2>>
 hs: <waitfor=0.4><speed=0.5>[[size d=0.1]]<shake a=1.1><wiggle a=0.22 s=0.018>不要离开...</wiggle></shake>[[/size]]<waitfor=1.2>
-<<expression_truth_gather 0.8 5>>
+<<expression_truth_strain 0.86 3.2 3>>
 <<wait 2>>
-<<expression_focus_interference "in" 3 "不要忘了发照片" "#FF304D" -1 10>>
+<<expression_truth_collapse 0.45>>
+<<wait 0.6>>
 me: 嗯——？
+<<expression_screen_glitch 0.58 1>>
 hs: <shake a=1><wiggle a=0.26 s=0.015><rainb>嘿——路斯——不要忘了给我发照片——</rainb></wiggle></shake><waitfor=1.2>
+<<expression_screen_glitch 0.18 1.6>>
 hs: …… #line:0d26cad
 me: 火山！说出来！
+<<expression_screen_glitch 0 1.2>>
 hs: 我……
-<<expression_focus_interference "adjust" 4 "" "" 0.28 26 0.1>>
+<<expression_truth_gather 0.8 3>>
 <<wait 1>>
 <<start_timeline "火山Glitch/火山头痛2">>
 <<expression_truth_gather 1 0.5>>
-<<expression_focus_interference "out" 0.5>>
 <<expression_memory_cut>>
 <<expression_truth_snap 0 0.42>>
 <<wait_timeline "火山Glitch/火山头痛2">>
@@ -394,6 +402,7 @@ hs: 我它妈就是个烂泥扶不上墙的废物！！
 hs: 可……为什么，#autonext
 hs: 偏偏我这样一个废物，#autonext
 hs: 就这么想赢一次……
+<<expression_screen_glitch 0.92 2>>
 <<expression_truth_attack "为什么为什么" 0.4 1.00>>
 <<expression_truth_attack "为什么为什么" 0.3 1.00>>
 <<expression_truth_attack "为什么为什么" 0.2 1.00>>
@@ -403,6 +412,7 @@ hs: 就这么想赢一次……
 <<expression_memory_cut>>
 <<expression_glitch_pulse 0.82 0.03 0.18>>
 <<wait 0.18>>
+<<expression_screen_glitch 0 0.9>>
 <<expression_truth_settle "我想赢一次" 0.85>>
 <<wait_timeline "火山Glitch/火山头痛2">>
 <<wait 1.2>>
@@ -446,12 +456,15 @@ hs: <waitfor=0.4><speed=0.5>[[size d=0.12]]<shake a=1><wiggle a=0.2 s=0.02>不
 hs: <waitfor=0.4><speed=0.5>[[size d=0.1]]<shake a=1.1><wiggle a=0.22 s=0.018>不要那样...</wiggle></shake>[[/size]]<waitfor=1.2>
 <<expression_truth_gather 0.8 5>>
 <<wait 2>>
+<<expression_screen_glitch 0.70 1.2>>
 <<expression_focus_interference "in" 3 "严肃反省没问题" "#FF304D" -1 10>>
 hs: <shake a=1.1><wiggle a=0.22 s=0.018><rainb>反省中！复盘中！下一次肯定一定"中”~</rainb><waitfor=1.2></wiggle></shake>
 <<wait 0.80>>
+<<expression_screen_glitch 0.22 1.4>>
 me: 等等。刚才那句，不是这个 log 里的话。
 hs: ……
 me: 火山，别替它们回答。你当时真正想说什么？
+<<expression_screen_glitch 0 1.2>>
 <<expression_focus_interference "adjust" 1 "" "" 0.28 26 0.1>>
 <<expression_truth_gather 1 0.5>>
 <<expression_focus_interference "out" 0.5>>