diff --git a/repo/js/AutoWoodmen/main.js b/repo/js/AutoWoodmen/main.js index 448d7220..ad0a393c 100644 --- a/repo/js/AutoWoodmen/main.js +++ b/repo/js/AutoWoodmen/main.js @@ -24,14 +24,46 @@ w(async function () { await performGameActions(); } } - async function AutoPath(locationName,time) { + async function AutoPath(locationName, time) { + //传入路径以及循环次数 let filePath = `assets/AutoPath/${locationName}.json`; await pathingScript.runFile(filePath); await runGameActionsMultipleTimes(time) } - await AutoPath('木材-却砂木_璃月_9个',2) - await AutoPath('木材-桦木_蒙德_15个',100) - await AutoPath('木材-杉木_蒙德_12个',100) - await AutoPath('木材-松木_蒙德_24个',80) + async function KeyMouse(locationName, sec, x, y) { + //传入路径,秒数,坐标 + if (x !== undefined && y !== undefined) { + await genshin.tp(x, y); + await sleep(1000); + } + + let filePath = `assets/KeyMouse/${locationName}.json`; + await keyMouseScript.runFile(filePath); + await sleep(sec * 1000); // 将秒转换为毫秒 + } + await AutoPath('松木_蒙德_24个', 84) + await AutoPath('业果木15个(辉木15个)', 134) + await AutoPath('刺葵木6个', 334) + await AutoPath('却砂木12个', 167) + await AutoPath('垂香木15个', 134) + await AutoPath('御伽木9个(孔雀木6个)', 334) + await AutoPath('悬铃木18个', 112) + await AutoPath('杉木_蒙德_12个', 167) + await AutoPath('枫木9个', 223) + await AutoPath('柽木15个', 134) + await AutoPath('桦木_蒙德_15个', 134) + await AutoPath('梦见木12个', 167) + await AutoPath('椴木9个(悬铃木9个)', 223) + await AutoPath('灰灰楼木6个', 334) + // await AutoPath('燃爆木15个', 0) + await AutoPath('燃爆木6个(白栗栎木6个)', 334) + await AutoPath('白梣木15个', 134) + await AutoPath('竹节30个', 67) + await AutoPath('萃华木6个(垂香木3个)', 334) + await AutoPath('证悟木15个(业果木6个)', 134) + await AutoPath('香柏木27个', 75) + await KeyMouse('炬木15个',3, 8359.7548828125, -2868.03515625) + // await keyDown('',5,8353.4921875,-2853.8505859375) + })(); \ No newline at end of file diff --git a/repo/js/AutoWoodmen/manifest.json b/repo/js/AutoWoodmen/manifest.json index 7d8be1fb..cad82d8f 100644 --- a/repo/js/AutoWoodmen/manifest.json +++ b/repo/js/AutoWoodmen/manifest.json @@ -5,7 +5,7 @@ "description": "小道具自动伐木,单个树种满后,前往下一个树种", "authors": [ { - "name": "½", + "name": "½" } ], "main": "main.js" diff --git a/repo/pathing/赤念果(纳西妲).zip b/repo/pathing/赤念果(纳西妲).zip deleted file mode 100644 index 9765f5cc..00000000 Binary files a/repo/pathing/赤念果(纳西妲).zip and /dev/null differ diff --git a/repo/pathing/赤念果(纳西妲)/赤念果.json b/repo/pathing/赤念果/赤念果.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果.json rename to repo/pathing/赤念果/赤念果.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果10.json b/repo/pathing/赤念果/赤念果10.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果10.json rename to repo/pathing/赤念果/赤念果10.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果11.json b/repo/pathing/赤念果/赤念果11.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果11.json rename to repo/pathing/赤念果/赤念果11.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果12.json b/repo/pathing/赤念果/赤念果12.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果12.json rename to repo/pathing/赤念果/赤念果12.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果13.json b/repo/pathing/赤念果/赤念果13.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果13.json rename to repo/pathing/赤念果/赤念果13.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果14.json b/repo/pathing/赤念果/赤念果14.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果14.json rename to repo/pathing/赤念果/赤念果14.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果15.json b/repo/pathing/赤念果/赤念果15.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果15.json rename to repo/pathing/赤念果/赤念果15.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果16.json b/repo/pathing/赤念果/赤念果16.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果16.json rename to repo/pathing/赤念果/赤念果16.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果2.json b/repo/pathing/赤念果/赤念果2.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果2.json rename to repo/pathing/赤念果/赤念果2.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果3.json b/repo/pathing/赤念果/赤念果3.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果3.json rename to repo/pathing/赤念果/赤念果3.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果4.json b/repo/pathing/赤念果/赤念果4.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果4.json rename to repo/pathing/赤念果/赤念果4.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果5.json b/repo/pathing/赤念果/赤念果5.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果5.json rename to repo/pathing/赤念果/赤念果5.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果6.json b/repo/pathing/赤念果/赤念果6.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果6.json rename to repo/pathing/赤念果/赤念果6.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果7.json b/repo/pathing/赤念果/赤念果7.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果7.json rename to repo/pathing/赤念果/赤念果7.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果8.json b/repo/pathing/赤念果/赤念果8.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果8.json rename to repo/pathing/赤念果/赤念果8.json diff --git a/repo/pathing/赤念果(纳西妲)/赤念果9.json b/repo/pathing/赤念果/赤念果9.json similarity index 100% rename from repo/pathing/赤念果(纳西妲)/赤念果9.json rename to repo/pathing/赤念果/赤念果9.json