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

feat: 自动战斗日志栏添加日志悬浮窗按钮

Browse Source
This commit is contained in:
uye
2026-01-09 20:35:57 +08:00
parent a02e9b8fc0
commit 60e191adf7
3 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1503,6 +1503,8 @@ public class TaskQueueViewModel : Screen
/// <returns>Task</returns>
public async Task LinkStart()
{
AddLog(1.ToString());
return;
if (!_runningState.GetIdle())
{
_logger.Information("Not idle, return.");

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

@@ -667,6 +667,49 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<!-- 覆盖层：悬浮窗按钮，绑定到信息流区域右上角（不占布局） -->
<Grid
Margin="0,10,0,0"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Panel.ZIndex="200">
<Path
Width="15"
Height="15"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Fill="{DynamicResource PrimaryTextBrush}"
IsHitTestVisible="False"
Stretch="Uniform"
StrokeThickness="1">
<Path.Style>
<Style TargetType="Path">
<Setter Property="Data" Value="{StaticResource CarbonUnlink}" />
<Style.Triggers>
<DataTrigger Binding="{Binding IsOverlayEnabled, Source={x:Static helper:Instances.TaskQueueViewModel}}" Value="True">
<Setter Property="Data" Value="{StaticResource CarbonLink}" />
</DataTrigger>
</Style.Triggers>
</Style>
</Path.Style>
</Path>
<Button
Width="27"
Height="27"
Click="{s:Action ToggleOverlay,
Target={x:Static helper:Instances.TaskQueueViewModel}}"
MouseRightButtonDown="{s:Action ChooseOverlayTarget,
Target={x:Static helper:Instances.TaskQueueViewModel}}" />
<controls:TooltipBlock
HorizontalAlignment="Right"
VerticalAlignment="Top"
MouseLeftButtonDown="{s:Action ToggleOverlay,
Target={x:Static helper:Instances.TaskQueueViewModel}}"
MouseRightButtonDown="{s:Action ChooseOverlayTarget,
Target={x:Static helper:Instances.TaskQueueViewModel}}"
NormalOpacity="0.25"
TooltipText="{DynamicResource ProcessPickerToolTip}" />
</Grid>
<hc:ScrollViewer
properties:AutoScroll.AutoScroll="True"
HorizontalScrollBarVisibility="Disabled"

6
src/MaaWpfGui/Views/UI/TaskQueueView.xaml
View File

@@ -385,9 +385,9 @@
</hc:ScrollViewer>
<Border Width="200" Margin="0,10,30,10">
<controls:TooltipBlock
NormalOpacity="0.5"
HorizontalAlignment="Right"
VerticalContentAlignment="Top"
NormalOpacity="0.5"
TooltipText="{DynamicResource InventoryUpdateTip}" />
</Border>
</Grid>
@@ -668,8 +668,8 @@
</Path.Style>
</Path>
<Button
Width="30"
Height="30"
Width="27"
Height="27"
Click="{s:Action ToggleOverlay}"
MouseRightButtonDown="{s:Action ChooseOverlayTarget}" />
<controls:TooltipBlock