diff --git a/repo.json b/repo.json index f7a859ab..011b1ae1 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20241121095945", + "time": "20241122223455", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -1630,8 +1630,8 @@ { "name": "狗粮-枫丹-白露区-秋分山东侧-2个.json", "type": "file", - "hash": "403351427298482da6e72f1adf7a25a13d3b1994", - "version": "4033514", + "hash": "43ce18fdfdce41ae407df67b4d2564239b2483de", + "version": "43ce18f", "author": "Yang-z", "description": "", "tags": [ @@ -1652,8 +1652,8 @@ { "name": "狗粮-枫丹-研究院区-东-3个.json", "type": "file", - "hash": "d9dc24d27a2fb1d53624838b403b7ce77cdf951d", - "version": "d9dc24d", + "hash": "729c34552514bae0f787d11860c3c997a8cce887", + "version": "729c345", "author": "Yang-z", "description": "", "tags": [ @@ -1685,8 +1685,8 @@ { "name": "狗粮-枫丹-研究院区-新枫丹科学院-东南侧-8个.json", "type": "file", - "hash": "63f869bd4a8aa2209a5488ebc1809b2ea9314b28", - "version": "63f869b", + "hash": "93c58463349a91e23ed37374aa360d1a9f6201f4", + "version": "93c5846", "author": "Yang-z", "description": "", "tags": [ @@ -1762,8 +1762,8 @@ { "name": "狗粮-稻妻-海祇岛-东方小岛-2个.json", "type": "file", - "hash": "f2d154aab9d8b8b9b9c71f46f8bfdb0b7223292e", - "version": "f2d154a", + "hash": "d35b52c4b4c6027106900ca1ca6df789db32f899", + "version": "d35b52c", "author": "Yang-z", "description": "", "tags": [ @@ -1773,8 +1773,8 @@ { "name": "狗粮-稻妻-海祇岛-望泷村西南-4个.json", "type": "file", - "hash": "200cac946b7f08b3500bc3f7a3b9c4e92d2ed985", - "version": "200cac9", + "hash": "852ed5b25c43584b3278dff5bcd0251eb1ef23c7", + "version": "852ed5b", "author": "Yang-z", "description": "", "tags": [ @@ -1795,8 +1795,8 @@ { "name": "狗粮-稻妻-清籁岛-平海砦西-8个.json", "type": "file", - "hash": "df2cb4ab6b34efdaaa7b84ad9430e6891ce37477", - "version": "df2cb4a", + "hash": "d642721b4f111c1c4f28cbcc1f38845059e79203", + "version": "d642721", "author": "Yang-z", "description": "", "tags": [ @@ -8155,12 +8155,21 @@ { "name": "AutoArtifacts_A_B_Extra", "type": "directory", - "hash": "bbebf7a34762a3c3d6dd64ac57fb5c39de6296b6", - "version": "1.1", + "hash": "9a87705807ecba06f77e1be13e0bec925f2437a0", + "version": "1.2", "author": "Yang-z", "description": "狗粮ABE路线,自动拾取分解~|~圣遗物狗粮AB路线自动轮换,及额外点位拾取,途中自动分解。", "tags": [] }, + { + "name": "AutoCatherine", + "type": "directory", + "hash": "a3560a0a4198f7e6ba32f5871b893d7a6feb58c0", + "version": "1.0", + "author": "½", + "description": "自动找凯瑟琳~|~去找凯瑟琳(基于路径追踪)", + "tags": [] + }, { "name": "AutoCrystalfly", "type": "directory", @@ -8200,8 +8209,8 @@ { "name": "BattlePass", "type": "directory", - "hash": "db466bcc84c3f4440178eabd5e702a637d5651fc", - "version": "1.0", + "hash": "bf4f4b380e4ea7c4b233c5a73b3dd03ff3afe49a", + "version": "1.1", "author": "HZYgrandma", "description": "领取纪行~|~用于领取纪行", "tags": [] @@ -8227,8 +8236,8 @@ { "name": "Daily Commission", "type": "directory", - "hash": "685d72f4a3ebc9d8b7f2a617a580b82718042437", - "version": "1.1", + "hash": "ac2832491f84e5b62a44432e85b24e44f3160561", + "version": "1.2", "author": "鹤望兰", "description": "领取每日委托奖励~|~用于领取每日委托奖励", "tags": [] diff --git a/repo/js/AutoCatherine/assets/枫丹凯瑟琳.json b/repo/js/AutoCatherine/assets/枫丹凯瑟琳.json new file mode 100644 index 00000000..0da20f2c --- /dev/null +++ b/repo/js/AutoCatherine/assets/枫丹凯瑟琳.json @@ -0,0 +1,28 @@ +{ + "info": { + "name": "枫丹凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "x": 4509.96044921875, + "y": 3630.826904296875, + "type": "teleport", + "move_mode": "walk", + "action": "" + }, + { + "id": 2, + "x": 4496.73193359375, + "y": 3638.144287109375, + "type": "path", + "move_mode": "walk", + "action": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/assets/璃月凯瑟琳.json b/repo/js/AutoCatherine/assets/璃月凯瑟琳.json new file mode 100644 index 00000000..3aecb4e5 --- /dev/null +++ b/repo/js/AutoCatherine/assets/璃月凯瑟琳.json @@ -0,0 +1,60 @@ +{ + "info": { + "name": "璃月凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "x": 267.958984375, + "y": -665.10888671875, + "action": "", + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": 258.3662109375, + "y": -663.82177734375, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 3, + "x": 246.689453125, + "y": -662.83740234375, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 4, + "x": 233.8564453125, + "y": -661.95849609375, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 5, + "x": 219.0625, + "y": -657.271484375, + "type": "target", + "move_mode": "walk", + "action": "" + }, + { + "id": 6, + "x": 203.84765625, + "y": -659.7158203125, + "type": "path", + "move_mode": "walk", + "action": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/assets/稻妻凯瑟琳.json b/repo/js/AutoCatherine/assets/稻妻凯瑟琳.json new file mode 100644 index 00000000..2e81f39b --- /dev/null +++ b/repo/js/AutoCatherine/assets/稻妻凯瑟琳.json @@ -0,0 +1,36 @@ +{ + "info": { + "name": "稻妻凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": -4402.556640625, + "y": -3053.041015625 + }, + { + "id": 2, + "x": -4408.984375, + "y": -3068.2470703125, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 3, + "x": -4418.185546875, + "y": -3086.4326171875, + "type": "path", + "move_mode": "walk", + "action": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/assets/纳塔凯瑟琳.json b/repo/js/AutoCatherine/assets/纳塔凯瑟琳.json new file mode 100644 index 00000000..2261d33b --- /dev/null +++ b/repo/js/AutoCatherine/assets/纳塔凯瑟琳.json @@ -0,0 +1,20 @@ +{ + "info": { + "name": "纳塔凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "action": "force_tp", + "move_mode": "walk", + "type": "teleport", + "x": 9046.666015625, + "y": -1855.35791015625 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/assets/蒙德凯瑟琳.json b/repo/js/AutoCatherine/assets/蒙德凯瑟琳.json new file mode 100644 index 00000000..52c7fd36 --- /dev/null +++ b/repo/js/AutoCatherine/assets/蒙德凯瑟琳.json @@ -0,0 +1,44 @@ +{ + "info": { + "name": "蒙德凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "x": -867.6884765625, + "y": 2281.365966796875, + "type": "teleport", + "move_mode": "walk", + "action": "" + }, + { + "id": 2, + "x": -882.1455078125, + "y": 2262.399658203125, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 3, + "x": -893.3056640625, + "y": 2249.19482421875, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 4, + "x": -914.3564453125, + "y": 2233.071044921875, + "type": "path", + "move_mode": "walk", + "action": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/assets/须弥凯瑟琳.json b/repo/js/AutoCatherine/assets/须弥凯瑟琳.json new file mode 100644 index 00000000..50f496f8 --- /dev/null +++ b/repo/js/AutoCatherine/assets/须弥凯瑟琳.json @@ -0,0 +1,68 @@ +{ + "info": { + "name": "须弥凯瑟琳", + "type": "collect", + "author": "½", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "x": 2786.97265625, + "y": -503.10498046875, + "type": "teleport", + "move_mode": "walk", + "action": "" + }, + { + "id": 2, + "x": 2787.900390625, + "y": -494.41162109375, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 3, + "x": 2786.150390625, + "y": -486.7470703125, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 4, + "x": 2781.1748046875, + "y": -483.95751953125, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 5, + "x": 2774.4716796875, + "y": -480.65478515625, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 6, + "x": 2771.126953125, + "y": -476.7919921875, + "type": "path", + "move_mode": "walk", + "action": "" + }, + { + "id": 7, + "x": 2765.76953125, + "y": -476.0498046875, + "type": "path", + "move_mode": "walk", + "action": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/main.js b/repo/js/AutoCatherine/main.js new file mode 100644 index 00000000..a8bca7e0 --- /dev/null +++ b/repo/js/AutoCatherine/main.js @@ -0,0 +1,29 @@ +(async function () { + // 所有的代码必须由 async function 包裹 + async function AutoPath(locationName) { + log.info(`前往 ${locationName}`); + try { + let filePath = `assets/${locationName}.json`; + await pathingScript.runFile(filePath); + } catch (error) { + log.error(`执行 ${locationName} 路径时发生错误`); + } + await sleep(2000); + if (locationName == "纳塔凯瑟琳") + keyDown("w"); + await sleep(4500); + keyUp("w"); + keyDown("d"); + await sleep(2000); + keyUp("d"); + } + let filePath; + + if (settings.selectway === undefined) + filePath = "枫丹凯瑟琳" + else + filePath = settings.selectway; + + log.info("开始执行路径脚本"); + await AutoPath(filePath); +})(); diff --git a/repo/js/AutoCatherine/manifest.json b/repo/js/AutoCatherine/manifest.json new file mode 100644 index 00000000..59da9f52 --- /dev/null +++ b/repo/js/AutoCatherine/manifest.json @@ -0,0 +1,13 @@ +{ + "manifest_version": 1, + "name": "自动找凯瑟琳", + "version": "1.0", + "description": "去找凯瑟琳(基于路径追踪)", + "authors": [ + { + "name": "½" + } + ], + "settings_ui": "settings.json", + "main": "main.js" +} \ No newline at end of file diff --git a/repo/js/AutoCatherine/settings.json b/repo/js/AutoCatherine/settings.json new file mode 100644 index 00000000..54386d95 --- /dev/null +++ b/repo/js/AutoCatherine/settings.json @@ -0,0 +1,16 @@ +[ + { + "name": "selectValue", // 变量名,在js内使用 settings.变量名 获取对应的配置值 + "type": "select", // 类型 + "label": "选项框", // 显示标签 + "options": [ //选项 + "蒙德凯瑟琳", + "璃月凯瑟琳", + "稻妻凯瑟琳", + "须弥凯瑟琳", + "枫丹凯瑟琳", + "纳塔凯瑟琳" + ] + } + ] + \ No newline at end of file diff --git a/repo/js/BattlePass/main.js b/repo/js/BattlePass/main.js index c30d21bb..4e36e109 100644 --- a/repo/js/BattlePass/main.js +++ b/repo/js/BattlePass/main.js @@ -5,8 +5,8 @@ click(1920, 100); await sleep(1000); click(3480, 1948); - await sleep(1000); + await sleep(3000); keyPress("Escape"); - log.info("已领取历练点"); -})(); \ No newline at end of file + log.info("已领取纪行奖励"); +})(); diff --git a/repo/js/BattlePass/manifest.json b/repo/js/BattlePass/manifest.json index d3ab9b25..b3d4fcf5 100644 --- a/repo/js/BattlePass/manifest.json +++ b/repo/js/BattlePass/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "领取纪行", - "version": "1.0", + "version": "1.1", "description": "用于领取纪行", "authors": [ { @@ -9,4 +9,4 @@ } ], "main": "main.js", -} \ No newline at end of file +} diff --git a/repo/js/Daily Commission/main.js b/repo/js/Daily Commission/main.js index b2ab13d3..f7b5d6a3 100644 --- a/repo/js/Daily Commission/main.js +++ b/repo/js/Daily Commission/main.js @@ -1,14 +1,23 @@ (async function () { - setGameMetrics(1920, 1080, 2); // 设置游戏窗口大小和DPI + setGameMetrics(1920, 1080, 2); keyPress("F"); - await sleep(3000); - click(960, 540); - await sleep(2000); - click(1400, 430); - await sleep(3000); - click(950, 800); - await sleep(800); - click(950, 800); - - log.info("已领取每日委托奖励"); -})(); \ No newline at end of file + log.info("按下F键"); + await sleep(1000); + log.info("等待1秒"); + click(960, 540); + log.info("点击坐标(960, 540)(屏幕中心)"); + await sleep(1000); + log.info("等待1秒"); + click(1380, 425); + log.info("点击坐标(1380, 425)(领取「每日委托」奖励)"); + await sleep(1000); + log.info("等待1秒"); + click(960, 540); + log.info("点击坐标(960, 540)(屏幕中心)"); + await sleep(3000); + log.info("等待3秒"); + click(960, 960); + log.info("点击坐标(960, 960)(关闭奖励弹出页面)"); + + log.info("结束"); +})(); diff --git a/repo/js/Daily Commission/manifest.json b/repo/js/Daily Commission/manifest.json index fc6221d7..6f235c65 100644 --- a/repo/js/Daily Commission/manifest.json +++ b/repo/js/Daily Commission/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "领取每日委托奖励", - "version": "1.1", + "version": "1.2", "description": "用于领取每日委托奖励", "authors": [ { @@ -9,4 +9,4 @@ } ], "main": "main.js", -} \ No newline at end of file +}