Skip to content
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

Jump to bottom

fix:修复setVar进行compile字符串时异常 #534

Merged
merged 2 commits into from
Aug 22, 2024
Merged

fix:修复setVar进行compile字符串时异常 #534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8e1593
fix:修复setVar进行compile字符串时异常
xiaoxustudio Aug 22, 2024
e5aaee6
add try catch
MakinoharaShoko Aug 22, 2024
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
12 changes: 9 additions & 3 deletions packages/webgal/src/Core/gameScripts/setVar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,18 @@ export const setVar = (sentence: ISentence): IPerform => {
const valExp2 = valExpArr
.map((e) => {
if (e.match(/\$?[.a-zA-Z]/)) {
return String(getValueFromState(e.trim()));
const _r = getValueFromState(e.trim());
return typeof _r === 'string' ? `'${_r}'` : _r;
} else return e;
})
.reduce((pre, curr) => pre + curr, '');
const exp = compile(valExp2);
const result = exp();
let result = '';
try {
const exp = compile(valExp2);
result = exp();
} catch (e) {
logger.error('expression compile error', e);
}
webgalStore.dispatch(targetReducerFunction({ key, value: result }));
} else if (valExp.match(/true|false/)) {
if (valExp.match(/true/)) {
Expand Down
Loading