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: 连战次数选项可隐藏

Browse Source
This commit is contained in:
uye
2024-05-10 22:28:53 +08:00
parent 4fd6030779
commit cbcfeac0de
9 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaWpfGui/Constants/ConfigurationKeys.cs
View File

@@ -40,6 +40,7 @@ namespace MaaWpfGui.Constants
public const string SaveWindowPlacement = "GUI.Placement.SaveOnClosing";
public const string UseAlternateStage = "GUI.UseAlternateStage";
public const string HideUnavailableStage = "GUI.HideUnavailableStage";
public const string HideSeries = "GUI.HideSeries";
public const string CustomStageCode = "GUI.CustomStageCode";
public const string InverseClearMode = "GUI.InverseClearMode";
public const string WindowTitlePrefix = "GUI.WindowTitlePrefix";

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

@@ -313,6 +313,7 @@ Please do not check it when the stage OF-1 is not unlocked.</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>
<system:String x:Key="UseExpiringMedicine">Unlimited use of expiring sanity potion</system:String>
<system:String x:Key="HideUnavailableStage">Hide today's not open stages</system:String>
<system:String x:Key="HideSeries">Hide series</system:String>
<system:String x:Key="CustomInfrastPlanShowInFightSettings">Show Base Plan</system:String>
<system:String x:Key="MainViewButtonFeature">Variable function button</system:String>
<system:String x:Key="CustomStageCode">Manual entry of stage names</system:String>
@@ -343,10 +344,8 @@ Only supports Official(CN) and Bilibili server. Login account is not supported.<
「C:\\Program Files\\Netease\\MuMuPlayer-12.0\\shell\\MuMuPlayer.exe」,\n
you should fill in\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0」.\n\n
2. Instance Number: (e.g., 0)\n
The instance number can be found in the MuMu Multi-Instance Manager, default is 0. If there are multiple instances, the number is shown before the instance.\n\n
3. Window Number: (e.g., 0)\n
Note: Fill in 0 after closing MuMu's background keep-alive. If you need to open the background keep-alive, please explore the method yourself.
</system:String>

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

@@ -314,6 +314,7 @@
<system:String x:Key="UseRemainingSanityStageTip">メインタスク終了後に指定されたレベルを選択しても、理性剤も源石も使わない</system:String>
<system:String x:Key="UseExpiringMedicine">48時間以内に期限が切れる回復剤を無制限に使用</system:String>
<system:String x:Key="HideUnavailableStage">当日開放されないステージを隠す</system:String>
<system:String x:Key="HideSeries">連戦回数を隠します</system:String>
<system:String x:Key="CustomInfrastPlanShowInFightSettings">基地計画を表示する</system:String>
<system:String x:Key="MainViewButtonFeature">スタート画面に表示する便利ボタン</system:String>
<system:String x:Key="CustomStageCode">ステージ名を入力する</system:String>
@@ -345,10 +346,8 @@
の場合、\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0」\n
を記入してください。\n\n
2. インスタンス番号：（例：0）\n
インスタンス番号はMuMuマルチインスタンスマネージャーで確認できます。デフォルトは0です。複数のインスタンスがある場合、番号はインスタンスの前に表示されます。\n\n
3. ウィンドウ番号：（例：0）\n
注意：MuMuのバックグラウンドでのアクティブ維持を閉じた後は0を記入してください。バックグラウンドでのアクティブ維持を開始する場合は、自分で方法を探してください。
</system:String>

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

@@ -314,6 +314,7 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
<system:String x:Key="UseRemainingSanityStageTip">주요 작업을 완료한 후 지정된 스테이지를 실행하며, 이성 회복제나 오리지늄을 사용하지 않습니다.</system:String>
<system:String x:Key="UseExpiringMedicine">48시간 미만 남은 이성 회복제 사용</system:String>
<system:String x:Key="HideUnavailableStage">미개방 스테이지 숨기기</system:String>
<system:String x:Key="HideSeries">연속 전투 횟수 숨기기</system:String>
<system:String x:Key="CustomInfrastPlanShowInFightSettings">기반시설 계획 표시</system:String>
<system:String x:Key="MainViewButtonFeature">메인 화면 버튼의 기능</system:String>
<system:String x:Key="CustomStageCode">스테이지 코드 수동 입력</system:String>
@@ -345,10 +346,8 @@ OF-1을 해금하지 않았다면 선택하지 말아 주세요.</system:String>
인 경우,\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0」\n
을 기입하십시오. \n\n
2. 인스턴스 번호: (예: 0) \n
인스턴스 번호는 MuMu 다중 인스턴스 관리자에서 확인할 수 있습니다. 기본값은 0입니다. 다중 인스턴스가 있는 경우 번호는 인스턴스 앞에 표시됩니다. \n\n
3. 창 번호: (예: 0) \n
참고: MuMu의 백그라운드 유지를 닫은 후 0을 기입하십시오. 백그라운드 유지를 시작하려면 직접 방법을 찾으십시오.
</system:String>

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

@@ -313,6 +313,7 @@
<system:String x:Key="UseRemainingSanityStageTip">在完成主任务后刷取指定关卡，不使用理智药/碎石</system:String>
<system:String x:Key="UseExpiringMedicine">无限吃48小时内过期的理智药</system:String>
<system:String x:Key="HideUnavailableStage">隐藏当日不开放关卡</system:String>
<system:String x:Key="HideSeries">隐藏连战次数</system:String>
<system:String x:Key="CustomInfrastPlanShowInFightSettings">显示基建计划</system:String>
<system:String x:Key="MainViewButtonFeature">主界面可选择按钮功能</system:String>
<system:String x:Key="CustomStageCode">手动输入关卡名</system:String>
@@ -338,16 +339,13 @@
<system:String x:Key="MuMu12ExtrasEnabled">启用 MuMu 截图增强模式</system:String>
<system:String x:Key="MuMu12ExtrasEnabledTip">
请填写以下信息：\n\n
1. 模拟器路径：（例如：C:\\Program Files\\Netease\\MuMuPlayer-12.0）\n
模拟器路径应填写模拟器应用的上一层文件夹路径，例如应用路径为\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0\\shell\\MuMuPlayer.exe」\n
应填写\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0」。\n\n
2. 实例编号：（例如：0）\n
实例编号可在 MuMu 多开器中查看，默认为 0，若有多开实例，编号见实例前的数字。\n\n
3. 窗口编号：（例如：0）\n
注意：关闭MuMu的后台保活后填写0，如需打开后台保活，请自行探索方法。\n
</system:String>

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

@@ -313,6 +313,7 @@
<system:String x:Key="UseRemainingSanityStageTip">在完成主任務後刷取指定關卡，不使用理智藥/碎石</system:String>
<system:String x:Key="UseExpiringMedicine">無限吃 48 小時內過期的理智藥</system:String>
<system:String x:Key="HideUnavailableStage">隱藏當日不開放關卡</system:String>
<system:String x:Key="HideSeries">隱藏連戰次數</system:String>
<system:String x:Key="CustomInfrastPlanShowInFightSettings">顯示基建計劃</system:String>
<system:String x:Key="MainViewButtonFeature">主介面可選擇按鈕功能</system:String>
<system:String x:Key="CustomStageCode">手動輸入關卡代名</system:String>
@@ -341,10 +342,8 @@
「C:\\Program Files\\Netease\\MuMuPlayer-12.0\\shell\\MuMuPlayer.exe」\n
應填寫\n
「C:\\Program Files\\Netease\\MuMuPlayer-12.0」。\n\n
2. 實例編號：（例如：0）\n
實例編號可在 MuMu 多開器中查看，默認為 0，若有多開實例，編號見實例前的數字。\n\n
3. 窗口編號：（例如：0）\n
注意：關閉MuMu的後台保活後填寫0，如需打開後台保活，請自行探索方法。
</system:String>

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

@@ -4061,6 +4061,22 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private bool _hideSeries = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideSeries, bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to hide series.
/// </summary>
public bool HideSeries
{
get => _hideSeries;
set
{
SetAndNotify(ref _hideSeries, value);
Instances.TaskQueueViewModel.HideSeries = value;
ConfigurationHelper.SetValue(ConfigurationKeys.HideSeries, value.ToString());
}
}
private bool _customStageCode = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.CustomStageCode, bool.FalseString));
/// <summary>

11
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -3007,6 +3007,17 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private bool _hideSeries = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.HideSeries, bool.FalseString));
/// <summary>
/// Gets or sets a value indicating whether to hide series.
/// </summary>
public bool HideSeries
{
get => _hideSeries;
set => SetAndNotify(ref _hideSeries, value);
}
#region Drops
private bool? _isSpecifiedDropsWithNull = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.DropsEnable, bool.FalseString));

6
src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
View File

@@ -148,7 +148,7 @@
Value="{Binding DropsQuantity, UpdateSourceTrigger=PropertyChanged}" />
</StackPanel>
</Grid>
<Grid Grid.Row="2">
<Grid Grid.Row="2" Visibility="{c:Binding !HideSeries}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="100" />
<ColumnDefinition />
@@ -365,6 +365,10 @@
Margin="0,10"
Content="{DynamicResource HideUnavailableStage}"
IsChecked="{Binding HideUnavailableStage}" />
<CheckBox
Margin="0,10"
Content="{DynamicResource HideSeries}"
IsChecked="{Binding HideSeries}" />
<CheckBox
Margin="0,10"
Content="{DynamicResource CustomInfrastPlanShowInFightSettings}"