diff --git a/docs/en-us/CALLBACK_SCHEMA.md b/docs/en-us/CALLBACK_SCHEMA.md
index 4521baafba..f3ca5f778b 100644
--- a/docs/en-us/CALLBACK_SCHEMA.md
+++ b/docs/en-us/CALLBACK_SCHEMA.md
@@ -87,6 +87,8 @@ Todo
Disconnected (adb/emulator crashed), and reconnected successfully
- `Disconnect`
Disconnected (adb/emulator crashed), and failed to reconnect
+- `ScreencapFailed`
+ Screencap Failed (adb/emulator crashed), and failed to reconnect
#### AllTasksCompleted
diff --git a/docs/回调消息协议.md b/docs/回调消息协议.md
index 891c0939ab..bb495b89c3 100644
--- a/docs/回调消息协议.md
+++ b/docs/回调消息协议.md
@@ -87,6 +87,8 @@ Todo
连接断开(adb / 模拟器 炸了),重连成功
- `Disconnect`
连接断开(adb / 模拟器 炸了),并重试失败
+- `ScreencapFailed`
+ 截图失败(adb / 模拟器 炸了),并重试失败
#### AllTasksCompleted
diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp
index c25f894313..168a33c137 100644
--- a/src/MeoAssistant/Controller.cpp
+++ b/src/MeoAssistant/Controller.cpp
@@ -1178,7 +1178,14 @@ cv::Mat asst::Controller::get_image(bool raw)
break;
}
}
- if (!success) {
+ if (!success && !need_exit()) {
+ Log.error(__FUNCTION__, "screencap failed!");
+ json::value info = json::object { { "uuid", m_uuid },
+ { "what", "ScreencapFailed" },
+ { "why", "ScreencapFailed" },
+ { "details", json::object {} } };
+ m_callback(AsstMsg::ConnectionInfo, info, m_callback_arg);
+
const static cv::Size d_size(m_scale_size.first, m_scale_size.second);
m_cache_image = cv::Mat(d_size, CV_8UC3);
}
diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index 82cd8e9d1a..9c9888e11d 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -336,6 +336,10 @@ namespace MeoAsstGui
mainModel.AddLog(Localization.GetString("ReconnectFailed"), LogColor.Error);
AsstStop();
break;
+
+ case "ScreencapFailed":
+ mainModel.AddLog(Localization.GetString("ScreencapFailed"), LogColor.Error);
+ break;
}
}
diff --git a/src/MeoAsstGui/Resources/Localizations/en-us.xaml b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
index b3372ee90d..ddb9fb70b0 100644
--- a/src/MeoAsstGui/Resources/Localizations/en-us.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/en-us.xaml
@@ -293,6 +293,7 @@
Emulator disconnected, trying to reconnect
Reconnect succeeded. Continue the task
Reconnect failed. The connection is down!
+ Screencap failed. If it happens repeatedly, try restarting or changing the emulator.
Identify error
Task error:
Combat error
diff --git a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
index df25988c9a..aee642d972 100644
--- a/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ja-jp.xaml
@@ -293,6 +293,7 @@
エミュレータが切断されました。再接続しようとしています
再接続に成功した。タスクを続行します
再接続に失敗した。切断されました!
+ スクリーン キャプチャに失敗しました。 繰り返し発生する場合は、エミュレータの再起動または変更をお試しください
認識エラー
タスクエラー:
戦闘エラー
diff --git a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
index 8c93532a6a..19b20366ce 100644
--- a/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/ko-kr.xaml
@@ -293,6 +293,7 @@
에뮬레이터가 연결 해제되었습니다. 다시 연결하려고 합니다.
다시 연결되었습니다. 작업을 계속합니다.
다시 연결하지 못했습니다. 연결 해제되었습니다!
+ 스크린캡이 실패했습니다. 반복적으로 발생하면 에뮬레이터를 다시 시작하거나 변경해 보세요.
인식 오류
작업 오류:
작전 오류
diff --git a/src/MeoAsstGui/Resources/Localizations/pallas.xaml b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
index 77621e6f7d..271c02cca8 100644
--- a/src/MeoAsstGui/Resources/Localizations/pallas.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/pallas.xaml
@@ -293,7 +293,7 @@
🕺🍷🍷🍻🍺🍻🍻
🍻💃🍸🍷🍷
🍻🍸🍻🍺🍸🕺
- 🍺🍺🍷
+ 🍷🍷🕺🍺🍻🍸🕺🍺🍷🍸💃🍻💃🍺🍷
🍷🕺🍺
🕺🍻💃
🍷🍻🍸
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 8defa04ff9..0ea4311acf 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -293,6 +293,7 @@
模拟器断开,正在尝试重连
重连成功,继续任务
重连失败,连接断开!
+ 截图失败,如反复出现请尝试重启或更换模拟器!
识别错误
任务出错:
战斗出错
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
index 98ef51675f..ed59c71a38 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-tw.xaml
@@ -293,6 +293,7 @@
模擬器斷開,正在嘗試重連
重連成功,繼續任務
重連失敗,連接斷開!
+ 截圖失敗,如反復出現請嘗試重啟或更換模擬器!
辨識錯誤
任務出錯:
戰鬥出錯