Skip to content

feat: add nobreak argument for wait #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MakinoharaShoko merged 4 commits into from
May 1, 2026
Merged

feat: add nobreak argument for wait #857

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbd0232
feat: add nobreak argument for wait
xiaoxustudio Feb 5, 2026
9920561
feat: change stop logic
xiaoxustudio Feb 5, 2026
fed28bc
refactor: simplify nobreak logic
xiaoxustudio Apr 28, 2026
04a718a
Merge branch 'dev' into pr/857
MakinoharaShoko May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/webgal/src/Core/gameScripts/wait.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { ISentence } from '@/Core/controller/scene/sceneInterface';
import { IPerform } from '@/Core/Modules/perform/performInterface';
import { getBooleanArgByKey } from '@/Core/util/getSentenceArg';

/**
* 等待 n 毫秒
Expand All @@ -8,14 +9,18 @@ import { IPerform } from '@/Core/Modules/perform/performInterface';
export const wait = (sentence: ISentence): IPerform => {
const duration = Number(sentence.content);
const performName = `wait${Math.random().toString()}`;
const nobreak = getBooleanArgByKey(sentence, 'nobreak') ?? false;

return {
performName,
duration: duration,
goNextWhenOver: true,
isHoldOn: false,
stopFunction: () => {},
blockingNext: () => false,
blockingAuto: () => true,
stopFunction: () => {
// 无需状态清理
},
blockingNext: () => nobreak,
blockingAuto: () => nobreak,
stopTimeout: undefined, // 暂时不用，后面会交给自动清除
};
};
Loading