diff --git a/repo/js/AutoPlanDomain/config/config.js b/repo/js/AutoPlanDomain/config/config.js index 1cec40319..1a3ca43fd 100644 --- a/repo/js/AutoPlanDomain/config/config.js +++ b/repo/js/AutoPlanDomain/config/config.js @@ -163,10 +163,10 @@ async function checkKey(key = "") { async function initConfig() { config.info.key = settings.key || config.info.key await checkKey(config.info.key) - //流程->返回主页 打开地图 返回主页 - const physical = await ocrPhysical(true, true) - config.user.physical.current = physical.current - config.user.physical.min = physical.min + // //流程->返回主页 打开地图 返回主页 + // const physical = await ocrPhysical(true, true) + // config.user.physical.current = physical.current + // config.user.physical.min = physical.min // 初始化uid config.user.uid = await ocrUid() config.bgi_tools.api.httpPullJsonConfig = settings.bgi_tools_http_pull_json_config diff --git a/repo/js/AutoPlanDomain/main.js b/repo/js/AutoPlanDomain/main.js index 3a7538a83..96da24321 100644 --- a/repo/js/AutoPlanDomain/main.js +++ b/repo/js/AutoPlanDomain/main.js @@ -2,6 +2,7 @@ import {config, initConfig, initSettings, LoadType} from './config/config'; import {ocrUid} from './utils/uid'; import {getDayOfWeek} from './utils/tool'; import {pullJsonConfig, pushAllJsonConfig} from './utils/bgi_tools'; +import {ocrPhysical} from "./utils/physical"; /** * 自动执行秘境任务的异步函数 @@ -9,6 +10,14 @@ import {pullJsonConfig, pushAllJsonConfig} from './utils/bgi_tools'; * @returns {Promise} - 执行完成后返回的Promise */ async function autoDomain(autoFight) { + //流程->返回主页 打开地图 返回主页 + const physicalOcr = await ocrPhysical(true, true) + config.user.physical.current = physicalOcr.current + config.user.physical.min = physicalOcr.min + const physical = config.user.physical + if (physical.current >= physical.min) { + throwError(`体力不足,当前体力${physical.current},最低体力${physical.min},请手动补充体力后重试`) + } // 创建秘境参数对象,初始化值为0 let domainParam = new AutoDomainParam(autoFight.DomainRoundNum); //秘境名称