From f0c31c4433a71c854be0dcfaec2ebf84184e941f Mon Sep 17 00:00:00 2001 From: Constrat <56174894+Constrat@users.noreply.github.com> Date: Sun, 7 Jul 2024 12:27:39 +0200 Subject: [PATCH] feat: YoStarEN resolution warning on client switch (#9539) Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com> --- .github/workflows/res-update-game.yml | 2 +- docs/ja-jp/readme.md | 2 +- docs/用户手册/新手上路.md | 2 +- resource/tasks.json | 4 +-- src/MaaWpfGui/MaaWpfGui.csproj | 3 ++- src/MaaWpfGui/Res/Localizations/en-us.xaml | 2 ++ src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 2 ++ src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 2 ++ src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 2 ++ src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 2 ++ .../ViewModels/UI/SettingsViewModel.cs | 26 ++++++++++++++++++- .../UserControl/GameClientUserControl.xaml | 8 ++++-- tools/ResourceUpdater/main.cpp | 2 +- 13 files changed, 49 insertions(+), 10 deletions(-) diff --git a/.github/workflows/res-update-game.yml b/.github/workflows/res-update-game.yml index 014e331fac..2a4b48e82e 100644 --- a/.github/workflows/res-update-game.yml +++ b/.github/workflows/res-update-game.yml @@ -56,7 +56,7 @@ jobs: /gamedata/excel/activity_table.json sparse-checkout-cone-mode: false - - name: Clone ArknightsGameResource_Yostar for Overseas + - name: Clone ArknightsGameResource_YoStar for Overseas uses: actions/checkout@v4 with: show-progress: false diff --git a/docs/ja-jp/readme.md b/docs/ja-jp/readme.md index c233e2857e..bdfa9cd89b 100644 --- a/docs/ja-jp/readme.md +++ b/docs/ja-jp/readme.md @@ -62,7 +62,7 @@ UIを見れば使い方もすぐ分かる！ 1. [エミュレータのサポート](./使用説明/エミュレータのサポート/Windowsでのエミューレータ.md)を参照して、対応するエミュレーターの操作に進んでください。 2. エミュレータの解像度を「1280 * 720」以上に変更します。最大は「2K」、アスペクト比は「16:9」です。 - YostarENでは、ゲームインターフェイスの問題から、解像度を`1920 * 1080`に変更することをお勧めします。 + YoStarENでは、ゲームインターフェイスの問題から、解像度を`1920 * 1080`に変更することをお勧めします。 3. ゲームスタート！ 詳しいマニュアルは[MAA使用説明書](./使用説明/詳細説明.md)を参照してください。 diff --git a/docs/用户手册/新手上路.md b/docs/用户手册/新手上路.md index 1117b5a41c..1b487e2a4d 100644 --- a/docs/用户手册/新手上路.md +++ b/docs/用户手册/新手上路.md @@ -37,7 +37,7 @@ winget install Microsoft.DotNet.DesktopRuntime.8 6. 正确设置模拟器分辨率 -模拟器分辨率应为 `16:9` 比例，最低为 `1280x720`；对于国际服（美服）玩家，最低为 `1920x1080`。 +模拟器分辨率应为 `16:9` 比例，最低为 `1280x720`；对于国际服（美服）玩家，唯一支持的分辨率是 `1920x1080`。 ## 初始配置 diff --git a/resource/tasks.json b/resource/tasks.json index 55f10d5a67..9f77a2e11b 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6469,7 +6469,7 @@ 272 ], "crop_doc": { - "doc": "Heads up: YostarEN needs 133 of 'y' instead of 120", + "doc": "Heads up: YoStarEN needs 133 of 'y' instead of 120", "roi": [ 903, 120, @@ -18565,4 +18565,4 @@ "Stop" ] } -} \ No newline at end of file +} diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 633ee49365..ffc903194b 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -1,5 +1,5 @@ - + net8.0-windows10.0.17763.0 @@ -12,6 +12,7 @@ Debug;Release;RelWithDebInfo ARM64;x64 true + True diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index c7a4215512..071f96fcdb 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -314,6 +314,8 @@ Please do not check it when the stage OF-1 is not unlocked. Custom log date format Date format string Restart immediately to apply changes? + Change the emulator resolution to 1920x1080! + Make sure the emulator is set to 1920x1080 Use alternative stage Use remaining sanity stage Brush the specified stage after completing the main task, won't use sanity potion or stone diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index 3e4dd035e4..33a44af7f4 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -314,6 +314,8 @@ カスタムログ日付形式 日付書式文字列 変更を適用するためにすぐに再起動しますか？ + エミュレータの解像度を1920x1080に変更! + エミュレータが1920x1080に設定されていることを確認してください 代替ステージを選択可能にする 余剰理性の使用 メインタスク終了後に指定されたレベルを選択しても、理性剤も源石も使わない diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 1322d8088d..b8b7e3759d 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -314,6 +314,8 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요. 사용자 정의 로그 날짜 형식 날짜 형식 문자열 변경 사항을 적용을 위해 즉시 다시 시작하시겠습니까? + 에뮬레이터 해상도를 1920x1080으로 변경! + 에뮬레이터가 1920x1080으로 설정되어 있는지 확인하세요 대체 스테이지 사용 남은 이성 활용 주 작업을 완료한 후 지정된 스테이지를 실행하며, 이성 회복제/오리지늄을 사용하지 않습니다 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index dfc9b93149..64f8a9cc47 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -315,6 +315,8 @@ 自选日志日期格式 日期格式字符串 是否立刻重启应用更改？ + 将模拟器分辨率更改为1920x1080！ + 确保模拟器设置为1920x1080 使用备选关卡 使用剩余理智 在完成主任务后刷取指定关卡，不使用理智药/碎石 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 322d13e142..b185e8f7da 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -308,6 +308,8 @@ 自訂日誌日期格式 日期格式字串 是否立刻重啟應用更改？ + 將模擬器解析度更改為1920x1080！ + 請確保模擬器設定為1920x1080 使用備選關卡 使用剩餘理智 在完成主任務後刷取指定關卡，不使用理智藥/碎石 diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index d5d35a2d62..4de217c175 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -1301,7 +1301,14 @@ namespace MaaWpfGui.ViewModels.UI Instances.TaskQueueViewModel.UpdateStageList(true); Instances.TaskQueueViewModel.UpdateDatePrompt(); Instances.AsstProxy.LoadResource(); - AskRestartToApplySettings(); + if (_clientType is "YoStarEN") + { + AskRestartToApplySettingsYoStarEN(); + } + else + { + AskRestartToApplySettings(); + } } } @@ -4760,6 +4767,23 @@ namespace MaaWpfGui.ViewModels.UI } } + /// + /// Remembers the user to set 1920x1080 for YoStarEN. + /// + private void AskRestartToApplySettingsYoStarEN() + { + var result = MessageBoxHelper.Show( + LocalizationHelper.GetString("PromptRestartForSettingsChange") + "\n" + + LocalizationHelper.GetString("SwitchResolutionTip"), + LocalizationHelper.GetString("Tip"), + MessageBoxButton.OKCancel, + MessageBoxImage.Question); + if (result == MessageBoxResult.OK) + { + Bootstrapper.ShutdownAndRestartWithoutArgs(); + } + } + /// /// Make comboBox searchable /// diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml index 8b5373c79e..49d09d7223 100644 --- a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml +++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml @@ -38,14 +38,18 @@ SelectedValue="{Binding ClientType}" SelectedValuePath="Value" /> + - + diff --git a/tools/ResourceUpdater/main.cpp b/tools/ResourceUpdater/main.cpp index c1661e5f31..901a665c1a 100644 --- a/tools/ResourceUpdater/main.cpp +++ b/tools/ResourceUpdater/main.cpp @@ -274,7 +274,7 @@ int main([[maybe_unused]] int argc, char** argv) std::cout << "Done" << std::endl; } - // Update global version info from ArknightsGameData_Yostar + // Update global version info from ArknightsGameData_YoStar for (const auto& [in, out] : global_dirs) { std::cout << "------- Update version info for " << out << "------- " << std::endl; if (!update_version_info(