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_Huoshan1/Stage6.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage6.yarn index 114e30583..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 diff --git a/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn b/Assets/Yarn/FP/FP_Peipei2/Stage8_停止想象.yarn index 74256096e..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 <> ===