diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn index cf2effd8b..17ccba2b0 100644 --- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn @@ -149,11 +149,11 @@ position: 0,400 //czq: 你说的是对的,而且带过就够了,现在已经写了,混在日常对话中间了 me: 啊…#auto_next #line:07efff9 +<> <> -<> +<> <> <> -<> <> hs:喂!你怎么了? #line:0d021a5 <> @@ -224,7 +224,7 @@ position: 0,560 <> <> <> -<> +<> <> yl: 看来我们的医生不知道现在是几点。 #line:06ddc95 <> diff --git a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn index 96716b3b4..5073f5a29 100644 --- a/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn +++ b/Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn @@ -219,7 +219,7 @@ me: 它不太稳定,你需要放松一些。 #line:0a70f88 <> <> <> -<> +<> <> <> @@ -231,8 +231,8 @@ peipei: 医生…这片树叶是什么颜色的? #line:0e34d95 me: 它已经黄了。 #line:0049b60 <> <> -<> -<> +<> +<> <> // <> //佩佩仔细端详它,捏着叶柄轻轻地旋转着。 #line:04efadd diff --git a/Assets/Resources/Yarn/FP_Day1_night/FP_Day1_night.yarn b/Assets/Resources/Yarn/FP_Day1_night/FP_Day1_night.yarn index 4a937996a..f1669a9f6 100644 --- a/Assets/Resources/Yarn/FP_Day1_night/FP_Day1_night.yarn +++ b/Assets/Resources/Yarn/FP_Day1_night/FP_Day1_night.yarn @@ -227,13 +227,13 @@ position: 250,200 <> -jb: 晚上好。想喝点什么呢? #line:07a41ab +[character name="jb" bubbleIdx=1 /]晚上好。想喝点什么呢? #line:07a41ab <> -jb: 如果不知道喝什么,可以试试我们的…#auto_next #line:0a3b5af +[character name="jb" bubbleIdx=1 /]如果不知道喝什么,可以试试我们的…#auto_next #line:0a3b5af me: Neat,双份。谢谢。 #line:0ed3bf5 -jb: 我们今天的调和润滑剂有折扣喔。如果… #line:05b8a4d +[character name="jb" bubbleIdx=1 /]我们今天的调和润滑剂有折扣喔。如果… #line:05b8a4d me: 我只要双份的Neat。 #line:0fde1a7 <> @@ -244,7 +244,7 @@ me: 谢谢。 #line:09a2a98 <> <> -jb: …好的。Neat双份。 #line:029d775 +[character name="jb" bubbleIdx=1 /]…好的。Neat双份。 #line:029d775 <> <> <> @@ -377,7 +377,7 @@ ql: 怎么样? #line:08a175f <> <> <> - <> + <> //TODO: 调酒动画 <> <> diff --git a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn index 3e4d2b34c..032a86d7a 100644 --- a/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn +++ b/Assets/Resources/Yarn/FP_Day1_sleep/FP_Day1_sleep.yarn @@ -550,11 +550,12 @@ me: …… #line:0ebcd24 <> <> <> +<> <> <> <> 闹钟声逐渐响起,又被按掉。 #line:0c79c2f -<> +<> // <> // 你睁开眼睛,眼神平和而冷淡。 #line:0829e5d <> diff --git a/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn index 406afe500..ca09d09c7 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn @@ -184,26 +184,26 @@ peipei: 一会…一会见。 #line:01ff340 你目视她离开,吸完最后一口烟,长舒一口气。 #line:0cac326 <> <> -<> +<> <> <> -<> -<> -<> +<> +<> +<> <> 占位台词 #line:095df55 <> // <> // <> -<> -<> +<> +<> <> <> // 一阵风吹过,树叶洋洋洒洒地落下。 #line:095df55 -<> +<> 你的头又疼了一下。 #line:086a27b <> -<> +<> <> <> <> diff --git a/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn b/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn index e0daf4dfa..ef61494ea 100644 --- a/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn +++ b/Assets/Resources/Yarn/FP_Day2_sleep/FP_Day2_sleep.yarn @@ -541,12 +541,13 @@ position: -2,398 // ???: 我会在海边等你,海边! #line:084121c <> - <> - <> - <> - <> - <> - <> + <> + // <> + // <> + // <> + // <> + // <> + // <> me: 姐姐! #line:09a9225 <> diff --git a/Assets/Scripts/MiniGame/HuoShan/Language/LanguageYarnCommand.cs b/Assets/Scripts/MiniGame/HuoShan/Language/LanguageYarnCommand.cs index 8a913f5ca..0b5ed66a9 100644 --- a/Assets/Scripts/MiniGame/HuoShan/Language/LanguageYarnCommand.cs +++ b/Assets/Scripts/MiniGame/HuoShan/Language/LanguageYarnCommand.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using System.Collections.Generic; using AibisDream.FixSystem; using AibisDream; @@ -165,19 +165,19 @@ namespace AibisDream.MiniGame.Language yield return ExpressionManager.StartCoroutine(ExpressionManager.TransitionGlitchAndWait(to, duration)); } - /// - /// Glitch 噪波过渡(指定起止值),等待完成后再继续下一步。 - /// - [YarnCommand("glitch_transition")] - public static IEnumerator GlitchTransition(float from, float to, float duration) - { - if (ExpressionManager == null) - { - UnityEngine.Debug.LogError("ExpressionManager 未找到!"); - yield break; - } - yield return ExpressionManager.StartCoroutine(ExpressionManager.TransitionGlitchAndWait(from, to, duration)); - } + // /// + // /// Glitch 噪波过渡(指定起止值),等待完成后再继续下一步。 + // /// + // [YarnCommand("glitch_transition")] + // public static IEnumerator GlitchTransition(float from, float to, float duration) + // { + // if (ExpressionManager == null) + // { + // UnityEngine.Debug.LogError("ExpressionManager 未找到!"); + // yield break; + // } + // yield return ExpressionManager.StartCoroutine(ExpressionManager.TransitionGlitchAndWait(from, to, duration)); + // } } }