VPet.Solution 修复一些bug

VPet.Solution/Models/SettingEditor/InteractiveSettingModel.cs

@@ -36,6 +36,20 @@ public class InteractiveSettingModel : ObservableClass<InteractiveSettingModel>
     }
     #endregion
 
+    #region EnableFunction
+    private bool _enableFunction;
+
+    /// <summary>
+    /// 启用计算等数据功能
+    /// </summary>
+    [ReflectionProperty(nameof(VPet_Simulator.Windows.Interface.Setting.EnableFunction))]
+    public bool EnableFunction
+    {
+        get => _enableFunction;
+        set => SetProperty(ref _enableFunction, value);
+    }
+    #endregion
+
     #region CalFunState
     private GameSave.ModeType _calFunState;
 
@@ -151,20 +165,6 @@ public class InteractiveSettingModel : ObservableClass<InteractiveSettingModel>
     }
     #endregion
 
-    #region EnableFunction
-    private bool _enableFunction;
-
-    /// <summary>
-    /// 启用计算等数据功能
-    /// </summary>
-    [ReflectionProperty(nameof(VPet_Simulator.Windows.Interface.Setting.EnableFunction))]
-    public bool EnableFunction
-    {
-        get => _enableFunction;
-        set => SetProperty(ref _enableFunction, value);
-    }
-    #endregion
-
     #region SmartMoveInterval
     private int _smartMoveInterval = 0;
 

VPet.Solution/Views/SaveViewer/SaveWindow.xaml

@@ -49,7 +49,7 @@
               <Setter.Value>
                 <ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=Self}}">
                   <MenuItem
-                    Command="{Binding PlacementTarget.Tag.OpenFileDommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
+                    Command="{Binding PlacementTarget.Tag.OpenFileCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
                     CommandParameter="{Binding}"
                     Header="{ll:Str 打开文件}" />
                   <MenuItem

VPet.Solution/Views/SettingEditor/InteractiveSettingPage.xaml

@@ -48,7 +48,7 @@
             x:Name="Switch_EnablePetState"
             Grid.Column="1"
             Content="{ll:Str '启用桌宠状态'}"
-            IsChecked="{Binding InteractiveSetting.CalFunState}"
+            IsChecked="{Binding InteractiveSetting.EnableFunction}"
             Style="{DynamicResource Switch_BaseStyle}"
             ToolTip="{ll:Str '启用数据计算,桌宠会有状态变化,需要按时投喂等.\
如果嫌麻烦可以关掉'}" />
           <!--  TODO: ComboBox使用内部数据  -->

VPet.Solution/Views/SettingEditor/SettingWindow.xaml

@@ -49,7 +49,7 @@
               <Setter.Value>
                 <ContextMenu DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=Self}}">
                   <MenuItem
-                    Command="{Binding PlacementTarget.Tag.OpenFileDommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
+                    Command="{Binding PlacementTarget.Tag.OpenFileCommand, RelativeSource={RelativeSource AncestorType=ContextMenu}}"
                     CommandParameter="{Binding}"
                     Header="{ll:Str 打开文件}" />
                   <MenuItem