Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

工作面板翻译和改进

Browse Source
This commit is contained in:
ZouJin 2024-05-25 02:30:21 +08:00
parent 540add8f60
commit 7ab8a0bc43
4 changed files with 269 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
VPet-Simulator.Windows.Interface/ScheduleItemBase.cs Normal file
View File

@ -0,0 +1,61 @@
using Panuon.WPF;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Media;
using static VPet_Simulator.Core.GraphHelper;
namespace VPet_Simulator.Windows.Interface;
/// <summary>
/// 日程表基础
/// </summary>
public class ScheduleItemBase : NotifyPropertyChangedBase
{
/// <summary>
/// 工作日程表
/// </summary>
public class WorkScheduleItem
: ScheduleItemBase
{
public Work work { get; set; }
public WorkScheduleItem()
{
}
public WorkScheduleItem(ImageSource image,
string workName,
int workTime)
{
Image = image;
WorkName = workName;
WorkTime = workTime;
}
public ImageSource Image { get; set; }
public string WorkName { get; set; }
public int WorkTime { get; set; }
public bool IsPreviousIsRest { get => _isPreviousIsRest; set => Set(ref _isPreviousIsRest, value); }
private bool _isPreviousIsRest;
}
public class RestScheduleItem
: ScheduleItemBase
{
public RestScheduleItem()
{
}
public RestScheduleItem(int restTime)
{
RestTime = restTime;
}
public int RestTime { get => _restTime; set => Set(ref _restTime, value); }
private int _restTime;
}
}

327
VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml
View File

@ -136,7 +136,7 @@
</Grid>
<Button x:Name="btnAddAuto" Grid.Row="1" Content="{ll:Str 添加至日程表}" Padding="0"
Style="{DynamicResource ThemedButtonStyle}" Background="{DynamicResource PrimaryDarker}"
Click="btnStart_Click" Margin="5" Height="25" IsEnabled="False" />
Click="btnStart_Click" Margin="5" Height="25" Visibility="Collapsed" />
<Button x:Name="btnStart" Grid.Row="2" Height="30" Content="{ll:Str 开始工作}"
Style="{DynamicResource ThemedButtonStyle}" Background="{DynamicResource PrimaryDarker}"
Click="btnStart_Click" FontSize="16" FontWeight="Bold" />
@ -150,7 +150,7 @@
pu:TabControlHelper.ItemsSelectedForeground="{DynamicResource DARKPrimaryText}"
Background="Transparent" BorderThickness="0" Foreground="{DynamicResource PrimaryText}"
SelectedIndex="0">
<TabItem Header="机构签署">
<TabItem Header="{ll:Str '机构签署'}">
<Grid Margin="7,3">
<Grid.ColumnDefinitions>
<ColumnDefinition />
@ -180,34 +180,33 @@
</Style>
</UniformGrid.Resources>
<ToggleButton x:Name="tbtnAgencyJob"
pu:ToggleButtonHelper.CornerRadius="4,0,0,4" Content="工作中介"
pu:ToggleButtonHelper.CornerRadius="4,0,0,4" Content="{ll:Str '工作中介'}"
IsChecked="True" Checked="tbtn_Agency_CheckChanged"
PreviewMouseLeftButtonDown="tbtnAgency_PreviewMouseLeftButtonDown" />
<ToggleButton x:Name="tbtnAgencyTraning"
pu:ToggleButtonHelper.CornerRadius="0,4,4,0" Content="培训机构"
pu:ToggleButtonHelper.CornerRadius="0,4,4,0" Content="{ll:Str '培训机构'}"
Checked="tbtn_Agency_CheckChanged"
PreviewMouseLeftButtonDown="tbtnAgency_PreviewMouseLeftButtonDown" />
</UniformGrid>
<Image x:Name="imgAgency" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="2" Grid.RowSpan="2"
Margin="-20,0" Stretch="Uniform" Source="/Res/img/r_agency_job.png" />
<ToggleButton x:Name="tbtnCurrentPlan"
Grid.Row="3"
HorizontalAlignment="Right"
Style="{DynamicResource StandardToggleButtonStyle}"
Padding="5,3"
Content="当前套餐">
<Image x:Name="imgAgency" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="2"
Grid.RowSpan="2" Margin="-20,0" Stretch="Uniform"
Source="/Res/img/r_agency_job.png" />
<ToggleButton x:Name="tbtnCurrentPlan" Grid.Row="3" HorizontalAlignment="Right"
Style="{DynamicResource StandardToggleButtonStyle}" Padding="5,3"
Content="{ll:Str '当前套餐'}">
<pu:ToggleButtonHelper.CheckedContent>
<StackPanel Orientation="Horizontal">
<TextBlock>当前套餐</TextBlock>
<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" FontFamily="{StaticResource RemixIcon}">&#xeb97;</TextBlock>
<TextBlock Margin="3,0,0,0" VerticalAlignment="Center"
FontFamily="{StaticResource RemixIcon}">&#xeb97;</TextBlock>
</StackPanel>
</pu:ToggleButtonHelper.CheckedContent>
</ToggleButton>
</Grid>
<Border Grid.Column="2" Background="White" CornerRadius="4" />
<Grid Grid.Column="2"
Margin="7">
<Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=tbtnCurrentPlan}">
<Grid Grid.Column="2" Margin="7">
<Grid d:Visibility="Collapsed"
Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=tbtnCurrentPlan}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
@ -216,37 +215,23 @@
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<ComboBox x:Name="combTaskType"
Margin="0,3,0,0"
Style="{DynamicResource StandardComboBoxStyle}"
pu:ComboBoxHelper.Watermark="--请选择套餐--" />
<TextBlock Grid.Row="1"
Margin="0,7,0,0"
VerticalAlignment="Bottom"
Text="{ll:Str 选择等级}" />
<TextBlock Grid.Row="1"
Margin="0,7,0,0"
FontSize="16"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}">
<ComboBox x:Name="combTaskType" Margin="0,3,0,0"
Style="{DynamicResource StandardComboBoxStyle}"
pu:ComboBoxHelper.Watermark="--请选择套餐--" />
<TextBlock Grid.Row="1" Margin="0,7,0,0" VerticalAlignment="Bottom"
Text="{ll:Str 选择等级}" />
<TextBlock Grid.Row="1" Margin="0,7,0,0" FontSize="16"
HorizontalAlignment="Right" Foreground="{DynamicResource DARKPrimary}">
<Run Text="Lv." />
<Run Text="50" />
<Run x:Name="rTaskLevel" Text="50" />
</TextBlock>
<Slider Grid.Row="2"
pu:SliderHelper.ThumbWidth="10"
pu:SliderHelper.ThumbCornerRadius="2"
pu:SliderHelper.ThumbHeight="16"
pu:SliderHelper.ThumbBorderThickness="2"
SmallChange="1"
Value="1"
Minimum="1"
TickFrequency="1"
IsSnapToTickEnabled="True"
LargeChange="1"
<Slider x:Name="sliderTaskLevel" Grid.Row="2" pu:SliderHelper.ThumbWidth="10"
pu:SliderHelper.ThumbCornerRadius="2" pu:SliderHelper.ThumbHeight="16"
pu:SliderHelper.ThumbBorderThickness="2" SmallChange="1" Value="1"
Minimum="1" TickFrequency="1" IsSnapToTickEnabled="True" LargeChange="1"
Style="{DynamicResource StandardSliderStyle}"
TickPlacement="BottomRight"></Slider>
<Grid Grid.Row="4"
Margin="0,7,0,0">
<Grid Grid.Row="4" Margin="0,7,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="22" />
<RowDefinition Height="22" />
@ -260,60 +245,37 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock x:Name="rTaskType">抽成</TextBlock>
<TextBlock Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="20%" />
<TextBlock Grid.Row="1"
Text="{ll:Str '等级需求'}" />
<TextBlock Grid.Row="1"
Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="Lv 100" />
<TextBlock Grid.Row="2"
Text="{ll:Str '合同持续时间'}" />
<TextBlock Grid.Row="2"
Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="7 天" />
<TextBlock Grid.Row="4"
Text="{ll:Str '办理费用'}"
VerticalAlignment="Bottom" />
<TextBlock Grid.Row="4"
Grid.Column="2"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Foreground="{DynamicResource DARKPrimary}"
Text="100000"
FontSize="26" />
<TextBlock Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="20%" />
<TextBlock Grid.Row="1" Text="{ll:Str '等级需求'}" />
<TextBlock Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="Lv 100" />
<TextBlock Grid.Row="2" Text="{ll:Str '合同持续时间'}" />
<TextBlock Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="7 天" />
<TextBlock Grid.Row="4" Text="{ll:Str '办理费用'}" VerticalAlignment="Bottom" />
<TextBlock Grid.Row="4" Grid.Column="2" HorizontalAlignment="Right"
VerticalAlignment="Center"
Foreground="{DynamicResource DARKPrimary}" Text="100000"
FontSize="26" />
</Grid>
<Button x:Name="btnSignAgency"
Grid.Row="6"
Margin="0,5,0,0"
Height="30"
Content="{ll:Str 签署}"
Style="{DynamicResource ThemedButtonStyle}"
Background="{DynamicResource PrimaryDarker}"
Click="btnSignAgency_Click"
FontSize="16"
FontWeight="Bold" />
<Button x:Name="btnSignAgency" Grid.Row="6" Margin="0,5,0,0" Height="30"
Content="{ll:Str 签署}" Style="{DynamicResource ThemedButtonStyle}"
Background="{DynamicResource PrimaryDarker}" Click="btnSignAgency_Click"
FontSize="16" FontWeight="Bold" />
</Grid>
<Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.FalseToCollapseConverter}, ElementName=tbtnCurrentPlan}">
<Grid
Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.FalseToCollapseConverter}, ElementName=tbtnCurrentPlan}"
d:Visibility="Visible">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition />
</Grid.RowDefinitions>
<TextBlock Text="当前套餐"
Opacity="0.7" />
<TextBlock Grid.Row="1"
Text="特别周特训套餐"
FontSize="24"
Foreground="{DynamicResource DARKPrimary}" />
<Grid Grid.Row="2"
Margin="0,7,0,0">
<TextBlock Text="{ll:Str '当前套餐'}" Opacity="0.7" />
<TextBlock Grid.Row="1" Text="{ll:Str '暂无签署套餐'}" FontSize="24"
Foreground="{DynamicResource DARKPrimary}" />
<Grid Grid.Row="2" Margin="0,7,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="22" />
<RowDefinition Height="22" />
@ -326,41 +288,26 @@
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock >抽成</TextBlock>
<TextBlock Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="20%" />
<TextBlock Grid.Row="1"
Text="{ll:Str '等级需求'}" />
<TextBlock Grid.Row="1"
Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="Lv 100" />
<TextBlock Grid.Row="2"
Text="{ll:Str '合同剩余时间'}" />
<TextBlock Grid.Row="2"
Grid.Column="2"
HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}"
Text="7 天" />
<TextBlock Grid.Row="4"
Text="{ll:Str '办理费用'}"
VerticalAlignment="Bottom" />
<TextBlock Grid.Row="4"
Grid.Column="2"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Foreground="{DynamicResource DARKPrimary}"
Text="100000"
FontSize="26" />
<TextBlock Text="{Binding Text,ElementName=rTaskType}" />
<TextBlock Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="20%" />
<TextBlock Grid.Row="1" Text="{ll:Str '等级需求'}" />
<TextBlock Grid.Row="1" Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="Lv 100" />
<TextBlock Grid.Row="2" Text="{ll:Str '合同剩余时间'}" />
<TextBlock Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right"
Foreground="{DynamicResource DARKPrimary}" Text="7 天" />
<TextBlock Grid.Row="4" Text="{ll:Str '办理费用'}" VerticalAlignment="Bottom" />
<TextBlock Grid.Row="4" Grid.Column="2" HorizontalAlignment="Right"
VerticalAlignment="Center"
Foreground="{DynamicResource DARKPrimary}" Text="100000"
FontSize="26" />
</Grid>
</Grid>
</Grid>
</Grid>
</TabItem>
<TabItem Header="日程表">
<TabItem Header="{ll:Str '日程表'}">
<Grid Margin="3">
<Grid.ColumnDefinitions>
<ColumnDefinition />
@ -373,7 +320,7 @@
<RowDefinition Height="Auto" />
<RowDefinition />
</Grid.RowDefinitions>
<TextBlock Margin="7,7,0,0" Text="日程安排" />
<TextBlock Margin="7,7,0,0" Text="{ll:Str '日程安排'}" />
<ScrollViewer Grid.Row="1">
<StackPanel Margin="20,7,7,7">
<ItemsControl x:Name="icSchedule"
@ -410,15 +357,119 @@
Source="/Res/img/r_autobuy_3.png" />
<StackPanel Grid.Column="1"
VerticalAlignment="Center">
<TextBlock>工作内容</TextBlock>
<TextBlock Text="{ll:Str '工作内容'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}"
Text="{Binding WorkName}" />
<TextBlock>持续时间</TextBlock>
<TextBlock Text="{ll:Str '持续时间'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}">
<Run Text="{Binding WorkTime}" />
<Run>分钟</Run>
<Run Text="{ll:Str '分钟'}" />
</TextBlock>
</StackPanel>
<Button Grid.Column="2"
HorizontalAlignment="Right"
Background="Transparent"
Foreground="{DynamicResource DangerBrush}"
FontFamily="{StaticResource RemixIcon}"
Click="btn_removeSchedule_Click">&#xeb97;</Button>
</Grid>
</Border>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="StudyScheduleTemplate">
<StackPanel>
<Button Margin="-20,-5,0,-5" HorizontalAlignment="Left"
Visibility="{Binding IsPreviousIsRest, Converter={x:Static pu:Converters.TrueToCollapseConverter}}"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 添加休息}"
Click="btn_addRest_Click">&#xea11;</Button>
<Border Height="90" CornerRadius="5"
Background="{DynamicResource DARKPrimaryTrans4}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Margin="-15,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<Button Margin="0,0,0,0" Padding="0"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 上移}"
Click="btn_scheduleUp_Click">&#xea76;</Button>
<Button Margin="0,0,0,0" Padding="0"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 下移}"
Click="btn_scheduleDown_Click">&#xea4c;</Button>
</StackPanel>
<Image Stretch="Uniform"
Source="/Res/img/r_autobuy_3.png" />
<StackPanel Grid.Column="1"
VerticalAlignment="Center">
<TextBlock Text="{ll:Str '学习内容'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}"
Text="{Binding WorkName}" />
<TextBlock Text="{ll:Str '持续时间'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}">
<Run Text="{Binding WorkTime}" />
<Run Text="{ll:Str '分钟'}" />
</TextBlock>
</StackPanel>
<Button Grid.Column="2"
HorizontalAlignment="Right"
Background="Transparent"
Foreground="{DynamicResource DangerBrush}"
FontFamily="{StaticResource RemixIcon}"
Click="btn_removeSchedule_Click">&#xeb97;</Button>
</Grid>
</Border>
</StackPanel>
</DataTemplate>
<DataTemplate x:Key="PlayScheduleTemplate">
<StackPanel>
<Button Margin="-20,-5,0,-5" HorizontalAlignment="Left"
Visibility="{Binding IsPreviousIsRest, Converter={x:Static pu:Converters.TrueToCollapseConverter}}"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 添加休息}"
Click="btn_addRest_Click">&#xea11;</Button>
<Border Height="90" CornerRadius="5"
Background="{DynamicResource DARKPrimaryTrans4}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="120" />
<ColumnDefinition />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Margin="-15,0,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Center">
<Button Margin="0,0,0,0" Padding="0"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 上移}"
Click="btn_scheduleUp_Click">&#xea76;</Button>
<Button Margin="0,0,0,0" Padding="0"
Style="{DynamicResource IconButtonStyle}"
ToolTip="{ll:Str 下移}"
Click="btn_scheduleDown_Click">&#xea4c;</Button>
</StackPanel>
<Image Stretch="Uniform"
Source="/Res/img/r_autobuy_3.png" />
<StackPanel Grid.Column="1"
VerticalAlignment="Center">
<TextBlock Text="{ll:Str '玩耍内容'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}"
Text="{Binding WorkName}" />
<TextBlock Text="{ll:Str '持续时间'}" />
<TextBlock FontSize="16"
Foreground="{DynamicResource DARKPrimary}">
<Run Text="{Binding WorkTime}" />
<Run Text="{ll:Str '分钟'}" />
</TextBlock>
</StackPanel>
<Button Grid.Column="2"
@ -440,9 +491,13 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="7,0">
<TextBlock VerticalAlignment="Center">休息</TextBlock>
<pu:NumberInput Minimum="0" Interval="1" StepFactor="5"
IsSnapToIntervalEnabled="True" Background="Transparent" BorderThickness="0"
<TextBlock VerticalAlignment="Center"
Text="{ll:Str '休息'}" />
<pu:NumberInput Minimum="0" Interval="1"
StepFactor="5"
IsSnapToIntervalEnabled="True"
Background="Transparent"
BorderThickness="0"
Foreground="{DynamicResource DARKPrimary}"
FontSize="16" Padding="0"
Value="{Binding RestTime, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
@ -457,7 +512,7 @@
</pu:NumberInput>
<TextBlock VerticalAlignment="Center"
Foreground="{DynamicResource DARKPrimary}"
FontSize="16">分钟</TextBlock>
FontSize="16" Text="{ll:Str '分钟'}" />
</StackPanel>
<Button Grid.Column="2" HorizontalAlignment="Right"
VerticalAlignment="Center"
@ -480,12 +535,13 @@
</Grid>
<Grid Grid.Column="1" Margin="0,7,7,7">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock Text="合计" />
<TextBlock Text="{ll:Str 合计}" />
<Grid Grid.Row="1" Margin="0,7,0,0">
<pu:RingProgressBar x:Name="rpgbSchedule"
Height="{Binding ActualWidth, RelativeSource={RelativeSource Self}}"
@ -495,22 +551,25 @@
Minimum="0" Maximum="100" Value="0" />
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel>
<TextBlock Opacity="0.5">工作时间</TextBlock>
<TextBlock Opacity="0.5" Text="{ll:Str '工作时间'}" />
<TextBlock Foreground="{DynamicResource DARKPrimary}"
HorizontalAlignment="Right">
<Run x:Name="runScheduleWork" FontSize="22">0</Run>
<Run>分钟</Run>
<Run Text="{ll:Str '分钟'}" />
</TextBlock>
<TextBlock Opacity="0.5">休息时间</TextBlock>
<TextBlock Opacity="0.5" Text="{ll:Str 休息时间}" />
<TextBlock Foreground="{DynamicResource DARKPrimary}"
HorizontalAlignment="Right">
<Run x:Name="runScheduleRest" FontSize="22">0</Run>
<Run>分钟</Run>
<Run Text="{ll:Str '分钟'}" />
</TextBlock>
</StackPanel>
</Grid>
</Grid>
<ToggleButton x:Name="btnStartSchedule" Grid.Row="3"
<TextBlock x:Name="runSchedulePercentage" Foreground="{DynamicResource DARKPrimary}"
Grid.Row="2" HorizontalAlignment="Center" FontSize="16" Margin="0,5,0,0"
Text="100%" FontWeight="Bold" />
<ToggleButton x:Name="btnStartSchedule" Grid.Row="4"
Style="{DynamicResource ThemedToggleButtonStyle}" Height="30"
Content="{ll:Str 开始日程}" Background="{DynamicResource PrimaryDarker}"
FontSize="16" FontWeight="Bold" Click="btnStartSchedule_Click" />

64
VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs
View File

@ -11,8 +11,10 @@ using System.Windows.Controls.Primitives;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Threading;
using VPet_Simulator.Core;
using VPet_Simulator.Windows.Interface;
using static VPet_Simulator.Core.GraphHelper;
using static VPet_Simulator.Windows.Interface.ScheduleItemBase;
namespace VPet_Simulator.Windows;
/// <summary>
@ -104,7 +106,7 @@ public partial class winWorkMenu : WindowX
//判断倍率
if (nowwork.LevelLimit > mw.GameSavesData.GameSave.Level)
{
wDouble.IsEnabled = false;
wDouble.Visibility = Visibility.Collapsed;
wDouble.Value = 1;
}
else
@ -112,12 +114,12 @@ public partial class winWorkMenu : WindowX
int max = Math.Min(4000, mw.GameSavesData.GameSave.Level) / (nowwork.LevelLimit + 10);
if (max <= 1)
{
wDouble.IsEnabled = false;
wDouble.Visibility = Visibility.Collapsed;
wDouble.Value = 1;
}
else
{
wDouble.IsEnabled = true;
wDouble.Visibility = Visibility.Visible;
wDouble.Maximum = max;
wDouble.Value = mw.Set["workmenu"].GetInt("double_" + nowwork.Name, 1);
}
@ -332,6 +334,14 @@ public partial class winWorkMenu : WindowX
runScheduleWork.Text = workTime.ToString();
runScheduleRest.Text = restTime.ToString();
double ps = workTime / (double)(workTime + restTime);
runSchedulePercentage.Text = ps.ToString("p0");
if (ps > 0.71)
runSchedulePercentage.Foreground = new SolidColorBrush(Colors.OrangeRed);
else
runSchedulePercentage.Foreground = Function.ResourcesBrush(Function.BrushType.DARKPrimary);
rpgbSchedule.Foreground = runSchedulePercentage.Foreground;
}
private void tbtn_Agency_CheckChanged(object sender, RoutedEventArgs e)
@ -451,52 +461,6 @@ public partial class winWorkMenu : WindowX
}
}
public abstract class ScheduleItemBase
: NotifyPropertyChangedBase
{
}
public class WorkScheduleItem
: ScheduleItemBase
{
public WorkScheduleItem()
{
}
public WorkScheduleItem(ImageSource image,
string workName,
int workTime)
{
Image = image;
WorkName = workName;
WorkTime = workTime;
}
public ImageSource Image { get; set; }
public string WorkName { get; set; }
public int WorkTime { get; set; }
public bool IsPreviousIsRest { get => _isPreviousIsRest; set => Set(ref _isPreviousIsRest, value); }
private bool _isPreviousIsRest;
}
public class RestScheduleItem
: ScheduleItemBase
{
public RestScheduleItem()
{
}
public RestScheduleItem(int restTime)
{
RestTime = restTime;
}
public int RestTime { get => _restTime; set => Set(ref _restTime, value); }
private int _restTime;
}
internal class ScheduleItemTemplateSelector
: DataTemplateSelector
@ -508,7 +472,7 @@ internal class ScheduleItemTemplateSelector
if (item is WorkScheduleItem workItem)
{
return element.FindResource("WorkScheduleTemplate") as DataTemplate;
}
}
else if (item is RestScheduleItem restItem)
{
return element.FindResource("RestScheduleTemplate") as DataTemplate;

1
VPet-Simulator.Windows/mod/1102_Live2DAnimation Symbolic link
View File

@ -0,0 +1 @@
D:/Documents/Visual Studio 2022/Projects/VPet.Live2DAnimation/VPet.Plugin.Live2DAnimation/1102_Live2DAnimation