From c2e2aeddbef75e3191b507d7e965190288b1bbaf Mon Sep 17 00:00:00 2001
From: Ovid <sim1996@live.cn>
Date: Tue, 11 Mar 2025 18:06:38 +0800
Subject: [PATCH] mem music +

---
 .../Yarn/FP_Peipei1/Stage4_记忆检查.yarn      |  11 ++++++++++-
 .../Yarn/FP_Shitou2_head/Stage2_头部检查.yarn |   2 ++
 Assets/Scenes/Persistence.unity               |   2 +-
 .../FMOD/Desktop/Master.strings.bank          | Bin 3322 -> 3362 bytes
 .../StreamingAssets/FMOD/Desktop/Music.bank   | Bin 20083648 -> 20084512 bytes
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn
index 76981951b..5792c1035 100644
--- a/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn
+++ b/Assets/Resources/Yarn/FP_Peipei1/Stage4_记忆检查.yarn
@@ -91,7 +91,7 @@ group:记忆
 colorID: 3
 position: -1203,-2508
 ---
-me: 把滑条拖到正确的位置，校正频率，才能播放记忆。
+校正记忆频率：把滑条拖到正确的位置。
 //<<ShowNotification ClueManager 提示 拖动滑条校准记忆>>
 ===
 
@@ -104,6 +104,7 @@ colorID: 8
 group:记忆
 position: -1208,-2662
 ---
+<<play_music event:/Music/mem_liuying1-1>>
 <<wait 3>>
 peipei_child: 医生！看，大象！
 docter: 哪里有？…啊，那朵云呀。确实很像大象喔。
@@ -124,6 +125,8 @@ peipei_child: 医生快看，它现在更像一个飞机啦！
 <<if visited("天空")==false>>
         <<set $memoryCount+=1>>
 <<endif>>
+<<stop_music event:/Music/mem_liuying1-1>>
+<<play_sfx event:/Scriptal/mem_out>>
 <<jump End_memoryPaly>>
 ===
 
@@ -136,6 +139,7 @@ colorID: 8
 group:记忆
 position: -1209,-2820
 ---
+<<play_music event:/Music/mem_liuying1-2>>
 <<wait 3>>
 unknown: 好美啊。
 peipei: 嘘，别说话。
@@ -152,6 +156,8 @@ unknown: 要是能一直坐在这儿就好了。
 <<if visited("海报")==false>>
     <<set $memoryCount+=1>>
 <<endif>>
+<<stop_music event:/Music/mem_liuying1-2>>
+<<play_sfx event:/Scriptal/mem_out>>
 <<jump End_memoryPaly>>
 ===
 
@@ -164,6 +170,7 @@ colorID: 8
 group:记忆
 position: -1208,-2974
 ---
+<<play_music event:/Music/mem_peipei_1>>
 <<wait 3>>
 peipei: 要是工作也能画画…要是能永远画画就好了。
 同学: 哈哈，可能等我们进入公司就不这么觉得了。听说进公司之后做什么都不会再快乐了。
@@ -182,5 +189,7 @@ peipei: 如果公司这么讨厌的话，我就不在那里干就好了啊！
 <<if visited("植物")==false>>
     <<set $memoryCount+=1>>
 <<endif>>
+<<stop_music event:/Music/mem_peipei_1>>
+<<play_sfx event:/Scriptal/mem_out>>
 <<jump End_memoryPaly>>
 ===
diff --git a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
index 7b63abd4e..5bfa3eba8 100644
--- a/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou2_head/Stage2_头部检查.yarn
@@ -346,6 +346,7 @@ position: 48,-156
 title: 朋友
 position: 80,48
 ---
+<<play_music event:/Music/mem_shitou_0>>
 <<set_music_param event:/Music/mem_shitou_0 shitou_mem_stage 0>>
 石头和一个受损的机体坐在一个小棚屋的门口，阳光穿过门口垂挂的许多盆小植物，洒在老旧开裂的木制家具上，破旧但整洁舒适。屋外望出去，是一座高高的垃圾山的阴影。
 <<set_music_param event:/Music/mem_shitou_0 shitou_mem_stage 0.1>>
@@ -445,6 +446,7 @@ shitou: 春̨̼̑�̥̅́ͅ묈̪̏갚鴉싧썮�계퓳�뚳 ̥́펽̞͌̒瓦
 <<wait 1>>
 shitou: 春天…我会...
 <<stop_music event:/Music/mem_shitou_0>>
+<<play_sfx event:/Scriptal/mem_out>>
 <<play_sfx event:/Music/music_shitou_0>>
 <<MemoryFinished MemoryManager>>
 me: 音频数据已经被完全覆盖了……
diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity
index 20a7bc19b..2aef8680a 100644
--- a/Assets/Scenes/Persistence.unity
+++ b/Assets/Scenes/Persistence.unity
@@ -9565,7 +9565,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 088974ca6c9487041b695af86b6c93a1, type: 2}
   runMode: 1
   firstTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
-  testTalkSo: {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2}
+  testTalkSo: {fileID: 11400000, guid: 7bf300be492f2634580f0eaabcca2b2e, type: 2}
   saveFileName: StoneDay2_1
 --- !u!4 &719228339
 Transform:
diff --git a/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank b/Assets/StreamingAssets/FMOD/Desktop/Master.strings.bank
index da74f7976f9c7e67eced27802c52f629e32d35bb..2617e41504073ded1a414f5c772530d8e2c8e9a8 100644
GIT binary patch
delta 1069
zcmZvbOH5r=6o$WjD0mTCs9F(_@{o#9<yl&bP+slT3k7Y9s3=fMT1sM*8=#mbCO2_l
z7#Lza8e`(b$IQf}l1`dBkfbFYG@Tenc0i)U8HvV$H4#4^oi$k}-&y<Yv)0;c{ri6L
z*CmywQ^{n>Zb+UOu1F3HRV08#pO1V_rp^rgceV2KklT_6!IhiwPoXrMi1cW@8fsEa
zuGPV%e2BW>@}v5_FkdF0hlxF|zvQ~_Y;0_hC7YqXVaGov`(dUdJ{6Vjem^if0EyoN
z^CR(<s5~^sUqt1#X5ce-ZPxZB%<Y%o!=%yq5z^0?Wf`X1;?<}wlhYr#+~v}5u+}L5
zg+GqCH4%8%<WXZFU7~-~bWh8kz?Bxc1`ChLzu{VuEDSUqf~?}exc_H8u5T*#1)9rc
zQJ|$jmb%_%+$z`G$q?20!IMRsCw|clWd<<NRtG9&wSN7MpDPdQ*UCZJDu)BpJ^nvp
zp~vNvg}$;A&rUPpzNG%7iJ#R!Z{nxqbl_rN#!BbyK#dFOK%*UC#*L1FIXAu_KlJ<S
z2KY2^?m7Lh0+ajXcYzC~@_OLX6LQ%Cj>?t5+#AOIHSk`x{(}29<?xAxM)G!GB1iu0
z;0CIE`NfvD%XI@CkbfGeTK?ln4$J(Ase`giB`H2?B4*E8P;JEIBl`6b7b|3D>CUci
zLg8P7WAiINe4M&*cm3YNa_a|6>71@899z1YXbOq+`DtyuX=yb#CuBPD0G@3al!rNo
zz|sxw$Q+6awII7X2F}7_iox1#lUg_huYx^Q*e`>n*sj;C2fP7R<aj2)qrC}^^lcdN
z?m)`vK_}fP&Qb7CC!qrrNT1RJ6{qT*LKnQ_%t6hZ1{LKEcnkKbI5-!7o3|J@<QHU=
z>b9xPZBvAriqag5rfRhAEmJYti7o5hx`t|I+nnt~Z2+`059~?Uwk&6Dqr~{8#kcYg
F{SU~?o^1dC

delta 993
zcmXw&Nla655XQfGwOF9IL=d3@1wl5glto36O{rEvWf29DMG}E1Nh6ElKzh|^xV#uO
z@q~91(vt^`%SB^689jL+F+?xMcrnof{wSEt>(`k#|M|~+^S#B~KRJb6(MaT%Uy8K#
z1|uCkL7$`ro_jp)(e9qlON9?C)t@dIkvHxu3wVE<Vgv57l}4+GRY;Q*aGIr=H2mYz
z>~3(MG_r;GQR0>OtE;Q>fYnkcwBa8E&qy~L+)gKuF=d)+mwaDLvwiNIQ($5DkyB7!
zPS$<0)_Qv^P3M76rBSNuxfI*OEw81CdUx5W2zgsgGfjlPN-GDzztXpZr20%Z!uVBO
z6Tq)G%~iWCp6qyy<jFA&k>%N83K#J<%T%2YW}9lZf&t?7oGv2HNKQF%+IQB*I>h@t
z&Qm8jW)LjK-@oCff|dAXU>jHqc9<qwINxcC$KcEvq^*-11>sYdNNmIJ=i(Cl0WRJJ
z4x7fKG&;$cd-2CiRg9?#@{WMl$%A{%^S+1kcTHDI@gJH-v%p2uwOnw?G?@uLv$$f1
z`SZdw-Amz*rdwY8IEiaZzeA@E_|i0z0={QGh2RJHg9)urs2Kc?ELeqpGDschaWsZF
zl<6pz0p>fJ8ls_~qtVUyC62}m!1=_dO;0RwJEhsNy2LwQ*b<&Juf-e1mYCpz#HP8S
zTcSToa0==X8@xc>6^VYhGDo68$UuMRrLz(Qq0xxMh36y|f|7$08yJ@8{-VUz`lUWr
zBb{O~QX|dsGa%77`fQMp0HmWps0&FD-6UORt>{SVl$iW9OOv)s+mOEdHhsbE^ZTPn
zZru?6x*;<R(O?jdp>V7@X)O|VB5AD>hAP&~UGis_u|Yl&tn0t+l-A7y<w+Zq2HhY2
F+JE;cjt~F<

diff --git a/Assets/StreamingAssets/FMOD/Desktop/Music.bank b/Assets/StreamingAssets/FMOD/Desktop/Music.bank
index 17fdf120c0995683342a24fd4921327fd99af615..b50e3f329974f5b555970616097fac3540be20ac 100644
GIT binary patch
delta 1918
zcmZY92~bpZ9Ki9nfWRW+TR8-j8v#)eOr+8Z5SCp7H1~yNh?r%CM&3tR;FSl+;p@IM
zGfSjMUSJ2sk!5HFm1$*^cA2RdY1(D={mnFK>&|?>JNtJ2$NSIjYdzXw-rUn+j+|t-
zS_2o4G+DFq!>zemxTm5hm8d|D-Jz{-sELdT58{)@zgG&q6~&(6aO8~3)7-cw-|0mz
zemj><F{{mOy}lD#X4=Y+<eXpKRaC2&xt16Q%rjjqJr+gDzGzsek?XzEMc2I5$b@Na
zGrBj~tkpfO$20AX#{!kvTKxX<y;^o->8|YjigTKtrWP27eNOmTx>!B;qG^JR?vUku
zRObO3!%B?8sL;Nau>%w(D_^^?TVq3FsYRcYs!lweSGZ_TL$$rR^HlfR_LLRe$Nyfv
zV-B{D+O{vdCBAFu$-?-9&iCfLrrwnrt2*C{UXv8!TkNYST29`DO>km6GyIKFX(e8I
zbebCDyp&0CRRR^Qb864o4)+P$-P_jH9X*t%S7yW+TgI2fS>lrwWpcXxzX?Yh5%c{m
zdec%>y<||?ia^zQetr7F0KIHp(xux?+A`L#u38YIH`S_o!S>(;M_#6lGiO7dN^66n
z6zxtnIkZeoj>@5B<jA`%-C>L4w=m1F?5Hxi#oAKJjIDKLE`H8OyyVQ><$82|v|BN=
ztjw=plV5Lw3tZubK5&NzJYj|x`obIi;Di29VZi|S!Vmrkz(52d2*DVH!3aSp!Vr!K
zL?Q~&7=jqYA`U|lk6{>&1SDbvl8}s%xD2C^g3(CD<+uV@VhqOODqM|gkcM<*U>q`$
z1uL>)gB{~>Epm{HJWRkuT!%?;K*ROO$7I}q8!-hpp#W1+h-oOobli*?xCOUjCT_#+
zxC6zQh1s|hCAbT7Fc<SM9}BP$i?A3=uoQRW9xTJXxDTZ$!*Z;^O02?a+>bR_i*;C!
za#UagDp7@M)L<iYJb(xB5FW-OcodJ}aXf)1@f0>;GoHp4JcF%x7TfR~p2v37Vh8H*
z0$xNtUcyc^z`)CBL=$%56}*bq@H(3D2Hr#qTG57fyoKF(8}DEb-bDxYVjtea`}hEz
z=)#Bi2p?lVKEVMT#HaWSpW_g|KsUa`S2&C#_!{5fTYQJ_aTGt`7=FZYoWM!+;1qsB
zFMh^poWU<Ri*xuDzu|ZMfj@B`f8p<P{`*ysxJX<jZjwF{cZr9@Q(~5QN%~5>CH*8m
zlKv7^Vv!7x_)7dF{*nO6KuMq^ND?d=BpECTk%UUZB;k?>Nu(r75-k}biIK!g;v_>Q
Y@seSZ;gSSNqGW_5$<)I0!c@HbAMkrk9smFU

delta 1604
zcmY+^c~}%>9Ki9}brBX;4tG#cSr<e^6vV5%QbAZ*T~OHxk5bnouZ%qKD)Yz#4}x^P
z%Co$WSY_0#EGf}KO)1Yb&CH|2yTdZmzP}zHANu3-ooC*8=bd-{m|1hP++2FC+#Hkb
zbU5~mZDw$!=hz*Ynms^KltL81<#cOy--4Jpdjx0xk4G*BDT*`I?RIs_(oBrWHLu60
z?wH)itZRWojOwT`Md@5=MwHB`h*b4UmXSvNNXUa=HQS;nnU$vew@5{_s^7Ma@YB!4
z+Je+MtdgFi{r@=~Td2A%d03d$VpSB)l~wtwcY0d5J}@;mP*2LtjkkJ|6{Tm2^T~{s
zY@$a|xL!8yVW?h^KQqo-yfwkwrq~kg@hOU@tf|4RrD<$cacikAIcB7|GgMx2xIVPF
z$YApKwNBLU`=%Mag(b13JZ|vb$x~;PmgJX~7+^#dnBa%1@J9g52t*JpsD@yKAQWM!
z4l7iIqXuds0+FbN+Ngsl*iaXCL?Z_E5R3YVLj%O4ArjCCjgg2XG(j?&q8XZ_1zO@M
zJdIXpjW%eDc6bKu(E%Nif>d-u8q(oFXJo*MF6asuGLeOD=#C!9h8r55MGktR7kZ-)
zp2PF#i+<=24+dZ$24OH>zz__@Fbu~Cyoix_3AuO~qc9p{Fcx_jhw+$ziI{{}@G2(b
zHB7-&Ov7}%jv1JVS(uG{%)wmD!+aFr4HTjXZ(;!!!iz;%j3ro#Wq1p3V>wn}C01cI
z*5Dnyi?vvX_1J)o*o4j4g00ww_fQNUwqplMpkpU?VK?5#9(;fg@e%goV|;>rD8;Av
z4Es@r12~A!@de6p2#0Y5U*af^p#opwYaGW3oWv=d#u<Ervp9!uaUK`&9WLT~T*42y
zj4QZ`YxogA;b;7U>$riNxP{xegS+?@zu|ZMfqVE9f8jp<#smC=hj=ufZ@&l<qoj(&
zB=M6}mH0~nBxXsVBuHYBRFectLL{M*FiCZZRiaA5B{d{9B@vQHNi9ijNgYX)#3rdL
su}h*QF_L<cSV?_JoTPyyUeZvKAZa9NEJ>6kNt#HK4g2_C7(8YF0yF|SQvd(}