更新

VPet.ModMaker/Models/ModModel/MoveModel.cs

@@ -0,0 +1,111 @@
+using HKW.HKWViewModels.SimpleObservable;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VPet_Simulator.Core;
+
+namespace VPet.ModMaker.Models.ModModel;
+
+public class MoveModel
+{
+    public static ObservableCollection<GraphHelper.Move.DirectionType> DirectionTypes { get; } =
+        new(
+            Enum.GetValues(typeof(GraphHelper.Move.DirectionType))
+                .Cast<GraphHelper.Move.DirectionType>()
+        );
+
+    public static ObservableCollection<GraphHelper.Move.ModeType> ModeTypes { get; } =
+        new(Enum.GetValues(typeof(GraphHelper.Move.ModeType)).Cast<GraphHelper.Move.ModeType>());
+
+    //public ObservableValue<string> Id { get; } = new();
+    public ObservableValue<string> Graph { get; } = new();
+    public ObservableValue<int> Distance { get; } = new(5);
+    public ObservableValue<int> Interval { get; } = new(125);
+    public ObservableValue<int> CheckLeft { get; } = new(100);
+    public ObservableValue<int> CheckRight { get; } = new(100);
+    public ObservableValue<int> CheckTop { get; } = new(100);
+    public ObservableValue<int> CheckBottom { get; } = new(100);
+    public ObservableValue<int> SpeedX { get; } = new();
+    public ObservableValue<int> SpeedY { get; } = new();
+    public ObservableValue<int> LocateLength { get; } = new();
+    public ObservableValue<int> TriggerLeft { get; } = new(100);
+    public ObservableValue<int> TriggerRight { get; } = new(100);
+    public ObservableValue<int> TriggerTop { get; } = new(100);
+    public ObservableValue<int> TriggerBottom { get; } = new(100);
+
+    public ObservableValue<GraphHelper.Move.DirectionType> DirectionType { get; } = new();
+
+    public ObservableValue<GraphHelper.Move.ModeType> ModeType { get; } = new();
+
+    public MoveModel() { }
+
+    public MoveModel(MoveModel model)
+        : this()
+    {
+        //Id.Value = model.Id.Value;
+        Graph.Value = model.Graph.Value;
+        Distance.Value = model.Distance.Value;
+        Interval.Value = model.Interval.Value;
+        CheckLeft.Value = model.CheckLeft.Value;
+        CheckRight.Value = model.CheckRight.Value;
+        CheckTop.Value = model.CheckTop.Value;
+        CheckBottom.Value = model.CheckBottom.Value;
+        SpeedX.Value = model.SpeedX.Value;
+        SpeedY.Value = model.SpeedY.Value;
+        LocateLength.Value = model.LocateLength.Value;
+        TriggerLeft.Value = model.TriggerLeft.Value;
+        TriggerRight.Value = model.TriggerRight.Value;
+        TriggerTop.Value = model.TriggerTop.Value;
+        TriggerBottom.Value = model.TriggerBottom.Value;
+        DirectionType.Value = model.DirectionType.Value;
+        ModeType.Value = model.ModeType.Value;
+    }
+
+    public MoveModel(GraphHelper.Move move)
+        : this()
+    {
+        //Id.Value = move.Id.Value;
+        Graph.Value = move.Graph;
+        Distance.Value = move.Distance;
+        Interval.Value = move.Interval;
+        CheckLeft.Value = move.CheckLeft;
+        CheckRight.Value = move.CheckRight;
+        CheckTop.Value = move.CheckTop;
+        CheckBottom.Value = move.CheckBottom;
+        SpeedX.Value = move.SpeedX;
+        SpeedY.Value = move.SpeedY;
+        LocateLength.Value = move.LocateLength;
+        TriggerLeft.Value = move.TriggerLeft;
+        TriggerRight.Value = move.TriggerRight;
+        TriggerTop.Value = move.TriggerTop;
+        TriggerBottom.Value = move.TriggerBottom;
+        DirectionType.Value = move.TriggerType;
+        ModeType.Value = move.Mode;
+    }
+
+    public GraphHelper.Move ToMove()
+    {
+        return new()
+        {
+            Graph = Graph.Value,
+            Distance = Distance.Value,
+            Interval = Interval.Value,
+            CheckLeft = CheckLeft.Value,
+            CheckRight = CheckRight.Value,
+            CheckTop = CheckTop.Value,
+            CheckBottom = CheckBottom.Value,
+            SpeedX = SpeedX.Value,
+            SpeedY = SpeedY.Value,
+            LocateLength = LocateLength.Value,
+            TriggerLeft = TriggerLeft.Value,
+            TriggerRight = TriggerRight.Value,
+            TriggerTop = TriggerTop.Value,
+            TriggerBottom = TriggerBottom.Value,
+            TriggerType = DirectionType.Value,
+            Mode = ModeType.Value,
+        };
+    }
+}

VPet.ModMaker/Models/ModModel/WorkModel.cs

@@ -17,7 +17,6 @@ public class WorkModel : I18nModel<I18nWorkModel>
                 .Cast<VPet_Simulator.Core.GraphHelper.Work.WorkType>()
         );
 
-    //public VPet_Simulator.Core.GraphHelper.Work
     public ObservableValue<VPet_Simulator.Core.GraphHelper.Work.WorkType> WorkType { get; } =
         new(VPet_Simulator.Core.GraphHelper.Work.WorkType.Work);
 

VPet.ModMaker/VPet.ModMaker.csproj

@@ -97,19 +97,20 @@
     <Compile Include="Converters\RatioMarginConverter.cs" />
     <Compile Include="Converters\MaxConverter.cs" />
     <Compile Include="Converters\MarginConverter.cs" />
-    <Compile Include="Models\ClickTextModel.cs" />
+    <Compile Include="Models\ModModel\ClickTextModel.cs" />
     <Compile Include="Models\Expansions.cs" />
-    <Compile Include="Models\FoodModel.cs" />
+    <Compile Include="Models\ModModel\FoodModel.cs" />
     <Compile Include="Models\I18nHelper.cs" />
     <Compile Include="Models\I18nModel.cs" />
-    <Compile Include="Models\LowTextModel.cs" />
+    <Compile Include="Models\ModModel\LowTextModel.cs" />
     <Compile Include="Models\ModLoader.cs" />
     <Compile Include="Models\ModMakerHistory.cs" />
     <Compile Include="Models\ModMakerInfo.cs" />
+    <Compile Include="Models\ModModel\MoveModel.cs" />
     <Compile Include="Models\ObservableRange.cs" />
-    <Compile Include="Models\PetModel.cs" />
-    <Compile Include="Models\SelectTextModel.cs" />
-    <Compile Include="Models\WorkModel.cs" />
+    <Compile Include="Models\ModModel\PetModel.cs" />
+    <Compile Include="Models\ModModel\SelectTextModel.cs" />
+    <Compile Include="Models\ModModel\WorkModel.cs" />
     <Compile Include="SimpleObservable\ObservableCommandT.cs" />
     <Compile Include="Styles.cs" />
     <Compile Include="ViewModels\ModEdit\ClickTextEdit\ClickTextEditWindowVM.cs" />
@@ -143,7 +144,7 @@
     <Compile Include="Views\ModEdit\AddLangWindow.xaml.cs">
       <DependentUpon>AddLangWindow.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Models\ModInfoModel.cs" />
+    <Compile Include="Models\ModModel\ModInfoModel.cs" />
     <Compile Include="Models\ModMaker.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>

VPet.ModMaker/ViewModels/ModEdit/ModEditWindowVM.cs

@@ -162,7 +162,8 @@ public class ModEditWindowVM
             {
                 var path = Path.GetDirectoryName(saveFileDialog.FileName);
                 ModInfo.Value.SaveTo(path);
-                ModInfo.Value.SourcePath.Value = path.Translate();
+                if (string.IsNullOrWhiteSpace(ModInfo.Value.SourcePath.Value))
+                    ModInfo.Value.SourcePath.Value = path;
             }
             catch (Exception ex)
             {