@@ -78,6 +78,8 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
### 更新日志
|
### 更新日志
|
||||||
|
### 1.4.2(2025.08.13)
|
||||||
|
1.修改拾取后延时效果
|
||||||
### 1.4.1(2025.08.12)
|
### 1.4.1(2025.08.12)
|
||||||
1.优化精英101路线
|
1.优化精英101路线
|
||||||
### 1.4.0(2025.08.12)
|
### 1.4.0(2025.08.12)
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//当前js版本 1.4.1
|
//当前js版本 1.4.2
|
||||||
|
|
||||||
//拾取时上下滑动的时间
|
//拾取时上下滑动的时间
|
||||||
let timeMoveUp = 500;
|
let timeMoveUp = 500;
|
||||||
@@ -58,7 +58,7 @@ let targetItems;
|
|||||||
|
|
||||||
targetItems = await readFolder(targetItemPath, false);
|
targetItems = await readFolder(targetItemPath, false);
|
||||||
//模板匹配对象处理
|
//模板匹配对象处理
|
||||||
if (settings.pickupMode === "模板匹配拾取,默认只拾取狗粮") {
|
if (pickupMode === "模板匹配拾取,默认只拾取狗粮") {
|
||||||
for (const targetItem of targetItems) {
|
for (const targetItem of targetItems) {
|
||||||
targetItem.template = file.ReadImageMatSync(targetItem.fullPath);
|
targetItem.template = file.ReadImageMatSync(targetItem.fullPath);
|
||||||
targetItem.itemName = targetItem.fileName.replace(/\.png$/, '');
|
targetItem.itemName = targetItem.fileName.replace(/\.png$/, '');
|
||||||
@@ -691,7 +691,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
|
|||||||
let foundTarget = false;
|
let foundTarget = false;
|
||||||
// 获取 F 图标的中心点 Y 坐标
|
// 获取 F 图标的中心点 Y 坐标
|
||||||
let centerYF = Math.round(fRes.y + fRes.height / 2);
|
let centerYF = Math.round(fRes.y + fRes.height / 2);
|
||||||
if (settings.pickupMode === "ocr拾取,默认只拾取狗粮和晶蝶") {
|
if (pickupMode === "ocr拾取,默认只拾取狗粮和晶蝶") {
|
||||||
// 在当前屏幕范围内进行 OCR 识别
|
// 在当前屏幕范围内进行 OCR 识别
|
||||||
let ocrResults = await performOcr(whitelistKeywords, textxRange, { min: fRes.y - texttolerance, max: fRes.y + fRes.height + texttolerance * 2 });
|
let ocrResults = await performOcr(whitelistKeywords, textxRange, { min: fRes.y - texttolerance, max: fRes.y + fRes.height + texttolerance * 2 });
|
||||||
|
|
||||||
@@ -716,15 +716,15 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (settings.pickupMode === "模板匹配拾取,默认只拾取狗粮") {
|
} else if (pickupMode === "模板匹配拾取,默认只拾取狗粮") {
|
||||||
let start = new Date();
|
//let start = new Date();
|
||||||
let itemName = await performTemplateMatch(centerYF);
|
let itemName = await performTemplateMatch(centerYF);
|
||||||
let end = new Date();
|
//let end = new Date();
|
||||||
//log.info(`调试-匹配用时${end - start}毫秒`)
|
//log.info(`调试-匹配用时${end - start}毫秒`)
|
||||||
if (itemName) {
|
if (itemName) {
|
||||||
keyPress("F"); // 执行交互操作
|
keyPress("F"); // 执行交互操作
|
||||||
log.info(`交互或拾取:"${itemName}"`);
|
log.info(`交互或拾取:"${itemName}"`);
|
||||||
await sleep(2 * trigger); // 操作后暂停 2*trigger 毫秒
|
await sleep(2 * trigger + 100); // 操作后暂停 2*trigger+100 毫秒
|
||||||
foundTarget = true;
|
foundTarget = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -751,7 +751,11 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
|
|||||||
// 否则执行下翻
|
// 否则执行下翻
|
||||||
await keyMouseScript.runFile(`assets/滚轮上翻.json`);
|
await keyMouseScript.runFile(`assets/滚轮上翻.json`);
|
||||||
}
|
}
|
||||||
await sleep(Math.round(trigger / 5));
|
if (pickupMode === "模板匹配拾取,默认只拾取狗粮") {
|
||||||
|
await sleep(Math.round(trigger / 5));
|
||||||
|
} else {
|
||||||
|
await sleep(Math.round(trigger));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state.cancelRequested) {
|
if (state.cancelRequested) {
|
||||||
|
|||||||
@@ -1,12 +1,16 @@
|
|||||||
{
|
{
|
||||||
"manifest_version": 1,
|
"manifest_version": 1,
|
||||||
"name": "锄地一条龙",
|
"name": "锄地一条龙",
|
||||||
"version": "1.4.1",
|
"version": "1.4.2",
|
||||||
"description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用",
|
"description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用",
|
||||||
"authors": [
|
"authors": [
|
||||||
{
|
{
|
||||||
"name": "mno",
|
"name": "mno",
|
||||||
"links": "https://github.com/Bedrockx"
|
"links": "https://github.com/Bedrockx"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "汐",
|
||||||
|
"links": "https://github.com/jiegedabaobei"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"settings_ui": "settings.json",
|
"settings_ui": "settings.json",
|
||||||
|
|||||||
Reference in New Issue
Block a user