From dd71224d63d0aca474d82ae12b02f4616b4455e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=93=E4=B8=B6=E6=A2=A6=E4=B8=B6=E4=BB=81?= <74444214+Daydreamer114@users.noreply.github.com> Date: Mon, 17 Feb 2025 21:20:38 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=82=89=E9=B8=BD=E4=B8=BA=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E9=94=99=E8=AF=AF=E7=9A=84=E4=BA=8B=E4=BB=B6=E4=B9=9F?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20callback=20(#11946)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf: 为识别错误的事件也添加 callback * perf: log.error、修改what内容 * i18n: KR translation * i18n: JP translation --------- Co-authored-by: HX3N Co-authored-by: ManicSteiner --- .../Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp | 6 ++++-- src/MaaWpfGui/Main/AsstProxy.cs | 4 ++++ src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 + 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp index dca1722d4f..89919cac16 100644 --- a/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp +++ b/src/MaaCore/Task/Roguelike/RoguelikeStageEncounterTaskPlugin.cpp @@ -50,12 +50,14 @@ bool asst::RoguelikeStageEncounterTaskPlugin::_run() name_analyzer.set_task_info(event_name_task_ptr); name_analyzer.set_required(event_names); if (!name_analyzer.analyze()) { - Log.info("Unknown Event"); + Log.error("Unknown Event"); + auto info = basic_info_with_what("EncounterOcrError"); + callback(AsstMsg::SubTaskExtraInfo, info); return true; } const auto& result_vec = name_analyzer.get_result(); if (result_vec.empty()) { - Log.info("Unknown Event"); + Log.error("Unknown Event"); return true; } std::string text = result_vec.front().text; diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 74ea4ee589..da1bb35564 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1494,6 +1494,10 @@ namespace MaaWpfGui.Main Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("RoguelikeEvent") + $" {subTaskDetails!["name"]}", UiLogColor.EventIS); break; + case "EncounterOcrError": + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("EncounterOcrError"), UiLogColor.Error); + break; + case "FoldartalGainOcrNextLevel": Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("FoldartalGainOcrNextLevel") + $" {subTaskDetails!["foldartal"]}"); break; diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 697de7f977..65fcc9891c 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -792,6 +792,7 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla Node: Emergency Operation Node: Dreadful Foe Event: + Event Name OCR Failed Foldartal Foresee: Invested {1}(+{0}), deposit: {2} Roguelike Settlement: {0}\nExplore: {1} Floor {2} Step\nCombat: {3} / {4} Emergency / {5} BOSS\nRecruit: {6}\nCollectibles: {7}\nDifficulty: {8}\nScore: {9} Exp: {10} Skill: {11} diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 50b86e421f..d9e1830a33 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -795,6 +795,7 @@ C:\\leidian\\LDPlayer9 ステージ: 緊急作戦 ステージ: 悪路凶敵 イベント: + イベント名認識失敗 予見啓示板: 投資しました: {1}(+{0})、貯蓄: {2} ローグライクスコア: {0}\n探索: {1} 階層 {2} ステップ\n戦闘: {3} / {4} 緊急 / {5} BOSS\n人材招集数: {6}\nアイテム入手数: {7}\n難度: {8}\nスコア: {9}\n経験値: {10}, スキル: {11} diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 171955fcf4..7acdf3254c 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -795,6 +795,7 @@ C:\\leidian\\LDPlayer9 노드: 긴급 작전 노드: 험난한 길 이벤트: + 이벤트명 인식 오류 암호판: 각뿔 투자: {1}(+{0}), 예금: {2} 로그라이크 종착점: {0}\n클리어 : {1} 구역 {2} 노드\n전투 횟수: {3} 일반 / {4} 정예 / {5} 리더\n모집 횟수 : {6} 회\n수집: {7}\n난이도: {8}\n점수: {9}\n경험치: {10}, 스킬: {11} diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index f3fe905e34..124e5faf29 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -794,6 +794,7 @@ C:\\leidian\\LDPlayer9。\n 关卡: 紧急作战 关卡: 险路恶敌 事件: + 事件名识别错误 预见: 已投资 {1}(+{0}), 存款: {2} 肉鸽结算: {0} (n{8})\n探索: {1} 层 {2} 步\n战斗: {3}/ {4}紧急/ {5}BOSS\n招募: {6} 收藏品: {7}\n得分: {9}\nExp: {10} Skill: {11} diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index b3883abc49..ed549686b6 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -794,6 +794,7 @@ C:\\leidian\\LDPlayer9。\n 關卡: 緊急作戰 關卡: 險路惡敵 事件: + 事件名識別錯誤 預見: 已投資 {1}(+{0}), 存款: {2} 肉鴿結算: {0}\n探索: {1} 层 {2} 步\n戰鬥: {3}/{4} 緊急/{5} BOSS\n招募: {6} 收藏品: {7}\n難度: {8} 得分: {9}\nExp: {10} Skill: {11}