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

fix: Wpf增加悖论模拟模式非悖论作业检测

Browse Source
This commit is contained in:
status102
2025-11-07 13:37:56 +08:00
parent d70f3144f0
commit c5c58e349c
2 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
View File

@@ -194,17 +194,17 @@ public partial class CopilotViewModel : Screen
set => SetAndNotify(ref _startEnabled, value);
}
private int _activeTabIndex = 0;
private int _copilotTabIndex = 0;
/// <summary>
/// Gets or sets 作业类型，0：主线/故事集/SS 1：保全派驻 2：悖论模拟 3：其他活动
/// </summary>
public int ActiveTabIndex
public int CopilotTabIndex
{
get => _activeTabIndex;
get => _copilotTabIndex;
set
{
if (!SetAndNotify(ref _activeTabIndex, value))
if (!SetAndNotify(ref _copilotTabIndex, value))
{
return;
}
@@ -492,7 +492,7 @@ public partial class CopilotViewModel : Screen
[UsedImplicitly]
public async Task PasteClipboardCopilotSet()
{
if (ActiveTabIndex is 1 or 3)
if (CopilotTabIndex is 1 or 3)
{
return;
}
@@ -847,7 +847,7 @@ public partial class CopilotViewModel : Screen
if (!writeToCache)
{// 现在是暂时将所有本地作业不添加到列表
}
else if (ActiveTabIndex is 1)
else if (CopilotTabIndex is 1)
{ // 保全不使用多作业列表
}
else if (copilotList)
@@ -1177,7 +1177,7 @@ public partial class CopilotViewModel : Screen
return false;
}
if (ActiveTabIndex == 2)
if (CopilotTabIndex == 2)
{
string? name = null;
if (stageId?.Length > 6)
@@ -1285,13 +1285,24 @@ public partial class CopilotViewModel : Screen
return;
}
if (_taskType == AsstTaskType.Copilot && UseCopilotList && !await VerifyCopilotListTask())
if (_taskType != AsstTaskType.Copilot)
{
// 校验作业合法性
_runningState.SetIdle(true);
return;
}
else if (_taskType == AsstTaskType.Copilot && !UseCopilotList && _copilotCache is null)
else if (UseCopilotList)
{
if (!await VerifyCopilotListTask())
{
// 校验作业合法性
_runningState.SetIdle(true);
return;
}
else if (CopilotTabIndex == 2 && !VerifyParadoxTasks())
{
_runningState.SetIdle(true);
return;
}
}
else if (!UseCopilotList && _copilotCache is null)
{
AddLog(LocalizationHelper.GetString("CopilotEmptyError"), UiLogColor.Error, showTime: false);
_runningState.SetIdle(true);
@@ -1336,7 +1347,7 @@ public partial class CopilotViewModel : Screen
var t = CopilotItemViewModels.Where(i => i.IsChecked).Select(i =>
{
_copilotIdList.Add(i.CopilotId);
return new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, IsParadox = ActiveTabIndex == 2, };
return new MultiTask { FileName = i.FilePath, IsRaid = i.IsRaid, StageName = i.Name, IsParadox = CopilotTabIndex == 2, };
});
var task = new AsstCopilotTask()
@@ -1531,6 +1542,21 @@ public partial class CopilotViewModel : Screen
return true;
}
private bool VerifyParadoxTasks()
{
bool ret = true;
foreach (var task in CopilotItemViewModels.Where(i => i.IsChecked))
{
if (!DataHelper.Operators.Any(op => op.Value.Name == task.Name))
{
AddLog("illegal oper name: " + task.Name, UiLogColor.Error);
ret = false;
}
}
return ret;
}
/// <summary>
/// 点击后移除界面中元素焦点
/// </summary>

16
src/MaaWpfGui/Views/UI/CopilotView.xaml
View File

@@ -45,7 +45,7 @@
<TabControl
HorizontalAlignment="Center"
BorderThickness="0"
SelectedIndex="{Binding ActiveTabIndex}"
SelectedIndex="{Binding CopilotTabIndex}"
Style="{StaticResource TabControlSliding}">
<TabControl.Template>
<ControlTemplate TargetType="{x:Type TabControl}">
@@ -122,7 +122,7 @@
hc:IconElement.Geometry="{StaticResource ClipboardLinkSet20Regular}"
BorderThickness="0,1,1,1"
Command="{s:Action PasteClipboardCopilotSet}"
IsEnabled="{c:Binding '(Idle) and (StartEnabled) and (ActiveTabIndex == 0 or ActiveTabIndex == 2)'}" />
IsEnabled="{c:Binding '(Idle) and (StartEnabled) and (CopilotTabIndex == 0 or CopilotTabIndex == 2)'}" />
<controls:TooltipBlock
Grid.Column="1"
HorizontalAlignment="Right"
@@ -170,7 +170,7 @@
<StackPanel
HorizontalAlignment="Center"
Orientation="Horizontal"
Visibility="{c:Binding 'ActiveTabIndex == 0 or ActiveTabIndex == 3'}">
Visibility="{c:Binding 'CopilotTabIndex == 0 or CopilotTabIndex == 3'}">
<StackPanel
Margin="2.5,5"
HorizontalAlignment="Center"
@@ -202,7 +202,7 @@
</StackPanel>
</StackPanel>
<StackPanel HorizontalAlignment="Center" Visibility="{c:Binding 'Form and (ActiveTabIndex == 0 or ActiveTabIndex == 3)'}">
<StackPanel HorizontalAlignment="Center" Visibility="{c:Binding 'Form and (CopilotTabIndex == 0 or CopilotTabIndex == 3)'}">
<CheckBox
Margin="2.5,5"
HorizontalAlignment="Center"
@@ -248,7 +248,7 @@
Margin="2.5,5"
VerticalAlignment="Center"
Orientation="Horizontal"
Visibility="{c:Binding 'ActiveTabIndex == 0 or ActiveTabIndex == 2'}">
Visibility="{c:Binding 'CopilotTabIndex == 0 or CopilotTabIndex == 2'}">
<CheckBox Content="{DynamicResource UseCopilotList}" IsChecked="{Binding UseCopilotList}" />
<controls:TooltipBlock TooltipText="{DynamicResource UseCopilotListTip}" />
</StackPanel>
@@ -256,7 +256,7 @@
Margin="2.5,5"
Content="{DynamicResource UseSanityPotion}"
IsChecked="{Binding UseSanityPotion}"
Visibility="{c:Binding 'UseCopilotList and ActiveTabIndex == 0'}" />
Visibility="{c:Binding 'UseCopilotList and CopilotTabIndex == 0'}" />
</StackPanel>
</StackPanel>
<StackPanel
@@ -264,7 +264,7 @@
HorizontalAlignment="Center"
VerticalAlignment="Center"
Orientation="Horizontal"
Visibility="{c:Binding '!UseCopilotList and ActiveTabIndex != 2'}">
Visibility="{c:Binding '!UseCopilotList and CopilotTabIndex != 2'}">
<CheckBox
VerticalContentAlignment="Center"
Content="{DynamicResource LoopTimes}"
@@ -285,7 +285,7 @@
Grid.Row="2"
Width="200"
Margin="0,7,0,0"
Visibility="{c:Binding 'UseCopilotList and (ActiveTabIndex == 0 or ActiveTabIndex == 2)'}">
Visibility="{c:Binding 'UseCopilotList and (CopilotTabIndex == 0 or CopilotTabIndex == 2)'}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="Auto" />