问题修复
1. 保存存档时立绘信息未保存 2. AMB切到Main时失效 3. 跳过对话功能不停止语音
This commit is contained in:
@@ -15,6 +15,7 @@ namespace AibisDream
|
||||
|
||||
if (DialogController.Instance.quickRunMode)
|
||||
{
|
||||
DialogCanvasManager.Instance.TrySkipLine(true);
|
||||
DialogCanvasManager.Instance.NextStep();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<ClinicData> LoadEvent;
|
||||
|
||||
public void Load()
|
||||
|
||||
@@ -186,7 +186,7 @@ namespace AibisDream.FixSystem
|
||||
// HideDialog应该由其他函数控制
|
||||
}
|
||||
|
||||
public bool TrySkipLine()
|
||||
public bool TrySkipLine(bool isAutoSkip)
|
||||
{
|
||||
// 这里不能跳过对话
|
||||
return true;
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace AibisDream
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public bool TrySkipLine()
|
||||
public bool TrySkipLine(bool isForceSkip)
|
||||
{
|
||||
// 无法跳过
|
||||
return true;
|
||||
|
||||
@@ -76,9 +76,9 @@ namespace AibisDream
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public bool TrySkipLine()
|
||||
public bool TrySkipLine(bool isForceSkip)
|
||||
{
|
||||
if (_skipLineDelay)
|
||||
if (_skipLineDelay && !isForceSkip)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -165,9 +165,9 @@ namespace AibisDream
|
||||
/// false说明对话已经显示完成了,可以跳过
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public virtual bool TrySkipLine()
|
||||
public virtual bool TrySkipLine(bool isForceSkip)
|
||||
{
|
||||
if (_skipLineDelay)
|
||||
if (_skipLineDelay && !isForceSkip)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace AibisDream
|
||||
|
||||
public void HideDialog();
|
||||
|
||||
public bool TrySkipLine();
|
||||
public bool TrySkipLine(bool isForceSkip = false);
|
||||
|
||||
public void NextStep();
|
||||
}
|
||||
|
||||
@@ -18,8 +18,6 @@ namespace AibisDream.Framework
|
||||
|
||||
#endregion
|
||||
|
||||
private bool _skipLineDelay;
|
||||
|
||||
public bool IsShowingText => _typewriter.isShowingText;
|
||||
|
||||
private void Awake()
|
||||
|
||||
@@ -103,9 +103,9 @@ namespace AibisDream
|
||||
}
|
||||
}
|
||||
|
||||
public bool TrySkipLine()
|
||||
public bool TrySkipLine(bool isForceSkip)
|
||||
{
|
||||
if (_skipLineDelay)
|
||||
if (_skipLineDelay && !isForceSkip)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user