diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs index ba60fb2..8f7a49e 100644 --- a/VPet-Simulator.Windows/MainWindow.cs +++ b/VPet-Simulator.Windows/MainWindow.cs @@ -1388,6 +1388,10 @@ namespace VPet_Simulator.Windows await Dispatcher.InvokeAsync(new Action(() => LoadingText.Content = "尝试加载游戏MOD".Translate())); + //旧版本设置兼容 + if(Set.PetGraph == "默认虚拟桌宠") + Set.PetGraph = "vup"; + //当前桌宠动画 var petloader = Pets.Find(x => x.Name == Set.PetGraph); petloader ??= Pets[0]; diff --git a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs index 41bd2ac..0324378 100644 --- a/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs +++ b/VPet-Simulator.Windows/WinDesign/winWorkMenu.xaml.cs @@ -123,7 +123,6 @@ public partial class winWorkMenu : Window sb.AppendLine('x' + (1 + work.FinishBonus).ToString("f2")); sb.AppendLine('x' + wDouble.Value.ToString("f0")); tbDisplay.Text = sb.ToString(); - } private void tbc_SelectionChanged(object sender, SelectionChangedEventArgs e) @@ -154,18 +153,21 @@ public partial class winWorkMenu : Window { nowwork = (ws[lbWork.SelectedIndex]); ShowWork(); + e.Handled = true; } private void lbStudy_SelectionChanged(object sender, SelectionChangedEventArgs e) { nowwork = (ss[lbStudy.SelectedIndex]); ShowWork(); + e.Handled = true; } private void lbPlay_SelectionChanged(object sender, SelectionChangedEventArgs e) { nowwork = (ps[lbPlay.SelectedIndex]); ShowWork(); + e.Handled = true; } private void Window_Closed(object sender, EventArgs e) diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Play.png b/VPet-Simulator.Windows/mod/0000_core/image/vup/Play.png new file mode 100644 index 0000000..f3544e2 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/vup/Play.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Study.png b/VPet-Simulator.Windows/mod/0000_core/image/vup/Study.png new file mode 100644 index 0000000..cce39ff Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/vup/Study.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/vup/Work.png b/VPet-Simulator.Windows/mod/0000_core/image/vup/Work.png new file mode 100644 index 0000000..69bfcd2 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/vup/Work.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/PlayONE.png b/VPet-Simulator.Windows/mod/0000_core/image/work/PlayONE.png new file mode 100644 index 0000000..21c12a1 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/PlayONE.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/RemoveObject.png b/VPet-Simulator.Windows/mod/0000_core/image/work/RemoveObject.png new file mode 100644 index 0000000..7dd90d7 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/RemoveObject.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/Study.png b/VPet-Simulator.Windows/mod/0000_core/image/work/Study.png new file mode 100644 index 0000000..fea4270 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/Study.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/StudyTWO.png b/VPet-Simulator.Windows/mod/0000_core/image/work/StudyTWO.png new file mode 100644 index 0000000..1c7733f Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/StudyTWO.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkClean.png b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkClean.png new file mode 100644 index 0000000..48490f0 Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkClean.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkONE.png b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkONE.png new file mode 100644 index 0000000..91e76da Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkONE.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/work/WorkTWO.png b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkTWO.png new file mode 100644 index 0000000..e062b1d Binary files /dev/null and b/VPet-Simulator.Windows/mod/0000_core/image/work/WorkTWO.png differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Play.png b/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Play.png deleted file mode 100644 index 4942bb0..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Play.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Study.png b/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Study.png deleted file mode 100644 index f41369b..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Study.png and /dev/null differ diff --git a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Work.png b/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Work.png deleted file mode 100644 index e7de453..0000000 Binary files a/VPet-Simulator.Windows/mod/0000_core/image/默认虚拟桌宠/Work.png and /dev/null differ