Skip to content

Commit c771051

Browse files
authored
js:联机狗粮&锄地一条龙 (#2272)
* js:联机狗粮&锄地一条龙 1.联机狗粮识别队伍编号增加输出 2.联机狗粮移除分解狗粮过程中找不到对应按钮的输出 3.锄地一条龙增加对12小时制的处理 * Update main.js
1 parent f894aa3 commit c771051

File tree

5 files changed

+30
-10
lines changed

5 files changed

+30
-10
lines changed

repo/js/ArtifactsGroupPurchasing/main.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ async function isMainUI() {
877877
async function getPlayerSign() {
878878
let attempts = 0;
879879
let result = 0;
880-
while (attempts < 5) {
880+
while (attempts < 10) {
881881
attempts++;
882882
const picDic = {
883883
"0P": "assets/RecognitionObject/0P.png",
@@ -912,12 +912,13 @@ async function getPlayerSign() {
912912
let p3 = gameRegion.Find(p3Ro);
913913
let p4 = gameRegion.Find(p4Ro);
914914
gameRegion.dispose();
915-
if (p0.isExist()) { result = 0; break; }
916-
if (p1.isExist()) { result = 1; break; }
917-
if (p2.isExist()) { result = 2; break; }
918-
if (p3.isExist()) { result = 3; break; }
919-
if (p4.isExist()) { result = 4; break; }
915+
if (p0.isExist()) { result = 0; log.info("识别结果为0P"); break; }
916+
if (p1.isExist()) { result = 1; log.info("识别结果为0P"); break; }
917+
if (p2.isExist()) { result = 2; log.info("识别结果为0P"); break; }
918+
if (p3.isExist()) { result = 3; log.info("识别结果为0P"); break; }
919+
if (p4.isExist()) { result = 4; log.info("识别结果为0P"); break; }
920920
}
921+
log.warn("超时仍未识别到队伍编号");
921922
return result;
922923
}
923924

@@ -1481,7 +1482,6 @@ async function processArtifacts() {
14811482
result.click();
14821483
return true; // 成功立刻返回
14831484
}
1484-
log.warn(`识别失败,第 ${attempts + 1} 次重试`);
14851485
} catch (err) {
14861486
} finally {
14871487
gameRegion.dispose();

repo/js/ArtifactsGroupPurchasing/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": "AAA狗粮联机团购",
4-
"version": "1.5.12",
4+
"version": "1.5.13",
55
"tags": [
66
"狗粮"
77
],

repo/js/AutoHoeingOneDragon/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
- **排除关键词:** 含有关键词的路线会被排除,例如填写纳塔来排除所有纳塔路线,同样使用中文逗号分隔
6565

6666
4. **只建议在原神中设置1080p,60帧使用,其他分辨率或帧率出现任何问题都是正常现象**
67+
5. **不建议使用12小时制时间(虽然也能跑)**
6768

6869
### 二、**锄地收益**
6970
- 击杀精英怪和小怪通常会掉落对应的材料和一定量摩拉,同时为队伍中角色提供经验,精英怪还会概率掉落三四星的战狂、教官、流放者圣遗物

repo/js/AutoHoeingOneDragon/main.js

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@ let blacklistSet = new Set();
2626
let state;
2727
const accountName = settings.accountName || "默认账户";
2828
let pathings;
29-
29+
let localeWorks;
3030
(async function () {
3131
targetItems = await loadTargetItems();
3232
//自定义配置处理
3333
const operationMode = settings.operationMode || "运行锄地路线";
3434

35+
localeWorks = !isNaN(Date.parse(new Date().toLocaleString()));
36+
if (!localeWorks) {
37+
log.warn('[WARN] 当前设备 toLocaleString 无法被 Date 解析');
38+
log.warn('[WARN] 建议不要使用12小时时间制');
39+
await sleep(5000);
40+
}
41+
3542
let k = settings.efficiencyIndex;
3643
// 空字符串、null、undefined 或非数字 → 0.5
3744
if (k === '' || k == null || Number.isNaN(Number(k))) {
@@ -147,6 +154,10 @@ let pathings;
147154
}
148155

149156
log.info('当前队伍:' + teamStr);
157+
if (improperTeam) {
158+
log.warn("当前队伍不适合锄地,建议重新阅读readme相关部分");
159+
await sleep(5000);
160+
}
150161

151162
log.info("开始运行锄地路线");
152163
await updateRecords(pathings, accountName);
@@ -1335,6 +1346,7 @@ async function processPathingsByGroup(pathings, accountName) {
13351346

13361347
// 更新路径的 cdTime
13371348
pathing.cdTime = nextEightClock.toLocaleString();
1349+
if (!localeWorks) pathing.cdTime = nextEightClock.toISOString();
13381350

13391351
remainingEstimatedTime -= pathing.t;
13401352
const actualUsedTime = (new Date() - groupStartTime) / 1000;
@@ -1369,6 +1381,9 @@ async function initializeCdTime(pathings, accountName) {
13691381
? new Date(entry.cdTime).toLocaleString()
13701382
: new Date(0).toLocaleString();
13711383

1384+
if (!localeWorks) pathing.cdTime = entry
1385+
? new Date(entry.cdTime).toISOString()
1386+
: new Date(0).toISOString();
13721387
// 确保当前 records 是数组
13731388
const current = Array.isArray(pathing.records) ? pathing.records : new Array(7).fill(-1);
13741389

@@ -1388,6 +1403,10 @@ async function initializeCdTime(pathings, accountName) {
13881403
pathing.cdTime = new Date(0).toLocaleString();
13891404
pathing.records = new Array(7).fill(-1);
13901405
});
1406+
if (!localeWorks) pathings.forEach(pathing => {
1407+
pathing.cdTime = new Date(0).toISOString();
1408+
pathing.records = new Array(7).fill(-1);
1409+
});
13911410
}
13921411
}
13931412

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.9.12",
4+
"version": "1.9.13",
55
"description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用",
66
"authors": [
77
{

0 commit comments

Comments
 (0)