Merge branch 'master' of https://github.com/zzliux/assttyys_autojs

Author: shui670

src/common/commonConfig.ts

@@ -39,4 +39,9 @@ const CommonConfig = [{
 	]
 }];
 
-export default CommonConfig;
+export default CommonConfig;
+
+export const commonConfigVal = CommonConfig[0].config.reduce((acc, cur) => {
+	acc[cur.name] = cur.default;
+	return acc;
+}, {});

src/system/script.ts

@@ -21,6 +21,7 @@ import { globalRoot, globalRootType } from '@/system/GlobalStore/index';
 import schedule, { Job } from '@/system/Schedule';
 import { MyFloaty } from '@/system/MyFloaty';
 import ncnnBgyx from '@/system/ncnn/ncnnBgyx';
+import { commonConfigVal } from '@/common/commonConfig';
 
 /**
  * 脚本对象，一个程序只能有一个
@@ -627,7 +628,8 @@ export class Script {
 							break;
 						}
 					} else {
-						flag = self.desc(tarFuncList[i], staredSchemeList[j].commonConfig);
+						const cmcfg = Object.assign({}, commonConfigVal, staredSchemeList[j]?.commonConfig || {});
+						flag = self.desc(tarFuncList[i], cmcfg);
 						funcDescCess[tarFuncList[i].id] = flag;
 						if (flag) {
 							break;