diff --git a/repo/js/AEscoffier_chef/README.md b/repo/js/AEscoffier_chef/README.md index 2b7324e3a..fd6eb8ab2 100644 --- a/repo/js/AEscoffier_chef/README.md +++ b/repo/js/AEscoffier_chef/README.md @@ -639,6 +639,11 @@
点击展开 + - ver 2.3.1 + + 1. 修复了食材加工中,检测到鱼类不足时不能正常跳过的问题 + 2. 修复了根据设置的矿石保留数重新调整使用的矿石数时,计算剩余时间过程出现报错的问题 + - ver 2.3.0 1. 矿石加速现在可用 @@ -646,7 +651,7 @@ - 支持单独设定每种矿石需要保留的数量 2. 修复了 ver2.2.0 存在的几项重大问题 - 当加工 鱼肉 以外的食材时,会套用鱼肉的配方选择逻辑导致脚本异常运行 - - + - 当 鱼类 未被选择时,异常执行非默认逻辑导致异常循环的问题 - ver 2.2.0 diff --git a/repo/js/AEscoffier_chef/main.js b/repo/js/AEscoffier_chef/main.js index d54c59fbf..98904c3fd 100644 --- a/repo/js/AEscoffier_chef/main.js +++ b/repo/js/AEscoffier_chef/main.js @@ -612,9 +612,9 @@ const templateMat2 = file.readImageMatSync("assets/best2.png"); // 创建模板匹配识别对象 - const templateRo0 = RecognitionObject.templateMatch(templateMat0); - const templateRo1 = RecognitionObject.templateMatch(templateMat1); - const templateRo2 = RecognitionObject.templateMatch(templateMat2); + const templateRo0 = RecognitionObject.TemplateMatch(templateMat0); + const templateRo1 = RecognitionObject.TemplateMatch(templateMat1); + const templateRo2 = RecognitionObject.TemplateMatch(templateMat2); templateRo0.threshold = 0.9; templateRo0.Use3Channels = true; templateRo1.threshold = 0.9; @@ -1201,8 +1201,8 @@ click(1185, 601); // 点击滑条最大值(736-1186) await sleep(500); if (detect) { // 检测摩拉是否充足 - let mora_ocr = Ocr(1609, 28, 162, 40); - let cost_ocr = Ocr(961,682, 95, 32); + let mora_ocr = await Ocr(1609, 28, 162, 40); + let cost_ocr = await Ocr(961,682, 95, 32); if (cost_ocr && mora_ocr) { let cost = parseInt(cost_ocr, 10); let mora = parseInt(mora_ocr, 10); @@ -1245,8 +1245,8 @@ } await sleep(500); if (detect) { // 检测摩拉是否充足 - let mora_ocr = Ocr(1609, 28, 162, 40); - let cost_ocr = Ocr(961,682, 95, 32); + let mora_ocr = await Ocr(1609, 28, 162, 40); + let cost_ocr = await Ocr(961,682, 95, 32); if (cost_ocr && mora_ocr) { let cost = parseInt(cost_ocr, 10); let mora = parseInt(mora_ocr, 10); @@ -1376,7 +1376,7 @@ let ocrNum = await get_current_item_num(); if (!(ocrNum && ocrNum !== 0)) { log.info(`鱼类(${fishSelect[i]})数量不足...`); - fishSelect.slice(i, 1); // 删去该鱼类 + fishSelect.splice(i, 1); // 删去该鱼类 await sleep(200); click(23, 516); // 点击左侧空白处 await sleep(300); @@ -1771,7 +1771,7 @@ if (clickCount > oreNumOcr - o_count) { log.info(`设置的矿石保留数为${o_count},此次加速使用矿石数由${clickCount + 1}改为${oreNumOcr - o_count}`); clickCount = oreNumOcr - o_count - 1; - timeRemain = Match.ceil((ingredientTime * 60 - clickCount * accelerator_msg[o_name]) / 60); // 已留冗余时间 + timeRemain = Math.ceil((ingredientTime * 60 - clickCount * accelerator_msg[o_name]) / 60); // 已留冗余时间 } else { log.info(`此次加速使用矿石(${o_name})数: ${clickCount + 1}个`); timeRemain = 0; @@ -1810,7 +1810,7 @@ await sleep(200); click(1199, 805); // 获取 await sleep(200); - click(1853, 850, 48, 4); // 点击空白处 + click(1853, 850); // 点击空白处 await sleep(300); return timeRemain; diff --git a/repo/js/AEscoffier_chef/manifest.json b/repo/js/AEscoffier_chef/manifest.json index 410b0fc44..729904202 100644 --- a/repo/js/AEscoffier_chef/manifest.json +++ b/repo/js/AEscoffier_chef/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "一只爱可菲", - "version": "2.3.0", + "version": "2.3.1", "bgi_version": "0.55.0", "description": "专精料理制作的爱可菲(自动烹饪及解锁、特殊料理、食材加工)[内置料理数据已更新至月之四]\n自动烹饪:烹饪精度自定义、一键全解锁、分类选择料理、自动处理食材不足等异常\n特殊料理:支持根据概率计算产出、支持全部的特殊料理\n食材加工:食材持有量检测、可自选制作鱼肉的配方、可选等待加工完成或跳过、矿石加速", "tags": [