diff --git a/VPet-Simulator.Windows.Interface/GameSave_v2.cs b/VPet-Simulator.Windows.Interface/GameSave_v2.cs index d8639dc..2f06da2 100644 --- a/VPet-Simulator.Windows.Interface/GameSave_v2.cs +++ b/VPet-Simulator.Windows.Interface/GameSave_v2.cs @@ -19,9 +19,9 @@ namespace VPet_Simulator.Windows.Interface /// /// 新存档 /// - public GameSave_v2() + public GameSave_v2(string petname) { - GameSave = new GameSave(); + GameSave = new GameSave(petname); Statistics = new Statistics(); } protected void load(ILPS lps, Statistics oldStatistics = null, GameSave oldGameSave = null, ILPS olddata = null) diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs index 050292f..78e9d84 100644 --- a/VPet-Simulator.Windows/MainWindow.cs +++ b/VPet-Simulator.Windows/MainWindow.cs @@ -49,7 +49,7 @@ namespace VPet_Simulator.Windows /// /// 版本号 /// - public int version { get; } = 106; + public int version { get; } = 107; /// /// 版本号 /// diff --git a/VPet-Simulator.Windows/MainWindow.xaml.cs b/VPet-Simulator.Windows/MainWindow.xaml.cs index 118eac5..40c922c 100644 --- a/VPet-Simulator.Windows/MainWindow.xaml.cs +++ b/VPet-Simulator.Windows/MainWindow.xaml.cs @@ -118,13 +118,13 @@ namespace VPet_Simulator.Windows L = point.X; T = point.Y; } - // control position inside bounds - Core.Controller = new MWController(this); - double dist; - if ((dist = Core.Controller.GetWindowsDistanceLeft()) < 0) L -= dist; - if ((dist = Core.Controller.GetWindowsDistanceRight()) < 0) L += dist; - if ((dist = Core.Controller.GetWindowsDistanceUp()) < 0) T -= dist; - if ((dist = Core.Controller.GetWindowsDistanceDown()) < 0) T += dist; + //// control position inside bounds + //Core.Controller = new MWController(this); + //double dist; + //if ((dist = Core.Controller.GetWindowsDistanceLeft()) < 0) L -= dist; + //if ((dist = Core.Controller.GetWindowsDistanceRight()) < 0) L += dist; + //if ((dist = Core.Controller.GetWindowsDistanceUp()) < 0) T -= dist; + //if ((dist = Core.Controller.GetWindowsDistanceDown()) < 0) T += dist; Left = L; Top = T; @@ -281,7 +281,8 @@ namespace VPet_Simulator.Windows } } } - Core.Save = new GameSave(petname.Translate()); + GameSavesData = new GameSave_v2(petname.Translate()); + Core.Save = GameSavesData.GameSave; } public async void GameLoad() { diff --git a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs index d1ba336..e734242 100644 --- a/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs +++ b/VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs @@ -1286,7 +1286,8 @@ namespace VPet_Simulator.Windows { if (MessageBoxX.Show("是否重置游戏数据重新开始?\n该操作无法撤回".Translate(), "重新开始".Translate(), MessageBoxButton.YesNo) == MessageBoxResult.Yes) { - mw.Core.Save = new GameSave(mw.Core.Save.Name); + mw.GameSavesData = new GameSave_v2(mw.Core.Save.Name); + mw.Core.Save = mw.GameSavesData.GameSave; if (!mw.HashCheck) mw.GameSavesData.Statistics = new Statistics(); mw.HashCheck = true;