tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/demo脚本调整' into 7.11春优化

Browse Source
This commit is contained in:
bottlefish
2026-07-15 19:55:59 +08:00
parent e9e21920f1 52573095f7
commit 8c37a0bd09
22 changed files with 2740 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Dialog System/LineAdvanceInput.cs
+20 -8
View File
@@ -49,7 +49,7 @@ namespace AibisDream
private void LateUpdate()
{
_handler.Handle(_curSyncToken, IsInputAvailable);
_handler.Handle(_curSyncToken, IsInputAvailable, IsPointerOverUI);
}
public void SwitchAdvanceHandler(AdvanceModeEnum advanceMode)
@@ -77,12 +77,18 @@ namespace AibisDream
&& _curSyncToken.state != LineSyncState.Advanced;
}
private bool IsPointerOverUI()
{
return UIManager.Instance != null
&& UIManager.Instance.IsPointerOverUI(Input.mousePosition);
}
#endregion
}
public interface ILineAdvanceHandler
{
void Handle(LineSyncToken token, Func<bool> isAvailable);
void Handle(LineSyncToken token, Func<bool> isAvailable, Func<bool> isPointerOverUI);
static ILineAdvanceHandler Create(bool autoMode)
{
@@ -92,9 +98,12 @@ namespace AibisDream
public class DefaultAdvanceHandler : ILineAdvanceHandler
{
public void Handle(LineSyncToken token, Func<bool> isAvailable)
public void Handle(LineSyncToken token, Func<bool> isAvailable, Func<bool> isPointerOverUI)
{
if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
var pointerAdvance = Input.GetMouseButtonDown(0) && !isPointerOverUI();
var keyboardAdvance = Input.GetKeyDown(KeyCode.Space);
if (pointerAdvance || keyboardAdvance)
{
if (isAvailable())
{
@@ -122,7 +131,7 @@ namespace AibisDream
public class AutoAdvanceHandler : ILineAdvanceHandler
{
public void Handle(LineSyncToken token, Func<bool> isAvailable)
public void Handle(LineSyncToken token, Func<bool> isAvailable, Func<bool> isPointerOverUI)
{
if (!isAvailable())
{
@@ -136,7 +145,10 @@ namespace AibisDream
return;
}
if (Input.GetMouseButtonDown(0) || Input.GetKeyDown(KeyCode.Space))
var pointerAdvance = Input.GetMouseButtonDown(0) && !isPointerOverUI();
var keyboardAdvance = Input.GetKeyDown(KeyCode.Space);
if (pointerAdvance || keyboardAdvance)
{
HandleInput(token);
}
@@ -161,7 +173,7 @@ namespace AibisDream
public class QuickAdvanceHandler : ILineAdvanceHandler
{
public void Handle(LineSyncToken token, Func<bool> isAvailable)
public void Handle(LineSyncToken token, Func<bool> isAvailable, Func<bool> isPointerOverUI)
{
if (!isAvailable())
{
@@ -180,4 +192,4 @@ namespace AibisDream
}
}
}
}
}