diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/0P.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/0P.png index a1afdd58d..3a5bf5ae4 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/0P.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/0P.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/2pInBigMap.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/2pInBigMap.png index 2b54b453d..31ffac707 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/2pInBigMap.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/2pInBigMap.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/3pInBigMap.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/3pInBigMap.png index 28d076774..d4a6f4582 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/3pInBigMap.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/3pInBigMap.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/4pInBigMap.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/4pInBigMap.png index 2f61fc9cc..c3fec1a57 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/4pInBigMap.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/4pInBigMap.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/allowEnter.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/allowEnter.png index 8c6cd7632..e3f5a941d 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/allowEnter.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/allowEnter.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/yUI.png b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/yUI.png index 4e365bb76..b7861b40b 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/yUI.png and b/repo/js/ArtifactsGroupPurchasing/assets/RecognitionObject/yUI.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index e1b2c43ff..49c010d1a 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -575,7 +575,7 @@ async function autoEnter(autoEnterSettings) { const requestEnterRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/requestEnter.png")); const requestEnter2Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/requestEnter.png"), 1480, 300, 280, 600); const yUIRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/yUI.png")); - const allowEnterRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/allowEnter.png"), 1250, 300, 150, 130); + const allowEnterRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/RecognitionObject/allowEnter.png")); const targetsPath = "targets"; // ===== 状态 ===== @@ -594,7 +594,7 @@ async function autoEnter(autoEnterSettings) { for (const f of targetPngs) { if (!f.fullPath.endsWith('.png')) continue; const mat = file.ReadImageMatSync(f.fullPath); - const ro = RecognitionObject.TemplateMatch(mat, 650, 320, 350, 60); + const ro = RecognitionObject.TemplateMatch(mat, 664, 481, 1355 - 668, 588 - 484); const baseName = f.fileName.replace(/\.png$/i, ''); targetsRo.push({ ro, baseName }); } @@ -728,7 +728,7 @@ async function autoEnter(autoEnterSettings) { } catch { } try { const gameRegion = captureGameRegion(); - const resList = gameRegion.findMulti(RecognitionObject.ocr(650, 320, 350, 60)); + const resList = gameRegion.findMulti(RecognitionObject.ocr(664, 481, 1355 - 668, 588 - 484)); gameRegion.dispose(); let hit = null; for (const res of resList) { @@ -859,10 +859,20 @@ async function getPlayerSign() { await genshin.returnMainUi(); await sleep(500); const p0Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync(picDic["0P"]), 344, 22, 45, 45); + p0Ro.Threshold = 0.95; + p0Ro.InitTemplate(); const p1Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync(picDic["1P"]), 344, 22, 45, 45); + p1Ro.Threshold = 0.95; + p1Ro.InitTemplate(); const p2Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync(picDic["2P"]), 344, 22, 45, 45); + p2Ro.Threshold = 0.95; + p2Ro.InitTemplate(); const p3Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync(picDic["3P"]), 344, 22, 45, 45); + p3Ro.Threshold = 0.95; + p3Ro.InitTemplate(); const p4Ro = RecognitionObject.TemplateMatch(file.ReadImageMatSync(picDic["4P"]), 344, 22, 45, 45); + p4Ro.Threshold = 0.95; + p4Ro.InitTemplate(); moveMouseTo(1555, 860); // 移走鼠标,防止干扰识别 const gameRegion = captureGameRegion(); // 当前页面模板匹配 diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index 03360ecca..04f153d82 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.5.2", + "version": "1.5.4", "tags": [ "狗粮" ], diff --git a/repo/js/ArtifactsGroupPurchasing/targets/二十四桥月.png b/repo/js/ArtifactsGroupPurchasing/targets/二十四桥月.png new file mode 100644 index 000000000..9c5b0ffbb Binary files /dev/null and b/repo/js/ArtifactsGroupPurchasing/targets/二十四桥月.png differ diff --git a/repo/js/ArtifactsGroupPurchasing/targets/火山老师.png b/repo/js/ArtifactsGroupPurchasing/targets/火山老师.png index 6c047f973..a5c5094a5 100644 Binary files a/repo/js/ArtifactsGroupPurchasing/targets/火山老师.png and b/repo/js/ArtifactsGroupPurchasing/targets/火山老师.png differ