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:
末城via 2024-05-24 15:23:32 +08:00
parent 9b3d39690e
commit 540add8f60
6 changed files with 186 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VPet-Simulator.Core/Display/basestyle.xaml
View File

@ -159,6 +159,20 @@
</Setter> </Setter>
</Style> </Style>
<Style x:Key="StandardToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
TargetType="{x:Type ToggleButton}">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="{DynamicResource DARKPrimary}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="pu:ToggleButtonHelper.HoverBackground" Value="{DynamicResource DARKPrimaryLighter}" />
<Setter Property="pu:ToggleButtonHelper.HoverForeground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="pu:ToggleButtonHelper.CheckedBackground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="pu:ToggleButtonHelper.CheckedForeground" Value="{DynamicResource DARKPrimaryText}" />
<Setter Property="Foreground" Value="{DynamicResource DARKPrimary}" />
<Setter Property="Padding" Value="10,5" />
<Setter Property="pu:ButtonHelper.CornerRadius" Value="5" />
</Style>
<Style x:Key="ThemedToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}" <Style x:Key="ThemedToggleButtonStyle" BasedOn="{StaticResource {x:Type ToggleButton}}"
TargetType="{x:Type ToggleButton}"> TargetType="{x:Type ToggleButton}">
<Setter Property="Background" Value="{DynamicResource DARKPrimary}" /> <Setter Property="Background" Value="{DynamicResource DARKPrimary}" />

4
VPet-Simulator.Core/VPet-Simulator.Core.csproj
View File

@ -25,8 +25,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="LinePutScript" Version="1.11.6" /> <PackageReference Include="LinePutScript" Version="1.11.6" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="Properties\Resources.Designer.cs"> <Compile Update="Properties\Resources.Designer.cs">

4
VPet-Simulator.Windows.Interface/VPet-Simulator.Windows.Interface.csproj
View File

@ -18,7 +18,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="LinePutScript" Version="1.11.6" /> <PackageReference Include="LinePutScript" Version="1.11.6" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
VPet-Simulator.Windows/VPet-Simulator.Windows.csproj
View File

@ -230,8 +230,8 @@
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="NAudio" Version="2.2.1" /> <PackageReference Include="NAudio" Version="2.2.1" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" /> <ProjectReference Include="..\VPet-Simulator.Core\VPet-Simulator.Core.csproj" />

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

@ -151,7 +151,7 @@
Background="Transparent" BorderThickness="0" Foreground="{DynamicResource PrimaryText}" Background="Transparent" BorderThickness="0" Foreground="{DynamicResource PrimaryText}"
SelectedIndex="0"> SelectedIndex="0">
<TabItem Header="机构签署"> <TabItem Header="机构签署">
<Grid Margin="7"> <Grid Margin="7,3">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition Width="15" /> <ColumnDefinition Width="15" />
@ -162,6 +162,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<UniformGrid Columns="2"> <UniformGrid Columns="2">
<UniformGrid.Resources> <UniformGrid.Resources>
@ -187,67 +188,175 @@
Checked="tbtn_Agency_CheckChanged" Checked="tbtn_Agency_CheckChanged"
PreviewMouseLeftButtonDown="tbtnAgency_PreviewMouseLeftButtonDown" /> PreviewMouseLeftButtonDown="tbtnAgency_PreviewMouseLeftButtonDown" />
</UniformGrid> </UniformGrid>
<Image x:Name="imgAgency" RenderOptions.BitmapScalingMode="HighQuality" Grid.Row="2" <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" /> 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="当前套餐">
<pu:ToggleButtonHelper.CheckedContent>
<StackPanel Orientation="Horizontal">
<TextBlock>当前套餐</TextBlock>
<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" FontFamily="{StaticResource RemixIcon}">&#xeb97;</TextBlock>
</StackPanel>
</pu:ToggleButtonHelper.CheckedContent>
</ToggleButton>
</Grid> </Grid>
<Border Grid.Column="2" Background="White" CornerRadius="4" /> <Border Grid.Column="2" Background="White" CornerRadius="4" />
<Grid Grid.Column="2" Margin="15"> <Grid Grid.Column="2"
<Grid.RowDefinitions> Margin="7">
<RowDefinition Height="Auto" /> <Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.TrueToCollapseConverter}, ElementName=tbtnCurrentPlan}">
<RowDefinition Height="Auto" /> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition />
</Grid.RowDefinitions> <RowDefinition Height="Auto" />
<ComboBox x:Name="combTaskType" Margin="0,3,0,0" </Grid.RowDefinitions>
Style="{DynamicResource StandardComboBoxStyle}" <ComboBox x:Name="combTaskType"
pu:ComboBoxHelper.Watermark="--请选择套餐--" /> Margin="0,3,0,0"
<TextBlock Grid.Row="1" Margin="0,7,0,0" VerticalAlignment="Bottom" Style="{DynamicResource StandardComboBoxStyle}"
Text="{ll:Str 选择等级}" /> pu:ComboBoxHelper.Watermark="--请选择套餐--" />
<TextBlock Grid.Row="1" Margin="0,7,0,0" FontSize="16" HorizontalAlignment="Right" <TextBlock Grid.Row="1"
Foreground="{DynamicResource DARKPrimary}"> 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="Lv." />
<Run Text="50" /> <Run Text="50" />
</TextBlock> </TextBlock>
<Slider Grid.Row="2" pu:SliderHelper.ThumbWidth="10" <Slider Grid.Row="2"
pu:SliderHelper.ThumbCornerRadius="2" pu:SliderHelper.ThumbHeight="16" pu:SliderHelper.ThumbWidth="10"
pu:SliderHelper.ThumbBorderThickness="2" SmallChange="1" Value="1" pu:SliderHelper.ThumbCornerRadius="2"
Minimum="1" TickFrequency="1" IsSnapToTickEnabled="True" LargeChange="1" pu:SliderHelper.ThumbHeight="16"
Style="{DynamicResource StandardSliderStyle}" TickPlacement="Both"></Slider> pu:SliderHelper.ThumbBorderThickness="2"
<Grid Grid.Row="4" Margin="0,3,0,0"> 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.RowDefinitions>
<RowDefinition Height="22" />
<RowDefinition Height="22" />
<RowDefinition Height="22" />
<RowDefinition />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<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" />
</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" />
</Grid>
<Grid Visibility="{Binding IsChecked, Converter={x:Static pu:Converters.FalseToCollapseConverter}, ElementName=tbtnCurrentPlan}">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition Height="Auto" />
<RowDefinition Height="5" /> <RowDefinition Height="Auto" />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="10"/>
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <TextBlock Text="当前套餐"
<ColumnDefinition Width="Auto" /> Opacity="0.7" />
<ColumnDefinition Width="35" /> <TextBlock Grid.Row="1"
<ColumnDefinition Width="Auto" /> Text="特别周特训套餐"
</Grid.ColumnDefinitions> FontSize="24"
<TextBlock x:Name="rTaskType">抽成</TextBlock> Foreground="{DynamicResource DARKPrimary}" />
<TextBlock Grid.Column="2" HorizontalAlignment="Right" <Grid Grid.Row="2"
Foreground="{DynamicResource DARKPrimary}" Text="20%" /> Margin="0,7,0,0">
<TextBlock Grid.Row="5" Text="{ll:Str '办理费用'}" /> <Grid.RowDefinitions>
<TextBlock Grid.Row="5" Grid.Column="2" HorizontalAlignment="Right" <RowDefinition Height="22" />
Foreground="{DynamicResource DARKPrimary}" Text="100000" <RowDefinition Height="22" />
FontWeight="Bold" FontSize="16" /> <RowDefinition Height="22" />
<TextBlock Grid.Row="2" Text="{ll:Str '等级需求'}" /> <RowDefinition />
<TextBlock Grid.Row="3" Text="{ll:Str '合同持续时间'}" /> <RowDefinition Height="Auto" />
<TextBlock Grid.Row="2" Grid.Column="2" HorizontalAlignment="Right" </Grid.RowDefinitions>
Foreground="{DynamicResource DARKPrimary}" Text="Lv 100" /> <Grid.ColumnDefinitions>
<TextBlock Grid.Row="3" Grid.Column="2" HorizontalAlignment="Right" <ColumnDefinition Width="Auto" />
Foreground="{DynamicResource DARKPrimary}" Text="7 天" /> <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" />
</Grid>
</Grid> </Grid>
<Button x:Name="btnSignAgency" Grid.Row="6" Height="30" Content="{ll:Str 签署}"
Style="{DynamicResource ThemedButtonStyle}"
Background="{DynamicResource PrimaryDarker}" Click="btnSignAgency_Click"
FontSize="16" FontWeight="Bold" />
</Grid> </Grid>
</Grid> </Grid>
</TabItem> </TabItem>
@ -332,10 +441,8 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Margin="7,0"> <StackPanel Orientation="Horizontal" Margin="7,0">
<TextBlock VerticalAlignment="Center">休息</TextBlock> <TextBlock VerticalAlignment="Center">休息</TextBlock>
<pu:NumberInput Minimum="0" Interval="1" <pu:NumberInput Minimum="0" Interval="1" StepFactor="5"
IsSnapToIntervalEnabled="True" IsSnapToIntervalEnabled="True" Background="Transparent" BorderThickness="0"
Background="Transparent"
BorderThickness="0"
Foreground="{DynamicResource DARKPrimary}" Foreground="{DynamicResource DARKPrimary}"
FontSize="16" Padding="0" FontSize="16" Padding="0"
Value="{Binding RestTime, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Value="{Binding RestTime, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"

4
VPet.Solution/VPet.Solution.csproj
View File

@ -22,8 +22,8 @@
<PackageReference Include="LinePutScript" Version="1.11.6" /> <PackageReference Include="LinePutScript" Version="1.11.6" />
<PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" /> <PackageReference Include="LinePutScript.Localization.WPF" Version="1.0.7" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Panuon.WPF" Version="1.1.0" /> <PackageReference Include="Panuon.WPF" Version="1.1.0.1" />
<PackageReference Include="Panuon.WPF.UI" Version="1.2.1.3" /> <PackageReference Include="Panuon.WPF.UI" Version="1.2.1.5" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>