支持多开, 不同存档

This commit is contained in:
ZouJin 2023-10-11 01:03:23 +08:00
parent 931fd47235
commit 1f3bd424ad
13 changed files with 171 additions and 233 deletions

View File

@ -11,6 +11,14 @@ namespace VPet_Simulator.Windows.Interface
/// </summary> /// </summary>
public interface IMainWindow public interface IMainWindow
{ {
/// <summary>
/// 存档前缀, 用于多开游戏, 为空时使用默认存档, 不为空时前缀的前缀一般为'-'
/// </summary>
string PrefixSave { get; }
/// <summary>
/// 启动参数
/// </summary>
LPS_D Args { get; }
/// <summary> /// <summary>
/// 是否为Steam用户 /// 是否为Steam用户
/// </summary> /// </summary>

View File

@ -15,6 +15,12 @@ namespace VPet_Simulator.Windows
#endif #endif
//AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
} }
public static string[] Args { get; set; }
protected override void OnStartup(StartupEventArgs e)
{
Args = e.Args;
}
private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) private void App_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
{ {
@ -30,7 +36,8 @@ namespace VPet_Simulator.Windows
{ {
MessageBox.Show("缓存被其他软件删除,游戏无法继续运行\n请重启游戏重新生成缓存".Translate()); MessageBox.Show("缓存被其他软件删除,游戏无法继续运行\n请重启游戏重新生成缓存".Translate());
return; return;
}else if (expt.Contains("0x80070008")) }
else if (expt.Contains("0x80070008"))
{ {
MessageBox.Show("游戏内存不足,请修改设置中渲染分辨率以便降低内存使用".Translate()); MessageBox.Show("游戏内存不足,请修改设置中渲染分辨率以便降低内存使用".Translate());
} }

View File

@ -31,6 +31,8 @@ namespace VPet_Simulator.Windows
{ {
public readonly string ModPath = Environment.CurrentDirectory + @"\mod"; public readonly string ModPath = Environment.CurrentDirectory + @"\mod";
public bool IsSteamUser { get; } public bool IsSteamUser { get; }
public LPS_D Args { get; }
public string PrefixSave { get; } = "";
public Setting Set { get; set; } public Setting Set { get; set; }
public List<PetLoader> Pets { get; set; } = new List<PetLoader>(); public List<PetLoader> Pets { get; set; } = new List<PetLoader>();
public List<CoreMOD> CoreMODs = new List<CoreMOD>(); public List<CoreMOD> CoreMODs = new List<CoreMOD>();
@ -186,16 +188,16 @@ namespace VPet_Simulator.Windows
//timecount = DateTime.Now; //timecount = DateTime.Now;
} }
Set.StartRecordLastPoint = new Point(Dispatcher.Invoke(() => Left), Dispatcher.Invoke(() => Top)); Set.StartRecordLastPoint = new Point(Dispatcher.Invoke(() => Left), Dispatcher.Invoke(() => Top));
File.WriteAllText(ExtensionValue.BaseDirectory + @"\Setting.lps", Set.ToString()); File.WriteAllText(ExtensionValue.BaseDirectory + @$"\Setting{PrefixSave}.lps", Set.ToString());
if (!Directory.Exists(ExtensionValue.BaseDirectory + @"\Saves")) if (!Directory.Exists(ExtensionValue.BaseDirectory + @"\Saves"))
Directory.CreateDirectory(ExtensionValue.BaseDirectory + @"\Saves"); Directory.CreateDirectory(ExtensionValue.BaseDirectory + @"\Saves");
if (Core != null && Core.Save != null) if (Core != null && Core.Save != null)
{ {
var ds = new List<string>(Directory.GetFiles(ExtensionValue.BaseDirectory + @"\Saves", "*.lps")).FindAll(x => x.Contains('_')).OrderBy(x => var ds = new List<string>(Directory.GetFiles(ExtensionValue.BaseDirectory + @"\Saves", $"Save{PrefixSave}_*.lps")).OrderBy(x =>
{ {
if (int.TryParse(x.Split('_')[1].Split('.')[0], out int i)) if (int.TryParse(x.Split('_').Last().Split('.')[0], out int i))
return i; return i;
return 0; return 0;
}).ToList(); }).ToList();
@ -204,16 +206,17 @@ namespace VPet_Simulator.Windows
File.Delete(ds[0]); File.Delete(ds[0]);
ds.RemoveAt(0); ds.RemoveAt(0);
} }
if (File.Exists(ExtensionValue.BaseDirectory + $"\\Saves\\Save_{st}.lps")) if (File.Exists(ExtensionValue.BaseDirectory + $"\\Saves\\Save{PrefixSave}_{st}.lps"))
File.Delete(ExtensionValue.BaseDirectory + $"\\Saves\\Save_{st}.lps"); File.Delete(ExtensionValue.BaseDirectory + $"\\Saves\\Save{PrefixSave}_{st}.lps");
File.WriteAllText(ExtensionValue.BaseDirectory + $"\\Saves\\Save_{st}.lps", GameSavesData.ToLPS().ToString()); File.WriteAllText(ExtensionValue.BaseDirectory + $"\\Saves\\Save{PrefixSave}_{st}.lps", GameSavesData.ToLPS().ToString());
if (File.Exists(ExtensionValue.BaseDirectory + @"\Save.bkp"))
File.Delete(ExtensionValue.BaseDirectory + @"\Save.bkp");
if (File.Exists(ExtensionValue.BaseDirectory + @"\Save.lps")) if (File.Exists(ExtensionValue.BaseDirectory + @"\Save.lps"))
{
if (File.Exists(ExtensionValue.BaseDirectory + @"\Save.bkp"))
File.Delete(ExtensionValue.BaseDirectory + @"\Save.bkp");
File.Move(ExtensionValue.BaseDirectory + @"\Save.lps", ExtensionValue.BaseDirectory + @"\Save.bkp"); File.Move(ExtensionValue.BaseDirectory + @"\Save.lps", ExtensionValue.BaseDirectory + @"\Save.bkp");
}
} }
} }

View File

@ -51,7 +51,7 @@ namespace VPet_Simulator.Windows
//存档前缀 //存档前缀
if (Args.ContainsLine("prefix")) if (Args.ContainsLine("prefix"))
PrefixSave = '_' + Args["prefix"].Info; PrefixSave = '-' + Args["prefix"].Info;
#if X64 #if X64
PNGAnimation.MaxLoadNumber = 50; PNGAnimation.MaxLoadNumber = 50;
@ -296,16 +296,17 @@ namespace VPet_Simulator.Windows
{ {
if (Directory.Exists(ExtensionValue.BaseDirectory + @"\Saves")) if (Directory.Exists(ExtensionValue.BaseDirectory + @"\Saves"))
{ {
var ds = new List<string>(Directory.GetFiles(ExtensionValue.BaseDirectory + @"\Saves", "*.lps")).FindAll(x => x.Contains('_')).OrderBy(x => var ds = new List<string>(Directory.GetFiles(ExtensionValue.BaseDirectory + @"\Saves", $@"Save{PrefixSave}_*.lps"))
.OrderBy(x =>
{ {
if (int.TryParse(x.Split('_')[1].Split('.')[0], out int i)) if (int.TryParse(x.Split('_').Last().Split('.')[0], out int i))
return i; return i;
return 0; return 0;
}).ToList(); }).ToList();
if (ds.Count != 0) if (ds.Count != 0)
{ {
int.TryParse(ds.Last().Split('_')[1].Split('.')[0], out int lastid); int.TryParse(ds.Last().Split('_').Last().Split('.')[0], out int lastid);
if (Set.SaveTimes < lastid) if (Set.SaveTimes < lastid)
{ {
Set.SaveTimes = lastid; Set.SaveTimes = lastid;

View File

@ -0,0 +1,8 @@
{
"profiles": {
"VPet-Simulator.Windows": {
"commandName": "Project",
"commandLineArgs": "prefix#test:|"
}
}
}

View File

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:local="clr-namespace:VPet_Simulator.Windows"
mc:Ignorable="d" Title="{ll:Str 更好买}" Height="550" Width="800" FontSize="14" mc:Ignorable="d" Height="550" Width="800" FontSize="14"
WindowStartupLocation="CenterScreen" Background="#E0F6FF" pu:WindowXCaption.Height="45" WindowStartupLocation="CenterScreen" Background="#E0F6FF" pu:WindowXCaption.Height="45"
pu:WindowXCaption.Background="{DynamicResource DARKPrimary}" pu:WindowXCaption.Foreground="#FFFFFF" pu:WindowXCaption.Background="{DynamicResource DARKPrimary}" pu:WindowXCaption.Foreground="#FFFFFF"
pu:WindowXCaption.Buttons="Close" Icon="/Res/BetterBuy.png" pu:WindowXCaption.Buttons="Close" Icon="/Res/BetterBuy.png"

View File

@ -42,6 +42,7 @@ namespace VPet_Simulator.Windows
{ {
InitializeComponent(); InitializeComponent();
this.mw = mw; this.mw = mw;
Title = "更好买".Translate() + ' ' + mw.PrefixSave;
LsbSortRule.SelectedIndex = mw.Set["betterbuy"].GetInt("lastorder"); LsbSortRule.SelectedIndex = mw.Set["betterbuy"].GetInt("lastorder");
LsbSortAsc.SelectedIndex = mw.Set["betterbuy"].GetBool("lastasc") ? 0 : 1; LsbSortAsc.SelectedIndex = mw.Set["betterbuy"].GetBool("lastasc") ? 0 : 1;
AllowChange = true; AllowChange = true;

View File

@ -1,46 +1,26 @@
<Window <Window x:Class="VPet_Simulator.Windows.winConsole" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
x:Class="VPet_Simulator.Windows.winConsole"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF" xmlns:ll="clr-namespace:LinePutScript.Localization.WPF;assembly=LinePutScript.Localization.WPF"
xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:local="clr-namespace:VPet_Simulator.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" Width="450" Height="450" FontSize="16"
Title="{ll:Str 桌宠管理开发控制台}"
Width="450"
Height="450"
FontSize="16"
mc:Ignorable="d"> mc:Ignorable="d">
<TabControl pu:TabControlHelper.HeaderPanelBackground="{DynamicResource PrimaryLight}" pu:TabControlHelper.ItemsSelectedBackground="White"> <TabControl pu:TabControlHelper.HeaderPanelBackground="{DynamicResource PrimaryLight}"
pu:TabControlHelper.ItemsSelectedBackground="White">
<TabItem Header="{ll:Str 动画列表}"> <TabItem Header="{ll:Str 动画列表}">
<Grid> <Grid>
<Label Background="{x:Null}" Content="{ll:Str '双击查看动画效果'}" /> <Label Background="{x:Null}" Content="{ll:Str '双击查看动画效果'}" />
<Label <Label Margin="0,20,0,0" VerticalAlignment="Top" Background="{x:Null}" Content="{ll:Str '选择状态模式:'}" />
Margin="0,20,0,0"
VerticalAlignment="Top"
Background="{x:Null}"
Content="{ll:Str '选择状态模式:'}" />
<ComboBox <ComboBox x:Name="ComboxMode" Margin="110,25,5,0" VerticalAlignment="Top" SelectedIndex="1">
x:Name="ComboxMode"
Margin="110,25,5,0"
VerticalAlignment="Top"
SelectedIndex="1">
<ComboBoxItem Content="Happy" /> <ComboBoxItem Content="Happy" />
<ComboBoxItem Content="Nomal" /> <ComboBoxItem Content="Nomal" />
<ComboBoxItem Content="PoorCondition" /> <ComboBoxItem Content="PoorCondition" />
<ComboBoxItem Content="Ill" /> <ComboBoxItem Content="Ill" />
</ComboBox> </ComboBox>
<Label <Label x:Name="LabelNowPlay" HorizontalAlignment="Right" Background="{x:Null}" Content="" />
x:Name="LabelNowPlay" <ListBox x:Name="GraphListBox" Margin="0,49,0,0" MouseDoubleClick="GraphListBox_MouseDoubleClick" />
HorizontalAlignment="Right"
Background="{x:Null}"
Content="" />
<ListBox
x:Name="GraphListBox"
Margin="0,49,0,0"
MouseDoubleClick="GraphListBox_MouseDoubleClick" />
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{ll:Str 动画播放}"> <TabItem Header="{ll:Str 动画播放}">
@ -54,67 +34,30 @@
<RowDefinition Height="110*" /> <RowDefinition Height="110*" />
<RowDefinition Height="10*" /> <RowDefinition Height="10*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Label <Label Grid.RowSpan="2" Grid.ColumnSpan="2" Background="{x:Null}" Content="{ll:Str '双击添加/移除播放列表内容'}" />
Grid.RowSpan="2" <Label Grid.RowSpan="2" Grid.ColumnSpan="2" Margin="0,20,0,0" VerticalAlignment="Top"
Grid.ColumnSpan="2" Background="{x:Null}" Content="{ll:Str '选择状态模式:'}" />
Background="{x:Null}" <ComboBox x:Name="ComboxPlayMode" Grid.ColumnSpan="2" Margin="110,25,5,0" VerticalAlignment="Top"
Content="{ll:Str '双击添加/移除播放列表内容'}" />
<Label
Grid.RowSpan="2"
Grid.ColumnSpan="2"
Margin="0,20,0,0"
VerticalAlignment="Top"
Background="{x:Null}"
Content="{ll:Str '选择状态模式:'}" />
<ComboBox
x:Name="ComboxPlayMode"
Grid.ColumnSpan="2"
Margin="110,25,5,0"
VerticalAlignment="Top"
SelectedIndex="1"> SelectedIndex="1">
<ComboBoxItem Content="Happy" /> <ComboBoxItem Content="Happy" />
<ComboBoxItem Content="Nomal" /> <ComboBoxItem Content="Nomal" />
<ComboBoxItem Content="PoorCondition" /> <ComboBoxItem Content="PoorCondition" />
<ComboBoxItem Content="Ill" /> <ComboBoxItem Content="Ill" />
</ComboBox> </ComboBox>
<ListBox <ListBox x:Name="GraphListPlayerBox" Grid.Row="1" Margin="5"
x:Name="GraphListPlayerBox"
Grid.Row="1"
Margin="5"
MouseDoubleClick="GraphListPlayerBox_MouseDoubleClick" /> MouseDoubleClick="GraphListPlayerBox_MouseDoubleClick" />
<ListBox <ListBox x:Name="GraphListWillPlayBox" Grid.Row="1" Grid.Column="1" Margin="5"
x:Name="GraphListWillPlayBox"
Grid.Row="1"
Grid.Column="1"
Margin="5"
MouseDoubleClick="GraphListWillPlayBox_MouseDoubleClick" /> MouseDoubleClick="GraphListWillPlayBox_MouseDoubleClick" />
<Button <Button Grid.Row="2" Grid.ColumnSpan="2" Margin="5" Click="Play_Click" Content="开始播放" />
Grid.Row="2" <Button Grid.Column="1" Margin="5" HorizontalAlignment="Right" VerticalAlignment="Top"
Grid.ColumnSpan="2" Click="PlayADD_Click" Content="ADD" />
Margin="5"
Click="Play_Click"
Content="开始播放" />
<Button
Grid.Column="1"
Margin="5"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Click="PlayADD_Click"
Content="ADD" />
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{ll:Str 显示逻辑}"> <TabItem Header="{ll:Str 显示逻辑}">
<Grid> <Grid>
<Label Background="{x:Null}" Content="{ll:Str 双击运行显示效果}" /> <Label Background="{x:Null}" Content="{ll:Str 双击运行显示效果}" />
<Label <Label x:Name="LabelSuccess" HorizontalAlignment="Right" Background="{x:Null}" Content="" />
x:Name="LabelSuccess" <ListBox x:Name="DisplayListBox" Margin="0,30,0,0" MouseDoubleClick="DisplayListBox_MouseDoubleClick">
HorizontalAlignment="Right"
Background="{x:Null}"
Content="" />
<ListBox
x:Name="DisplayListBox"
Margin="0,30,0,0"
MouseDoubleClick="DisplayListBox_MouseDoubleClick">
<ListBoxItem Content="DisplayNomal" /> <ListBoxItem Content="DisplayNomal" />
<ListBoxItem Content="DisplayTouchHead" /> <ListBoxItem Content="DisplayTouchHead" />
<ListBoxItem Content="DisplayTouchBody" /> <ListBoxItem Content="DisplayTouchBody" />
@ -130,29 +73,12 @@
<TabItem Header="{ll:Str 说话}"> <TabItem Header="{ll:Str 说话}">
<Grid> <Grid>
<Label Background="{x:Null}" Content="{ll:Str '输入要说的话,按说话键发送'}" /> <Label Background="{x:Null}" Content="{ll:Str '输入要说的话,按说话键发送'}" />
<Label <Label Margin="0,20,0,0" VerticalAlignment="Top" Background="{x:Null}" Content="{ll:Str '选择说话类型:'}" />
Margin="0,20,0,0" <ComboBox x:Name="CombSay" Margin="110,26,5,0" VerticalAlignment="Top" />
VerticalAlignment="Top" <TextBox x:Name="SayTextBox" Height="200" Margin="5,54,5,0" VerticalAlignment="Top"
Background="{x:Null}" VerticalContentAlignment="Top" pu:TextBoxHelper.Watermark="{ll:Str 在这里输入要说话的内容}"
Content="{ll:Str '选择说话类型:'}" /> AcceptsReturn="True" TextWrapping="Wrap" />
<ComboBox <Button VerticalAlignment="Bottom" Click="Say_Click" Content="{ll:Str 说话}" FontSize="24" />
x:Name="CombSay"
Margin="110,26,5,0"
VerticalAlignment="Top" />
<TextBox
x:Name="SayTextBox"
Height="200"
Margin="5,54,5,0"
VerticalAlignment="Top"
VerticalContentAlignment="Top"
pu:TextBoxHelper.Watermark="{ll:Str 在这里输入要说话的内容}"
AcceptsReturn="True"
TextWrapping="Wrap" />
<Button
VerticalAlignment="Bottom"
Click="Say_Click"
Content="{ll:Str 说话}"
FontSize="24" />
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem Header="{ll:Str 距离查看器}"> <TabItem Header="{ll:Str 距离查看器}">
@ -162,13 +88,8 @@
<RowDefinition /> <RowDefinition />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid> <Grid>
<CheckBox <CheckBox Margin="10,5,5,5" HorizontalAlignment="Left" VerticalAlignment="Top"
Margin="10,5,5,5" Checked="CheckBox_Checked" Content="{ll:Str 启动距离查看器}" Unchecked="CheckBox_Unchecked" />
HorizontalAlignment="Left"
VerticalAlignment="Top"
Checked="CheckBox_Checked"
Content="{ll:Str 启动距离查看器}"
Unchecked="CheckBox_Unchecked" />
<TextBlock Margin="10,24,0,0" FontSize="24"> <TextBlock Margin="10,24,0,0" FontSize="24">
<Run Text="{ll:Str '屏幕边缘距离'}" /><LineBreak /> <Run Text="{ll:Str '屏幕边缘距离'}" /><LineBreak />
<Run Text="{ll:Str 左侧}" /> <Run Text="{ll:Str 左侧}" />
@ -183,22 +104,10 @@
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<StackPanel> <StackPanel>
<Button <Button x:Name="Button_MoveToLeft" Click="Button_MoveToLeft_Click" Content="向左移动" />
x:Name="Button_MoveToLeft" <Button x:Name="Button_MoveToUp" Click="Button_MoveToUp_Click" Content="向上移动" />
Click="Button_MoveToLeft_Click" <Button x:Name="Button_MoveToRight" Click="Button_MoveToRight_Click" Content="向右移动" />
Content="向左移动" /> <Button x:Name="Button_MoveToButton" Click="Button_MoveToButton_Click" Content="向下移动" />
<Button
x:Name="Button_MoveToUp"
Click="Button_MoveToUp_Click"
Content="向上移动" />
<Button
x:Name="Button_MoveToRight"
Click="Button_MoveToRight_Click"
Content="向右移动" />
<Button
x:Name="Button_MoveToButton"
Click="Button_MoveToButton_Click"
Content="向下移动" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>
@ -210,11 +119,7 @@
<RowDefinition Height="10*" /> <RowDefinition Height="10*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Button Click="Output_No_Local" Content="{ll:Str 导出未翻译文档}" /> <Button Click="Output_No_Local" Content="{ll:Str 导出未翻译文档}" />
<TextBox <TextBox x:Name="LocalTextBox" Grid.Row="1" AcceptsReturn="True" IsReadOnly="True"
x:Name="LocalTextBox"
Grid.Row="1"
AcceptsReturn="True"
IsReadOnly="True"
MouseDown="Local_SelectAll_Click" /> MouseDown="Local_SelectAll_Click" />
</Grid> </Grid>
</TabItem> </TabItem>

View File

@ -23,6 +23,7 @@ namespace VPet_Simulator.Windows
public winConsole(MainWindow mw) public winConsole(MainWindow mw)
{ {
InitializeComponent(); InitializeComponent();
Title = "桌宠管理开发控制台".Translate() + ' ' + mw.PrefixSave;
this.mw = mw; this.mw = mw;
foreach (var v in mw.Core.Graph.GraphsList) foreach (var v in mw.Core.Graph.GraphsList)
{ {

View File

@ -6,7 +6,7 @@
xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:local="clr-namespace:VPet_Simulator.Windows"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:system="clr-namespace:System;assembly=mscorlib" Title="{ll:Str 设置}" xmlns:system="clr-namespace:System;assembly=mscorlib"
Width="{ll:Dbe SettingWidth, DefValue=500}" Height="550" Closing="WindowX_Closing" FontSize="16" Width="{ll:Dbe SettingWidth, DefValue=500}" Height="550" Closing="WindowX_Closing" FontSize="16"
Style="{DynamicResource BaseWindowXStyle}" Topmost="True" WindowStartupLocation="CenterScreen" mc:Ignorable="d"> Style="{DynamicResource BaseWindowXStyle}" Topmost="True" WindowStartupLocation="CenterScreen" mc:Ignorable="d">
<!--<pu:WindowX.Resources> <!--<pu:WindowX.Resources>

View File

@ -39,6 +39,9 @@ namespace VPet_Simulator.Windows
//Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff"));
////ImageWHY.Source = bit; ////ImageWHY.Source = bit;
//Console.WriteLine(DateTime.Now.ToString("mm:ss.fff")); //Console.WriteLine(DateTime.Now.ToString("mm:ss.fff"));
Title = "设置".Translate() + ' ' + mw.PrefixSave;
TopMostBox.IsChecked = mw.Set.TopMost; TopMostBox.IsChecked = mw.Set.TopMost;
if (mw.Set.IsBiggerScreen) if (mw.Set.IsBiggerScreen)
{ {

View File

@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet_Simulator.Windows" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:VPet_Simulator.Windows"
xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI" xmlns:pu="clr-namespace:Panuon.WPF.UI;assembly=Panuon.WPF.UI"
xmlns:system="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d" Title="{ll:Str 反馈中心}" xmlns:system="clr-namespace:System;assembly=mscorlib" mc:Ignorable="d"
Style="{DynamicResource BaseWindowXStyle}" WindowStartupLocation="CenterScreen" Width="500" MinHeight="250" Style="{DynamicResource BaseWindowXStyle}" WindowStartupLocation="CenterScreen" Width="500" MinHeight="250"
Height="Auto" ResizeMode="NoResize" WindowState="Normal" Icon="../vpeticon.ico" SizeToContent="Height"> Height="Auto" ResizeMode="NoResize" WindowState="Normal" Icon="../vpeticon.ico" SizeToContent="Height">
<StackPanel x:Name="MainGrid" Margin="10,10,15,10" VerticalAlignment="Top"> <StackPanel x:Name="MainGrid" Margin="10,10,15,10" VerticalAlignment="Top">

View File

@ -22,6 +22,7 @@ namespace VPet_Simulator.Windows
{ {
InitializeComponent(); InitializeComponent();
mw = mainw; mw = mainw;
Title = "反馈中心".Translate() + ' ' + mw.PrefixSave;
save = mw.Core.Save.ToLine().ToString() + mw.Set.ToString(); save = mw.Core.Save.ToLine().ToString() + mw.Set.ToString();
if (errmsg != null) if (errmsg != null)
{ {