Skip to content

feat: support random function range arguments #657

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 1 commit into from
Apr 1, 2025
+17 −2
Merged

feat: support random function range arguments #657

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 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 @@ -8,7 +8,10 @@ import { setScriptManagedGlobalVar } from '@/store/userDataReducer';
import { ActionCreatorWithPayload } from '@reduxjs/toolkit';
import { ISetGameVar } from '@/store/stageInterface';
import { dumpToStorageFast } from '@/Core/controller/storage/storageController';
import expression from 'angular-expressions';
import get from 'lodash/get';
import random from 'lodash/random';

/**
* 设置变量
* @param sentence
Expand All @@ -30,8 +33,8 @@ export const setVar = (sentence: ISentence): IPerform => {
if (sentence.content.match(/\s*=\s*/)) {
const key = sentence.content.split(/\s*=\s*/)[0];
const valExp = sentence.content.split(/\s*=\s*/)[1];
if (valExp === 'random()') {
webgalStore.dispatch(targetReducerFunction({ key, value: Math.random() }));
if (/^\s*[a-zA-Z_$][\w$]*\s*\(.*\)\s*$/.test(valExp)) {
Copy link
Copy Markdown
Member

@MakinoharaShoko MakinoharaShoko Mar 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该明确判断是和 random 相关联

Copy link
Copy Markdown
Member Author

@xiaoxustudio xiaoxustudio Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该明确判断是和 random 相关联

这个主要是匹配xxx(...xxx)这种函数调用，因为想到以后的可扩展性

webgalStore.dispatch(targetReducerFunction({ key, value: EvaluateExpression(valExp) }));
} else if (valExp.match(/[+\-*\/()]/)) {
// 如果包含加减乘除号，则运算
// 先取出运算表达式中的变量
Expand Down Expand Up @@ -92,6 +95,18 @@ export const setVar = (sentence: ISentence): IPerform => {

type BaseVal = string | number | boolean | undefined;

/**
* 执行函数
*/
function EvaluateExpression(val: string) {
const instance = expression.compile(val);
return instance({
random: (...args: any[]) => {
return args.length ? random(...args) : Math.random();
Copy link
Copy Markdown
Member

@MakinoharaShoko MakinoharaShoko Mar 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lodash 的 random 不能不传参数吗

Copy link
Copy Markdown
Member Author

@xiaoxustudio xiaoxustudio Mar 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lodash 的 random 不能不传参数吗

它不传参只返回0和1，不符合 预期的不传参为浮点数

},
});
}

/**
* 取不到时返回 undefined
*/
Expand Down