diff --git a/repo/js/AutoPlan/main.js b/repo/js/AutoPlan/main.js index 875fc7b75..df809bb6f 100644 --- a/repo/js/AutoPlan/main.js +++ b/repo/js/AutoPlan/main.js @@ -223,6 +223,7 @@ async function loadMode(Load, autoOrderSet, runConfig) { let autoOrder = { order: order, // 顺序值 // day: day,// 执行日期 + runType: runType, // 运行类型 days: days, // 执行日期(数组) autoFight: undefined, // 秘境信息对象 autoLeyLineOutcrop: undefined // 地脉信息对象 @@ -417,6 +418,7 @@ async function initRunOrderList(domainConfig) { // if (item.day) { // return item.day === dayOfWeek.day // } + log.debug(`[{1}]item.days.length:{0}`, dayOfWeek.day, item?.days?.length||0) if (item.days && item.days.length > 0) { const includes = item.days.includes(dayOfWeek.day); log.debug(`[{1}]item.days:{0}`, dayOfWeek.day, JSON.stringify(item.days)) diff --git a/repo/js/AutoPlan/manifest.json b/repo/js/AutoPlan/manifest.json index 67d22b7c8..adb92c962 100644 --- a/repo/js/AutoPlan/manifest.json +++ b/repo/js/AutoPlan/manifest.json @@ -1,5 +1,5 @@ { - "name": "自动秘境计划", + "name": "自动体力计划", "version": "0.0.1", "description": "", "settings_ui": "settings.json", diff --git a/repo/js/AutoPlan/utils/tool.js b/repo/js/AutoPlan/utils/tool.js index 2d0d4b622..4744184a5 100644 --- a/repo/js/AutoPlan/utils/tool.js +++ b/repo/js/AutoPlan/utils/tool.js @@ -110,9 +110,13 @@ const isInMainUI = () => { genshinJson.width / 5.0 ); let captureRegion = captureGameRegion(); - let res = captureRegion.find(paimonMenuRo); - captureRegion.Dispose() - return !res.isEmpty(); + try { + let res = captureRegion.find(paimonMenuRo); + return !res.isEmpty(); + }finally { + captureRegion.Dispose() + } + }; async function toMainUi() { @@ -143,9 +147,12 @@ const isInOutDomainUI = () => { genshinJson.width / 5.0 ); let captureRegion = captureGameRegion(); - let res = captureRegion.find(paimonMenuRo); - captureRegion.Dispose() - return !res.isEmpty(); + try { + let res = captureRegion.find(paimonMenuRo); + return !res.isEmpty(); + }finally { + captureRegion.Dispose() + } }; async function outDomainUI() { @@ -156,21 +163,25 @@ async function outDomainUI() { await sleep(ms); await keyPress("ESCAPE"); await sleep(ms); + if (isInMainUI()){ + break + } else if (isInOutDomainUI()) { + try { + //点击确认按钮 + await findTextAndClick('确认') + }catch (e) { + // log.error(`多次尝试点击确认失败 假定已经退出处理`); + } + + } if (index > 3) { log.error(`多次尝试匹配退出秘境界面失败 假定已经退出处理`); + break } index += 1 } - if (isInOutDomainUI()) { - try { - //点击确认按钮 - await findTextAndClick('确认') - }catch (e) { - log.error(`多次尝试点击确认失败 假定已经退出处理`); - } - } }