From 6c7bf710cf3a9599d96d798541acea2bc83a7789 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Wed, 12 Apr 2023 23:02:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E5=85=B3=E5=8D=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=20"R8-11"=20=E4=B8=8E=20"12-17-HARD?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Services/StageManager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/MaaWpfGui/Services/StageManager.cs b/src/MaaWpfGui/Services/StageManager.cs index e739a52359..14524e9a12 100644 --- a/src/MaaWpfGui/Services/StageManager.cs +++ b/src/MaaWpfGui/Services/StageManager.cs @@ -269,6 +269,8 @@ namespace MaaWpfGui.Services { // 主线关卡 { "1-7", new StageInfo { Display = "1-7", Value = "1-7" } }, + { "R8-11", new StageInfo { Display = "R8-11", Value = "R8-11" } }, + { "12-17-HARD", new StageInfo { Display = "12-17-HARD", Value = "12-17-HARD" } }, // 资源本 { "CE-6", new StageInfo("CE-6", "CETip", new[] { DayOfWeek.Tuesday, DayOfWeek.Thursday, DayOfWeek.Saturday, DayOfWeek.Sunday }, resourceCollection) }, From 5334094d76497b12d67869d8c110d4ffa5bbcc22 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 13 Apr 2023 00:09:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E6=97=B6=E7=9A=84=E5=B4=A9=E6=BA=83?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues/4298 --- src/MaaCore/Config/TemplResource.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/MaaCore/Config/TemplResource.cpp b/src/MaaCore/Config/TemplResource.cpp index 7154fe09ef..45232fd98e 100644 --- a/src/MaaCore/Config/TemplResource.cpp +++ b/src/MaaCore/Config/TemplResource.cpp @@ -57,7 +57,20 @@ const cv::Mat& asst::TemplResource::get_templ(const std::string& name) { if (m_templs.find(name) == m_templs.cend()) { Log.info(__FUNCTION__, "lazy load", name); - cv::Mat templ = asst::imread(m_templ_paths.at(name)); + + auto path_iter = m_templ_paths.find(name); + if (path_iter == m_templ_paths.cend()) { + Log.error(__FUNCTION__, "templ not found", name); + +#ifdef ASST_DEBUG + throw std::runtime_error("templ not found: " + name); +#else + static cv::Mat empty; + return empty; +#endif + } + + cv::Mat templ = asst::imread(path_iter->second); m_templs.emplace(name, std::move(templ)); } return m_templs.at(name); From 63457d5ec08fb64087c1f7cd94b6e004c70d258c Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 13 Apr 2023 00:17:35 +0800 Subject: [PATCH 3/5] docs: changelogs --- CHANGELOG.md | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02ce87b15d..397447d4d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,32 +1,59 @@ -## v4.14.0-rc.1 +## v4.14.0-beta.1 ### 新增 -- 将退出时不释放adb作为独立选项 @MistEO +- 添加主线第十二章导航 @zzyyyl +- 关卡列表添加 "R8-11" 与 "12-17-HARD" @ABA2396 +- 启动MAA后直接最小化选项 (#4193) @moomiji +- 将退出时不释放adb作为独立选项，并默认关闭 @MistEO - 任务出错时单独弹出通知提醒 fix #4274 @ABA2396 ### 改进 +- 绝大部分资源改为惰性加载，大幅提高启动速度和并优化内存占用 @MistEO +- 新增肉鸽不期而遇插件，优化招募与战斗策略 (#4241) @LingXii +- 更新技能识别模型，优化最上面一排干员技能的识别 @MistEO +- 重构界面部分样式，改用 HandyControls (#4200) @moomiji +- 简化肉鸽编队界面的选中识别 (#4246) @horror-proton +- 企鹅 id 无条件同步到界面 @MistEO +- 规避第十二章三倍掉落被上传的可能性 @MistEO - 为夜神的截图错误增加检查 @MistEO - 增加开始行动前置延迟 @ABA2396 ### 修复 +- 修复傀影肉鸽招募错误 (#4241) @LingXii +- 修复战斗中狂点cooling干员的问题 @MistEO - 修复重连时 minitouch 不可用的问题 (#4280) @aa889788 +- 修复部分视频识别错误 @MistEO +- 修复 iOS 识别不到战斗干员 @hguandl @MistEO +- 修复会客室偶现送完线索卡住的问题 @MistEO +- 修复一个罕见的肉鸽崩溃情况 @horror-proton +- 修改主线导航替换文本 #4226 @ABA2396 +- 修复 MAA 主窗口最小化后弹窗位置错误 @moomiji +- 过滤中坚信物，提高仓库识别速度 (#4210) @orzFly @MistEO +- 修复更新镜像爆炸时不尝试其他镜像的问题，删掉几个爆炸的镜像 @MistEO - 修复雷电多开端口自动识别 @ABA2396 - 修复资源本 6 识别无代理 #4278 @ABA2396 ### 其他 +- 删除已经用不上了的 component 包 @MistEO +- 扩大识别区域 @ABA2396 +- 替换三星判断条件 @ABA2396 +- 修改 EpisodeOcrReplace 替换内容 @ABA2396 +- 添加标注 @ABA2396 +- revert tiles data @MistEO - 添加翻译 @ABA2396 @MistEO - update logger for posix @horror-proton ### For Overseas -#### Common - -- Fix crash when material doesn't exist @MistEO - #### YostarJP -- Fix stage navigation bug #4289 @ABA2396 +- Fix dead loop of options in I.S. @MistEO +- Fix stage navigation #4289 @ABA2396 + +#### YostarEN + +- Fix stage navigation #4226 @ABA2396 From 2e572dc9c46e019c69278ebbe43a19a75390cd3b Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Thu, 13 Apr 2023 00:23:44 +0800 Subject: [PATCH 4/5] docs: fix typo --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 397447d4d9..9055413fed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## v4.14.0-beta.1 +## v4.14.0 ### 新增 From b6d51941acc4c56e95d40395073bfc5b96a869b5 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 13 Apr 2023 00:24:48 +0800 Subject: [PATCH 5/5] docs: changelogs --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9055413fed..d7e515d403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,8 @@ - 添加主线第十二章导航 @zzyyyl - 关卡列表添加 "R8-11" 与 "12-17-HARD" @ABA2396 -- 启动MAA后直接最小化选项 (#4193) @moomiji -- 将退出时不释放adb作为独立选项，并默认关闭 @MistEO +- 启动 MAA 后直接最小化选项 (#4193) @moomiji +- 退出时不释放 adb 作为独立选项，并默认关闭 @MistEO - 任务出错时单独弹出通知提醒 fix #4274 @ABA2396 ### 改进 @@ -23,7 +23,7 @@ ### 修复 - 修复傀影肉鸽招募错误 (#4241) @LingXii -- 修复战斗中狂点cooling干员的问题 @MistEO +- 修复战斗中狂点 cooling 干员的问题 @MistEO - 修复重连时 minitouch 不可用的问题 (#4280) @aa889788 - 修复部分视频识别错误 @MistEO - 修复 iOS 识别不到战斗干员 @hguandl @MistEO