Skip to content

Commit cad6906

Browse files
authored
js:锄地一条龙1.17 (#1340)
### 1.1.7(2025.07.13) 1. 获取结束坐标添加独立地图处理 2. 含有传奇或高危标签的路线将不再被视为小怪路线
1 parent 8c1ba11 commit cad6906

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

repo/js/AutoHoeingOneDragon/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# 锄地一条龙
2-
31
**重要免责声明:**
42

53
1. **使用风险:**
@@ -73,6 +71,9 @@
7371

7472
---
7573
### 更新日志
74+
### 1.1.7(2025.07.13)
75+
1. 获取结束坐标添加独立地图处理
76+
2. 含有传奇或高危标签的路线将不再被视为小怪路线
7677
### 1.1.5(2025.07.10)
7778
1. 添加验证,游戏卡住等情况下会终止js并不再将后续路线视为运行完成,便于重跑
7879
2. 添加优先关键词,便于优先考虑部分路线

repo/js/AutoHoeingOneDragon/assets/index2.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,12 +1600,12 @@
16001600
{
16011601
"fileName": "6706--纳塔_踞石山_彩石顶2_(7-16).json",
16021602
"时间": 241.03,
1603-
"精英摩拉": 0,
1603+
"精英摩拉": 200,
16041604
"小怪摩拉": 1048.5,
16051605
"小怪数量": 20.5,
16061606
"水免": 0,
16071607
"高危": 0,
1608-
"精英数量": 0
1608+
"精英数量": 1
16091609
},
16101610
{
16111611
"fileName": "6707--纳塔_踞石山_庙宇_(9-11).json",

repo/js/AutoHoeingOneDragon/main.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,9 @@ async function processPathings() {
180180

181181
// 去除重复标签
182182
pathing.tags = [...new Set(pathing.tags)];
183+
// 处理 map_name 属性
184+
pathing.map_name = parsedContent.info?.map_name || "Teyvat"; // 如果有 map_name,则使用其值,否则默认为 "Teyvat"
183185
}
184-
185186
return pathings; // 返回处理后的 pathings 数组
186187
}
187188

@@ -343,7 +344,11 @@ async function findBestRouteGroups(pathings, k, targetEliteNum, targetMonsterNum
343344

344345
// 为最终选中且精英怪数量为0的路线添加小怪标签
345346
pathings.forEach(pathing => {
346-
if (pathing.selected && pathing.e === 0) {
347+
// 检查是否包含 "传奇" 或 "高危" 标签
348+
const hasLegendOrHighRisk = pathing.tags.includes("传奇") || pathing.tags.includes("高危");
349+
350+
// 如果路径被选中、没有精英怪物且不包含 "传奇" 或 "高危" 标签,则添加 "小怪" 标签
351+
if (pathing.selected && pathing.e === 0 && !hasLegendOrHighRisk) {
347352
pathing.tags.push("小怪");
348353
}
349354
});
@@ -810,7 +815,7 @@ async function processPathingsByGroup(pathings, targetTexts, blacklistKeywords,
810815
await fakeLog(`${pathing.fileName}`, false, false, 0);
811816

812817
try {
813-
const miniMapPosition = await genshin.getPositionFromMap();
818+
const miniMapPosition = await genshin.getPositionFromMap(pathing.map_name);
814819
// 比较坐标
815820
const diffX = Math.abs(lastX - miniMapPosition.X);
816821
const diffY = Math.abs(lastY - miniMapPosition.Y);
@@ -819,14 +824,19 @@ async function processPathingsByGroup(pathings, targetTexts, blacklistKeywords,
819824
if ((diffX + diffY) < 5) {
820825
runningFailCount++;
821826
} else {
822-
//log.info(`当前坐标(${miniMapPosition.X},${miniMapPosition.Y},距离上次距离${(diffX + diffY)}`)
823827
runningFailCount = 0;
824828
}
829+
//log.info(`当前位于${pathing.map_name}地图的(${miniMapPosition.X},${miniMapPosition.Y},距离上次距离${(diffX + diffY)}`);
825830
} catch (error) {
826831
log.error(`执行任务时发生错误:${error.message}`);
827832
runningFailCount++;
828833
}
829834

835+
if (runningFailCount >= 1) {
836+
log.error("连续两条路线终止时坐标不变,不记录运行数据");
837+
continue;
838+
}
839+
830840
// 计算下一个 UTC 时间的晚上 8 点(即北京时间凌晨四点)
831841
const nextEightClock = new Date(now);
832842
nextEightClock.setUTCHours(20, 0, 0, 0); // 设置为 UTC 时间的 20:00
@@ -847,11 +857,6 @@ async function processPathingsByGroup(pathings, targetTexts, blacklistKeywords,
847857
const remainingseconds = predictRemainingTime % 60;
848858
log.info(`当前进度:第 ${targetGroup} 组第 ${groupPathCount}/${totalPathsInGroup}${pathing.fileName}已完成,该组预计剩余: ${remaininghours}${remainingminutes}${remainingseconds.toFixed(0)} 秒`);
849859

850-
if (runningFailCount >= 1) {
851-
log.error("连续两条路线终止时坐标不变,暂时不记录运行数据");
852-
continue;
853-
}
854-
855860
await updateCdTimeRecord(pathings, accountName);
856861
}
857862
}

repo/js/AutoHoeingOneDragon/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "锄地一条龙",
4-
"version": "1.1.6",
4+
"version": "1.1.7",
55
"description": "一站式解决自动化锄地,支持只拾取狗粮,请阅读README.md后使用",
66
"authors": [
77
{

0 commit comments

Comments
 (0)