Skip to content

feat: support conditional logic for string in -when command #826

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 2 commits into from
Jan 7, 2026
Merged

feat: support conditional logic for string in -when command #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
903e316
feat: support conditional logic for string in -when command
ChangeSuger Jan 6, 2026
e591cd9
add a trim to var name
MakinoharaShoko Jan 7, 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
7 changes: 4 additions & 3 deletions packages/webgal/src/Core/controller/gamePlay/scriptExecutor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ export const whenChecker = (whenValue: string | undefined): boolean => {
// 先把变量解析出来
const valExpArr = whenValue.split(/([+\-*\/()><!]|>=|<=|==|&&|\|\||!=)/g);
const valExp = valExpArr
.map((e) => {
.map((_e) => {
const e = _e.trim();
if (e.match(/[a-zA-Z]/)) {
if (e.match(/true/) || e.match(/false/)) {
if (e.match(/^(true|false)$/)) {
return e;
}
return getValueFromStateElseKey(e, true);
return getValueFromStateElseKey(e, true, true);
} else return e;
})
.reduce((pre, curr) => pre + curr, '');
Expand Down
6 changes: 5 additions & 1 deletion packages/webgal/src/Core/gameScripts/setVar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export function getValueFromState(key: string) {
/**
* 取不到时返回 {key}
*/
export function getValueFromStateElseKey(key: string, useKeyNameAsReturn = false) {
export function getValueFromStateElseKey(key: string, useKeyNameAsReturn = false, quoteString = false) {
const valueFromState = getValueFromState(key);
if (valueFromState === null || valueFromState === undefined) {
logger.warn('valueFromState result null, key = ' + key);
Expand All @@ -134,5 +134,9 @@ export function getValueFromStateElseKey(key: string, useKeyNameAsReturn = false
}
return `{${key}}`;
}
// 用 "" 包裹字符串，用于使用 compile 条件判断，处理字符串类型的变量
if (quoteString && typeof valueFromState === 'string') {
return `"${valueFromState.replaceAll('"', '\\"')}"`;
}
return valueFromState;
}