diff --git a/Assets/Scripts/FixSystemNew/States/HuoShanFixCues.cs b/Assets/Scripts/FixSystemNew/States/HuoShanFixCues.cs index 3396821fe..2fb891792 100644 --- a/Assets/Scripts/FixSystemNew/States/HuoShanFixCues.cs +++ b/Assets/Scripts/FixSystemNew/States/HuoShanFixCues.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using AibisDream.Framework; using AibisDream.UI; @@ -33,6 +33,8 @@ namespace AibisDream.FixSystem yield return CameraKit.Instance.SwitchCamera(CameraEnum.ExpressionDeep); yield return UIManager.Instance.GetPanel().FadeOutAsync(0.5f); yield return TimelineCenter.Instance.PlayTimelineAsync("火山表达模块/火山表达深入"); + + BubbleSlotKit.Instance.LoadBubbles(BubbleSlotEnum.Expression); } public IEnumerator Exit(FixTransition transition) diff --git a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs index c0cb6ad29..a46080c3a 100644 --- a/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs +++ b/Assets/Scripts/SceneManagement/TimelineKit/DirectorHandler.cs @@ -485,11 +485,11 @@ namespace AibisDream switch (phase) { case TimelinePlaybackPhase.AtStart: - if (entry.hasEverAppliedPlayback) - { - Reset(); - } - + // Reset反而容易出现异常 + // if (entry.hasEverAppliedPlayback) + // { + // Reset(); + // } break; case TimelinePlaybackPhase.AtEnd: if (!string.IsNullOrEmpty(entry.loadedAddressableKey))