From a98d230e0511939ad23dc34901ddc279ca0a73a4 Mon Sep 17 00:00:00 2001
From: Ovid <sim1996@live.cn>
Date: Mon, 27 Jul 2026 01:46:26 +0800
Subject: [PATCH] sfxUpdate

---
 Assets/FMOD Banks/Desktop/Ambience.bank       |  4 +--
 Assets/FMOD Banks/Desktop/Environment.bank    |  4 +--
 Assets/FMOD Banks/Desktop/Music.bank          |  4 +--
 Assets/FMOD Banks/Desktop/VO.bank             |  4 +--
 Assets/Render/Renderer2Dtest.asset            | 27 +++++---------
 .../Yarn/FP/FP_Day2_night/FP_Day2_night.yarn  | 10 +++---
 .../Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn  |  2 +-
 .../FP_Day2_sleep/FP_Day2_sleep_new.yarn      | 14 +++++---
 .../Yarn/Refactor/FP_Day2_sleep/Function.yarn | 35 ++++++++++++-------
 9 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/Assets/FMOD Banks/Desktop/Ambience.bank b/Assets/FMOD Banks/Desktop/Ambience.bank
index b8b5af437..3ad9fe8ec 100644
--- a/Assets/FMOD Banks/Desktop/Ambience.bank	
+++ b/Assets/FMOD Banks/Desktop/Ambience.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5df65a3ca4809738e6d5bbe9b902e684029c5ffaaa162440a54801960a82b31
-size 26990656
+oid sha256:e9b2737a1d0f01f4678627300493b4d4d05aa52304c6b360236c1cfeb1abfcfd
+size 26990880
diff --git a/Assets/FMOD Banks/Desktop/Environment.bank b/Assets/FMOD Banks/Desktop/Environment.bank
index 54e8604aa..21b43dba9 100644
--- a/Assets/FMOD Banks/Desktop/Environment.bank	
+++ b/Assets/FMOD Banks/Desktop/Environment.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec7d538cae62cb27ac09d5c55184acf6099a27f921342149fc4c1d350820a3d4
-size 14712128
+oid sha256:d36b9c19e93cf7d22c494741f02d7b865379e046979ef32e405f963b95a4b82e
+size 14712352
diff --git a/Assets/FMOD Banks/Desktop/Music.bank b/Assets/FMOD Banks/Desktop/Music.bank
index fee62049c..02e812cd7 100644
--- a/Assets/FMOD Banks/Desktop/Music.bank	
+++ b/Assets/FMOD Banks/Desktop/Music.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2fb4d3ff34ab4fac15685340a9d8180badb726162d8dc1ccd9cb726956ac2a3
-size 89713344
+oid sha256:511a0194baa7e7b3b06dd7682cc6a5b4935fb430a9de93f58c897cde8924498a
+size 89720960
diff --git a/Assets/FMOD Banks/Desktop/VO.bank b/Assets/FMOD Banks/Desktop/VO.bank
index 4dce058e4..be809f89d 100644
--- a/Assets/FMOD Banks/Desktop/VO.bank	
+++ b/Assets/FMOD Banks/Desktop/VO.bank	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4191cdd5e50ccf0f358d32f19cbb8e9caf7d48c6bbd7517230ebf4cae197265c
-size 591936
+oid sha256:3f08ce4d76544e1067ec9f555a638dad67c5f2284a5bd7bd15d397641dc5c3e6
+size 592128
diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset
index 429af6a23..62fbbf45b 100644
--- a/Assets/Render/Renderer2Dtest.asset
+++ b/Assets/Render/Renderer2Dtest.asset
@@ -893,24 +893,15 @@ MonoBehaviour:
     m_PostInfinity: 2
     m_RotationOrder: 4
   _filter:
-  - 0.003236246
-  - 0.0077324267
-  - 0.019586023
-  - 0.03634456
-  - 0.055555556
-  - 0.074766554
-  - 0.091525085
-  - 0.10337868
-  - 0.10787487
-  - 0.10787487
-  - 0.10337868
-  - 0.091525085
-  - 0.074766554
-  - 0.055555556
-  - 0.03634456
-  - 0.019586023
-  - 0.0077324267
-  - 0.003236246
+  - 0.007228916
+  - 0.043749984
+  - 0.12409639
+  - 0.20444278
+  - 0.24096388
+  - 0.20444278
+  - 0.12409639
+  - 0.043749984
+  - 0.007228916
 --- !u!114 &-631177313846276655
 MonoBehaviour:
   m_ObjectHideFlags: 3
diff --git a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
index f4a4d383d..169876e14 100644
--- a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
+++ b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
@@ -74,7 +74,7 @@ me: …… #line:06df2f5
 // 她疲惫地四处张望着。这里显然已经和她印象中的世界不太一样了。
 // 或许是因为季节的变化，或许是因为别的什么。
 peipei: 和我想象的…不太一样。 #line:06144e9 
-me: 因为天要黑了吧。 #line:0b4ef34 
+me: 因为天要黑了吧。<br>要是在更高些的地方，景色应该会不错。 #line:0b4ef34 
 <<hide_dialog>>
 <<wait 1>>
 me: 真的很抱歉。 #line:030c331 
@@ -85,7 +85,9 @@ peipei: 不。医生…这不是你的错。<br>我想这是注定的… #line:0
 pp: 我生来就是个残次品。 #line:099f942 
 // 你抽了一口烟。 #line:099f942 
 
-me: 要是这里再高一些就好了。可以看 #line:08565f1 
+<<wait 1>>
+
+me: 太阳要下去了。
 
 <<hide_dialog>>
 <<wait 1>>
@@ -110,12 +112,12 @@ me: 你打算几点回来？ #line:0e84854
 me: … #line:0ef5bd7 
 <<hide_dialog>>
 <<wait 1>>
-me: 如果你想继续看夕阳，应该要找个更高的地方。 #line:08565f1 
+me: 去吧。去找个高些的地方。 #line:08565f1 
 她依然沉默着，嘴角露出了一丝笑容，[[comma-pause]]<br>然后咧开嘴笑了。 #line:0529bb5 
 眼泪从她的眼角划过，流进了她的嘴里。 #line:0b50578 
 <<hide_dialog>>
 <<wait 1>>
-她抿了一下嘴。 #line:018c3cf 
+//她抿了一下嘴。 #line:018c3cf 
 <<change_actor_state_async "回头_Flow" 天桥佩佩>>
 peipei: 一会…一会见。 #line:01ff340 
 <<wait 1>>
diff --git a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
index e49ed767e..98be44742 100644
--- a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
+++ b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn
@@ -1,4 +1,4 @@
-title: Start
+title: Start
 color: blue
 cluster: Day2_Entry
 tags: demo start
diff --git a/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn b/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn
index ce9bf291e..978e87377 100644
--- a/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn
+++ b/Assets/Yarn/Refactor/FP_Day2_sleep/FP_Day2_sleep_new.yarn
@@ -214,7 +214,6 @@ mecd: 还是落回来了啊。 #line:0a5c874
 title: 广场
 tags: hub
 ---
-<<set_global_param dream1scene 0>>
 <<detour 展示广场_Func>>
 <<detour 广场_入场>>
 <<if $leaving==true>>
@@ -622,7 +621,6 @@ title: 风筝抉择
 tags: linear
 ---
 <<kite_accent wrench>>
-<<set_global_param d2sAccend 1>>
 轱辘发出咚的一声，停止了转动。你被拽得向前走了两步，几乎要被带离地面。  #line:0629fc9 
 所有的线都被放出去了。<br>你知道只有一个办法让它飞得更高了。 #line:002fd88 
 <<show_sprite_motion "D2S轱辘没线" "reel_tension" 0.25>>
@@ -649,9 +647,13 @@ tags: linear
 ---
 <<detour 上升_入场_Func>>
 
-zls?: …所以…那个时候…
-zls?: 得知她去世的时候。你是什么感觉？
-mem: 我不记得了。
+zls?: …
+zls?: …那么，当时…
+zls?: …得知她去世的时候。你有什么感觉？
+
+<<wait 1>>
+
+mem: 不记得。
 zls: 如果你真的想忘掉，现在就必须记起来。否则β-阻滞剂就无法生效。
 
 <<wait 1>>
@@ -1156,5 +1158,7 @@ tags: linear
 英理: …
 <<wait 2>>
 <<fade_in 0>>
+<<set_global_param d2sStage 7>>
+<<stop_music event:/Music/mus_dream2>>
 <<NextYarn>>
 ===
diff --git a/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn b/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn
index 77058fbdf..f4fa036e3 100644
--- a/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn
+++ b/Assets/Yarn/Refactor/FP_Day2_sleep/Function.yarn
@@ -21,9 +21,8 @@ tags: init
 title: InitMusic
 tags: function
 ---
-<<set_global_param dream1Stage 1>>
-<<set_global_param dream1scene 5>>
 <<set_global_param day 2>>
+<<set_global_param Vol_general 0>>
 ===
 
 title: 风筝1风向_Set
@@ -268,14 +267,14 @@ tags: function
 title: 上升_入场_Func
 tags: function
 ---
+<<set_global_param d2sAccend 1>>
 <<wait 2>>
-<<set_global_param dream1Stage 2.3>>
-<<bloom_exposure_in "BloomEffect" 2.2 0.6>>
+<<bloom_exposure_in "BloomEffect" 2.2 6>>
 <<show_large_sprite_animation "D2S天花板风扇" 5 0.2 0>>
 <<set_large_sprite_blur 0>>
-<<bloom_exposure_out "BloomEffect" 1.6 0.5>>
-<<set_global_param dream1scene 4>>
-<<wait 4>>
+<<wait 2>>
+<<bloom_exposure_out "BloomEffect" 1.6 6>>
+<<wait 2>>
 ===
 
 title: 上升_模糊_Func
@@ -293,7 +292,8 @@ tags: function
 title: 上升_高空开始_Func
 tags: function
 ---
-<<set_global_param dream1Stage 2.1>>
+<<set $gameStage = 4>>
+<<set_global_param d2sStage 4>>
 <<bloom_exposure_in "BloomEffect" 1.8 0.6>>
 <<wait 0.8>>
 <<wait 1>>
@@ -324,15 +324,12 @@ tags: function
 title: 上升_醒来_Set
 tags: function
 ---
-<<set_global_param dream1Stage 0.5>>
 <<bloom_exposure_in "BloomEffect" 2.2 0.6>>
-<<set $gameStage = 4>>
 <<wait 2>>
 <<tween_large_sprite_blur_async 0 0 0.5>>
 <<show_large_sprite "D2S枯树-Large" 0>>
 <<bloom_exposure_out "BloomEffect" 2.2 0.6>>
 <<set_global_param dream1scene 5>>
-<<set_global_param dream1Stage 1>>
 ===
 
 title: 上升_解开_Func
@@ -364,11 +361,13 @@ tags: function
 ---
 <<if $doorCheck == false>>
     <<hide_dream_door>>
+    <<set_global_param d2sDoorDistance 1>>
     <<show_large_sprite "D2S门">>
     <<set_global_param dream1Stage 1.6>>
 <<else>>
     <<set_global_param dream1Stage 2>>
     <<show_door_listen_view false 0>>
+    <<set_global_param d2sDoorDistance 0>>
     <<set_door_closeup 1 1>>
     <<set_volume_weight "BloomEffect" 0.4>>
     <<set_volume_brightness "BloomEffect" 0>>
@@ -387,6 +386,7 @@ tags: function
 <<set $doorCheck = true>>
 <<set_global_param dream1Stage 2>>
 <<show_door_listen_view false 0>>
+<<set_global_param d2sDoorDistance 0>>
 <<set_door_closeup 1 1>>
 <<set_volume_weight "BloomEffect" 0.4>>
 <<set_volume_brightness "BloomEffect" 0>>
@@ -396,6 +396,7 @@ tags: function
 title: 展示门把手_Func
 tags: function
 ---
+<<set_global_param d2sDoorDistance 0>>
 <<show_large_sprite "门把手特写" 0>>
 ===
 
@@ -403,6 +404,7 @@ title: 推门_凑近_Func
 tags: function
 ---
 <<show_door_listen_view false 0>>
+<<set_global_param d2sDoorDistance 0>>
 <<tween_door_closeup_async 1.2 1 10>>
 ===
 
@@ -432,6 +434,7 @@ tags: function
 <<wait 2>>
 <<tween_door_closeup_async 1 1 0>>
 <<show_door_listen_view true 0>>
+<<set_global_param d2sDoorDistance 0>>
 <<tween_door_closeup_async 1 1 1>>
 <<tween_volume_weight_async "BloomEffect" 0.05 4>>
 <<tween_volume_brightness_async "BloomEffect" 0 2>>
@@ -470,6 +473,7 @@ tags: function
 <<tween_door_closeup_async 1.5 1 20>>
 <<set_door_closeup 1.1 1>>
 <<show_door_listen_view true 1>>
+<<set_global_param d2sDoorDistance 0>>
 <<set_volume_weight "BloomEffect" 0.02>>
 <<set_volume_brightness "BloomEffect" 0>>
 ===
@@ -479,6 +483,7 @@ tags: function
 ---
 <<fade_in 0>>
 <<wait 0.1>>
+<<set_global_param d2sCode 1>>
 <<tween_door_closeup_async 1.6 1 20>>
 <<tween_volume_weight_async "BloomEffect" 1 2.4>>
 <<tween_volume_brightness_async "BloomEffect" 1 2.4>>
@@ -487,8 +492,8 @@ tags: function
 <<set_global_param dream1Stage 3>>
 <<set_door_closeup 1.1 0>>
 <<show_door_listen_view false 0>>
+<<set_global_param d2sDoorDistance 0>>
 <<show_door_code_sea_fullscreen>>
-<<play_sfx event:/FollowInput/defib/defib_charging>>
 <<tween_volume_weight_async "BloomEffect" 0 2>>
 <<tween_volume_brightness_async "BloomEffect" 0 2>>
 <<wait 2>>
@@ -514,6 +519,8 @@ title: 靠近黑暗_Set
 tags: function
 ---
 <<set $gameStage=5>>
+<<set_global_param d2sStage 5>>
+<<set_global_param d2sEnd 1>>
 <<hide_dialog>>
 <<set_volume_weight "BloomEffect" 0>>
 <<set_volume_brightness "BloomEffect" 0>>
@@ -523,7 +530,9 @@ tags: function
 title: 苏醒_入场_Func
 tags: function
 ---
-<<set_global_param dream1Stage 0>>
+<<set $gameStage = 6>>
+<<set_global_param d2sStage 6>>
+<<set_global_param Vol_general 1>>
 <<tween_volume_weight "BloomEffect" 0.3 2>>
 <<stop_sfx event:/FollowInput/defib/defib_charging>>
 <<play_sfx event:/FollowInput/defib/defib_shock>>