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 2023-04-10 19:16:15 +10:00
parent b5fc501226
commit 731a13c5cc
7 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
VPet-Simulator.Core/Display/Main.xaml
View File

@ -1,15 +1,17 @@
<pu:ContentControlX x:Class="VPet_Simulator.Core.Main" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet_Simulator.Core"
mc:Ignorable="d" d:DesignHeight="250" d:DesignWidth="250">
<Viewbox>
<Grid x:Name="MainGrid" Width="500" Height="500" MouseLeftButtonDown="MainGrid_MouseLeftButtonDown" x:FieldModifier="public"
MouseLeftButtonUp="MainGrid_MouseLeftButtonUp" MouseRightButtonDown="MainGrid_MouseRightButtonDown" MouseMove="MainGrid_MouseWave">
<Grid x:Name="UIGrid_Back" x:FieldModifier="public"/>
<Grid x:Name="MainGrid" Width="500" Height="500" MouseLeftButtonDown="MainGrid_MouseLeftButtonDown"
x:FieldModifier="public" MouseLeftButtonUp="MainGrid_MouseLeftButtonUp"
MouseRightButtonDown="MainGrid_MouseRightButtonDown" MouseMove="MainGrid_MouseWave">
<Grid x:Name="UIGrid_Back" x:FieldModifier="public" />
<Border x:Name="PetGrid" VerticalAlignment="Bottom" />
<Border x:Name="PetGrid2" VerticalAlignment="Bottom" />
<Grid x:Name="UIGrid" x:FieldModifier="public"/>
<Grid x:Name="UIGrid" x:FieldModifier="public" />
</Grid>
</Viewbox>
</pu:ContentControlX>

3
VPet-Simulator.Core/Display/MessageBar.xaml.cs
View File

@ -91,8 +91,7 @@ namespace VPet_Simulator.Core
{
if (m.UIGrid.Children.IndexOf(this) != m.UIGrid.Children.Count - 1)
{
m.UIGrid.Children.Remove(this);
m.UIGrid.Children.Add(this);
Panel.SetZIndex(this, m.UIGrid.Children.Count);
}
TText.Text = "";
outputtext = text.ToList();

3
VPet-Simulator.Core/Display/ToolBar.xaml.cs
View File

@ -103,8 +103,7 @@ namespace VPet_Simulator.Core
{
if (m.UIGrid.Children.IndexOf(this) != m.UIGrid.Children.Count - 1)
{
m.UIGrid.Children.Remove(this);
m.UIGrid.Children.Add(this);
Panel.SetZIndex(this, m.UIGrid.Children.Count);
}
Visibility = Visibility.Visible;
if (CloseTimer.Enabled)

3
VPet-Simulator.Windows/MainWindow.xaml.cs
View File

@ -182,6 +182,9 @@ namespace VPet_Simulator.Windows
Dispatcher.Invoke(new Action(() => LoadingText.Content = $"尝试加载 MOD数据: {di.Name}"));
CoreMODs.Add(new CoreMOD(di, this));
}
foreach (CoreMOD cm in CoreMODs)
if (!cm.SuccessLoad)
MessageBoxX.Show($"由于 {cm.Name} 包含代码插件\n虚拟桌宠模拟器已自动停止加载该插件\n请手动前往设置允许启用该mod 代码插件", $"{cm.Name} 未加载代码插件");
Dispatcher.Invoke(new Action(() => LoadingText.Content = "尝试加载游戏存档"));
//加载游戏内容

2
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -555,7 +555,7 @@
Foreground="{DynamicResource DARKPrimary}" BorderThickness="2" />
<TextBlock x:Name="ButtonSetting" HorizontalAlignment="Left" Margin="0,2,0,0"
TextWrapping="Wrap" Text="MOD设置" VerticalAlignment="Top" FontSize="14"
Foreground="DimGray" TextDecorations="Underline" Cursor="Hand" MouseDown="ButtonSetting_MouseDown"
Foreground="{DynamicResource DARKPrimaryDarker}" TextDecorations="Underline" Cursor="Hand" MouseDown="ButtonSetting_MouseDown"
/>
<Button x:Name="ButtonAllow" Content="启用代码插件" HorizontalAlignment="Left"
VerticalAlignment="Top" Background="#FFFF2C2C" Foreground="White"

21
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
View File

@ -20,6 +20,7 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using VPet_Simulator.Core;
using VPet_Simulator.Windows.Interface;
namespace VPet_Simulator.Windows
{
@ -267,6 +268,17 @@ namespace VPet_Simulator.Windows
ButtonAllow.Visibility = mod.SuccessLoad ? Visibility.Collapsed : Visibility.Visible;
ButtonSetting.Visibility = ButtonAllow.Visibility;
foreach (var mainplug in mw.Plugins)
{
if (mainplug.PluginName == mod.Name)
{
ButtonSetting.Visibility = Visibility.Visible;
return;
}
}
ButtonSetting.Visibility = Visibility.Collapsed;
}
private void FullScreenBox_Check(object sender, RoutedEventArgs e)
{
@ -738,7 +750,14 @@ namespace VPet_Simulator.Windows
private void ButtonSetting_MouseDown(object sender, MouseButtonEventArgs e)
{
foreach(var mainplug in mw.Plugins)
{
if(mainplug.PluginName == mod.Name)
{
mainplug.Setting();
return;
}
}
}
private void StartPlace_Checked(object sender, RoutedEventArgs e)

1
VPet-Simulator.Windows/mod/1100_DemoClock Symbolic link
View File

@ -0,0 +1 @@
C:/Users/ZouJin/Documents/Visual Studio 2022/Project/VPet.Plugin.DemoClock/VPet.Plugin.DemoClock/1100_DemoClock