From a52aa4c3957d5e59491274c00cbbc9cbb2dc2d56 Mon Sep 17 00:00:00 2001 From: Hakoyu Date: Mon, 9 Oct 2023 02:12:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/ModModel/ClickTextModel.cs | 20 +++++++++++++++---- .../Models/ModModel/SelectTextModel.cs | 10 ++++++++-- .../ClickTextEdit/ClickTextEditWindow.xaml | 6 +++--- .../ModEdit/FoodEdit/FoodEditWindow.xaml | 2 +- .../LowTextEdit/LowTextEditWindow.xaml | 2 +- .../SelectTextEdit/SelectTextEditWindow.xaml | 4 ++-- 6 files changed, 31 insertions(+), 13 deletions(-) diff --git a/VPet.ModMaker/Models/ModModel/ClickTextModel.cs b/VPet.ModMaker/Models/ModModel/ClickTextModel.cs index 4803a7f..2976583 100644 --- a/VPet.ModMaker/Models/ModModel/ClickTextModel.cs +++ b/VPet.ModMaker/Models/ModModel/ClickTextModel.cs @@ -47,19 +47,31 @@ public class ClickTextModel : I18nModel public ObservableValue Working { get; } = new(); /// - /// 模式 + /// 宠物状态 /// - public ObservableEnumFlags Mode { get; } = new(); + public ObservableEnumFlags Mode { get; } = + new( + ClickText.ModeType.Happy + | ClickText.ModeType.Nomal + | ClickText.ModeType.PoorCondition + | ClickText.ModeType.Ill + ); /// - /// 工作状态 + /// 行动状态 /// public ObservableValue WorkingState { get; } = new(); /// /// 日期区间 /// - public ObservableEnumFlags DayTime { get; } = new(); + public ObservableEnumFlags DayTime { get; } = + new( + ClickText.DayTime.Morning + | ClickText.DayTime.Afternoon + | ClickText.DayTime.Night + | ClickText.DayTime.Midnight + ); /// /// 好感度 diff --git a/VPet.ModMaker/Models/ModModel/SelectTextModel.cs b/VPet.ModMaker/Models/ModModel/SelectTextModel.cs index 7b2b617..be54d37 100644 --- a/VPet.ModMaker/Models/ModModel/SelectTextModel.cs +++ b/VPet.ModMaker/Models/ModModel/SelectTextModel.cs @@ -41,9 +41,15 @@ public class SelectTextModel : I18nModel public ObservableValue ChooseId { get; } = new(); /// - /// 模式 + /// 宠物状态 /// - public ObservableEnumFlags Mode { get; } = new(); + public ObservableEnumFlags Mode { get; } = + new( + ClickText.ModeType.Happy + | ClickText.ModeType.Nomal + | ClickText.ModeType.PoorCondition + | ClickText.ModeType.Ill + ); /// /// 好感度 diff --git a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml index 26092d4..3bef0d4 100644 --- a/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml +++ b/VPet.ModMaker/Views/ModEdit/ClickTextEdit/ClickTextEditWindow.xaml @@ -8,7 +8,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:pu="https://opensource.panuon.com/wpf-ui" xmlns:vm="clr-namespace:VPet.ModMaker.ViewModels.ModEdit.ClickTextEdit" - Title="ClickTextWindow" + Title="{ll:Str 编辑点击文本}" Width="800" Height="450" d:DataContext="{d:DesignInstance Type=vm:ClickTextEditWindowVM}" @@ -70,7 +70,7 @@ Grid.Column="1" pu:TextBoxHelper.Watermark="{ll:Str 非必要}" Text="{Binding ClickText.Value.Working.Value, UpdateSourceTrigger=PropertyChanged}" /> -