diff --git a/repo/js/ABGIHoui/README.md b/repo/js/ABGIHoui/README.md index 2b6033f78..15fd97a9b 100644 --- a/repo/js/ABGIHoui/README.md +++ b/repo/js/ABGIHoui/README.md @@ -20,12 +20,11 @@ "米游社签到", [需要自己配置相关文件] "启动bat脚本",[参数为:bat脚本路径,Ps:【E:\ABGI\重启.bat】] "联机更换ABGI的账号信息",[参数为:uid-name,Ps:【1*******-原神大王】] - "关闭原神",(待开放) + "更换联机房间",[参数为:房间名字+vip密钥,Ps:【古叉别断网-GUYOUSHIGEHAOREN】] + "等待时间" ------ - ## 注意 - #### 使用`ABGIHoui`脚本时,`ABGI`最低版本为【3.4.15】 #### 原理解释 这是ABGI内置关键词识别,然后进行调用功能 diff --git a/repo/js/ABGIHoui/main.js b/repo/js/ABGIHoui/main.js index 804b690d8..e6fd62578 100644 --- a/repo/js/ABGIHoui/main.js +++ b/repo/js/ABGIHoui/main.js @@ -1,5 +1,27 @@ +// 延时时间 +const outTime= ~~settings.outTime; + +// 比较结果 +let result = 0 +// 比较ABGI版本号 +async function compareVersion(version1, version2) { + const v1Segments = version1.split('.'); + const v2Segments = version2.split('.'); + const maxLength = Math.max(v1Segments.length, v2Segments.length); + for (let i = 0; i < maxLength; i++) { + const v1Num = Number(v1Segments[i] || 0); + const v2Num = Number(v2Segments[i] || 0); + if (v1Num > v2Num) { + return 1; + } else if (v1Num < v2Num) { + return -1; + } + }; + return 0; +}; + +// 主函数 (async function () { - const outTime= ~~settings.outTime; switch (settings.selectTask) { case "一条龙": await sleep(500); @@ -77,13 +99,34 @@ await sleep(outTime); return; case "联机更换ABGI的账号信息": + result = await compareVersion(settings.versionABGI, "3.4.12"); + if (result == -1) { + log.error("无法调用该任务,请更新ABGI至3.4.12版本或更高版本"); + await sleep(outTime); + return; + }; await sleep(500); log.info("ABGI启动联机换号:"+`${settings.inputText}`); await sleep(outTime); return; - case "关闭原神": + // case "关闭原神": + // await sleep(500); + // log.info(`ABGI启动${settings.selectTask}`+":"); + // await sleep(outTime); + // return; + case "更换联机房间": + result = await compareVersion(settings.versionABGI, "3.5.25"); + if (result == -1) { + log.error("无法调用该任务,请更新ABGI至3.5.25版本或更高版本"); + await sleep(outTime); + return; + }; + await sleep(500); + log.info(`ABGI启动更换房间:`+`${settings.inputText}`); + await sleep(outTime); + return; + case "等待时间(单位为ms)": await sleep(500); - log.info(`ABGI启动${settings.selectTask}`+":"); await sleep(outTime); return; default: diff --git a/repo/js/ABGIHoui/manifest.json b/repo/js/ABGIHoui/manifest.json index 4c7d23806..22690ab8d 100644 --- a/repo/js/ABGIHoui/manifest.json +++ b/repo/js/ABGIHoui/manifest.json @@ -1,12 +1,13 @@ { "manifest_version": 1, "name": "老王妙妙屋", - "version": "0.7", + "version": "0.8", "tags": [ "abgi" ], "description": "启动ABGI各种功能", "saved_files": [ + ], "authors": [ { diff --git a/repo/js/ABGIHoui/settings.json b/repo/js/ABGIHoui/settings.json index 4d2ebccf2..b0751a441 100644 --- a/repo/js/ABGIHoui/settings.json +++ b/repo/js/ABGIHoui/settings.json @@ -19,8 +19,9 @@ "结束obs录制", "米游社签到", "bat脚本", - "联机更换ABGI的账号信息" - // "关闭原神" + "联机更换ABGI的账号信息", + "更换联机房间", + "等待时间(单位为ms)" ], "default": "" }, @@ -35,5 +36,11 @@ "type": "input-text", "label": " 结束延时(可改) \n 默认一秒,可以设置延时时间,单位毫秒", "default": "1000" + }, + { + "name": "versionABGI", + "type": "input-text", + "label": " 本地ABGI版本(别改) \n 本地ABGI自动修改版本号,不用改", + "default": "3.4.12" } ] \ No newline at end of file