From b1c285ac66167badfb1c214e8ccf95f64566b811 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 25 Feb 2026 21:36:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=87=BB=E6=9D=80=E6=95=B0=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF=E6=97=B6=E9=97=AA?= =?UTF-8?q?=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index 394388aef5..1563c0281a 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp @@ -309,6 +309,11 @@ BattlefieldMatcher::MatchResult> BattlefieldMatcher::kills_a } } + if (kills_text.length() <= pos + 1) { + Log.error("kills_text length is too short"); + return {}; + } + // 例子中的"0" std::string kills_count = kills_text.substr(0, pos); if (kills_count.empty() || !std::ranges::all_of(kills_count, [](char c) -> bool { return std::isdigit(c); })) { From 1bfe044e9d5758b2ee7d055c9dc20c56c67084d5 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 25 Feb 2026 22:21:26 +0800 Subject: [PATCH 2/4] chore: BattleKills roi --- resource/tasks/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/tasks/tasks.json b/resource/tasks/tasks.json index c3b6356196..bd14013ab6 100644 --- a/resource/tasks/tasks.json +++ b/resource/tasks/tasks.json @@ -3771,7 +3771,7 @@ "algorithm": "OcrDetect", "isAscii": true, "text": [], - "roi": [50, 0, 100, 40], + "roi": [50, -20, 100, 40], "useRaw": false, "specialParams_doc": "Kill区域变化阈值, 模板匹配, 100=1.0; 正常在 0.997-1 之间波动, 少有0.995; _5->_6 的分数最高, 可达0.94", "specialParams": [98] From 867b94a0fd45833ec0e2304335f18228e008ecbd Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 25 Feb 2026 23:20:09 +0800 Subject: [PATCH 3/4] docs: Bump version to v6.3.5 and update changelog Updated version number to v6.3.5 and added release notes. --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc54d972a9..aba6e6e426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v6.3.4 +## v6.3.5 ### 拉电线不知天地为何物 | Highlight @@ -65,6 +65,16 @@ We warmly welcome community developers to assist with adaptation and submit impr 以下是详细内容: +## v6.3.5 + +### 修复 | Fix + +* 击杀数部分识别错误情况下闪退 @ABA2396 + +### 其他 | Other + +* 调整 BattleKills roi @ABA2396 + ## v6.3.4 ### 修复 | Fix From f90afe7914cc6002d87499291378342eee828d77 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 25 Feb 2026 23:21:38 +0800 Subject: [PATCH 4/4] chore: Update src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp index 1563c0281a..f6347abebf 100644 --- a/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp +++ b/src/MaaCore/Vision/Battle/BattlefieldMatcher.cpp @@ -310,7 +310,12 @@ BattlefieldMatcher::MatchResult> BattlefieldMatcher::kills_a } if (kills_text.length() <= pos + 1) { - Log.error("kills_text length is too short"); + Log.error( + "kills_text length is too short: text='{}', length={}, pos={}", + kills_text, + kills_text.size(), + pos + ); return {}; }