From a18677a683028c74aca73c371f5702dfc7b245c8 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Thu, 27 Apr 2023 01:56:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=8B=9F?=
=?UTF-8?q?=E5=99=A8=E5=90=AF=E5=8A=A8=E7=AD=89=E5=BE=85=E7=BB=93=E6=9D=9F?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
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 +
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 4 ++++
6 files changed, 9 insertions(+)
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 0eadd622cd..c801a43d06 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -193,6 +193,7 @@
Startup Emulator after launched
Minimizing the startup Emulator
Delay time (s)
+ End of wait
Emulator exec path
Select
Forced Replace ADB File
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 9b311c281c..808909a456 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -191,6 +191,7 @@
起動時にエミュレータ自動起動
エミュレーターの起動を最小化する
エミュレータを待つ時間(秒)
+ 待ち時間は終わりました
エミュレータパス
選択
ADB強制置き換え
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index e5e4ece938..de996e01c1 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -185,6 +185,7 @@
MAA 실행 후 에뮬레이터를 실행
시작 시뮬레이터 최소화
에뮬레이터 실행 대기 (초)
+ 기다림은 끝났다
에뮬레이터 경로
선택
ADB 강제 교체
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 62f65acb56..4a78021d87 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -195,6 +195,7 @@
启动MAA后自动开启模拟器
最小化启动模拟器
等待模拟器启动时间(秒)
+ 等待结束
模拟器路径
选择
强制替换 ADB
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index e7f5371c09..d8bfa44c88 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -148,6 +148,7 @@
啟動後自動開啟模擬器
最小化啟動模擬器
等待模擬器啟動時間(秒)
+ 等待結束
模擬器路徑
選擇
附加命令
diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index 34f163b05a..032b7aba30 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -705,6 +705,10 @@ namespace MaaWpfGui.ViewModels.UI
Thread.Sleep(1000);
}
+ Execute.OnUIThread(() => Instances.TaskQueueViewModel.AddLog(
+ LocalizationHelper.GetString("WaitForEmulatorFinish")));
+ AsstProxy.AsstLog("The wait is over");
+
// 重置按钮状态,不影响后续判断
Instances.TaskQueueViewModel.Idle = true;
}