MOD支持+新增 文字宠物

VPet-Simulator.Windows/Function/Setting.cs

@@ -267,5 +267,13 @@ namespace VPet_Simulator.Windows
             get => !this["gameconfig"].GetBool("startbootsteam");
             set => this["gameconfig"].SetBool("startbootsteam", !value);
         }
+        /// <summary>
+        /// 桌宠选择内容
+        /// </summary>
+        public string PetGraph
+        {
+            get => this["gameconfig"].GetString("petgraph", "默认虚拟桌宠");
+            set => this["gameconfig"].SetString("petgraph", value);
+        }
     }
 }

VPet-Simulator.Windows/MainWindow.xaml.cs

@@ -157,7 +157,8 @@ namespace VPet_Simulator.Windows
             Dispatcher.Invoke(new Action(() =>
             {
                 LoadingText.Content = "尝试加载动画和生成缓存";
-                Core.Graph = Pets[0].Graph();
+                var pl = Pets.Find(x => x.Name == Set.PetGraph);
+                Core.Graph = pl == null ? Pets[0].Graph() : pl.Graph();
                 LoadingText.Content = "正在加载游戏";
                 winSetting = new winGameSetting(this);
                 Main = new Main(Core) { };
@@ -224,7 +225,7 @@ namespace VPet_Simulator.Windows
                 {
                     Set["SingleTips"].SetDateTime("update", DateTime.Now);
                     notifyIcon.ShowBalloonTip(10, "更新通知 02/17",
-                        "现在使用缓存机制,不仅占用小,而且再也不会有那种闪闪的问题了!\n现已支持开机启动功能,前往设置设置开机启动", ToolTipIcon.Info);                    
+                        "现在使用缓存机制,不仅占用小,而且再也不会有那种闪闪的问题了!\n现已支持开机启动功能,前往设置设置开机启动", ToolTipIcon.Info);
                 }
             }));
         }

VPet-Simulator.Windows/WinDesign/winGameSetting.xaml

@@ -39,7 +39,8 @@
                             <RowDefinition Height="35" />
                             <RowDefinition Height="35" />
                             <RowDefinition Height="35" />
-                            <RowDefinition Height="169*" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <TextBlock Text="置于顶层" VerticalAlignment="Center" FontSize="14" />
                         <pu:Switch x:Name="TopMostBox" Grid.Column="2" BorderBrush="{DynamicResource PrimaryDark}"
@@ -107,8 +108,13 @@
                                     Unchecked="StartUpSteamBox_Checked" />
                         </Grid>
                         <TextBlock Grid.Row="6" Text="宠物动画" VerticalAlignment="Center" FontSize="14" />
+                        <TextBlock x:Name="PetIntor" Grid.Row="7" Text="动画描述动画描述动画描述动画描述动画描述" VerticalAlignment="Top" Grid.Column="2" Margin="0,0,0,5" TextWrapping="WrapWithOverflow" />
                         <ComboBox x:Name="PetBox" Grid.Row="6" Grid.Column="2" ToolTip="加载的宠物动画,重启后生效"
-                                Style="{DynamicResource StandardComboBoxStyle}" Margin="0,3,0,2" />
+                                Style="{DynamicResource StandardComboBoxStyle}" Margin="0,3,0,2" SelectionChanged="PetBox_SelectionChanged" />
+                        <Button x:Name="ButtonRestartGraph"  Content="重启软件以应用更改" Margin="0,2,0,0" Visibility="Collapsed"
+                                        VerticalAlignment="Bottom" Background="{DynamicResource DARKPrimary}"
+                                        Foreground="{DynamicResource DARKPrimaryText}"
+                                        Click="ButtonRestart_Click" Grid.ColumnSpan="3" Grid.Row="10" />
                     </Grid>
                 </TabItem>
                 <TabItem Header="系统" BorderBrush="{DynamicResource PrimaryDarker}">
@@ -186,6 +192,7 @@
                                         Background="{x:Null}" />
                             </Grid>
                         </Grid>
+                        
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="互动" BorderBrush="{DynamicResource PrimaryDarker}">

VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs

@@ -60,7 +60,11 @@ namespace VPet_Simulator.Windows
             {
                 PetBox.Items.Add(pl.Name);
             }
-            PetBox.SelectedIndex = 0;
+            int petboxid = mw.Pets.FindIndex(x => x.Name == mw.Set.PetGraph);
+            if (petboxid == -1)
+                petboxid = 0;
+            PetBox.SelectedIndex = petboxid;
+            PetIntor.Text = mw.Pets[petboxid].Intor;
 
             foreach (ComboBoxItem v in CBAutoSave.Items)
             {
@@ -588,14 +592,27 @@ namespace VPet_Simulator.Windows
         }
         private void StartUpBox_Checked(object sender, RoutedEventArgs e)
         {
+            if (!AllowChange)
+                return;
             mw.Set.StartUPBoot = StartUpBox.IsChecked == true;
             GenStartUP();
         }
 
         private void StartUpSteamBox_Checked(object sender, RoutedEventArgs e)
         {
+            if (!AllowChange)
+                return;
             mw.Set.StartUPBootSteam = StartUpSteamBox.IsChecked == true;
             GenStartUP();
         }
+
+        private void PetBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!AllowChange)
+                return;
+            mw.Set.PetGraph = (string)PetBox.SelectedItem;
+            PetIntor.Text = mw.Pets[PetBox.SelectedIndex].Intor;
+            ButtonRestartGraph.Visibility = Visibility.Visible;
+        }
     }
 }

VPet-Simulator.Windows/mod/1000_FontPet/info.lps

@@ -0,0 +1,4 @@
+vupmod#FontPet:|author#LorisYounger:|gamever#20:|ver#100:|
+intro#来试试这个文字版的单帧宠物吧/com这个算是单帧宠物示例模组:|
+authorid#253101309:|
+itemid#2934625683:|

VPet-Simulator.Windows/mod/1000_FontPet/pet/font.lps

@@ -0,0 +1,6 @@
+pet#文字宠物:|intor#来试试这个文字版的单帧宠物吧:|path#font:|
+touchhead:|px#0:|py#0:|sw#500:|sh#200:|
+touchraised:|px#0:|py#0:|sw#500:|sh#200:|
+raisepoint:|x#250:|y#125:|
+speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:|fallx#14:|fally#10:|crawl#10:|
+locate:|climbleft#100:|climbright#100:|climbtop#100:|

VPet-Simulator.Windows/mod/1000_MatchPet/info.lps

@@ -1,2 +0,0 @@
-vupmod#MatchPet:|author#LorisYounger:|gamever#20:|ver#100:|
-intro#来试试这个极简手残画风的单帧宠物吧:|

VPet-Simulator.Windows/mod/1000_MatchPet/pet/matchmen.lps

@@ -1,6 +0,0 @@
-pet#火柴人:|intor#来试试这个极简手残画风的单帧宠物吧:|path#matchmen:|
-touchhead:|px#159:|py#16:|sw#189:|sh#178:|
-touchraised:|px#0:|py#50:|sw#500:|sh#200:|
-raisepoint:|x#290:|y#128:|
-speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:|fallx#14:|fally#10:|crawl#10:|
-locate:|climbleft#145:|climbright#185:|climbtop#150:|

VPet-Simulator.Windows/mod/1000_MatchPet/pet/vup.lps

@@ -1,6 +0,0 @@
-pet#火柴人:|intor#来试试这个极简手残画风的单帧宠物吧:|path#matchmen:|
-touchhead:|px#159:|py#16:|sw#189:|sh#178:|
-touchraised:|px#0:|py#50:|sw#500:|sh#200:|
-raisepoint:|x#290:|y#128:|
-speed:|walk#20:|climb#10:|climbtop#8:|crawl#8:|fallx#14:|fally#10:|crawl#10:|
-locate:|climbleft#145:|climbright#185:|climbtop#150:|