diff --git a/VPet.ModMaker/Models/ModModel/PetModel.cs b/VPet.ModMaker/Models/ModModel/PetModel.cs index 791c390..237d4a5 100644 --- a/VPet.ModMaker/Models/ModModel/PetModel.cs +++ b/VPet.ModMaker/Models/ModModel/PetModel.cs @@ -17,9 +17,19 @@ public class PetModel : I18nModel public ObservableValue Id { get; } = new(); public ObservableValue PetNameId { get; } = new(); public ObservableValue DescriptionId { get; } = new(); - public ObservableValue> TouchHeadRect { get; } = new(new()); - public ObservableValue TouchRaisedRect { get; } = new(new()); - public ObservableValue RaisePoint { get; } = new(new()); + public ObservableValue> TouchHeadRect { get; } = + new(new(159, 16, 189, 178)); + public ObservableValue TouchRaisedRect { get; } = + new( + new( + new(0, 50, 500, 200), + new(0, 50, 500, 200), + new(0, 50, 500, 200), + new(0, 200, 500, 300) + ) + ); + public ObservableValue RaisePoint { get; } = + new(new(new(290, 128), new(290, 128), new(290, 128), new(225, 115))); public ObservableCollection Works { get; } = new(); @@ -141,6 +151,21 @@ public class ObservableMultiStateRect public ObservableValue> PoorCondition { get; } = new(new()); public ObservableValue> Ill { get; } = new(new()); + public ObservableMultiStateRect() { } + + public ObservableMultiStateRect( + ObservableRect happy, + ObservableRect nomal, + ObservableRect poorCondition, + ObservableRect ill + ) + { + Happy.Value = happy; + Nomal.Value = nomal; + PoorCondition.Value = poorCondition; + Ill.Value = ill; + } + public ObservableMultiStateRect Copy() { var result = new ObservableMultiStateRect(); @@ -159,6 +184,21 @@ public class ObservableMultiStatePoint public ObservableValue> PoorCondition { get; } = new(new()); public ObservableValue> Ill { get; } = new(new()); + public ObservableMultiStatePoint() { } + + public ObservableMultiStatePoint( + ObservablePoint happy, + ObservablePoint nomal, + ObservablePoint poorCondition, + ObservablePoint ill + ) + { + Happy.Value = happy; + Nomal.Value = nomal; + PoorCondition.Value = poorCondition; + Ill.Value = ill; + } + public ObservableMultiStatePoint Copy() { var result = new ObservableMultiStatePoint(); @@ -177,6 +217,16 @@ public class ObservableRect public ObservableValue Width { get; } = new(); public ObservableValue 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; @@ -201,6 +251,14 @@ public class ObservablePoint public ObservableValue X { get; } = new(); public ObservableValue 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; diff --git a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml index c7bda12..76b15d5 100644 --- a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml @@ -325,23 +325,23 @@