From fb81811be05ac025c0953048bfb206dd436d1071 Mon Sep 17 00:00:00 2001
From: Hakoyu <Hakoyu@outlook.com>
Date: Wed, 6 Dec 2023 13:11:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet.ModMaker/Models/ModModel/PetModel.cs | 64 -----------------------
 VPet.ModMaker/Models/ObservablePoint.cs   | 31 +++++++++++
 VPet.ModMaker/Models/ObservableRect.cs    | 39 ++++++++++++++
 VPet.ModMaker/NativeStyles.xaml           |  6 +--
 VPet.ModMaker/VPet.ModMaker.csproj        |  2 +
 5 files changed, 75 insertions(+), 67 deletions(-)
 create mode 100644 VPet.ModMaker/Models/ObservablePoint.cs
 create mode 100644 VPet.ModMaker/Models/ObservableRect.cs

diff --git a/VPet.ModMaker/Models/ModModel/PetModel.cs b/VPet.ModMaker/Models/ModModel/PetModel.cs
index a98e1c4..0182cf2 100644
--- a/VPet.ModMaker/Models/ModModel/PetModel.cs
+++ b/VPet.ModMaker/Models/ModModel/PetModel.cs
@@ -469,67 +469,3 @@ public class ObservableMultiStatePoint
         return result;
     }
 }
-
-public class ObservableRect<T>
-{
-    public ObservableValue<T> X { get; } = new();
-    public ObservableValue<T> Y { get; } = new();
-    public ObservableValue<T> Width { get; } = new();
-    public ObservableValue<T> Height { get; } = new();
-
-    public ObservableRect() { }
-
-    public ObservableRect(T x, T y, T width, T hetght)
-    {
-        X.Value = x;
-        Y.Value = y;
-        Width.Value = width;
-        Height.Value = hetght;
-    }
-
-    public void SetValue(T x, T y, T width, T hetght)
-    {
-        X.Value = x;
-        Y.Value = y;
-        Width.Value = width;
-        Height.Value = hetght;
-    }
-
-    public ObservableRect<T> Copy()
-    {
-        var result = new ObservableRect<T>();
-        result.X.Value = X.Value;
-        result.Y.Value = Y.Value;
-        result.Width.Value = Width.Value;
-        result.Height.Value = Height.Value;
-        return result;
-    }
-}
-
-public class ObservablePoint<T>
-{
-    public ObservableValue<T> X { get; } = new();
-    public ObservableValue<T> Y { get; } = new();
-
-    public ObservablePoint() { }
-
-    public ObservablePoint(T x, T y)
-    {
-        X.Value = x;
-        Y.Value = y;
-    }
-
-    public void SetValue(T x, T y)
-    {
-        X.Value = x;
-        Y.Value = y;
-    }
-
-    public ObservablePoint<T> Copy()
-    {
-        var result = new ObservablePoint<T>();
-        result.X.Value = X.Value;
-        result.Y.Value = Y.Value;
-        return result;
-    }
-}
diff --git a/VPet.ModMaker/Models/ObservablePoint.cs b/VPet.ModMaker/Models/ObservablePoint.cs
new file mode 100644
index 0000000..c454003
--- /dev/null
+++ b/VPet.ModMaker/Models/ObservablePoint.cs
@@ -0,0 +1,31 @@
+using HKW.HKWUtils.Observable;
+
+namespace VPet.ModMaker.Models;
+
+public class ObservablePoint<T>
+{
+    public ObservableValue<T> X { get; } = new();
+    public ObservableValue<T> Y { get; } = new();
+
+    public ObservablePoint() { }
+
+    public ObservablePoint(T x, T y)
+    {
+        X.Value = x;
+        Y.Value = y;
+    }
+
+    public void SetValue(T x, T y)
+    {
+        X.Value = x;
+        Y.Value = y;
+    }
+
+    public ObservablePoint<T> Copy()
+    {
+        var result = new ObservablePoint<T>();
+        result.X.Value = X.Value;
+        result.Y.Value = Y.Value;
+        return result;
+    }
+}
diff --git a/VPet.ModMaker/Models/ObservableRect.cs b/VPet.ModMaker/Models/ObservableRect.cs
new file mode 100644
index 0000000..2ffd0fa
--- /dev/null
+++ b/VPet.ModMaker/Models/ObservableRect.cs
@@ -0,0 +1,39 @@
+using HKW.HKWUtils.Observable;
+
+namespace VPet.ModMaker.Models;
+
+public class ObservableRect<T>
+{
+    public ObservableValue<T> X { get; } = new();
+    public ObservableValue<T> Y { get; } = new();
+    public ObservableValue<T> Width { get; } = new();
+    public ObservableValue<T> Height { get; } = new();
+
+    public ObservableRect() { }
+
+    public ObservableRect(T x, T y, T width, T hetght)
+    {
+        X.Value = x;
+        Y.Value = y;
+        Width.Value = width;
+        Height.Value = hetght;
+    }
+
+    public void SetValue(T x, T y, T width, T hetght)
+    {
+        X.Value = x;
+        Y.Value = y;
+        Width.Value = width;
+        Height.Value = hetght;
+    }
+
+    public ObservableRect<T> Copy()
+    {
+        var result = new ObservableRect<T>();
+        result.X.Value = X.Value;
+        result.Y.Value = Y.Value;
+        result.Width.Value = Width.Value;
+        result.Height.Value = Height.Value;
+        return result;
+    }
+}
diff --git a/VPet.ModMaker/NativeStyles.xaml b/VPet.ModMaker/NativeStyles.xaml
index ebcc9c0..10e2db8 100644
--- a/VPet.ModMaker/NativeStyles.xaml
+++ b/VPet.ModMaker/NativeStyles.xaml
@@ -5,8 +5,8 @@
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="pack://application:,,,/Panuon.WPF.UI;component/Control.xaml" />
     <ResourceDictionary Source="/VPet-Simulator.Windows.Interface;component/ResourceStyle.xaml" />
-    <ResourceDictionary Source="../Converters.xaml" />
-    <ResourceDictionary Source="../Templates.xaml" />
-    <ResourceDictionary Source="../Styles.xaml" />
+    <ResourceDictionary Source="Converters.xaml" />
+    <ResourceDictionary Source="Templates.xaml" />
+    <ResourceDictionary Source="Styles.xaml" />
   </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/VPet.ModMaker/VPet.ModMaker.csproj b/VPet.ModMaker/VPet.ModMaker.csproj
index 1aac115..86d81bb 100644
--- a/VPet.ModMaker/VPet.ModMaker.csproj
+++ b/VPet.ModMaker/VPet.ModMaker.csproj
@@ -128,6 +128,8 @@
     <Compile Include="Models\ModMakeHistory.cs" />
     <Compile Include="Models\ModMakerInfo.cs" />
     <Compile Include="Models\ModModel\MoveModel.cs" />
+    <Compile Include="Models\ObservablePoint.cs" />
+    <Compile Include="Models\ObservableRect.cs" />
     <Compile Include="Models\ObservableRange.cs" />
     <Compile Include="Models\ModModel\PetModel.cs" />
     <Compile Include="Models\ModModel\SelectTextModel.cs" />