diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn index 52cfc3d52..fddbdb301 100644 --- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn @@ -155,7 +155,7 @@ position: 250,200 <> <> <> -<> +<> <> <> <> diff --git a/Assets/Scripts/SubWay/OutsideCenter.cs b/Assets/Scripts/SubWay/OutsideCenter.cs index da0c19d3c..babcbe6db 100644 --- a/Assets/Scripts/SubWay/OutsideCenter.cs +++ b/Assets/Scripts/SubWay/OutsideCenter.cs @@ -19,38 +19,20 @@ namespace AibisDream public void PlayTimeline(string timelinePath) { - StartCoroutine(PlayTimelineCoroutine(timelinePath)); + StartCoroutine(PlayTimelineCoroutine()); } public void PlayTimelineAsync(string timelinePath) { - var timeline = Resources.Load(timelinePath); - if (timeline != null) - { - director.playableAsset = timeline; - director.Play(); - } - else - { - Debug.LogError($"Timeline not found at path: {timelinePath}"); - } + director.Play(); } - public IEnumerator PlayTimelineCoroutine(string timelinePath) + public IEnumerator PlayTimelineCoroutine() { - var timeline = Resources.Load(timelinePath); - if (timeline != null) + director.Play(); + while (director.state == PlayState.Playing) { - director.playableAsset = timeline; - director.Play(); - while (director.state == PlayState.Playing) - { - yield return null; - } - } - else - { - Debug.LogError($"Timeline not found at path: {timelinePath}"); + yield return null; } } } diff --git a/Assets/Scripts/SubWay/OutsideYarnCommand.cs b/Assets/Scripts/SubWay/OutsideYarnCommand.cs index 544e8674b..267f98835 100644 --- a/Assets/Scripts/SubWay/OutsideYarnCommand.cs +++ b/Assets/Scripts/SubWay/OutsideYarnCommand.cs @@ -6,9 +6,9 @@ namespace AibisDream public static class OutsideYarnCommand { [YarnCommand("outside_play_timeline")] - public static IEnumerator PlayTimeline(string timelinePath) + public static IEnumerator PlayTimeline() { - yield return OutsideCenter.Instance.PlayTimelineCoroutine(timelinePath); + yield return OutsideCenter.Instance.PlayTimelineCoroutine(); } [YarnCommand("outside_play_timeline_nowait")]