From f22b7087fb4c8030754acf8950aa4cd8401cc9d3 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Tue, 18 Mar 2025 14:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 保存存档时立绘信息未保存 2. AMB切到Main时失效 3. 跳过对话功能不停止语音 --- Assets/Scripts/Dialog System/LineView.cs | 1 + Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs | 10 +++++----- .../Scripts/FixSystemNew/Screen System/ScreenSystem.cs | 2 +- Assets/Scripts/UI/DialogUI/CenterOption.cs | 2 +- Assets/Scripts/UI/DialogUI/CenterText.cs | 4 ++-- Assets/Scripts/UI/DialogUI/DialogBoxBase.cs | 4 ++-- Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs | 4 ++-- Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs | 4 ++-- Assets/Scripts/UI/DialogUI/IDialogView.cs | 2 +- Assets/Scripts/UI/DialogUI/TextBubble.cs | 2 -- Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs | 4 ++-- 11 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Assets/Scripts/Dialog System/LineView.cs b/Assets/Scripts/Dialog System/LineView.cs index 3964def07..6d85745f2 100644 --- a/Assets/Scripts/Dialog System/LineView.cs +++ b/Assets/Scripts/Dialog System/LineView.cs @@ -15,6 +15,7 @@ namespace AibisDream if (DialogController.Instance.quickRunMode) { + DialogCanvasManager.Instance.TrySkipLine(true); DialogCanvasManager.Instance.NextStep(); } } diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index 5a0390ae7..c590d2f9b 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -57,9 +57,9 @@ namespace AibisDream // } // SpriteGroup加载 - characterGroup.config.key = data.groupName; + characterGroup.config.key = data.configKey; yield return characterGroup.InstantiateByConfigAsync(); - characterGroup.SwitchState(data.state); + characterGroup.SwitchState(data.curState); yield return characterGroup.Fade(data.shown); } @@ -99,10 +99,10 @@ namespace AibisDream public bool hasDevice; public bool isShow; - public string groupName; - public string state; + public string configKey; + public string curState; public bool shown; - + public event Action LoadEvent; public void Load() diff --git a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs index 39daf0890..7e1ab162d 100644 --- a/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs +++ b/Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs @@ -186,7 +186,7 @@ namespace AibisDream.FixSystem // HideDialog应该由其他函数控制 } - public bool TrySkipLine() + public bool TrySkipLine(bool isAutoSkip) { // 这里不能跳过对话 return true; diff --git a/Assets/Scripts/UI/DialogUI/CenterOption.cs b/Assets/Scripts/UI/DialogUI/CenterOption.cs index 62010fb3b..85269f1bf 100644 --- a/Assets/Scripts/UI/DialogUI/CenterOption.cs +++ b/Assets/Scripts/UI/DialogUI/CenterOption.cs @@ -52,7 +52,7 @@ namespace AibisDream gameObject.SetActive(false); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { // 无法跳过 return true; diff --git a/Assets/Scripts/UI/DialogUI/CenterText.cs b/Assets/Scripts/UI/DialogUI/CenterText.cs index 3e98a6cd4..676949922 100644 --- a/Assets/Scripts/UI/DialogUI/CenterText.cs +++ b/Assets/Scripts/UI/DialogUI/CenterText.cs @@ -76,9 +76,9 @@ namespace AibisDream gameObject.SetActive(false); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; } diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index d114752e9..6a5a4ba4f 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -165,9 +165,9 @@ namespace AibisDream /// false说明对话已经显示完成了，可以跳过 /// /// - public virtual bool TrySkipLine() + public virtual bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; } diff --git a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs index 326c80dda..f84b8e213 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBubbleViewer.cs @@ -68,9 +68,9 @@ namespace AibisDream _dialogViews?.ForEach(item => item.HideDialog()); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip = false) { - return _currentView == null || _currentView.TrySkipLine(); + return _currentView == null || _currentView.TrySkipLine(isForceSkip); } public void NextStep() diff --git a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs index a59bbc517..7fa8fcb19 100644 --- a/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs +++ b/Assets/Scripts/UI/DialogUI/DialogCanvasManager.cs @@ -169,9 +169,9 @@ namespace AibisDream _curView.HideDialog(); } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip = false) { - return _lastShowView != null && _lastShowView.TrySkipLine(); + return _lastShowView != null && _lastShowView.TrySkipLine(isForceSkip); } public void NextStep() diff --git a/Assets/Scripts/UI/DialogUI/IDialogView.cs b/Assets/Scripts/UI/DialogUI/IDialogView.cs index dc6d81e6f..e7ad425fe 100644 --- a/Assets/Scripts/UI/DialogUI/IDialogView.cs +++ b/Assets/Scripts/UI/DialogUI/IDialogView.cs @@ -16,7 +16,7 @@ namespace AibisDream public void HideDialog(); - public bool TrySkipLine(); + public bool TrySkipLine(bool isForceSkip = false); public void NextStep(); } diff --git a/Assets/Scripts/UI/DialogUI/TextBubble.cs b/Assets/Scripts/UI/DialogUI/TextBubble.cs index 59664134e..8c72f85fe 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubble.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubble.cs @@ -18,8 +18,6 @@ namespace AibisDream.Framework #endregion - private bool _skipLineDelay; - public bool IsShowingText => _typewriter.isShowingText; private void Awake() diff --git a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs index 1809642cf..05e720049 100644 --- a/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs +++ b/Assets/Scripts/UI/DialogUI/TextBubbleGroup.cs @@ -103,9 +103,9 @@ namespace AibisDream } } - public bool TrySkipLine() + public bool TrySkipLine(bool isForceSkip) { - if (_skipLineDelay) + if (_skipLineDelay && !isForceSkip) { return true; }