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-10-13 23:31:52 +08:00
parent 54dd8fb1bd
commit 19a76bf707
3 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
VPet-Simulator.Windows/MainWindow.cs
View File

@ -1062,10 +1062,10 @@ namespace VPet_Simulator.Windows
if (!modpath.Exists)
{
MessageBoxX.Show("缺少模组Core,无法启动桌宠\nMissing module Core, can't start up", "启动错误 boot error", Panuon.WPF.UI.MessageBoxIcon.Error);
Environment.Exit(0);
App.MainWindows.Remove(this);
Close();
return;
}
Closed += ForceClose;
Task.Run(GameLoad_muti);
}

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

@ -170,7 +170,6 @@ namespace VPet_Simulator.Windows
Environment.Exit(0);
return;
}
Closed += ForceClose;
//更新存档系统
if (Directory.Exists(ExtensionValue.BaseDirectory + @"\BackUP"))
@ -223,15 +222,6 @@ namespace VPet_Simulator.Windows
this.Closed += Restart_Closed;
base.Close();
}
private void ForceClose(object sender, EventArgs e)
{
Task.Run(() =>
{
Thread.Sleep(10000);
while (true)
Environment.Exit(0);
});
}
private void Restart_Closed(object sender, EventArgs e)
{
@ -244,52 +234,63 @@ namespace VPet_Simulator.Windows
}
catch { }
Save();
System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().Location);
if (App.MainWindows.Count == 1)
System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().Location);
else
{
App.MainWindows.Remove(this);
new MainWindow(PrefixSave).Show();
}
Exit();
}
private void Exit()
{
try
if (App.MainWindows.Count == 1)
{
if (IsSteamUser)
SteamClient.Shutdown();//关掉和Steam的连线
if (Core != null)
try
{
foreach (var igs in Core.Graph.GraphsList.Values)
if (IsSteamUser)
SteamClient.Shutdown();//关掉和Steam的连线
if (Core != null)
{
foreach (var ig2 in igs.Values)
foreach (var igs in Core.Graph.GraphsList.Values)
{
foreach (var ig3 in ig2)
foreach (var ig2 in igs.Values)
{
ig3.Stop();
foreach (var ig3 in ig2)
{
ig3.Stop();
}
}
}
}
if (Main != null)
{
Main.Dispose();
}
if (winSetting != null)
{
winSetting.Close();
}
AutoSaveTimer?.Stop();
MusicTimer?.Stop();
petHelper?.Close();
if (notifyIcon != null)
{
notifyIcon.Visible = false;
notifyIcon.Dispose();
}
notifyIcon?.Dispose();
}
if (Main != null)
finally
{
Main.Dispose();
Environment.Exit(0);
}
if (winSetting != null)
{
winSetting.Close();
}
AutoSaveTimer?.Stop();
MusicTimer?.Stop();
petHelper?.Close();
if (notifyIcon != null)
{
notifyIcon.Visible = false;
notifyIcon.Dispose();
}
notifyIcon?.Dispose();
while (true)
Environment.Exit(0);
}
finally
{
Environment.Exit(0);
}
while (true)
Environment.Exit(0);
else
App.MainWindows.Remove(this);
}

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

@ -1406,11 +1406,11 @@ namespace VPet_Simulator.Windows
{
str = string.Empty;
}
if (str.EndsWith("(当前存档)".Translate()))
if (str.EndsWith("(当前存档)".Translate()) || App.MainWindows.FirstOrDefault(x => x.PrefixSave.Trim('-') == str) != null)
{
MessageBoxX.Show("当前多开已经加载".Translate());
return;
}
}
new MainWindow(str).Show();
}
@ -1428,6 +1428,7 @@ namespace VPet_Simulator.Windows
MessageBoxX.Show("存档名重复".Translate());
return;
}
var lps = new LPS(mw.Set);
lps.SetInt("savetimes", 0);
File.WriteAllText(ExtensionValue.BaseDirectory + @$"\Setting-{savename}.lps", lps.ToString());