diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json index d49a9da35..7fe286f69 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/settings.json +++ b/repo/js/AAA-Artifacts-Bulk-Supply/settings.json @@ -2,7 +2,7 @@ { "name": "artifactPartyName", "type": "input-text", - "label": "####################################################################\n队伍切换配置\n\n请输入【狗粮队伍】的名称", + "label": "#############################################\n队伍切换配置\n\n请输入【狗粮队伍】的名称", "default": "狗粮" }, { @@ -13,7 +13,7 @@ { "name": "minIntervalTime", "type": "input-text", - "label": "####################################################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认为1分钟，过短可能导致丢失收尾和额外收益", + "label": "#############################################\n卡时间与收尾配置\n\n最短间隔时间（分钟）\n默认为1分钟，过短可能导致丢失收尾和额外收益", "default": "1" }, { @@ -35,7 +35,7 @@ { "name": "decomposeMode", "type": "select", - "label": "####################################################################\n狗粮分解配置\n\n狗粮分解模式", + "label": "#############################################\n狗粮分解配置\n\n狗粮分解模式", "options": [ "保留", "分解（经验瓶）", @@ -56,7 +56,7 @@ { "name": "notify", "type": "checkbox", - "label": "####################################################################\n其他配置\n\n是否通知信息" + "label": "#############################################\n其他配置\n\n是否通知信息" }, { "name": "accountName", diff --git a/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p清籁丸(替补)/执行/310【收尾】稻妻-清籁丸20.json b/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/清籁丸/执行/310【收尾】稻妻-清籁丸20.json similarity index 100% rename from repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p清籁丸(替补)/执行/310【收尾】稻妻-清籁丸20.json rename to repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/清籁丸/执行/310【收尾】稻妻-清籁丸20.json diff --git a/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p茶叶(替补)/执行/01沉玉谷-翘英庄-沉玉仙茗35.json b/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/茶叶/执行/01沉玉谷-翘英庄-沉玉仙茗35.json similarity index 100% rename from repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p茶叶(替补)/执行/01沉玉谷-翘英庄-沉玉仙茗35.json rename to repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/茶叶/执行/01沉玉谷-翘英庄-沉玉仙茗35.json diff --git a/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p茶叶(替补)/执行/02沉玉谷-翘英庄-沉玉仙茗25.json b/repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/茶叶/执行/02沉玉谷-翘英庄-沉玉仙茗25.json similarity index 100% rename from repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/1p茶叶(替补)/执行/02沉玉谷-翘英庄-沉玉仙茗25.json rename to repo/js/ArtifactsGroupPurchasing/assets/ArtifactsPath/茶叶/执行/02沉玉谷-翘英庄-沉玉仙茗25.json diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index eb9076e3d..82735fec3 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -80,7 +80,7 @@ let skipRunning = false; autoEnterSettings = { enterMode: "等待他人进入", permissionMode: "白名单", - timeout: loopCnt++ === 0 ? 15 : 5, // ← 第一次 15，之后 5 + timeout: loopCnt++ === 0 ? 10 : 5, // ← 第一次 10，之后 5 maxEnterCount: Object.keys(permits).length }; @@ -93,7 +93,7 @@ let skipRunning = false; autoEnterSettings = { enterMode: "进入他人世界", enteringUID: settings[`p${idx}UID`], - timeout: loopCnt++ === 0 ? 15 : 5, // ← 第一次 15，之后 5 + timeout: loopCnt++ === 0 ? 10 : 5, // ← 第一次 10，之后 5 }; log.info(`将要进入序号${idx}，uid为${settings[`p${idx}UID`]}的世界`); notification.send(`将要进入序号${idx}，uid为${settings[`p${idx}UID`]}，名称为${settings[`p${idx}Name`]}的世界`); @@ -219,9 +219,9 @@ async function checkP1Name(p1Name) { async function runGroupPurchasing(runExtra) { // ===== 1. 读取配置 ===== const p1EndingRoute = settings.p1EndingRoute || "枫丹高塔"; - const p2EndingRoute = settings.p2EndingRoute || "度假村"; - const p3EndingRoute = settings.p3EndingRoute || "智障厅"; - const p4EndingRoute = settings.p4EndingRoute || "踏鞴砂"; + const p2EndingRoute = "度假村"; + const p3EndingRoute = "智障厅"; + const p4EndingRoute = "踏鞴砂"; const forceGroupNumber = settings.forceGroupNumber || 0; // ===== 2. 图标模板 ===== diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index 3851fb875..eac5cf10e 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.10.2", + "version": "1.10.3", "tags": [ "狗粮" ], diff --git a/repo/js/ArtifactsGroupPurchasing/settings.json b/repo/js/ArtifactsGroupPurchasing/settings.json index 6ca4358b9..25afb7f46 100644 --- a/repo/js/ArtifactsGroupPurchasing/settings.json +++ b/repo/js/ArtifactsGroupPurchasing/settings.json @@ -22,7 +22,7 @@ { "name": "groupMode", "type": "select", - "label": "####################################################################\n联机运行配置\n\n运行模式", + "label": "#############################################\n联机运行配置\n\n运行模式", "options": [ "手动进入后运行", "按照下列配置自动进入并运行" @@ -83,7 +83,7 @@ { "name": "notify", "type": "checkbox", - "label": "####################################################################\n其他配置\n\n是否通知信息" + "label": "#############################################\n其他配置\n\n是否通知信息" }, { "name": "forceGroupNumber", @@ -116,49 +116,12 @@ { "name": "p1EndingRoute", "type": "select", - "label": "####################################################################\n收尾路线配置\n请确保每个人在该部分的选项【完全一致】\n非必要不建议更改\n\n1p收尾路线", + "label": "#############################################\n收尾路线配置\n非必要不建议更改\n\n1p收尾路线", "options": [ "枫丹高塔", - "度假村", - "智障厅", - "踏鞴砂" + "茶叶", + "清籁丸" ], "default": "枫丹高塔" - }, - { - "name": "p2EndingRoute", - "type": "select", - "label": "2p收尾路线", - "options": [ - "枫丹高塔", - "度假村", - "智障厅", - "踏鞴砂" - ], - "default": "度假村" - }, - { - "name": "p3EndingRoute", - "type": "select", - "label": "3p收尾路线", - "options": [ - "枫丹高塔", - "度假村", - "智障厅", - "踏鞴砂" - ], - "default": "智障厅" - }, - { - "name": "p4EndingRoute", - "type": "select", - "label": "4p收尾路线", - "options": [ - "枫丹高塔", - "度假村", - "智障厅", - "踏鞴砂" - ], - "default": "踏鞴砂" } ] \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/settings.json b/repo/js/AutoHoeingOneDragon/settings.json index 28e74809d..29f4df5b6 100644 --- a/repo/js/AutoHoeingOneDragon/settings.json +++ b/repo/js/AutoHoeingOneDragon/settings.json @@ -2,7 +2,7 @@ { "name": "operationMode", "type": "select", - "label": "第一部分：路径组执行配置\n根据每个配置组的具体需求填写\n######################################################\n\n执行模式", + "label": "第一部分：路径组执行配置\n根据每个配置组的具体需求填写\n#############################################\n\n执行模式", "options": [ "运行锄地路线", "输出地图追踪文件", @@ -92,7 +92,7 @@ { "name": "accountName", "type": "input-text", - "label": "######################################################\n\n第二部分：路线选择与分组配置\n确保不同路径组中该部分配置【完全相同】\n######################################################\n\n账户名称\n用于多用户运行时区分不同账户的记录\n单用户请勿修改", + "label": "#############################################\n\n第二部分：路线选择与分组配置\n确保不同路径组中该部分配置【完全相同】\n#############################################\n\n账户名称\n用于多用户运行时区分不同账户的记录\n单用户请勿修改", "default": "默认账户" }, { diff --git a/repo/js/采集cd管理/main.js b/repo/js/采集cd管理/main.js index 7e69bf647..14669188c 100644 --- a/repo/js/采集cd管理/main.js +++ b/repo/js/采集cd管理/main.js @@ -255,7 +255,7 @@ let underWater = false; newSettings.push({ name: `pathGroup${g}FolderName`, type: "select", - label: `##############################################################################\n选择路径组${g}文件夹（pathing下第一层）`, + label: `#############################################\n选择路径组${g}文件夹（pathing下第一层）`, options: ["", ...uniqueDirs] });