From adeea6cfdab06c1f5e8ebdea4e8a3206b05964c4 Mon Sep 17 00:00:00 2001
From: Ovid <sim1996@live.cn>
Date: Fri, 21 Feb 2025 00:31:05 +0800
Subject: [PATCH] music fix

---
 Assets/Resources/Audio/mem_shitou_0.ogg.meta  | 23 +++++++++++++++++++
 .../Resources/Audio/music_shitou_1.ogg.meta   | 23 +++++++++++++++++++
 Assets/Resources/Audio/music_shitou_2.ogg     |  4 ++--
 .../Resources/Audio/music_shitou_2.ogg.meta   | 23 +++++++++++++++++++
 .../Yarn/FP_Shitou1/Stage2_提速.yarn          |  4 ++--
 .../Yarn/FP_Shitou2_2/Stage4_刻录.yarn        | 17 +++++++-------
 .../Yarn/FP_Shitou2_head/Stage2_头部检查.yarn |  4 ++--
 7 files changed, 84 insertions(+), 14 deletions(-)
 create mode 100644 Assets/Resources/Audio/mem_shitou_0.ogg.meta
 create mode 100644 Assets/Resources/Audio/music_shitou_1.ogg.meta
 create mode 100644 Assets/Resources/Audio/music_shitou_2.ogg.meta

diff --git a/Assets/Resources/Audio/mem_shitou_0.ogg.meta b/Assets/Resources/Audio/mem_shitou_0.ogg.meta
new file mode 100644
index 000000000..6c04abaed
--- /dev/null
+++ b/Assets/Resources/Audio/mem_shitou_0.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: aa2d10380faeca340b0b5e1b4eb0f783
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Audio/music_shitou_1.ogg.meta b/Assets/Resources/Audio/music_shitou_1.ogg.meta
new file mode 100644
index 000000000..06b04514f
--- /dev/null
+++ b/Assets/Resources/Audio/music_shitou_1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e4ab4b242547b884d814e1defedddbc5
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Audio/music_shitou_2.ogg b/Assets/Resources/Audio/music_shitou_2.ogg
index 58405c1db..ec7d959f1 100644
--- a/Assets/Resources/Audio/music_shitou_2.ogg
+++ b/Assets/Resources/Audio/music_shitou_2.ogg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c5d7741d3a4f8da991b1e9d5624635c4a95194b1bdaee54122f7838c4b2beef
-size 2236849
+oid sha256:626087a3d6276d3ee7fe3d627437f53ae1ef0c625ac155d100d3a78256e5d096
+size 2280228
diff --git a/Assets/Resources/Audio/music_shitou_2.ogg.meta b/Assets/Resources/Audio/music_shitou_2.ogg.meta
new file mode 100644
index 000000000..f664653cb
--- /dev/null
+++ b/Assets/Resources/Audio/music_shitou_2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: b5490fcbf22e42b42bf7f6c78977541a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
index 45941f311..d0a374f0d 100644
--- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
@@ -60,8 +60,8 @@ me: 总之，找到他的<b><size=100%><color=\#D9BC26>动力模块</color></b>
 title: 主维修界面
 position: 385,81
 ---
-//<<MessageBoxSetNull>>
-//<<MessageBoxSetText 等待信号输入……>>
+<<MessageBoxSetNull>>
+<<MessageBoxSetText 等待信号输入……>>
 
 //<<if $lungProblemKnown==true && $engineProblemKnown==true && $fuelProblemKnown==true && $bloodProblemKnown==true>>
     // 全部插入后进入下一阶段
diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
index e2477a36c..49f88064b 100644
--- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn
@@ -199,9 +199,11 @@ shitou: 我好紧张，感觉~像演唱会一样！
 <<hide_dialog>>
 <<fade_out 1>>
 <<wait 1>>
-
+<<move_needle>>
 me: 好了…接下来，只需要唱出来，声音就会被这个齿轮记录下来。
-
+<<hide_dialog>>
+<<step_on_gas 0.5 3>>
+<<wait 2>>
 <<complete_task TaskManager "检查引擎状态">>
 <<add_task TaskManager "刻录下石头的歌声">>
 shitou: ……
@@ -217,8 +219,7 @@ shitou: ……
 title: 刻录调速
 position: 729,302
 ---
-
-齿轮开始转动#auto_next
+<<hide_dialog>>
 <<wait 1>>
 me: ……
 <<hide_dialog>>
@@ -231,11 +232,11 @@ shitou: 给我一些伴奏。
 me: 什么？哪来的伴奏……
 <<hide_dialog>>
 <<wait 1>>
-<<play_loop_audio music_shitou_1>>
-你用脚打起拍子。
-<<play_loop_audio disc>>
-<<hide_dialog>>
+你打起了拍子。
 <<wait 1>>
+<<play_loop_audio music_shitou_1>>
+<<hide_dialog>>
+<<wait 2>>
 shitou: 听众朋友们，晚上好！<br>.这里是石头！
 me: (还整这出……)
 shitou: 还有医生——
diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
index 1a656b140..cb5a6462b 100644
--- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
@@ -358,7 +358,7 @@ position: 48,-156
 title: 天空
 position: 80,48
 ---
-<<play_loop_audio mem_shitou_0>>
+//<<play_loop_audio mem_shitou_0>>
 石头和一个受损的机体坐在一个小棚屋的门口，阳光穿过门口垂挂的许多盆小植物，洒在老旧开裂的木制家具上，破旧但整洁舒适。屋外望出去，是一座高高的垃圾山的阴影。
 <<wait 2>>
 【风铃声】
@@ -423,7 +423,7 @@ me: 音频数据已经被完全覆盖了……
 <<complete_task TaskManager "检查记忆的受损情况">>
 <<hide_dialog>>
 <<wait 1>>
-<<pause_loop_audio>>
+//<<pause_loop_audio>>
 //音频相关记忆受损了，可用的分区变得很小，新的音频记忆会很快覆盖掉旧的音频记忆
 <<set $memoryPlayed = true>>
 <<jump toStage3>>