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

WpfGUI 添加肉鸽助战选项

Browse Source
This commit is contained in:
wangli
2022-12-31 18:36:35 +08:00
parent 6a9ec6bb55
commit 095fc37ede
9 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1431,10 +1431,12 @@ namespace MaaWpfGui
/// <param name="squad"><paramref name="squad"/> TODO.</param>
/// <param name="roles"><paramref name="roles"/> TODO.</param>
/// <param name="core_char"><paramref name="core_char"/> TODO.</param>
/// <param name="use_support">是否core_char使用好友助战</param>
/// <param name="enable_nonfriend_support">是否允许使用非好友助战</param>
/// <param name="theme">肉鸽名字。["Phantom", "Mizuki"]</param>
/// <returns>是否成功。</returns>
public bool AsstAppendRoguelike(int mode, int starts, bool investment_enabled, int invests, bool stop_when_full,
string squad, string roles, string core_char, string theme)
string squad, string roles, string core_char, bool use_support, bool enable_nonfriend_support, string theme)
{
var task_params = new JObject();
task_params["mode"] = mode;
@@ -1457,6 +1459,8 @@ namespace MaaWpfGui
{
task_params["core_char"] = core_char;
}
task_params["use_support"] = use_support;
task_params["use_nonfriend_support"] = enable_nonfriend_support;
AsstTaskId id = AsstAppendTaskWithEncoding("Roguelike", task_params);
_latestTaskId[TaskType.Roguelike] = id;

30
src/MaaWpfGui/Main/SettingsViewModel.cs
View File

@@ -1078,6 +1078,36 @@ namespace MaaWpfGui
}
}
private string _roguelikeUseSupportUnit = ViewStatusStorage.Get("Roguelike.RoguelikeUseSupportUnit", false.ToString());
/// <summary>
/// Is core char a support unit
/// </summary>
public bool RoguelikeUseSupportUnit
{
get => bool.Parse(_roguelikeUseSupportUnit);
set
{
SetAndNotify(ref _roguelikeUseSupportUnit, value.ToString());
ViewStatusStorage.Set("Roguelike.RoguelikeUseSupportUnit", value.ToString());
}
}
private string _roguelikeEnableNonfriendSupport = ViewStatusStorage.Get("Roguelike.RoguelikeEnableNonfriendSupport", false.ToString());
/// <summary>
/// Can roguelike support unit belong to nonfriend
/// </summary>
public bool RoguelikeEnableNonfriendSupport
{
get => bool.Parse(_roguelikeEnableNonfriendSupport);
set
{
SetAndNotify(ref _roguelikeEnableNonfriendSupport, value.ToString());
ViewStatusStorage.Set("Roguelike.RoguelikeEnableNonfriendSupport", value.ToString());
}
}
private string _roguelikeStartsCount = ViewStatusStorage.Get("Roguelike.StartsCount", "9999999");
/// <summary>

3
src/MaaWpfGui/Main/TaskQueueViewModel.cs
View File

@@ -899,7 +899,8 @@ namespace MaaWpfGui
return asstProxy.AsstAppendRoguelike(
mode, settings.RoguelikeStartsCount,
settings.RoguelikeInvestmentEnabled, settings.RoguelikeInvestsCount, settings.RoguelikeStopWhenInvestmentFull,
settings.RoguelikeSquad, settings.RoguelikeRoles, settings.RoguelikeCoreChar, settings.RoguelikeTheme);
settings.RoguelikeSquad, settings.RoguelikeRoles, settings.RoguelikeCoreChar, settings.RoguelikeUseSupportUnit,
settings.RoguelikeEnableNonfriendSupport, settings.RoguelikeTheme);
}
[DllImport("User32.dll", EntryPoint = "FindWindow")]

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

@@ -74,6 +74,8 @@
<system:String x:Key="StartingRoles">Starting Roles</system:String>
<system:String x:Key="StartingCoreChar">Starting Oper (single, CN name only)</system:String>
<system:String x:Key="StartingCoreCharTip">Only supports the CN name of a single oper, default if not filled.</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">Select "Starting Oper" from support unit list</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">Enable nonfirend support</system:String>
<system:String x:Key="DeploymentWithPause">Deployment with Pause (Works for IS, Copilot and 保全派驻)</system:String>
<system:String x:Key="DefaultSquad">Default</system:String>

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

@@ -66,6 +66,8 @@
<system:String x:Key="StartingRoles">最初の職業</system:String>
<system:String x:Key="StartingCoreChar">最初のオペレーター（一人だけ、中国名のみを入力可能）</system:String>
<system:String x:Key="StartingCoreCharTip">一人のオペレーターの中国名のみをサポートします。入力されていない場合はデフォルトになります。</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">開幕戦の幹部は助戦を使った</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">フレンド以外のアシストを使用できます</system:String>
<system:String x:Key="DefaultSquad">デフォルト</system:String>
<system:String x:Key="IS2NewSquad1">（ミヅキ）心胜于物分队</system:String>

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

@@ -73,6 +73,8 @@
<system:String x:Key="StartingRoles">모집 조합</system:String>
<system:String x:Key="StartingCoreChar">시작 오퍼레이터 (1명)</system:String>
<system:String x:Key="StartingCoreCharTip">단일 오퍼레이터의 중국어 이름만 지원하며, 입력하지 않으면 기본값이 선택됩니다</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">오프닝 요원은 전투를 돕기 위해 사용합니다</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">친구가 아닌 친구를 사용하여 전투를 도울 수 있습니다</system:String>
<system:String x:Key="DeploymentWithPause">일시정지 상태로 배치하기 (통합전략, 자동 작전, 보전파견에 적용)</system:String>
<system:String x:Key="DefaultSquad">기본값</system:String>

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

@@ -74,6 +74,8 @@
<system:String x:Key="StartingRoles">开局职业组</system:String>
<system:String x:Key="StartingCoreChar">开局干员 (单个)</system:String>
<system:String x:Key="StartingCoreCharTip">仅支持单个干员中文名，不填写则默认选择</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">“开局干员”使用助战</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">可以使用非好友助战</system:String>
<system:String x:Key="DeploymentWithPause">暂停下干员（同时影响肉鸽、自动战斗、保全）</system:String>
<system:String x:Key="DefaultSquad">默认分队</system:String>

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

@@ -65,6 +65,8 @@
<system:String x:Key="StartingRoles">開局職業組</system:String>
<system:String x:Key="StartingCoreChar">開局幹員(單個)</system:String>
<system:String x:Key="StartingCoreCharTip">僅支持單個幹員中文名，不填寫則默認選擇</system:String>
<system:String x:Key="RoguelikeUseSupportUnit">開局幹員使用助戰</system:String>
<system:String x:Key="RoguelikeUseNonFriendSupport">可以使用非好友助戰</system:String>
<system:String x:Key="DefaultSquad">默認分隊</system:String>
<system:String x:Key="IS2NewSquad1">心勝於物分隊</system:String>

18
src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
View File

@@ -164,6 +164,24 @@
TextWrapping="Wrap"
ToolTip="{DynamicResource StartingCoreCharTip}" />
</StackPanel>
<StackPanel
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal">
<CheckBox
Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{DynamicResource RoguelikeUseSupportUnit}"
IsChecked="{Binding RoguelikeUseSupportUnit}"/>
<CheckBox
Margin="10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{DynamicResource RoguelikeUseNonFriendSupport}"
IsChecked="{Binding RoguelikeEnableNonfriendSupport}"
IsEnabled="{Binding RoguelikeUseSupportUnit}"/>
</StackPanel>
</StackPanel>
</Grid>
</UserControl>