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

修复重开读备份时工作未停止的bug

Browse Source
This commit is contained in:
ZouJin 2023-09-25 19:07:22 +08:00
parent 22a32beb3a
commit f278442c71
3 changed files with 14 additions and 2 deletions
VPet-Simulator.Core/Display
WorkTimer.xaml.cs
VPet-Simulator.Windows
MainWindow.xaml.cs
WinDesign
winGameSetting.xaml.cs

2
VPet-Simulator.Core/Display/WorkTimer.xaml.cs

@ -88,7 +88,7 @@ namespace VPet_Simulator.Core
//ts = TimeSpan.FromMinutes(MaxTime);
//tleft = TimeSpan.Zero;
//PBLeft.Value = MaxTime;
var fwi = new FinishWorkInfo(nowWork, GetCount);
FinishWorkInfo fwi = new FinishWorkInfo(nowWork, GetCount);
E_FinishWork?.Invoke(fwi);
if (nowWork.Type == Work.WorkType.Work)
{

2
VPet-Simulator.Windows/MainWindow.xaml.cs

@ -165,6 +165,8 @@ namespace VPet_Simulator.Windows
foreach (var file in new DirectoryInfo(ExtensionValue.BaseDirectory + @"\BackUP").GetFiles())
if (!File.Exists(ExtensionValue.BaseDirectory + @"\Saves\" + file.Name))
file.MoveTo(ExtensionValue.BaseDirectory + @"\Saves\" + file.Name);
else
file.Delete();
Directory.Delete(ExtensionValue.BaseDirectory + @"\BackUP");
}
}

12
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs

@ -1075,6 +1075,11 @@ namespace VPet_Simulator.Windows
{
mw.Set.EnableFunction = false;
combCalFunState.IsEnabled = true;
if (mw.Main.State != Main.WorkingState.Nomal)
{
mw.Main.WorkTimer.Visibility = Visibility.Collapsed;
mw.Main.State = Main.WorkingState.Nomal;
}
}
}
@ -1132,8 +1137,13 @@ namespace VPet_Simulator.Windows
{
try
{
if (mw.Main.State != Main.WorkingState.Nomal)
{
mw.Main.WorkTimer.Visibility = Visibility.Collapsed;
mw.Main.State = Main.WorkingState.Nomal;
}
if (!mw.GameLoad(l))
MessageBoxX.Show("存档损毁,无法加载该存档\n可能是上次储存出错或Steam云同步导致的\n请在设置中加载备份还原存档", "存档损毁".Translate());
MessageBoxX.Show("存档损毁,无法加载该存档\n可能是上次储存出错或Steam云同步导致的\n请在设置中加载备份还原存档", "存档损毁".Translate());
}
catch (Exception ex)
{