diff --git a/Assets/FMOD Banks/Desktop/Ambience.bank b/Assets/FMOD Banks/Desktop/Ambience.bank index dbba2dd6a..2e8bf7496 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:76baf75ff25927ae6eec70d04338d7ac1099615843ecaea0ab19d0237c92b0c4 -size 27006464 +oid sha256:044f1c40dffa7004a358936896af29239e1312f05d999f97dba718c70a34a3fe +size 42779392 diff --git a/Assets/FMOD Banks/Desktop/Environment.bank b/Assets/FMOD Banks/Desktop/Environment.bank index a97daffb1..109e0f23c 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:5adcf6300704081f1d80fd87e443d4fcefa28f5708988d40bc295b9561d4be04 -size 14745312 +oid sha256:3d855869e2daf3fffbf77f1c75d56f96379f00800b3a42d43c164ce981875e95 +size 15840384 diff --git a/Assets/FMOD Banks/Desktop/Master.bank b/Assets/FMOD Banks/Desktop/Master.bank index 3e4035f27..c2e6d39dc 100644 --- a/Assets/FMOD Banks/Desktop/Master.bank +++ b/Assets/FMOD Banks/Desktop/Master.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c5b727e6726e60cc97a7be10ccf979205fedf415478e42b4f4ca64c5aa6a017 -size 8820 +oid sha256:491356f96d6c46b004dcf99f03e3fd48dcdc901741fb4e5c66ff6517c38640fd +size 9338 diff --git a/Assets/FMOD Banks/Desktop/Master.strings.bank b/Assets/FMOD Banks/Desktop/Master.strings.bank index 8946d9aa4..62b6306da 100644 --- a/Assets/FMOD Banks/Desktop/Master.strings.bank +++ b/Assets/FMOD Banks/Desktop/Master.strings.bank @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61e549850e94e9eb21c3d56750fdfbcdb1bcce08a4b18bdb0113e5352770f17d -size 9650 +oid sha256:07529407106f348ba2a8f137ff98bda717e09481161e07c02ab849e77478b500 +size 9992 diff --git a/Assets/FMOD Banks/Desktop/Music.bank b/Assets/FMOD Banks/Desktop/Music.bank index c7d0ec5e0..fc460d865 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:e2f58818ea9c8bdd4f07f1385e5e84cf8a261de28130b789bf4280c73ed33fa1 -size 89720960 +oid sha256:a4fb131116334bdc37e30b562c8aec40131d0d039a0b40ceed86bc9e9fb717fa +size 96180064 diff --git a/Assets/FMOD Banks/Desktop/VO.bank b/Assets/FMOD Banks/Desktop/VO.bank index 3959bfca3..e5f045da3 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:c47290d00848713b88cac2810f02e5d9b2366e7c7cffb01e7e458d8fba8af3a7 +oid sha256:515a8648b1bd1517b4db8b9a15cbf9f9c2623f710ac9a1af45d53b3287843f3d size 592128 diff --git a/Assets/Yarn/FP/FP_Day1_night/FP_Day1_night.yarn b/Assets/Yarn/FP/FP_Day1_night/FP_Day1_night.yarn index 47c403be3..a0010d5dd 100644 --- a/Assets/Yarn/FP/FP_Day1_night/FP_Day1_night.yarn +++ b/Assets/Yarn/FP/FP_Day1_night/FP_Day1_night.yarn @@ -181,6 +181,7 @@ ql: 怎么样? #line:08a175f <> <> <> + <> <> //TODO: 调酒动画 <> @@ -311,7 +312,6 @@ ql: 我觉得也许你需要这个。 #line:053e24f // 【它拿出一套崭新的卡牌。】 #line:017a66d <> me: 这是什么? #line:0431bdb - ql: 你的原型里应该有关于它的数据。"塔罗牌"。 #line:090f954 ql: 虽然我也不是很懂…
但既然是原型的问题,
应该可以用原型的方法来解决。对吧? #line:0f8220f <> @@ -319,6 +319,7 @@ ql: 试试吧。抽一张。 #line:032a6f1 me: … #line:09f3fc1 <> ->翻面 #line:0047271 + <> <> // -> 抽牌 #line:00d082d // 【你看了看牌。】 #line:0b53792 @@ -327,6 +328,7 @@ me: 这画的是什么? #line:064fa6d ql: 倒吊人。你拿反了。 #line:09d2ede ->旋转 #line:0b58edf + <> <> // 【你把牌转过来。】 #line:057bfa8 <> diff --git a/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn index 6b0b19173..114e30583 100644 --- a/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn +++ b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn @@ -562,7 +562,7 @@ hs: 总是被你当狗一样训,#auto_next <> <> <> -hs: 路斯,我它妈真该死! +hs: 路斯,我它码真该死! <> hs: 我真没用! <> @@ -577,7 +577,7 @@ hs: 我没办法追上你,#auto_next <> hs: 没办法帮到英理,#auto_next <> -hs: 甚至连自己被霸凌了都没有勇气#auto_next +hs: 甚至连自己被羞辱了都没有勇气#auto_next <> hs: 说出来,#auto_next // —— 顿:最狠那句前面一定要有空 diff --git a/Assets/Yarn/FP/FP_Peipei1/Stage6_中间对话.yarn b/Assets/Yarn/FP/FP_Peipei1/Stage6_中间对话.yarn index d57c3cc43..c861d907e 100644 --- a/Assets/Yarn/FP/FP_Peipei1/Stage6_中间对话.yarn +++ b/Assets/Yarn/FP/FP_Peipei1/Stage6_中间对话.yarn @@ -97,7 +97,7 @@ peipei: 我想要继续画画。哪怕 <> me: 好,如果你同意…就请在手术单上签个字吧。 #line:08ba804 <> -<> +<> //<> //<> //<> @@ -106,12 +106,14 @@ me: 好,如果你同意…就请在手术单上签 //<> //<> //<> +<> +<> <> <> <> me: 我们到治疗室来吧。 #line:086658c <> -<> +<> <> === diff --git a/Assets/Yarn/FP/FP_Peipei1/Stage7_手术.yarn b/Assets/Yarn/FP/FP_Peipei1/Stage7_手术.yarn index 4133b10cc..1715bd77c 100644 --- a/Assets/Yarn/FP/FP_Peipei1/Stage7_手术.yarn +++ b/Assets/Yarn/FP/FP_Peipei1/Stage7_手术.yarn @@ -34,6 +34,7 @@ tags: content no_save group:手术相关 position: -273,-66 --- +<> <> // <> // <> diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn index 6951c6df0..14a9f4580 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage10_术前谈话2.yarn @@ -279,9 +279,11 @@ me: 好吧。毕竟…这是你自己的选择。 #line:058d556 <> <> <> - <> + <> +<> + <> <> -<> + <> //TODO: <> diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn index 6b7a6de04..d765dd918 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage12_结束对话.yarn @@ -5,6 +5,7 @@ position: 251,-1150 --- <> <> +<> <> <> <> diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn index 06ab13c08..40fc99f86 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage5_UF检查.yarn @@ -269,6 +269,8 @@ ULM自训练进程: [[ulm]]检测到进程接管请求!正在识别手动选 // <> // <> me: 已经足够进行病理分析了。 #line:090a836 + <> + <> <> <> <> diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn index 5dfea618e..74256096e 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn @@ -190,6 +190,7 @@ ULM自训练进程: [[ulm]]检测到进程接管请求!正在识别手动选 ////【植物变成油画风格】 <> peipei: 停止想象!停止想象!停止,停止,停止! #line:0cd8d2f + <> peipei: 停下!你做的所有事情都是错的……所有!它们有认真看过你一眼吗!有吗!! #line:017faf3 // <> ////【画面闪白,佩佩拍自己,数据乱流加重】 diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn index eb215833d..d13fe66f3 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage9_UF拆除.yarn @@ -16,6 +16,7 @@ position: 43,-97 <> <> me: 可得小心点…别把这东西碰坏了。 #line:097ba5e + <> === diff --git a/Assets/Yarn/FP/FP_Peipei2/Start.yarn b/Assets/Yarn/FP/FP_Peipei2/Start.yarn index bb51b7423..b5670bb4e 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Start.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Start.yarn @@ -125,6 +125,7 @@ colorID: 1 <> <> <> + <> <> <> <> @@ -134,6 +135,7 @@ colorID: 1 <> <> <> + <> <> <> === \ No newline at end of file diff --git a/Assets/Yarn/FP/FP_Prologue/Stage1_开灯.yarn b/Assets/Yarn/FP/FP_Prologue/Stage1_开灯.yarn index a61942fdd..aba1a90ec 100644 --- a/Assets/Yarn/FP/FP_Prologue/Stage1_开灯.yarn +++ b/Assets/Yarn/FP/FP_Prologue/Stage1_开灯.yarn @@ -21,7 +21,7 @@ position: 250,200 <> <> <> -我知道我不应该在这里,
但是在醒来之前,我还有很多时间。 #line:0e3b3ba +我知道我不应该在这里,
但是在醒来之前,我还有很多时间。 #line:0e3b3ba <> <> diff --git a/Assets/Yarn/Test/Test_GeneralEnd/GeneralEnd.yarn b/Assets/Yarn/Test/Test_GeneralEnd/GeneralEnd.yarn index 975cc5876..bdeafb5ba 100644 --- a/Assets/Yarn/Test/Test_GeneralEnd/GeneralEnd.yarn +++ b/Assets/Yarn/Test/Test_GeneralEnd/GeneralEnd.yarn @@ -5,12 +5,13 @@ position: 250,200 --- // <> <> +<> // <> // <> <> <> <> -感谢游玩 爱与机器人维修技术 ;
本次playtest的体验流程已结束。 #line:0cd82d0 +感谢游玩 爱与机器人维修技术 ;
本次playtest的体验流程已结束。#option_prompt #line:0cd82d0 // <> ===