From f3a6a3653015e2926b7194406e7dfa14c4221711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=90?= <121607261+jiegedabaobei@users.noreply.github.com> Date: Thu, 4 Sep 2025 00:49:45 +0800 Subject: [PATCH 1/6] repo/js/AAA-Artifacts-Bulk-Supply: fix pathing (#1812) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修几条路线622,638, 2.联机-收尾-清怪增加踏鞴砂 --- repo/js/AAA-Artifacts-Bulk-Supply/README.md | 3 + .../普通A/执行/622纳塔-悠悠集市栈道南7.json | 9 ++- .../普通B/执行/638纳塔-浪浪湾9.json | 20 +++++-- .../优先收尾路线/清怪/305【清怪】稻妻-踏鞴砂.json | 58 +++++++++++++++++++ .../AAA-Artifacts-Bulk-Supply/manifest.json | 2 +- 5 files changed, 80 insertions(+), 12 deletions(-) create mode 100644 repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/清怪/305【清怪】稻妻-踏鞴砂.json diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md index 6b60b2dc1..223a1d90b 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/README.md +++ b/repo/js/AAA-Artifacts-Bulk-Supply/README.md @@ -82,6 +82,9 @@ https://www.kdocs.cn/wo/sl/v13uXscL ## 更新日志 +### 1.2.7（2025.09.03） +1.修几条路线622,638, +2.联机-收尾-清怪增加踏鞴砂 ### 1.2.6（2025.09.03） 1.调整清怪和准备的位置 ### 1.2.5（2025.09.02） diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json index d1f849d49..35f768cf0 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通A/执行/622纳塔-悠悠集市栈道南7.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1755973841887, + "last_modified_time": 1756916571673, "map_match_method": "", "map_name": "Teyvat", "name": "622纳塔-悠悠集市栈道南7", @@ -67,7 +67,6 @@ "action": "combat_script", "action_params": "wait(1.1)", "id": 6, - "locked": false, "move_mode": "dash", "type": "orientation", "x": 13736.154296875, @@ -240,9 +239,9 @@ "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", "id": 25, "move_mode": "climb", - "type": "target", - "x": 13737.6953125, - "y": 140.15869140625 + "type": "path", + "x": 13737.6396484375, + "y": 139.68603515625 } ] } \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/638纳塔-浪浪湾9.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/638纳塔-浪浪湾9.json index 00fe27765..48453a45a 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/638纳塔-浪浪湾9.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/普通B/执行/638纳塔-浪浪湾9.json @@ -9,7 +9,7 @@ "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1756576123668, + "last_modified_time": 1756916416345, "map_match_method": "", "map_name": "Teyvat", "name": "638纳塔-浪浪湾9", @@ -103,7 +103,6 @@ "action": "combat_script", "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "id": 10, - "locked": false, "move_mode": "climb", "type": "path", "x": 14501.9287109375, @@ -201,12 +200,12 @@ }, { "action": "combat_script", - "action_params": "keydown(Q),keypress(f),wait(0.8),keypress(f),keyup(Q),wait(0.1),j,keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),attack(0.08);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", + "action_params": "keydown(Q),keypress(f),wait(0.8),keypress(f),keyup(Q),wait(0.1),j,keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),attack(0.08);万叶 attack(0.08),keydown(E),wait(0.8),keyup(E),attack(0.2),wait(1);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", "id": 21, "move_mode": "climb", "type": "target", - "x": 14552.43359375, - "y": 973.0966796875 + "x": 14554.5625, + "y": 969.5323345208872 }, { "action": "", @@ -255,12 +254,21 @@ }, { "action": "combat_script", - "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", + "action_params": "keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f);万叶 attack(0.08),keydown(E),wait(0.48),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);wait(2)", "id": 27, "move_mode": "climb", "type": "target", "x": 14538.6826171875, "y": 961.74609375 + }, + { + "action": "combat_script", + "action_params": "keypress(f);万叶 attack(0.08),keydown(E),wait(0.7),keyup(E),attack(0.2);琴 attack(0.08),keydown(E),wait(0.4),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,0),wait(0.2),moveby(1000,-3500),wait(1.8),keyup(E),wait(0.3),click(middle);", + "id": 28, + "move_mode": "walk", + "type": "path", + "x": 14544.9296875, + "y": 962.48486328125 } ] } \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/清怪/305【清怪】稻妻-踏鞴砂.json b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/清怪/305【清怪】稻妻-踏鞴砂.json new file mode 100644 index 000000000..7405cdd24 --- /dev/null +++ b/repo/js/AAA-Artifacts-Bulk-Supply/assets/ArtifactsPath/联机收尾/优先收尾路线/清怪/305【清怪】稻妻-踏鞴砂.json @@ -0,0 +1,58 @@ +{ + "info": { + "authors": [ + { + "links": "", + "name": "汐" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1756581878183, + "map_match_method": "", + "map_name": "Teyvat", + "name": "305【清怪】稻妻-踏鞴砂", + "tags": [], + "type": "collect", + "version": "1.0" + }, + "positions": [ + { + "action": "", + "action_params": "", + "id": 1, + "move_mode": "walk", + "type": "teleport", + "x": -3291.32421875, + "y": -3653.3291015625 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 2, + "move_mode": "fly", + "type": "path", + "x": -3325.451171875, + "y": -3657.1875 + }, + { + "action": "combat_script", + "action_params": "keypress(x);芙宁娜 e;玛薇卡 e;爱可菲 e;伊涅芙 e;", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": -3341.513671875, + "y": -3660.4853515625 + }, + { + "action": "fight", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": -3328.49609375, + "y": -3677.412109375 + } + ] +} \ No newline at end of file diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json index 41e014118..4be5a379c 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮批发", - "version": "1.2.6", + "version": "1.2.7", "tags": [ "狗粮" ], From c9500fe81e42e1deaf0dda8e7e9bedb412e57052 Mon Sep 17 00:00:00 2001 From: physligl <181079228+physligl@users.noreply.github.com> Date: Wed, 3 Sep 2025 16:50:05 +0000 Subject: [PATCH 2/6] update repo.json --- repo.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/repo.json b/repo.json index 856b3de12..23ca577ab 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20250903225151", + "time": "20250904005003", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -77226,8 +77226,8 @@ { "name": "AAA-Artifacts-Bulk-Supply", "type": "directory", - "hash": "b61bc54b30e8c7a1998436fac7359028d4fa43d2", - "version": "1.2.6", + "hash": "69a51b82e37154618a52861298f495ba44f7db08", + "version": "1.2.7", "author": "mno", "authors": [ { @@ -77243,7 +77243,7 @@ "tags": [ "狗粮" ], - "lastUpdated": "2025-09-03 20:18:52" + "lastUpdated": "2025-09-04 00:49:45" }, { "name": "AEscoffier_chef", From 5112cf08958e05ae95796566d38cf11a3404b161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Thu, 4 Sep 2025 02:16:02 +0800 Subject: [PATCH 3/6] fix bug --- build/build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.js b/build/build.js index 00245c4fe..2616aa2d0 100644 --- a/build/build.js +++ b/build/build.js @@ -384,7 +384,7 @@ function extractInfoFromPathingFile(filePath, parentFolders) { if (actions.includes('log_output')) tags.push('有日志'); if (actions.includes('pick_around')) tags.push('转圈拾取'); if (actions.includes('fishing')) tags.push('钓鱼'); - if (actions.includes('set_time')) tag.push('时间调整'); + if (actions.includes('set_time')) tags.push('时间调整'); const move_modes = contentObj.positions.map(pos => pos.move_mode); if (move_modes.includes('climb')) tags.push("有攀爬"); From 71ba329c5115cfd0a1c40e49c0454cf46fc785c7 Mon Sep 17 00:00:00 2001 From: huiyadanli <15783049+huiyadanli@users.noreply.github.com> Date: Wed, 3 Sep 2025 18:17:04 +0000 Subject: [PATCH 4/6] update repo.json --- repo.json | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/repo.json b/repo.json index 23ca577ab..a69487529 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20250904005003", + "time": "20250904021703", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -12222,8 +12222,22 @@ "name": "09-沉玉谷上谷-6个.json", "type": "file", "hash": "2c35cf6fb3d4884b4ff53445d075cd8f2024b084", - "version": "2c35cf6", - "error": "tag is not defined" + "version": "1.0", + "author": "芝士贝果", + "authors": [ + { + "name": "芝士贝果" + } + ], + "description": "", + "tags": [ + "bgi≥0.45.0", + "地方特产", + "璃月", + "绝云椒椒", + "时间调整" + ], + "lastUpdated": "2025-08-23 12:10:26" }, { "name": "10-古茶树坡-6个.json", From f3d5cb859024f298c93b3e5e4546749e2ec5a514 Mon Sep 17 00:00:00 2001 From: Yihan Zhao <61570580+Juhao73692@users.noreply.github.com> Date: Thu, 4 Sep 2025 04:22:26 +0800 Subject: [PATCH 5/6] =?UTF-8?q?repo/js/=E9=87=87=E9=9B=86cd=E7=AE=A1?= =?UTF-8?q?=E7=90=86:=20=E5=A2=9E=E5=8A=A0=E4=BA=86=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E7=9A=84=E5=8A=9F=E8=83=BD=20(#1806?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * new feature: skip folders that end with .disabled * Updated readme and manifest. * Update some comments * Fix an issue where tasks unexpectedly stop --- repo/js/采集cd管理/README.md | 2 +- repo/js/采集cd管理/main.js | 13 ++++++++----- repo/js/采集cd管理/manifest.json | 6 +++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/repo/js/采集cd管理/README.md b/repo/js/采集cd管理/README.md index 35504330f..330163065 100644 --- a/repo/js/采集cd管理/README.md +++ b/repo/js/采集cd管理/README.md @@ -15,5 +15,5 @@ - **配队管理**：支持为每个路径组指定配队名称，自动切换配队。 ## 使用方法 -1. 将要运行的地图追踪文件放在pathing文件夹下的不同路径组中，将会按照路径组的顺序执行，并跳过未刷新的路线 +1. 将要运行的地图追踪文件放在pathing文件夹下的不同路径组中，将会按照路径组的顺序执行，并跳过未刷新的路线。可以在文件夹名称后面添加“.disabled”以禁用这个文件夹下的路径追踪文件。 2. 根据需要修改自定义配置，设置操作模式、路径组CD类型、配队名称等参数。 \ No newline at end of file diff --git a/repo/js/采集cd管理/main.js b/repo/js/采集cd管理/main.js index 08ffd7f30..02f571403 100644 --- a/repo/js/采集cd管理/main.js +++ b/repo/js/采集cd管理/main.js @@ -159,8 +159,11 @@ async function readFolder(folderPath, onlyJson) { // 临时数组，用于存储子文件夹路径 const subFolders = []; for (const filePath of filesInSubFolder) { - if (file.IsFolder(filePath)) { - // 如果是文件夹，先存储到临时数组中 + if (file.IsFolder(filePath)) { // 如果是文件夹，先存储到临时数组中 + if (filePath.toLowerCase().endsWith(".disabled")) { // 跳过以.disabled结尾的被禁用的路径 + log.info(`跳过禁用的文件夹：${filePath}`); + continue; + } subFolders.push(filePath); } else { // 如果是文件，根据 onlyJson 判断是否存储 @@ -236,10 +239,10 @@ async function readFolder(folderPath, onlyJson) { const targetFolder = `pathing/路径组${i}`; // 动态生成目标文件夹路径 const files = await readFolder(targetFolder, true); const filePaths = files.map(file => file.fullPath); - // 如果文件夹为空，退出循环 + // 如果文件夹为空，跳过当前路径组 if (filePaths.length === 0) { - log.info(`路径组${i} 文件夹为空，停止处理`); - break; + log.info(`路径组${i} 文件夹为空，跳过`); + continue; } // 用于存储符合条件的文件名的数组 const jsonFileNames = []; diff --git a/repo/js/采集cd管理/manifest.json b/repo/js/采集cd管理/manifest.json index 8da71d15b..c57122c72 100644 --- a/repo/js/采集cd管理/manifest.json +++ b/repo/js/采集cd管理/manifest.json @@ -1,13 +1,17 @@ { "manifest_version": 1, "name": "采集cd管理", - "version": "1.3.2", + "version": "1.3.3", "bgi_version": "0.44.8", "description": "仅面对会操作文件和读readme的用户，基于文件夹操作自动管理采集路线的cd，会按照路径组的顺序依次运行，直到指定的时间，并会按照给定的cd类型，自动跳过未刷新的路线", "authors": [ { "name": "mno", "links": "https://github.com/Bedrockx" + }, + { + "name": "Juhao73692", + "links": "https://github.com/Juhao73692" } ], "settings_ui": "settings.json", From e4c3a1f9f46dc2cfa49d500c75224215d5fd8cfc Mon Sep 17 00:00:00 2001 From: physligl <181079228+physligl@users.noreply.github.com> Date: Wed, 3 Sep 2025 20:23:31 +0000 Subject: [PATCH 6/6] update repo.json --- repo.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/repo.json b/repo.json index a69487529..05f4ee030 100644 --- a/repo.json +++ b/repo.json @@ -1,5 +1,5 @@ { - "time": "20250904021703", + "time": "20250904042330", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "file": "repo.json", "indexes": [ @@ -79354,20 +79354,24 @@ { "name": "采集cd管理", "type": "directory", - "hash": "22e5c0e06b601d6bda1117604de150b45c0104d1", - "version": "1.3.2", + "hash": "1c05a40218b773364eb5a9e31df22920892e426a", + "version": "1.3.3", "author": "mno", "authors": [ { "name": "mno", "link": "https://github.com/Bedrockx" + }, + { + "name": "Juhao73692", + "link": "https://github.com/Juhao73692" } ], "description": "采集cd管理~|~仅面对会操作文件和读readme的用户，基于文件夹操作自动管理采集路线的cd，会按照路径组的顺序依次运行，直到指定的时间，并会按照给定的cd类型，自动跳过未刷新的路线", "tags": [ "bgi≥0.44.8" ], - "lastUpdated": "2025-07-04 23:14:44" + "lastUpdated": "2025-09-04 04:22:26" }, { "name": "铁匠铺",