diff --git a/Assets/FMOD Banks/Desktop/Environment.bank b/Assets/FMOD Banks/Desktop/Environment.bank index 96ea556cd..5f012fd85 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:ef2223178e27a043a60d527619186772ced8fcae42a7eb642625531072386906 -size 15838464 +oid sha256:dad22fcc2ebfe7dd6655773dcf555b2a0d3570b492df6c8c19590a0d1a4ad0a6 +size 260 diff --git a/Assets/FMOD Banks/Desktop/Music.bank b/Assets/FMOD Banks/Desktop/Music.bank index 7b1a1156b..1fa2f8fce 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:b265b7baef61ba4fe6c8e46af4d92dba744e27b2d7cb4c232430020de1ff42ea -size 96180064 +oid sha256:e67ec3fad84af4cf3d6f5fe03c98864086fef5e03a44dd4e18feb89b6763cf66 +size 246 diff --git a/Assets/Scripts/MiniGame/Tarot/TarotDeck.cs b/Assets/Scripts/MiniGame/Tarot/TarotDeck.cs index dd5a98da9..f865b32eb 100644 --- a/Assets/Scripts/MiniGame/Tarot/TarotDeck.cs +++ b/Assets/Scripts/MiniGame/Tarot/TarotDeck.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using AibisDream.Kit; using DG.Tweening; using UnityEngine; @@ -376,6 +377,8 @@ namespace AibisDream.MiniGame.Tarot _hoveredCard = card; KillHoverTween(card); + AudioManager.Instance?.PlaySfx("event:/Scriptal/cardPick"); + if (!_fanPositions.TryGetValue(card, out var basePos)) return; Vector3 pushDir = GetFanRadialOutDirection(basePos); diff --git a/Assets/Scripts/MiniGame/Tarot/TarotManager.cs b/Assets/Scripts/MiniGame/Tarot/TarotManager.cs index 92bd073af..a00331450 100644 --- a/Assets/Scripts/MiniGame/Tarot/TarotManager.cs +++ b/Assets/Scripts/MiniGame/Tarot/TarotManager.cs @@ -2,6 +2,7 @@ using System.Collections; using AibisDream; using AibisDream.FixSystem; using AibisDream.Framework; +using AibisDream.Kit; using DG.Tweening; using UnityEngine; @@ -179,6 +180,7 @@ namespace AibisDream.MiniGame.Tarot _isCardSelected = true; _selectedIndex = card.Index; YarnVariableStorage.Instance?.SetValue("$tarotSelectedIndex", (float)card.Index); + AudioManager.Instance?.PlaySfx("event:/Scriptal/cardDraw"); } private void OnDestroy() diff --git a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn index f2276a8af..40d4fdad3 100644 --- a/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Yarn/FP/FP_Day1_begin/Day1_begin.yarn @@ -167,30 +167,30 @@ position: 0,400 <> hs:喂!你怎么了? #line:0d021a5 <> -<> +<> me: …我没事。 #line:0126199 hs: 那你怎么老是… #line:0752aae <> -<> +<> <> hs: 啊…我怎么这么傻。 #line:0c8b9ba <> -<> +<> hs: 你又做那个噩梦了。 #line:0aa633c <> -<> +<> <> me: 嗯。 #line:0a42ea5 //hs: 又是那个关于抢救的? //me: 是…也不是。
这次的有一些…新东西。 //hs: 新东西? <> -<> +<> <> hs: 没事儿,都过去了。 #line:015a2ab <> -<> +<> hs: 年审结束之后我带你去个好地方吧。 #line:040432c <> me: 你不是还差很多分么? #line:0834523 @@ -198,7 +198,7 @@ hs: 嗨,怕啥!我可是我们全组前三…呃 <> <> <> -<> +<> hs: 实在不行就…年审前吧。 #line:0b1df41 <> @@ -211,7 +211,7 @@ me: 至少…现在先别想年审后的事情,
专心做准备吧。 #line <> <> <> -<> +<> <> hs: 好吧…祝你…祝我们都年审顺利。低温运行! #line:0124a14 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..1abd4b4cf 100644 --- a/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn +++ b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn @@ -380,7 +380,7 @@ me: 竟然都这么久了啊… #line:098ccd3 <> hs: 尴尬的话就别讲了,[[comma-pause]]
生活给我们开了个大玩笑,不是吗? me: 是啊。至少,兜兜转转,我们又回来了。 -hs: 嘿嘿。不过比起在42区,我还是喜欢看你赢的样子。 +hs: 嘿嘿。不过比起和我一起留在这破地方,
我还是更喜欢看你赢的样子。 <> <> me: 对不起…火山。 #line:03686b2a @@ -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..c9d52be46 100644 --- a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn +++ b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn @@ -16,7 +16,7 @@ position: 428,-88 --- me:准备好了么? #line:0eb665d peipei: 我们来吧,医生。 #line:04a3898 -Task: 尝试停止想象 #line:08f5fd5 +Task: 进入UF尝试停止想象 #line:08f5fd5 <> === @@ -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..1e67da856 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的体验流程已结束。#line:0cd82d0 // <> ===