From da60c837281eea5cfb33274130043cea20e96e4f Mon Sep 17 00:00:00 2001 From: mno <718135749@qq.com> Date: Wed, 27 Aug 2025 00:40:19 +0800 Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E4=B8=A4=E4=B8=AAAAA=E7=8B=97?= =?UTF-8?q?=E7=B2=AE=20(#1723)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * js：AAA狗粮联机团购 * js：AAA狗粮批发 ### 1.1.4（2025.08.27） 1.尝试修正经验识别 --- repo/js/AAA-Artifacts-Bulk-Supply/README.md | 2 ++ repo/js/AAA-Artifacts-Bulk-Supply/main.js | 30 +++++++++++------- .../AAA-Artifacts-Bulk-Supply/manifest.json | 2 +- .../assets/RecognitionObject/2P.png | Bin 1392 -> 888 bytes .../assets/RecognitionObject/3P.png | Bin 1515 -> 971 bytes .../js/AAA-Artifacts-Group-Purchasing/main.js | 18 ++++++++--- .../manifest.json | 2 +- .../settings.json | 6 ++++ 8 files changed, 43 insertions(+), 17 deletions(-) diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/README.md b/repo/js/AAA-Artifacts-Bulk-Supply/README.md index 37a7afb08..e20e360e0 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/README.md +++ b/repo/js/AAA-Artifacts-Bulk-Supply/README.md @@ -82,6 +82,8 @@ https://www.kdocs.cn/wo/sl/v13uXscL ## 更新日志 +### 1.1.4（2025.08.27） +1.尝试修正经验识别 ### 1.1.3（2025.08.26） 1.更正联机收尾路线逻辑 ### 1.1.2（2025.08.25） diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/main.js b/repo/js/AAA-Artifacts-Bulk-Supply/main.js index 98b45796e..ce48b4f56 100644 --- a/repo/js/AAA-Artifacts-Bulk-Supply/main.js +++ b/repo/js/AAA-Artifacts-Bulk-Supply/main.js @@ -330,17 +330,21 @@ async function processArtifacts(times = 1) { } await sleep(1000); - //识别已储存经验（1570-880-1650-930） - let regionToCheck1 = { x: 1570, y: 880, width: 80, height: 50 }; - let initialNum = await recognizeTextInRegion(regionToCheck1); - let initialValue = 0; + // 识别已储存经验（1570-880-1650-930） + const regionToCheck1 = { x: 1570, y: 880, width: 80, height: 50 }; + const raw = await recognizeTextInRegion(regionToCheck1); - if (initialNum && !isNaN(parseInt(initialNum, 10))) { - initialValue = parseInt(initialNum, 10); + // 把识别到的文字里所有非数字字符去掉，只保留数字 + const digits = (raw || '').replace(/\D/g, ''); + + let initialValue = 0; + if (digits) { + initialValue = parseInt(digits, 10); log.info(`已储存经验识别成功: ${initialValue}`); } else { log.warn(`在指定区域未识别到有效数字: ${initialValue}`); } + let regionToCheck3 = { x: 100, y: 885, width: 170, height: 50 }; let decomposedNum = 0; let firstNumber = 0; @@ -418,12 +422,16 @@ async function processArtifacts(times = 1) { if (settings.notify) { notification.Send(`当前经验如图`); } - let regionToCheck2 = { x: 1470, y: 880, width: 205, height: 70 }; - let newNum = await recognizeTextInRegion(regionToCheck2); - let newValue = 0; + // 当前总经验（1470-880-205-70） + const regionToCheck2 = { x: 1470, y: 880, width: 205, height: 70 }; + const raw2 = await recognizeTextInRegion(regionToCheck2); - if (newNum && !isNaN(parseInt(newNum, 10))) { - newValue = parseInt(newNum, 10); + // 只保留数字 + const digits2 = (raw2 || '').replace(/\D/g, ''); + + let newValue = 0; + if (digits2) { + newValue = parseInt(digits2, 10); log.info(`当前总经验识别成功: ${newValue}`); } else { log.warn(`在指定区域未识别到有效数字: ${newValue}`); diff --git a/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json b/repo/js/AAA-Artifacts-Bulk-Supply/manifest.json index b6966c747..144a89ab3 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.1.3", + "version": "1.1.4", "tags": [ "狗粮" ], diff --git a/repo/js/AAA-Artifacts-Group-Purchasing/assets/RecognitionObject/2P.png b/repo/js/AAA-Artifacts-Group-Purchasing/assets/RecognitionObject/2P.png index 3e936ddc649554e49b94365f747c3376ffec83fa..4f8edeef3f6381c14b5b0c83247d03c266a7ebdc 100644 GIT binary patch literal 888 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