fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: YoStarEN resolution warning on client switch (#9539)

Browse Source 
Co-authored-by: uye <99072975+ABA2396@users.noreply.github.com>
This commit is contained in:
Constrat
2024-07-07 12:27:39 +02:00
committed by GitHub
parent 0d7370bcf1
commit f0c31c4433
13 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/res-update-game.yml vendored
View File

@@ -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

2
docs/ja-jp/readme.md
View File

@@ -62,7 +62,7 @@ UIを見れば使い方もすぐ分かる！
1. [エミュレータのサポート](./使用説明/エミュレータのサポート/Windowsでのエミューレータ.md)を参照して、対応するエミュレーターの操作に進んでください。
2. エミュレータの解像度を「1280 * 720」以上に変更します。最大は「2K」、アスペクト比は「16:9」です。
YostarENでは、ゲームインターフェイスの問題から、解像度を`1920 * 1080`に変更することをお勧めします。
YoStarENでは、ゲームインターフェイスの問題から、解像度を`1920 * 1080`に変更することをお勧めします。
3. ゲームスタート！
詳しいマニュアルは[MAA使用説明書](./使用説明/詳細説明.md)を参照してください。

2
docs/用户手册/新手上路.md
View File

@@ -37,7 +37,7 @@ winget install Microsoft.DotNet.DesktopRuntime.8
6. 正确设置模拟器分辨率
模拟器分辨率应为 `16:9` 比例，最低为 `1280x720`；对于国际服（美服）玩家，最低为 `1920x1080`。
模拟器分辨率应为 `16:9` 比例，最低为 `1280x720`；对于国际服（美服）玩家，唯一支持的分辨率是 `1920x1080`。
## 初始配置

4
resource/tasks.json
View File

@@ -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"
]
}
}
}

3
src/MaaWpfGui/MaaWpfGui.csproj
View File

@@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- Project -->
<PropertyGroup>
<TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
@@ -12,6 +12,7 @@
<Configurations>Debug;Release;RelWithDebInfo</Configurations>
<Platforms>ARM64;x64</Platforms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<XamlDebuggingInformation>True</XamlDebuggingInformation>
</PropertyGroup>
<!-- Build and Publish -->

2
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -314,6 +314,8 @@ Please do not check it when the stage OF-1 is not unlocked.</system:String>
<system:String x:Key="UseLogItemDateFormat">Custom log date format</system:String>
<system:String x:Key="LogItemDateFormatString">Date format string</system:String>
<system:String x:Key="PromptRestartForSettingsChange">Restart immediately to apply changes?</system:String>
<system:String x:Key="SwitchResolutionTip">Change the emulator resolution to 1920x1080!</system:String>
<system:String x:Key="ResolutionInfoYoStarEN">Make sure the emulator is set to 1920x1080</system:String>
<system:String x:Key="UseAlternateStage">Use alternative stage</system:String>
<system:String x:Key="UseRemainingSanityStage">Use remaining sanity stage</system:String>
<system:String x:Key="UseRemainingSanityStageTip">Brush the specified stage after completing the main task, won't use sanity potion or stone</system:String>

2
src/MaaWpfGui/Res/Localizations/ja-jp.xaml
View File

@@ -314,6 +314,8 @@
<system:String x:Key="UseLogItemDateFormat">カスタムログ日付形式</system:String>
<system:String x:Key="LogItemDateFormatString">日付書式文字列</system:String>
<system:String x:Key="PromptRestartForSettingsChange">変更を適用するためにすぐに再起動しますか？</system:String>
<system:String x:Key="SwitchResolutionTip">エミュレータの解像度を1920x1080に変更!</system:String>
<system:String x:Key="ResolutionInfoYoStarEN">エミュレータが1920x1080に設定されていることを確認してください</system:String>
<system:String x:Key="UseAlternateStage">代替ステージを選択可能にする</system:String>
<system:String x:Key="UseRemainingSanityStage">余剰理性の使用</system:String>
<system:String x:Key="UseRemainingSanityStageTip">メインタスク終了後に指定されたレベルを選択しても、理性剤も源石も使わない</system:String>

2
src/MaaWpfGui/Res/Localizations/ko-kr.xaml
View File

@@ -314,6 +314,8 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
<system:String x:Key="UseLogItemDateFormat">사용자 정의 로그 날짜 형식</system:String>
<system:String x:Key="LogItemDateFormatString">날짜 형식 문자열</system:String>
<system:String x:Key="PromptRestartForSettingsChange">변경 사항을 적용을 위해 즉시 다시 시작하시겠습니까?</system:String>
<system:String x:Key="SwitchResolutionTip">에뮬레이터 해상도를 1920x1080으로 변경!</system:String>
<system:String x:Key="ResolutionInfoYoStarEN">에뮬레이터가 1920x1080으로 설정되어 있는지 확인하세요</system:String>
<system:String x:Key="UseAlternateStage">대체 스테이지 사용</system:String>
<system:String x:Key="UseRemainingSanityStage">남은 이성 활용</system:String>
<system:String x:Key="UseRemainingSanityStageTip">주 작업을 완료한 후 지정된 스테이지를 실행하며, 이성 회복제/오리지늄을 사용하지 않습니다</system:String>

2
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -315,6 +315,8 @@
<system:String x:Key="UseLogItemDateFormat">自选日志日期格式</system:String>
<system:String x:Key="LogItemDateFormatString">日期格式字符串</system:String>
<system:String x:Key="PromptRestartForSettingsChange">是否立刻重启应用更改？</system:String>
<system:String x:Key="SwitchResolutionTip">将模拟器分辨率更改为1920x1080！</system:String>
<system:String x:Key="ResolutionInfoYoStarEN">确保模拟器设置为1920x1080</system:String>
<system:String x:Key="UseAlternateStage">使用备选关卡</system:String>
<system:String x:Key="UseRemainingSanityStage">使用剩余理智</system:String>
<system:String x:Key="UseRemainingSanityStageTip">在完成主任务后刷取指定关卡，不使用理智药/碎石</system:String>

2
src/MaaWpfGui/Res/Localizations/zh-tw.xaml
View File

@@ -308,6 +308,8 @@
<system:String x:Key="UseLogItemDateFormat">自訂日誌日期格式</system:String>
<system:String x:Key="LogItemDateFormatString">日期格式字串</system:String>
<system:String x:Key="PromptRestartForSettingsChange">是否立刻重啟應用更改？</system:String>
<system:String x:Key="SwitchResolutionTip">將模擬器解析度更改為1920x1080！</system:String>
<system:String x:Key="ResolutionInfoYoStarEN">請確保模擬器設定為1920x1080</system:String>
<system:String x:Key="UseAlternateStage">使用備選關卡</system:String>
<system:String x:Key="UseRemainingSanityStage">使用剩餘理智</system:String>
<system:String x:Key="UseRemainingSanityStageTip">在完成主任務後刷取指定關卡，不使用理智藥/碎石</system:String>

26
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -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
}
}
/// <summary>
/// Remembers the user to set 1920x1080 for YoStarEN.
/// </summary>
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();
}
}
/// <summary>
/// Make comboBox searchable
/// </summary>

8
src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
View File

@@ -38,14 +38,18 @@
SelectedValue="{Binding ClientType}"
SelectedValuePath="Value" />
<controls:TextBlock
Margin="10"
HorizontalAlignment="Center"
Text="{DynamicResource ResolutionInfoYoStarEN}"
Visibility="{c:Binding 'ClientType == &quot;YoStarEN&quot;'}"/>
<controls:TextBlock
Margin="0,20,0,0"
HorizontalAlignment="Center"
Visibility="{c:Binding 'ClientType != &quot;Official&quot; and ClientType != &quot;Bilibili&quot; and ClientType != &quot;&quot;'}">
<Hyperlink
Cursor="Hand"
NavigateUri="{Binding Source={x:Static constants:MaaUrls.OverseasAdaptation}}"
TextDecorations="None">
<TextBlock Text="{DynamicResource HelpUsWithOverseasServersTip}" />
<TextBlock Text="{DynamicResource HelpUsWithOverseasServersTip}" TextAlignment="Center" FontSize="10"/>
</Hyperlink>
</controls:TextBlock>
</StackPanel>

2
tools/ResourceUpdater/main.cpp
View File

@@ -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(