diff --git a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn index 641c7cf8b..2c54d5d49 100644 --- a/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn +++ b/Assets/Resources/Yarn/FP_Day1_begin/Day1_begin.yarn @@ -267,7 +267,7 @@ position: 250,200 <> <> <> -<> +<> <> yl: 看来我们的医生不知道自己应该什么时间到岗。 #line:0f1db57 <> diff --git a/Assets/Scripts/SceneManagement/SceneCenter/OutsideCenter.cs b/Assets/Scripts/SceneManagement/SceneCenter/OutsideCenter.cs index 953cb06d5..289989196 100644 --- a/Assets/Scripts/SceneManagement/SceneCenter/OutsideCenter.cs +++ b/Assets/Scripts/SceneManagement/SceneCenter/OutsideCenter.cs @@ -1,38 +1,15 @@ using AibisDream.Kit; -using UnityEngine; -using UnityEngine.Playables; -using System.Collections; namespace AibisDream { public class OutsideCenter : Singleton { public BubbleSlotGroup bubbleSlotGroup; - public PlayableDirector director; - + public override void OnSingletonInit() { // 加载气泡 DialogUIManager.Instance.LoadBubbles(bubbleSlotGroup.CollectData()); } - - public void PlayTimeline(string timelinePath) - { - StartCoroutine(PlayTimelineCoroutine()); - } - - public void PlayTimelineAsync(string timelinePath) - { - director.Play(); - } - - public IEnumerator PlayTimelineCoroutine() - { - director.Play(); - while (director.state == PlayState.Playing) - { - yield return null; - } - } } } diff --git a/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs b/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs deleted file mode 100644 index 267f98835..000000000 --- a/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using Yarn.Unity; - -namespace AibisDream -{ - public static class OutsideYarnCommand - { - [YarnCommand("outside_play_timeline")] - public static IEnumerator PlayTimeline() - { - yield return OutsideCenter.Instance.PlayTimelineCoroutine(); - } - - [YarnCommand("outside_play_timeline_nowait")] - public static void PlayTimelineAsync(string timelinePath) - { - OutsideCenter.Instance.PlayTimelineAsync(timelinePath); - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs.meta b/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs.meta deleted file mode 100644 index e1f78915d..000000000 --- a/Assets/Scripts/SceneManagement/SceneCenter/OutsideYarnCommand.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3c92bc3944d75174b8894851d86f50c5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: