From 83d902e63594fcca1e55a05e1d72043904be3f34 Mon Sep 17 00:00:00 2001
From: Hakoyu <Hakoyu@outlook.com>
Date: Sat, 13 Jan 2024 22:05:28 +0800
Subject: [PATCH] =?UTF-8?q?VPet.Solution=20=E4=BF=AE=E5=A4=8D=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SettingEditor/InteractiveSettingModel.cs  | 28 +++++++++----------
 .../Views/SaveViewer/SaveWindow.xaml          |  2 +-
 .../SettingEditor/InteractiveSettingPage.xaml |  2 +-
 .../Views/SettingEditor/SettingWindow.xaml    |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/VPet.Solution/Models/SettingEditor/InteractiveSettingModel.cs b/VPet.Solution/Models/SettingEditor/InteractiveSettingModel.cs
index 5527351..6ab7376 100644
--- a/VPet.Solution/Models/SettingEditor/InteractiveSettingModel.cs
+++ b/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;
 
diff --git a/VPet.Solution/Views/SaveViewer/SaveWindow.xaml b/VPet.Solution/Views/SaveViewer/SaveWindow.xaml
index 9bf9550..dac9ed0 100644
--- a/VPet.Solution/Views/SaveViewer/SaveWindow.xaml
+++ b/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
diff --git a/VPet.Solution/Views/SettingEditor/InteractiveSettingPage.xaml b/VPet.Solution/Views/SettingEditor/InteractiveSettingPage.xaml
index 9e3b4b1..6570286 100644
--- a/VPet.Solution/Views/SettingEditor/InteractiveSettingPage.xaml
+++ b/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 '启用数据计算,桌宠会有状态变化,需要按时投喂等.\&#13;如果嫌麻烦可以关掉'}" />
           <!--  TODO: ComboBox使用内部数据  -->
diff --git a/VPet.Solution/Views/SettingEditor/SettingWindow.xaml b/VPet.Solution/Views/SettingEditor/SettingWindow.xaml
index e31a510..2b972cb 100644
--- a/VPet.Solution/Views/SettingEditor/SettingWindow.xaml
+++ b/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