diff --git a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp index b38ed42f5b..ec9c29bfab 100644 --- a/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp +++ b/src/MaaCore/Task/Miscellaneous/BattleFormationTask.cpp @@ -481,8 +481,13 @@ bool asst::BattleFormationTask::select_opers_in_cur_page(std::vector& ret = ProcessTask(*this, { "BattleQuickFormationModulePage" }).run(); ret = ret && ProcessTask(*this, { "BattleQuickFormationModule-" + std::to_string(module) }).run(); if (!ret) { - LogError << __FUNCTION__ << "| Module " << std::to_string(module) - << "not found, please check the module number"; + LogWarn << __FUNCTION__ << "| Module " << std::to_string(module) + << "not found, please check the module number"; + + json::value info = basic_info_with_what("BattleFormationOperUnavailable"); + info["details"]["oper_name"] = name; + info["details"]["requirement_type"] = "module"; + callback(AsstMsg::SubTaskExtraInfo, info); ctrler()->click(res.flag_rect); // 选择模组失败时反选干员 sleep(delay); // 继续检查同组其他干员 diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index acc23abb0f..7287f19a09 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1707,15 +1707,24 @@ namespace MaaWpfGui.Main break; case "BattleFormationSelected": - var oper_name = DataHelper.GetLocalizedCharacterName(subTaskDetails!["selected"]?.ToString()); - var group_name = subTaskDetails!["group_name"]?.ToString(); - if (group_name is not null && oper_name != group_name) { - oper_name = $"{group_name} => {oper_name}"; + var oper_name = DataHelper.GetLocalizedCharacterName(subTaskDetails!["selected"]?.ToString()); + var group_name = subTaskDetails!["group_name"]?.ToString(); + if (group_name is not null && oper_name != group_name) + { + oper_name = $"{group_name} => {oper_name}"; + } + + Instances.CopilotViewModel.AddLog(LocalizationHelper.GetString("BattleFormationSelected") + oper_name); + break; } - Instances.CopilotViewModel.AddLog(LocalizationHelper.GetString("BattleFormationSelected") + oper_name); - break; + case "BattleFormationOperUnavailable": + { + var oper_name = DataHelper.GetLocalizedCharacterName(subTaskDetails!["oper_name"]?.ToString()); + Instances.CopilotViewModel.AddLog(string.Format(LocalizationHelper.GetString("BattleFormationOperUnavailable"), oper_name, subTaskDetails["requirement_type"])); + break; + } case "CopilotAction": { diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 3016fb4971..bc2fbe8bf0 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -949,6 +949,7 @@ Right-click to clear inactive tasks Current Start formation Selected:  + Oper unavailable: {0}, Restriction: {1} Step: {0} {1} Unsupported stage, please check the stage name or go to 「{key=Settings} - {key=UpdateSettings} - {key=ResourceUpdate}」 and try updating the resource version! Identification results:  diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index efe9cb877e..5418b2ee3d 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -953,6 +953,7 @@ C:\\leidian\\LDPlayer9 現在 編成開始 オペレーターを選択: + オペレーターを利用不可: {0}、制限: {1} 現在の手順: {0} {1} サポートされていないステージです。ステージ名を確認するか、「{key=Settings} - {key=UpdateSettings} - {key=ResourceUpdate}」 に移動してリソースバージョンを更新してみてください! 認識結果: diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index f030a0d10d..2130ae941f 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -952,6 +952,7 @@ C:\\leidian\\LDPlayer9 현재 편성 시작 오퍼레이터를 선택: + 사용할 수 없는 운영자: {0}, 제한: {1} 현재 단계: {0} {1} 지원되지 않는 스테이지입니다. 스테이지 이름을 확인하거나 「{key=Settings} - {key=UpdateSettings} - {key=ResourceUpdate}」 로 이동하여 리소스 버전을 업데이트해 보세요! 인식 결과: diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index e7eed35f2b..b1df2d390b 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -953,6 +953,7 @@ C:\\leidian\\LDPlayer9。\n 当前 开始编队 选择干员: + 干员不可用: {0}, 限制: {1} 当前步骤: {0} {1} 不支持的关卡,请检查关卡名或前往 「{key=Settings} - {key=UpdateSettings} - {key=ResourceUpdate}」 尝试更新资源版本! 识别结果: diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index d0b5a19c79..23aac4d692 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -950,6 +950,7 @@ C:\\leidian\\LDPlayer9。\n 當前 開始編隊 選擇幹員: + 幹員不可用: {0}, 限制: {1} 當前步驟: {0} {1} 不支援的關卡,請檢查關卡名稱或前往 「{key=Settings} - {key=UpdateSettings} - {key=ResourceUpdate}」,嘗試更新資源版本! 辨識結果: