diff --git a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs
index 42b92e2..57b68bd 100644
--- a/VPet.ModMaker/Models/ModModel/ModInfoModel.cs
+++ b/VPet.ModMaker/Models/ModModel/ModInfoModel.cs
@@ -289,8 +289,6 @@ public class ModInfoModel : I18nModel<I18nModInfoModel>
                     var petI18n = pet.I18nDatas[i18nData.Key];
                     if (i18nData.Value.TryGetValue(pet.Id.Value, out var name))
                         petI18n.Name.Value = name;
-                    if (i18nData.Value.TryGetValue(pet.PetNameId.Value, out var petName))
-                        petI18n.PetName.Value = petName;
                     if (i18nData.Value.TryGetValue(pet.DescriptionId.Value, out var description))
                         petI18n.Description.Value = description;
                     foreach (var work in pet.Works)
@@ -393,10 +391,6 @@ public class ModInfoModel : I18nModel<I18nModInfoModel>
                     pet.Id.Value,
                     pet.I18nDatas[cultureName].Name.Value
                 );
-                _saveI18nDatas[cultureName].TryAdd(
-                    pet.PetNameId.Value,
-                    pet.I18nDatas[cultureName].PetName.Value
-                );
                 _saveI18nDatas[cultureName].TryAdd(
                     pet.DescriptionId.Value,
                     pet.I18nDatas[cultureName].Description.Value
@@ -462,7 +456,7 @@ public class ModInfoModel : I18nModel<I18nModInfoModel>
             {
                 new Sub("intor", pet.DescriptionId.Value),
                 new Sub("path", pet.Id.Value),
-                new Sub("petname", pet.PetNameId.Value)
+                new Sub("petname", pet.Id.Value)
             }
         );
         lps.Add(
diff --git a/VPet.ModMaker/Models/ModModel/MoveModel.cs b/VPet.ModMaker/Models/ModModel/MoveModel.cs
index d1da15e..35a04bc 100644
--- a/VPet.ModMaker/Models/ModModel/MoveModel.cs
+++ b/VPet.ModMaker/Models/ModModel/MoveModel.cs
@@ -116,7 +116,12 @@ public class MoveModel
     /// 模式
     /// </summary>
     public ObservableEnumFlags<GraphHelper.Move.ModeType> ModeType { get; } =
-        new(GraphHelper.Move.ModeType.Nomal);
+        new(
+            GraphHelper.Move.ModeType.Happy
+                | GraphHelper.Move.ModeType.Nomal
+                | GraphHelper.Move.ModeType.PoorCondition
+                | GraphHelper.Move.ModeType.Ill
+        );
 
     public MoveModel() { }
 
diff --git a/VPet.ModMaker/Models/ModModel/PetModel.cs b/VPet.ModMaker/Models/ModModel/PetModel.cs
index fde38f8..f9e4c65 100644
--- a/VPet.ModMaker/Models/ModModel/PetModel.cs
+++ b/VPet.ModMaker/Models/ModModel/PetModel.cs
@@ -22,11 +22,6 @@ public class PetModel : I18nModel<I18nPetInfoModel>
     /// </summary>
     public ObservableValue<string> Id { get; } = new();
 
-    /// <summary>
-    /// 宠物名称Id
-    /// </summary>
-    public ObservableValue<string> PetNameId { get; } = new();
-
     /// <summary>
     /// 描述Id
     /// </summary>
@@ -74,11 +69,9 @@ public class PetModel : I18nModel<I18nPetInfoModel>
 
     public PetModel()
     {
-        PetNameId.Value = $"{Id.Value}_{nameof(PetNameId)}";
         DescriptionId.Value = $"{Id.Value}_{nameof(DescriptionId)}";
         Id.ValueChanged += (o, n) =>
         {
-            PetNameId.Value = $"{n}_{nameof(PetNameId)}";
             DescriptionId.Value = $"{n}_{nameof(DescriptionId)}";
         };
     }
@@ -101,8 +94,7 @@ public class PetModel : I18nModel<I18nPetInfoModel>
     public PetModel(PetLoader loader)
         : this()
     {
-        Id.Value = loader.Name;
-        PetNameId.Value = loader.PetName;
+        Id.Value = loader.PetName;
         DescriptionId.Value = loader.Intor;
 
         TouchHeadRect.Value.SetValue(
@@ -166,14 +158,12 @@ public class PetModel : I18nModel<I18nPetInfoModel>
 public class I18nPetInfoModel
 {
     public ObservableValue<string> Name { get; } = new();
-    public ObservableValue<string> PetName { get; } = new();
     public ObservableValue<string> Description { get; } = new();
 
     public I18nPetInfoModel Copy()
     {
         var result = new I18nPetInfoModel();
         result.Name.Value = Name.Value;
-        result.PetName.Value = PetName.Value;
         result.Description.Value = Description.Value;
         return result;
     }
diff --git a/VPet.ModMaker/Views/ModEdit/AddCultureWindow.xaml b/VPet.ModMaker/Views/ModEdit/AddCultureWindow.xaml
index a7363d6..5aadcbd 100644
--- a/VPet.ModMaker/Views/ModEdit/AddCultureWindow.xaml
+++ b/VPet.ModMaker/Views/ModEdit/AddCultureWindow.xaml
@@ -32,7 +32,7 @@
         </Grid.RowDefinitions>
         <TextBox
           x:Name="TextBox_Lang"
-          pu:TextBoxHelper.Watermark="{ll:Str 语言区域标记}"
+          pu:TextBoxHelper.Watermark="{ll:Str 文化名称}"
           Text="{Binding Culture.Value, UpdateSourceTrigger=PropertyChanged}" />
         <TextBlock Grid.Row="1">
           <Hyperlink Click="Hyperlink_Click">
diff --git a/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml
index 729552d..5842314 100644
--- a/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.xaml
+++ b/VPet.ModMaker/Views/ModEdit/AnimeEdit/AnimeEditWindow.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.AnimeEdit"
-  Title="AnimeEditWindow"
+  Title="{ll:Str 编辑动画}"
   Width="1000"
   Height="600"
   d:DataContext="{d:DesignInstance Type=vm:AnimeEditWindowVM}"
@@ -191,7 +191,7 @@
         <RowDefinition Height="Auto" />
       </Grid.RowDefinitions>
       <TabControl SelectionChanged="TabControl_SelectionChanged">
-        <TabItem Tag="{Binding Anime.Value.ModeTypes[0]}">
+        <TabItem d:Header="Happy (0)" Tag="Happy">
           <TabItem.Header>
             <MultiBinding Converter="{StaticResource StringFormatConverter}" ConverterParameter="{}{0} ({1})">
               <Binding Path="Tag" RelativeSource="{RelativeSource Mode=Self}" />
diff --git a/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml
index cd3e81c..12fde1d 100644
--- a/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml
+++ b/VPet.ModMaker/Views/ModEdit/MoveEdit/MoveEditWindow.xaml
@@ -64,7 +64,7 @@
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Label Grid.Row="3" Content="{ll:Str 指定动画}" />
+        <Label Grid.Row="3" Content="{ll:Str 动画}" />
         <TextBox
           Grid.Row="3"
           Grid.Column="1"
diff --git a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml
index ffa2842..8c90c5f 100644
--- a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml
+++ b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.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.PetEdit"
-  Title="PetEditWindow"
+  Title="{ll:Str 编辑宠物}"
   Width="800"
   Height="450"
   d:DataContext="{d:DesignInstance Type=vm:PetEditWindowVM}"
@@ -58,7 +58,7 @@
           </Image.ContextMenu>
         </Image>
         <Grid>
-          <Label Content="TouchHeadRect" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchHead}">
+          <Label Content="{ll:Str 头部触碰范围}" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchHead}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
                 <Setter Property="Width">
@@ -89,7 +89,7 @@
               </Style>
             </Label.Style>
           </Label>
-          <Label Content="TouchRaisedRect_Happy" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_HappyState}">
+          <Label Content="{ll:Str 开心状态提起范围}" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_HappyState}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
                 <Setter Property="Width">
@@ -120,7 +120,7 @@
               </Style>
             </Label.Style>
           </Label>
-          <Label Content="TouchRaisedRect_Nomal" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_NomalState}">
+          <Label Content="{ll:Str 普通状态提起范围}" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_NomalState}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
                 <Setter Property="Width">
@@ -151,7 +151,7 @@
               </Style>
             </Label.Style>
           </Label>
-          <Label Content="TouchRaisedRect_PoorCondition" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_PoorConditionState}">
+          <Label Content="{ll:Str 低状态提起范围}" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_PoorConditionState}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
                 <Setter Property="Width">
@@ -182,7 +182,7 @@
               </Style>
             </Label.Style>
           </Label>
-          <Label Content="TouchRaisedRect_Ill" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_IllState}">
+          <Label Content="{ll:Str 生病状态提起范围}" Tag="{Binding IsChecked, ElementName=ToggleButton_TouchRaisedRect_IllState}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
                 <Setter Property="Width">
@@ -217,7 +217,7 @@
             Width="5"
             Height="5"
             Background="Red"
-            Content="RaisePoint_Happy"
+            Content="{ll:Str 开心状态提起点位}"
             Tag="{Binding IsChecked, ElementName=ToggleButton_RaisePoint_Happy}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
@@ -237,7 +237,7 @@
             Width="5"
             Height="5"
             Background="Red"
-            Content="RaisePoint_Nomal"
+            Content="{ll:Str 普通状态提起点位}"
             Tag="{Binding IsChecked, ElementName=ToggleButton_RaisePoint_Nomal}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
@@ -257,7 +257,7 @@
             Width="5"
             Height="5"
             Background="Red"
-            Content="RaisePoint_PoorCondition"
+            Content="{ll:Str 低状态提起点位}"
             Tag="{Binding IsChecked, ElementName=ToggleButton_RaisePoint_PoorCondition}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
@@ -277,7 +277,7 @@
             Width="5"
             Height="5"
             Background="Red"
-            Content="RaisePoint_Ill"
+            Content="{ll:Str 生病状态提起点位}"
             Tag="{Binding IsChecked, ElementName=ToggleButton_RaisePoint_Ill}">
             <Label.Style>
               <Style BasedOn="{StaticResource Label_ThouchRect}" TargetType="Label">
@@ -323,21 +323,27 @@
           <RowDefinition />
         </Grid.RowDefinitions>
         <Label Content="Id" />
-        <TextBox Grid.Column="1" Text="{Binding Pet.Value.Id.Value, UpdateSourceTrigger=PropertyChanged}" />
-        <Label Grid.Row="1" Content="{ll:Str 名称}" />
+        <TextBox
+          Grid.Column="1"
+          pu:TextBoxHelper.Watermark="Id"
+          Text="{Binding Pet.Value.Id.Value, UpdateSourceTrigger=PropertyChanged}" />
+        <!--<Label Grid.Row="1" Content="{ll:Str 名称}" />
         <TextBox
           Grid.Row="1"
           Grid.Column="1"
-          Text="{Binding Pet.Value.CurrentI18nData.Value.Name.Value, UpdateSourceTrigger=PropertyChanged}" />
-        <Label Grid.Row="2" Content="{ll:Str 宠物名称}" />
+          pu:TextBoxHelper.Watermark="{ll:Str 名称}"
+          Text="{Binding Pet.Value.CurrentI18nData.Value.Name.Value, UpdateSourceTrigger=PropertyChanged}" />-->
+        <Label Grid.Row="2" Content="{ll:Str 名称}" />
         <TextBox
           Grid.Row="2"
           Grid.Column="1"
-          Text="{Binding Pet.Value.CurrentI18nData.Value.PetName.Value, UpdateSourceTrigger=PropertyChanged}" />
-        <Label Grid.Row="3" Content="{ll:Str 宠物描述}" />
+          pu:TextBoxHelper.Watermark="{ll:Str 名称}"
+          Text="{Binding Pet.Value.CurrentI18nData.Value.Name.Value, UpdateSourceTrigger=PropertyChanged}" />
+        <Label Grid.Row="3" Content="{ll:Str 描述}" />
         <TextBox
           Grid.Row="3"
           Grid.Column="1"
+          pu:TextBoxHelper.Watermark="{ll:Str 描述}"
           Style="{StaticResource TextBox_Wrap}"
           Text="{Binding Pet.Value.CurrentI18nData.Value.Description.Value, UpdateSourceTrigger=PropertyChanged}" />
       </Grid>
@@ -358,7 +364,7 @@
               x:Name="ToggleButton_TouchHead"
               Padding="5"
               HorizontalContentAlignment="Stretch"
-              Content="TouchHead:" />
+              Content="{ll:Str 头部触碰范围}" />
             <Grid Grid.Column="1" Margin="5">
               <Grid.RowDefinitions>
                 <RowDefinition />
@@ -371,18 +377,12 @@
                 <ColumnDefinition />
               </Grid.ColumnDefinitions>
               <Label Background="{x:Null}" Content="x:" />
-              <pu:NumberInput
-                Grid.Column="1"
-                d:Value="100"
-                Value="{Binding Pet.Value.TouchHeadRect.Value.X.Value}" />
+              <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.TouchHeadRect.Value.X.Value}" />
               <Label
                 Grid.Column="2"
                 Background="{x:Null}"
                 Content="y:" />
-              <pu:NumberInput
-                Grid.Column="3"
-                d:Value="100"
-                Value="{Binding Pet.Value.TouchHeadRect.Value.Y.Value, Mode=TwoWay}" />
+              <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.TouchHeadRect.Value.Y.Value, Mode=TwoWay}" />
               <Label
                 Grid.Row="1"
                 Background="{x:Null}"
@@ -390,7 +390,6 @@
               <pu:NumberInput
                 Grid.Row="1"
                 Grid.Column="1"
-                d:Value="100"
                 Value="{Binding Pet.Value.TouchHeadRect.Value.Width.Value, Mode=TwoWay}" />
               <Label
                 Grid.Row="1"
@@ -400,11 +399,10 @@
               <pu:NumberInput
                 Grid.Row="1"
                 Grid.Column="3"
-                d:Value="100"
                 Value="{Binding Pet.Value.TouchHeadRect.Value.Height.Value, Mode=TwoWay}" />
             </Grid>
           </Grid>
-          <Expander Header="TouchRaisedRect">
+          <Expander Header="{ll:Str 提起范围}">
             <Grid>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -421,7 +419,7 @@
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
                 d:IsChecked="True"
-                Content="HappyState:" />
+                Content="{ll:Str 开心状态}" />
               <Grid Grid.Column="1" Margin="5">
                 <Grid.RowDefinitions>
                   <RowDefinition />
@@ -434,18 +432,12 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.Y.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
                   Background="{x:Null}"
@@ -453,7 +445,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="1"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.Width.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
@@ -463,7 +454,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="3"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Happy.Value.Height.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
@@ -472,7 +462,7 @@
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
                 d:IsChecked="True"
-                Content="NomalState:" />
+                Content="{ll:Str 普通状态}" />
               <Grid
                 Grid.Row="1"
                 Grid.Column="1"
@@ -488,18 +478,12 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.Y.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
                   Background="{x:Null}"
@@ -507,7 +491,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="1"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.Width.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
@@ -517,7 +500,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="3"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Nomal.Value.Height.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
@@ -526,7 +508,7 @@
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
                 d:IsChecked="True"
-                Content="PoorConditionState:" />
+                Content="{ll:Str 低状态}" />
               <Grid
                 Grid.Row="2"
                 Grid.Column="1"
@@ -542,18 +524,12 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.Y.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
                   Background="{x:Null}"
@@ -561,7 +537,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="1"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.Width.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
@@ -571,7 +546,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="3"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.PoorCondition.Value.Height.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
@@ -580,7 +554,7 @@
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
                 d:IsChecked="True"
-                Content="IllState:" />
+                Content="{ll:Str 生病状态}" />
               <Grid
                 Grid.Row="3"
                 Grid.Column="1"
@@ -596,18 +570,12 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.Y.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
                   Background="{x:Null}"
@@ -615,7 +583,6 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="1"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.Width.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Row="1"
@@ -625,12 +592,11 @@
                 <pu:NumberInput
                   Grid.Row="1"
                   Grid.Column="3"
-                  d:Value="100"
                   Value="{Binding Pet.Value.TouchRaisedRect.Value.Ill.Value.Height.Value, Mode=TwoWay}" />
               </Grid>
             </Grid>
           </Expander>
-          <Expander Header="RaisePoint">
+          <Expander Header="{ll:Str 提起点位}">
             <Grid>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
@@ -646,7 +612,7 @@
                 x:Name="ToggleButton_RaisePoint_Happy"
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
-                Content="HappyState:" />
+                Content="{ll:Str 开心状态}" />
               <Grid Grid.Column="1" Margin="5">
                 <Grid.RowDefinitions>
                   <RowDefinition />
@@ -659,25 +625,19 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Happy.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.RaisePoint.Value.Happy.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Happy.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.RaisePoint.Value.Happy.Value.Y.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
                 x:Name="ToggleButton_RaisePoint_Nomal"
                 Grid.Row="1"
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
-                Content="NomalState:" />
+                Content="{ll:Str 普通状态}" />
               <Grid
                 Grid.Row="1"
                 Grid.Column="1"
@@ -693,25 +653,19 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Nomal.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.RaisePoint.Value.Nomal.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Nomal.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.RaisePoint.Value.Nomal.Value.Y.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
                 x:Name="ToggleButton_RaisePoint_PoorCondition"
                 Grid.Row="2"
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
-                Content="PoorConditionState:" />
+                Content="{ll:Str 低状态}" />
               <Grid
                 Grid.Row="2"
                 Grid.Column="1"
@@ -727,25 +681,19 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.PoorCondition.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.RaisePoint.Value.PoorCondition.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.PoorCondition.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.RaisePoint.Value.PoorCondition.Value.Y.Value, Mode=TwoWay}" />
               </Grid>
               <ToggleButton
                 x:Name="ToggleButton_RaisePoint_Ill"
                 Grid.Row="3"
                 Padding="5"
                 HorizontalContentAlignment="Stretch"
-                Content="IllState:" />
+                Content="{ll:Str 生病状态}" />
               <Grid
                 Grid.Row="3"
                 Grid.Column="1"
@@ -761,18 +709,12 @@
                   <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <Label Background="{x:Null}" Content="x:" />
-                <pu:NumberInput
-                  Grid.Column="1"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Ill.Value.X.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="1" Value="{Binding Pet.Value.RaisePoint.Value.Ill.Value.X.Value, Mode=TwoWay}" />
                 <Label
                   Grid.Column="2"
                   Background="{x:Null}"
                   Content="y:" />
-                <pu:NumberInput
-                  Grid.Column="3"
-                  d:Value="100"
-                  Value="{Binding Pet.Value.RaisePoint.Value.Ill.Value.Y.Value, Mode=TwoWay}" />
+                <pu:NumberInput Grid.Column="3" Value="{Binding Pet.Value.RaisePoint.Value.Ill.Value.Y.Value, Mode=TwoWay}" />
               </Grid>
             </Grid>
           </Expander>
diff --git a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml.cs b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml.cs
index ff4bde9..e70a4c2 100644
--- a/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml.cs
+++ b/VPet.ModMaker/Views/ModEdit/PetEdit/PetEditWindow.xaml.cs
@@ -57,16 +57,6 @@ public partial class PetEditWindow : Window
             MessageBox.Show("名称不可为空".Translate(), "", MessageBoxButton.OK, MessageBoxImage.Warning);
             return;
         }
-        if (string.IsNullOrWhiteSpace(ViewModel.Pet.Value.CurrentI18nData.Value.PetName.Value))
-        {
-            MessageBox.Show(
-                "宠物名称不可为空".Translate(),
-                "",
-                MessageBoxButton.OK,
-                MessageBoxImage.Warning
-            );
-            return;
-        }
         if (
             ViewModel.OldPet?.Id.Value != ViewModel.Pet.Value.Id.Value
             && ModInfoModel.Current.Pets.Any(i => i.Id == ViewModel.Pet.Value.Id)
diff --git a/VPet.ModMaker/Views/ModEdit/PetEdit/PetPage.xaml b/VPet.ModMaker/Views/ModEdit/PetEdit/PetPage.xaml
index 83983e9..ad4a311 100644
--- a/VPet.ModMaker/Views/ModEdit/PetEdit/PetPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/PetEdit/PetPage.xaml
@@ -58,22 +58,13 @@
             <TextBlock Text="{ll:Str 名称}" />
           </DataGridTextColumn.Header>
         </DataGridTextColumn>
-        <DataGridTextColumn
-          Binding="{Binding CurrentI18nData.Value.PetName.Value}"
-          CanUserSort="True"
-          IsReadOnly="True"
-          SortMemberPath="CurrentI18nData.Value.PetName.Value">
-          <DataGridTextColumn.Header>
-            <TextBlock Text="{ll:Str 宠物名称}" />
-          </DataGridTextColumn.Header>
-        </DataGridTextColumn>
         <DataGridTextColumn
           Binding="{Binding CurrentI18nData.Value.Description.Value}"
           CanUserSort="True"
           IsReadOnly="True"
           SortMemberPath="CurrentI18nData.Value.Description.Value">
           <DataGridTextColumn.Header>
-            <TextBlock Text="{ll:Str 宠物描述}" />
+            <TextBlock Text="{ll:Str 描述}" />
           </DataGridTextColumn.Header>
         </DataGridTextColumn>
       </DataGrid.Columns>
diff --git a/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
index b761be8..a1aa0b7 100644
--- a/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
+++ b/VPet.ModMaker/Views/ModEdit/SelectTextEdit/SelectTextPage.xaml
@@ -96,10 +96,10 @@
           </DataGridTextColumn.Header>
         </DataGridTextColumn>
         <DataGridTextColumn
-          Binding="{Binding Mode.Value}"
+          Binding="{Binding Mode.EnumValue}"
           CanUserSort="True"
           IsReadOnly="True"
-          SortMemberPath="Mode.Value">
+          SortMemberPath="Mode.EnumValue">
           <DataGridTextColumn.Header>
             <TextBlock Text="{ll:Str 状态}" />
           </DataGridTextColumn.Header>
diff --git a/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkEditWindow.xaml b/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkEditWindow.xaml
index f0fcb62..b344c84 100644
--- a/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkEditWindow.xaml
+++ b/VPet.ModMaker/Views/ModEdit/WorkEdit/WorkEditWindow.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.WorkEdit"
-  Title="WorkEditWindow"
+  Title="{ll:Str 编辑工作}"
   Width="800"
   Height="450"
   d:DataContext="{d:DesignInstance Type=vm:WorkEditWindowVM}"