统计总结功能正式版

VPet-Simulator.Windows.Interface/Mod/Food.cs

@@ -50,13 +50,9 @@ namespace VPet_Simulator.Windows.Interface
             /// </summary>
             Drug,
             /// <summary>
-            /// 礼品 (没做)
+            /// 礼品
             /// </summary>
             Gift,
-            ///// <summary>
-            ///// 限定食物优先显示
-            ///// </summary>
-            //Limit,
         }
         /// <summary>
         /// 食物类型
@@ -107,7 +103,6 @@ namespace VPet_Simulator.Windows.Interface
         /// </summary>
         [Line(ignoreCase: true)]
         public string Desc { get; set; }
-        private string desc = null;
         private string descs = null;
         /// <summary>
         /// 描述(ToBetterBuy)

VPet-Simulator.Windows/MainWindow.cs

@@ -1713,11 +1713,38 @@ namespace VPet_Simulator.Windows
                         Thread.Sleep(2000);
                         Set["SingleTips"].SetBool("helloworld", true);
                         NoticeBox.Show("欢迎使用虚拟桌宠模拟器!\n如果遇到桌宠爬不见了,可以在我这里设置居中或退出桌宠".Translate(),
-                           "你好".Translate() + (IsSteamUser ? SteamClient.Name : Environment.UserName));
+                           "你好".Translate() + (IsSteamUser ? SteamClient.Name : Environment.UserName), Panuon.WPF.UI.MessageBoxIcon.Info, true, 5000);
                         //Thread.Sleep(2000);
                         //Main.SayRnd("欢迎使用虚拟桌宠模拟器\n这是个中期的测试版,若有bug请多多包涵\n欢迎加群虚拟主播模拟器430081239或在菜单栏-管理-反馈中提交bug或建议".Translate());
                     });
                 }
+                if (Set["v"][(gint)"rank"] != DateTime.Now.Year && GameSavesData.Statistics[(gint)"stat_total_time"] > 3600)
+                {//年度报告提醒
+                    Task.Run(() =>
+                    {
+                        Thread.Sleep(120000);
+                        Set["v"][(gint)"rank"] = DateTime.Now.Year;
+                        Dispatcher.Invoke(() =>
+                        {
+                            var button = new System.Windows.Controls.Button()
+                            {
+                                Content = "点击前往查看".Translate(),
+                                FontSize = 20,
+                                HorizontalAlignment = System.Windows.HorizontalAlignment.Right,
+                                Background = Function.ResourcesBrush(Function.BrushType.Primary),
+                                Foreground = Function.ResourcesBrush(Function.BrushType.PrimaryText),
+                            };
+                            button.Click += (x, y) =>
+                            {
+                                var panelWindow = new winCharacterPanel(this);
+                                panelWindow.MainTab.SelectedIndex = 2;
+                                panelWindow.Show();
+                            };
+                            Main.MsgBar.MessageBoxContent.Children.Add(button);
+                        });
+                        Main.Say("哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵".Translate(), "shining");
+                    });
+                }
 #if DEMO
                 else
                 {

VPet-Simulator.Windows/VPet-Simulator.Windows.csproj

@@ -71,6 +71,47 @@
 		<None Remove="Res\img\rank4.png" />
 		<None Remove="Res\img\rank5.png" />
 		<None Remove="Res\img\rank6.png" />
+		<None Remove="Res\img\rbgb.png" />
+		<None Remove="Res\img\rbgt.png" />
+		<None Remove="Res\img\r_autobuy_1.png" />
+		<None Remove="Res\img\r_autobuy_2.png" />
+		<None Remove="Res\img\r_autobuy_3.png" />
+		<None Remove="Res\img\r_autobuy_4.png" />
+		<None Remove="Res\img\r_level_1.png" />
+		<None Remove="Res\img\r_level_2.png" />
+		<None Remove="Res\img\r_level_3.png" />
+		<None Remove="Res\img\r_level_4.png" />
+		<None Remove="Res\img\r_level_5.png" />
+		<None Remove="Res\img\r_mod_1.png" />
+		<None Remove="Res\img\r_mod_2.png" />
+		<None Remove="Res\img\r_mod_3.png" />
+		<None Remove="Res\img\r_mostfood_Drink.png" />
+		<None Remove="Res\img\r_mostfood_Drug.png" />
+		<None Remove="Res\img\r_mostfood_Food.png" />
+		<None Remove="Res\img\r_mostfood_Functional.png" />
+		<None Remove="Res\img\r_mostfood_Gift.png" />
+		<None Remove="Res\img\r_mostfood_Meal.png" />
+		<None Remove="Res\img\r_mostfood_Snack.png" />
+		<None Remove="Res\img\r_singleexp_1.png" />
+		<None Remove="Res\img\r_singleexp_2.png" />
+		<None Remove="Res\img\r_singleexp_3.png" />
+		<None Remove="Res\img\r_singleexp_4.png" />
+		<None Remove="Res\img\r_singleexp_5.png" />
+		<None Remove="Res\img\r_singlemoney_1.png" />
+		<None Remove="Res\img\r_singlemoney_2.png" />
+		<None Remove="Res\img\r_singlemoney_3.png" />
+		<None Remove="Res\img\r_singlemoney_4.png" />
+		<None Remove="Res\img\r_timelength_1.png" />
+		<None Remove="Res\img\r_timelength_2.png" />
+		<None Remove="Res\img\r_timelength_3.png" />
+		<None Remove="Res\img\r_timelength_4.png" />
+		<None Remove="Res\img\r_timelength_5.png" />
+		<None Remove="Res\img\r_worktime_1.png" />
+		<None Remove="Res\img\r_worktime_2.png" />
+		<None Remove="Res\img\r_worktime_3.png" />
+		<None Remove="Res\img\r_worktime_4.png" />
+		<None Remove="Res\img\r_worktime_5.png" />
+		<None Remove="Res\img\r_worktime_6.png" />
 		<None Remove="快捷键通用注解.md" />
 	</ItemGroup>
 	<ItemGroup>
@@ -79,9 +120,8 @@
 		<Resource Include="Res\img\rank2.png" />
 		<Resource Include="Res\img\rank1.png" />
 		<Resource Include="Res\img\rank3.png" />
-		<Resource Include="Res\img\rank4.png" />
-		<Resource Include="Res\img\rank5.png" />
-		<Resource Include="Res\img\rank6.png" />
+		<Resource Include="Res\img\rbgb.png" />
+		<Resource Include="Res\img\r_mostfood_Food.png" />
 		<Resource Include="Res\remixicon.ttf" />
 		<Resource Include="vpeticon.ico" />
 	</ItemGroup>
@@ -144,6 +184,47 @@
 			<Install>false</Install>
 		</BootstrapperPackage>
 	</ItemGroup>
+	<ItemGroup>
+	  <Resource Include="Res\img\rbgt.png" />
+	  <Resource Include="Res\img\r_autobuy_1.png" />
+	  <Resource Include="Res\img\r_autobuy_2.png" />
+	  <Resource Include="Res\img\r_autobuy_3.png" />
+	  <Resource Include="Res\img\r_autobuy_4.png" />
+	  <Resource Include="Res\img\r_level_1.png" />
+	  <Resource Include="Res\img\r_level_2.png" />
+	  <Resource Include="Res\img\r_level_3.png" />
+	  <Resource Include="Res\img\r_level_4.png" />
+	  <Resource Include="Res\img\r_level_5.png" />
+	  <Resource Include="Res\img\r_mod_1.png" />
+	  <Resource Include="Res\img\r_mod_2.png" />
+	  <Resource Include="Res\img\r_mod_3.png" />
+	  <Resource Include="Res\img\r_mostfood_Drink.png" />
+	  <Resource Include="Res\img\r_mostfood_Drug.png" />
+	  <Resource Include="Res\img\r_mostfood_Functional.png" />
+	  <Resource Include="Res\img\r_mostfood_Gift.png" />
+	  <Resource Include="Res\img\r_mostfood_Meal.png" />
+	  <Resource Include="Res\img\r_mostfood_Snack.png" />
+	  <Resource Include="Res\img\r_singleexp_1.png" />
+	  <Resource Include="Res\img\r_singleexp_2.png" />
+	  <Resource Include="Res\img\r_singleexp_3.png" />
+	  <Resource Include="Res\img\r_singleexp_4.png" />
+	  <Resource Include="Res\img\r_singleexp_5.png" />
+	  <Resource Include="Res\img\r_singlemoney_1.png" />
+	  <Resource Include="Res\img\r_singlemoney_2.png" />
+	  <Resource Include="Res\img\r_singlemoney_3.png" />
+	  <Resource Include="Res\img\r_singlemoney_4.png" />
+	  <Resource Include="Res\img\r_timelength_1.png" />
+	  <Resource Include="Res\img\r_timelength_2.png" />
+	  <Resource Include="Res\img\r_timelength_3.png" />
+	  <Resource Include="Res\img\r_timelength_4.png" />
+	  <Resource Include="Res\img\r_timelength_5.png" />
+	  <Resource Include="Res\img\r_worktime_1.png" />
+	  <Resource Include="Res\img\r_worktime_2.png" />
+	  <Resource Include="Res\img\r_worktime_3.png" />
+	  <Resource Include="Res\img\r_worktime_4.png" />
+	  <Resource Include="Res\img\r_worktime_5.png" />
+	  <Resource Include="Res\img\r_worktime_6.png" />
+	</ItemGroup>
 
 	<ItemGroup>
 		<Reference Include="System.Web" />

VPet-Simulator.Windows/WinDesign/winCharacterPanel.xaml

@@ -225,196 +225,217 @@
                         IsEnabled="False" Checked="cb_AgreeUpload_Checked" />
                 <ScrollViewer Grid.Row="2" Grid.ColumnSpan="2" x:Name="r_viewbox" Visibility="Collapsed">
                     <Viewbox x:Name="r_output">
-                        <Grid Background="White">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="200" />
-                                <RowDefinition Height="100" />
-                                <RowDefinition Height="100" />
-                                <RowDefinition Height="200" />
-                                <RowDefinition Height="100" />
-                                <RowDefinition Height="200" />
-                                <RowDefinition Height="100" />
-                                <RowDefinition Height="200" />
-                                <RowDefinition Height="100" />
-                                <RowDefinition Height="200" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <Image Source="/Res/img/rank1.png" Margin="20,0,0,0" />
-                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" FontSize="16">
+                        <Grid x:Name="r_output_base">
+                            <Image Source="/Res/img/rbgt.png" VerticalAlignment="Top" Stretch="UniformToFill" />
+                            <Image Source="/Res/img/rbgb.png" VerticalAlignment="Bottom" Stretch="UniformToFill" />
+                            <Grid Margin="55,310,55,55">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="10" />
+                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="110" />
+                                    <RowDefinition Height="160" />
+                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="160" />
+                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="160" />
+                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="160" />
+                                    <RowDefinition Height="200" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="40" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <Image Source="/Res/img/rank1.png" Grid.Row="1" />
+                                <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" FontSize="16" Grid.Row="1">
                                 <Run x:Name="r_r_startday" Text="XXXX年XX月XX日" FontSize="24" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
                                 <Run Text="{ll:Str 你第一次遇到了这只可爱的小东西}" /><LineBreak />
                                 <Run Text="{ll:Str '初次见面，主人~'}" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="1" Grid.ColumnSpan="2" FontSize="16" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                </TextBlock>
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="2" FontSize="16" MaxWidth="500" TextWrapping="Wrap"
+                                        Grid.ColumnSpan="2">
                                 <Run Text="{ll:Str 你和}" /><Run x:Name="r_r_petname_2" Text="萝莉斯" /><Run
-                                        Text="{ll:Str 一共生活了}" /> <Run x:Name="r_r_startlength" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str r天}" /><LineBreak />
+                                            Text="{ll:Str 一共生活了}" /> <Run x:Name="r_r_startlength" Text="XX"
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str r天}" /><LineBreak />
                                 <Run Text="{ll:Str 你陪伴她的时长是}" /> <Run x:Name="r_r_length_h" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r小时}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r小时}" /><LineBreak />
                                 <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_length_p" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
                                 <Run x:Name="r_r_lenghranktext" Text="主人~感谢陪伴~" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="2" Grid.ColumnSpan="2" FontSize="16" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" />
+                                </TextBlock>
+
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="3" FontSize="16" MaxWidth="300" TextWrapping="Wrap">
                                  <Run Text="{ll:Str 平均一天有}" /> <Run x:Name="r_r_lengthph" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 小时在一起}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 小时在一起}" /><LineBreak />
                                  <Run Text="{ll:Str 相当于平均和}" /> <Run x:Name="r_r_lengthphtext" Text="同学"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 在一起的时间}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 在一起的时间}" /><LineBreak />
                                  <Run x:Name="r_r_lenghtext" Text="学长~前辈"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="3" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_timelength" Source="/Res/img/r_timelength_1.png" Grid.Row="3"
+                                        Grid.Column="1" HorizontalAlignment="Left" />
+                                <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="4" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
                                 <Run Text="{ll:Str 你的等级是}" /> <Run x:Name="r_r_level" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r级}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r级}" /><LineBreak />
                                 <Run Text="{ll:Str 累计获得经验}" /> <Run x:Name="r_r_exp" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
                                 <Run Text="{ll:Str 累计学习时间是}" /> <Run x:Name="r_r_studytime" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r分钟}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r分钟}" /><LineBreak />
                                <Run x:Name="r_r_studytext" Text="相当于桌宠的小学学历哦&#13;“肃清! 萝莉斯的安魂曲☆”"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <Image Source="/Res/img/rank2.png" Margin="40,20,0,20" Grid.Row="3" />
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="4" Grid.ColumnSpan="2" FontSize="16" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_exp" Source="/Res/img/r_level_1.png" Grid.Row="4" />
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="5" FontSize="16" MaxWidth="300" TextWrapping="Wrap">
                              <Run Text="{ll:Str 单次学习最大获得}" /> <Run x:Name="r_r_studyexpmax" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 经验}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 经验}" /><LineBreak />
                              <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_studyexpmaxrank" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
                              <Run x:Name="r_r_studyexptext" Text="看我量子速读法!"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="5" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_singleexp" Source="/Res/img/r_singleexp_1.png" Grid.Row="5"
+                                        Grid.Column="1" HorizontalAlignment="Left" />
+                                <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="6" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
                                 <Run Text="{ll:Str 累计工作时间是}" /> <Run x:Name="r_r_worktime" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r分钟}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r分钟}" /><LineBreak />
                                 <Run Text="{ll:Str 工作占总时间}" /> <Run x:Name="r_r_worktimeps" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
                                 <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_worktimepsrank" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str r的主人}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str r的主人}" /><LineBreak />
                                <Run x:Name="r_r_worktext" Text="“我草，卷狗”"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <Image Source="/Res/img/rank3.png" Margin="40,20,0,20" Grid.Row="5" />
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="6" Grid.ColumnSpan="2" FontSize="16" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_money" Source="/Res/img/r_worktime_1.png" Grid.Row="6" />
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="7" FontSize="16" MaxWidth="300" TextWrapping="Wrap">
                                  <Run Text="{ll:Str 单次工作最大获得}" /> <Run x:Name="r_r_workmoneymax" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 金钱}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 金钱}" /><LineBreak />
                                  <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_workmoneyrank" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str r的主人}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str r的主人}" /><LineBreak />
                                  <Run x:Name="r_r_workmoneytext" Text="可是，我真的很需要那些钱钱!"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="7" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_singlemoney" Source="/Res/img/r_singlemoney_1.png" Grid.Row="7"
+                                        HorizontalAlignment="Left" Grid.Column="1" />
+                                <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="8" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
                                  <Run Text="{ll:Str 累计购买}" /> <Run x:Name="r_r_betterbuytimes" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 次更好买商品}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 次更好买商品}" /><LineBreak />
                                  <Run Text="{ll:Str 累计花费}" /> <Run x:Name="r_r_betterbuycount" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 金钱}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 金钱}" /><LineBreak />
                                  <Run Text="{ll:Str 其中最多购买的是}" /> <Run x:Name="r_r_betterbuymostitem" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 在分类}" /> <Run x:Name="r_r_betterbuymosttype" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 在分类}" /> <Run x:Name="r_r_betterbuymosttype" Text="XX"
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
                                 <Run x:Name="r_r_betterbuymosttext" Text="“多吃零食有益心理健康”"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <Image Source="/Res/img/rank4.png" Margin="40,20,0,20" Grid.Row="7" />
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="8" Grid.ColumnSpan="2" FontSize="16" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_mostfood" Grid.Row="8" Source="/Res/img/r_mostfood_Snack.png" />
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="9" FontSize="16" MaxWidth="500" TextWrapping="Wrap">
                                  <Run Text="{ll:Str 自动购买}" /> <Run x:Name="r_r_autobuy" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 次}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 次}" /><LineBreak />
                                  <Run Text="{ll:Str 占全部购买}" /> <Run x:Name="r_r_autobuypres" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak />
                                  <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_autobuyrank" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str r的主人}" /><LineBreak />
                                  <Run x:Name="r_r_autobuytext" Text="“不要小看我的情报网！你自动购买礼物没关，对不对？”"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="9" FontSize="16" MaxWidth="350" TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_autobuy" Grid.Row="9" Source="/Res/img/r_autobuy_1.png"
+                                        Grid.Column="1" HorizontalAlignment="Left" />
+                                <TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10,0,10,0" Grid.Row="10" FontSize="16" MaxWidth="350"
+                                        TextWrapping="Wrap">
                                    <Run Text="{ll:Str 你订阅了}" /> <Run x:Name="r_r_modcount" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 个mod}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 个mod}" /><LineBreak />
                                    <Run Text="{ll:Str 启用的其中的}" /> <Run x:Name="r_r_modenablecount" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 个mod}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 个mod}" /><LineBreak />
                                    <Run Text="{ll:Str 你订阅mod数超过了全球}" /> <Run x:Name="r_r_modcountrank" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str r的主人}" /><LineBreak />
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str r的主人}" /><LineBreak />
                                   <Run x:Name="r_r_modcounttext" Text="“主人已经是mod大师了喵，要不要试试mod制作器，给我做mod喵”"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <Image Source="/Res/img/rank5.png" Margin="40" Grid.Row="9" />
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="10,0,10,0" Grid.Row="10" Grid.ColumnSpan="2" FontSize="20" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_mod" Source="/Res/img/r_mod_1.png" Grid.Row="10" />
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="10" Grid.Row="11" Grid.ColumnSpan="2" FontSize="20" MaxWidth="500"
+                                        TextWrapping="Wrap">
                                  <Run Text="{ll:Str 睡了}" /> <Run x:Name="r_r_sleeplength" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 小时的觉}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 小时的觉}" /><LineBreak />
                                  <Run Text="{ll:Str 移动了}" /> <Run x:Name="r_r_movelength" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><Run 
-                                        Text="px" FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '的距离'}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><Run
+                                            x:Name="r_r_movelengthcm" Text="px" 
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str '的距离'}" /><LineBreak />
                                  <Run Text="{ll:Str 说了}" /> <Run x:Name="r_r_saycount" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '句话'}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '句话'}" /><LineBreak />
                                  <Run Text="{ll:Str 跳了}" /> <Run x:Name="r_r_musiccount" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '次舞蹈'}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '次舞蹈'}" /><LineBreak />
                                  <Run Text="{ll:Str 摸了}" /> <Run x:Name="r_r_touchtotal" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '次头'}" /><LineBreak />                                 
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str '次头'}" /><LineBreak />                                 
                                  <Run Text="&quot;" Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" /><Run
-                                        Text="{ll:Str '吃喝玩乐睡, 惨了养成猪了'}" Foreground="{DynamicResource DARKPrimaryDarker}"
-                                        FontWeight="Bold" /><Run Text="&quot;"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Margin="40" Grid.Row="11" Grid.ColumnSpan="2" FontSize="20" MaxWidth="500"
-                                    TextWrapping="Wrap">
+                                            Text="{ll:Str '吃喝玩乐睡, 惨了养成猪了'}"
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" /><Run
+                                            Text="&quot;" Foreground="{DynamicResource DARKPrimaryDarker}"
+                                            FontWeight="Bold" />
+                                </TextBlock>
+                                <Image x:Name="r_i_like" Source="/Res/img/rank2.png" Grid.Row="12" Grid.ColumnSpan="2" />
+                                <TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                        Margin="40" Grid.Row="13" Grid.ColumnSpan="2" FontSize="20" MaxWidth="500"
+                                        TextWrapping="Wrap">
                                  <Run Text="{ll:Str 打开游戏次数是}" /> <Run x:Name="r_r_opencount" Text="XX" FontWeight="Bold"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 次}" /><LineBreak />
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /> <Run Text="{ll:Str 次}" /><LineBreak />
                                  <Run Text="{ll:Str 你照顾的}" /><Run x:Name="r_r_petname_3" Text="萝莉斯" /><Run
-                                        Text="{ll:Str 满状态次数是}" /> <Run x:Name="r_r_bettercount" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str '次'}" /><LineBreak /><LineBreak />
+                                            Text="{ll:Str 满状态次数是}" /> <Run x:Name="r_r_bettercount" Text="XX"
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str '次'}" /><LineBreak /><LineBreak />
                                  <Run x:Name="r_r_petname_4" Text="萝莉斯" /><Run Text="{ll:Str 对你的好感度是}" /><LineBreak /> <Run
-                                        x:Name="r_r_likecount" Text="&#xEE0E;&#xEE0E;&#xEE0E;&#xEE0F;" FontWeight="Bold"
-                                        FontFamily="/VPet-Simulator.Windows;component/Res/#remixicon"
-                                        Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak /><LineBreak />
+                                            x:Name="r_r_likecount" Text="&#xEE0E;&#xEE0E;&#xEE0E;&#xEE0F;"
+                                            FontWeight="Bold"
+                                            FontFamily="/VPet-Simulator.Windows;component/Res/#remixicon"
+                                            Foreground="{DynamicResource DARKPrimaryDark}" /><LineBreak /><LineBreak />
                                  <Run Text="{ll:Str 超过了全球}" /> <Run x:Name="r_r_likecountrank" Text="XX"
-                                        FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
-                                        Text="{ll:Str 'r的主人'}" /><LineBreak />                                 
+                                            FontWeight="Bold" Foreground="{DynamicResource DARKPrimaryDark}" /> <Run
+                                            Text="{ll:Str 'r的主人'}" /><LineBreak />                                 
                                  <LineBreak />
                                 <Run Text="&quot;" Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" /><Run
-                                        Text="{ll:Str '最喜欢你了主人~ 新的一年请多多关照喵~'}"
-                                        Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" /><Run
-                                        Text="&quot;" Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" />
-                            </TextBlock>
-                            <Image Source="/Res/img/rank6.png" Grid.Row="12" Grid.ColumnSpan="2" Stretch="UniformToFill" />
-                            <TextBlock Grid.Row="12" Grid.ColumnSpan="2" VerticalAlignment="Bottom"
-                                    HorizontalAlignment="Left" Foreground="{DynamicResource DARKPrimaryText}"
-                                    Margin="10" FontWeight="Bold">
-                                <Run Text="To" FontSize="16" /> <Run x:Name="r_r_petname" Text="萝莉斯" FontSize="16" /> <LineBreak />
-                                <Run Text="By" FontSize="16" /> <Run x:Name="r_r_username" Text="洛里斯杨远" FontSize="16" /> <LineBreak />
-                                @<Run Text="{ll:Str 虚拟桌宠模拟器}" /> (<Run x:Name="r_r_now" Text="2023/12/29" />) TEST VERSION
+                                            Text="{ll:Str '最喜欢你了主人~ 新的一年请多多关照喵~'}"
+                                            Foreground="{DynamicResource DARKPrimaryDarker}" FontWeight="Bold" /><Run
+                                            Text="&quot;" Foreground="{DynamicResource DARKPrimaryDarker}"
+                                            FontWeight="Bold" />
+                                </TextBlock>
+                                <Image Source="/Res/img/rank3.png" Grid.Row="14" Grid.ColumnSpan="2" />
+                            </Grid>
+                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Left"
+                                    Foreground="{DynamicResource DARKPrimaryDarker}" Margin="60,0,0,55"
+                                    FontWeight="Bold" FontSize="16">
+                                    <Run Text="To" FontSize="20" /> <Run x:Name="r_r_petname" Text="萝莉斯" FontSize="24" /> <LineBreak />
+                                    <Run Text="By" FontSize="20" /> <Run x:Name="r_r_username" Text="洛里斯杨远"
+                                        FontSize="24" /> <LineBreak />
+                                    @<Run Text="{ll:Str 虚拟桌宠模拟器}" /> (<Run x:Name="r_r_now" Text="2023/12/29" />)
                             </TextBlock>
                         </Grid>
                     </Viewbox>

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

@@ -15,6 +15,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Media.Effects;
 using System.Windows.Media.Imaging;
 using System.Xml.Linq;
 using VPet_Simulator.Windows.Interface;
@@ -236,8 +237,14 @@ namespace VPet_Simulator.Windows
             };
             if (saveFileDialog.ShowDialog() != true)
                 return;
-            RenderTargetBitmap image = new RenderTargetBitmap((int)r_output.ActualWidth, (int)r_output.ActualHeight, 96, 96, PixelFormats.Pbgra32);
-            image.Render(r_output);
+            r_viewbox.ScrollToTop();
+            FrameworkElement outputbox;
+            if (r_output.ActualWidth > r_output_base.ActualWidth)
+                outputbox = r_output;
+            else
+                outputbox = r_output_base;
+            RenderTargetBitmap image = new RenderTargetBitmap((int)outputbox.ActualWidth, (int)outputbox.ActualHeight, 96, 96, PixelFormats.Pbgra32);
+            image.Render(outputbox);
             var path = saveFileDialog.FileName;
             using (MemoryStream ms = new MemoryStream())
             {
@@ -264,16 +271,18 @@ namespace VPet_Simulator.Windows
 
         private void btn_r_genRank_Click(object sender, RoutedEventArgs e)
         {
+            btn_r_genRank.IsEnabled = false;
             pb_r_genRank.Value = 0;
             pb_r_genRank.Visibility = Visibility.Visible;
-            btn_r_genRank.IsEnabled = false;
             Task.Run(GenRank);
         }
         private async void GenRank()
         {
+            mw.Set["v"][(gint)"rank"] = DateTime.Now.Year;
             bool useranking = mw.IsSteamUser && await Dispatcher.InvokeAsync(() => cb_AgreeUpload.IsChecked == true);
 
-            string petname = mw.IsSteamUser ? SteamClient.Name : Environment.UserName;
+            string petname = mw.GameSavesData.GameSave.Name;
+            string username = mw.IsSteamUser ? SteamClient.Name : Environment.UserName;
 
             int timelength = mw.GameSavesData.Statistics[(gint)"stat_total_time"];
             double timelength_h = (timelength / 3600.0);
@@ -295,44 +304,66 @@ namespace VPet_Simulator.Windows
             double timelengthph = timelength_h / startdatelength;
             string timelengthphtext;
             string timelengthtext;
+            int timelength_i;
             if (timelengthph < 2)
             {
                 timelengthphtext = "同学".Translate();
                 timelengthtext = '"' + "学长~前辈~".Translate() + '"';
+                timelength_i = 1;
             }
             else if (timelengthph < 4)
             {
                 timelengthphtext = "朋友".Translate();
                 timelengthtext = '"' + "兄弟!".Translate() + '"';
+                timelength_i = 2;
             }
             else if (timelengthph < 7)
             {
                 timelengthphtext = "挚友".Translate();
                 timelengthtext = '"' + "不求同年同月同日生，但求同年同月同日打开《虚拟桌宠模拟器》".Translate() + '"';
+                timelength_i = 3;
             }
             else if (timelengthph < 10)
             {
                 timelengthphtext = "家人".Translate();
                 timelengthtext = '"' + "We are 伐木累~".Translate() + '"';
+                timelength_i = 4;
             }
             else
             {
                 timelengthphtext = "女鹅".Translate();
                 timelengthtext = '"' + "爸妈~ 这么叫好像不太好".Translate() + '"';
+                timelength_i = 5;
             }
 
             await Dispatcher.InvokeAsync(() => pb_r_genRank.Value = 10);
             string studytext;
+            int study_i;
             if (mw.GameSavesData.GameSave.Level < 20)
+            {
                 studytext = "相当于桌宠的小学学历哦\n\"肃清! {0}的安魂曲☆\"".Translate(petname);
+                study_i = 1;
+            }
             else if (mw.GameSavesData.GameSave.Level < 40)
+            {
                 studytext = "相当于桌宠的中学学历哦\n<高考桌宠100天>".Translate();
+                study_i = 2;
+            }
             else if (mw.GameSavesData.GameSave.Level < 60)
+            {
                 studytext = "相当于桌宠的大学学历哦\n\"大学生上课吃饭睡觉, {0}学习吃饭睡觉, {0}＝大学生\"".Translate(petname);
+                study_i = 3;
+            }
             else if (mw.GameSavesData.GameSave.Level < 80)
+            {
                 studytext = "相当于桌宠的博士学历哦\n\"大学生上课吃饭睡觉, 人家和那个带兜帽的没关系啦\"".Translate();
+                study_i = 4;
+            }
             else
-                studytext = "<虚拟桌宠模拟器砖家>\n\"一定是{0}干的!\"".Translate(petname);
+            {
+                studytext = "<虚拟桌宠模拟器砖家>\n\"一定是{0}干的!\"".Translate(username);
+                study_i = 5;
+            }
 
             int studyexpmax, studymoneymax;
             double studyexpmaxrank = 0, studymoneymaxrank = 0;
@@ -360,23 +391,53 @@ namespace VPet_Simulator.Windows
                 studymoneymaxrank = 1 - ((result?.NewGlobalRank - 1) ?? length) / length;
             }
             string studyexptext, workmoneytext;
+            int studyexp_i, workmoney_i;
             if (studyexpmaxrank < 0.25)
+            {
                 studyexptext = '"' + "在你这个年纪,你怎么睡得着觉的?".Translate() + '"';
-            else if (studyexpmaxrank < 0.5)
-                studyexptext = '"' + "学而不思则罔，思而不学则die".Translate() + '"';
+                studyexp_i = 5;
+            }
+            else if (studyexpmaxrank < 0.4)
+            {
+                studyexptext = '"' + "孩子学习老不好，多半是废了，快来试试思维驰学习机".Translate() + '"';
+                studyexp_i = 4;
+            }
+            else if (studyexpmaxrank < 0.55)
+            {
+                studyexptext = '"' + "孩子学习老不好，多半是废了，快来试试思维驰学习机".Translate() + '"';
+                studyexp_i = 3;
+            }
             else if (studyexpmaxrank < 0.75)
-                studyexptext = '"' + "学习?".Translate() + '"';
+            {
+                studyexptext = '"' + "学而不思则罔，思而不学则die".Translate() + '"';
+                studyexp_i = 2;
+            }
             else
+            {
                 studyexptext = '"' + "看我量子速读法!".Translate() + '"';
+                studyexp_i = 1;
+            }
 
             if (studymoneymaxrank < 0.25)
+            {
                 workmoneytext = '"' + "钱钱乃身外之物".Translate() + '"';
+                workmoney_i = 4;
+            }
             else if (studymoneymaxrank < 0.5)
+            {
                 workmoneytext = '"' + "风声雨声读书声声声入耳，日结月结次次结钱钱入账".Translate() + '"';
+                workmoney_i = 3;
+            }
             else if (studymoneymaxrank < 0.75)
+            {
                 workmoneytext = '"' + "有钱能使磨推鬼".Translate() + '"';
+                workmoney_i = 2;
+            }
             else
+            {
                 workmoneytext = '"' + "可是，我真的很需要那些钱钱!".Translate() + '"';
+                workmoney_i = 1;
+            }
 
             await Dispatcher.InvokeAsync(() => pb_r_genRank.Value = 40);
 
@@ -391,14 +452,37 @@ namespace VPet_Simulator.Windows
                 worktimephrank = 1 - ((result?.NewGlobalRank - 1) ?? length) / length;
             }
             string worktimephtext;
+            int worktime_i;
             if (worktimephrank < 0.25)
+            {
                 worktimephtext = '"' + "干一天来歇一天, 能混一天是一天".Translate() + '"';
-            else if (worktimephrank < 0.5)
+                worktime_i = 1;
+            }
+            else if (worktimephrank < 0.35)
+            {
                 worktimephtext = '"' + "早8晚5，快乐回家".Translate() + '"';
+                worktime_i = 2;
+            }
+            else if (worktimephrank < 0.45)
+            {
+                worktimephtext = '"' + "早8晚5，快乐回家".Translate() + '"';
+                worktime_i = 3;
+            }
+            else if (worktimephrank < 0.55)
+            {
+                worktimephtext = '"' + "早8晚5，快乐回家".Translate() + '"';
+                worktime_i = 4;
+            }
             else if (worktimephrank < 0.75)
+            {
                 worktimephtext = '"' + "加班没有加班费不是基本常识吗?".Translate() + '"';
+                worktime_i = 5;
+            }
             else
+            {
                 worktimephtext = '"' + "老板! 路灯已经准备好了!".Translate() + '"';
+                worktime_i = 6;
+            }
 
             int betterbuytimes = mw.GameSavesData.Statistics[(gint)"stat_buytimes"];
             int betterbuycount = (int)mw.GameSavesData.Statistics[(gdbe)"stat_betterbuy"];
@@ -408,9 +492,9 @@ namespace VPet_Simulator.Windows
                 Name = "None",
             };
 
-            foreach (string name in mw.GameSavesData.Statistics.Data.Where(x => x.Key.StartsWith("buy_")).OrderByDescending(x => x.Value).Select(x => x.Key))
+            foreach (var pair in mw.GameSavesData.Statistics.Data.Where(x => x.Key.StartsWith("buy_")).OrderByDescending(x => ((int)x.Value)))
             {
-                var fn = name.Substring(4);
+                var fn = pair.Key.Substring(4);
                 var f = mw.Foods.FirstOrDefault(x => x.Name == fn);
                 if (f != null)
                 {
@@ -418,6 +502,7 @@ namespace VPet_Simulator.Windows
                     break;
                 }
             }
+
             string foodtext = "啥也没吃,{0}都饿坏了".Translate(petname);
             switch (mostfood.Type)
             {
@@ -454,14 +539,27 @@ namespace VPet_Simulator.Windows
                 autobuytimesphrank = 1 - ((result?.NewGlobalRank - 1) ?? length) / length;
             }
             string autobuytext;
+            int autobuy_i;
             if (autobuytimesph < 0.25)
+            {
                 autobuytext = '"' + "主人, 是担心我乱买东西嘛".Translate() + '"';
+                autobuy_i = 4;
+            }
             else if (autobuytimesph < 0.5)
+            {
                 autobuytext = '"' + "自己赚的钱自己花".Translate() + '"';
+                autobuy_i = 3;
+            }
             else if (autobuytimesph < 0.75)
+            {
                 autobuytext = '"' + "不要小看我的情报网! 你自动购买礼物没关,对不对?".Translate() + '"';
+                autobuy_i = 2;
+            }
             else
+            {
                 autobuytext = '"' + "诚招保姆,工资面议".Translate() + '"';
+                autobuy_i = 1;
+            }
 
             await Dispatcher.InvokeAsync(() => pb_r_genRank.Value = 70);
 
@@ -477,12 +575,21 @@ namespace VPet_Simulator.Windows
                 modworkshoprank = 1 - ((result?.NewGlobalRank - 1) ?? length) / length;
             }
             string modworkshoptext;
+            int modworkshop_i;
             if (modworkshop == 0)
+            {
                 modworkshoptext = '"' + "桌宠的steam创意工坊里有许多的mod喵, 主人快去试试吧".Translate() + '"';
+                modworkshop_i = 3;
+            }
             else if (modworkshoprank < 0.3)
-                modworkshoptext = '"' + "创意工坊又更新了很多有趣的mod喵, 主人要不要去看看?".Translate() + '"';
+            {
+                modworkshoptext = '"' + "主人还可以再去创意工坊体验更多MOD喵".Translate() + '"';
+                modworkshop_i = 3;
+            }
+            else if (modworkshoprank < 0.7)
+            { modworkshoptext = '"' + "创意工坊又更新了很多有趣的mod喵, 主人要不要去看看?".Translate() + '"'; modworkshop_i = 2; }
             else
-                modworkshoptext = '"' + "主人已经是mod大师了喵,要不要试试mod制作器,给我做mod喵!".Translate() + '"';
+            { modworkshoptext = '"' + "主人已经是mod大师了喵,要不要试试mod制作器,给我做mod喵!".Translate() + '"'; modworkshop_i = 1; }
 
             await Dispatcher.InvokeAsync(() => pb_r_genRank.Value = 80);
 
@@ -498,7 +605,7 @@ namespace VPet_Simulator.Windows
                 like -= 50;
                 liketext += '\uEE0F';
             }
-            if(liketext.Length == 0)
+            if (liketext.Length == 0)
             {
                 liketext = "\uEECA";
             }
@@ -523,27 +630,32 @@ namespace VPet_Simulator.Windows
                 r_r_lengthph.Text = timelengthph.ToString("f1");
                 r_r_lengthphtext.Text = timelengthphtext;
                 r_r_lenghtext.Text = timelengthtext;
+                r_i_timelength.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_timelength_{timelength_i}.png"));
 
                 r_r_level.Text = mw.GameSavesData.GameSave.Level.ToString();
                 r_r_exp.Text = mw.GameSavesData.GameSave.Exp.ToString("f0");
                 r_r_studytime.Text = (mw.GameSavesData.Statistics[(gint)"stat_study_time"] / 60).ToString();
                 r_r_studytext.Text = studytext;
+                r_i_exp.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_level_{study_i}.png"));
 
                 r_r_studyexpmax.Text = studyexpmax.ToString();
                 r_r_studyexpmaxrank.Text = studyexpmaxrank.ToString("p1");
                 r_r_studyexptext.Text = studyexptext;
+                r_i_singleexp.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_singleexp_{studyexp_i}.png"));
 
                 r_r_worktime.Text = (worktime / 60).ToString();
                 r_r_worktimeps.Text = worktimeph.ToString("p1");
                 r_r_worktimepsrank.Text = worktimephrank.ToString("p1");
                 r_r_worktext.Text = worktimephtext;
+                r_i_money.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_worktime_{worktime_i}.png"));
 
                 r_r_workmoneymax.Text = studymoneymax.ToString();
                 r_r_workmoneyrank.Text = studymoneymaxrank.ToString("p1");
                 r_r_workmoneytext.Text = workmoneytext;
+                r_i_singlemoney.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_singlemoney_{workmoney_i}.png"));
 
-                r_r_username.Text = petname;
-                r_r_petname.Text = r_r_petname_2.Text = r_r_petname_3.Text = r_r_petname_4.Text = mw.GameSavesData.GameSave.Name;
+                r_r_username.Text = username;
+                r_r_petname.Text = r_r_petname_2.Text = r_r_petname_3.Text = r_r_petname_4.Text = petname;
                 r_r_now.Text = DateTime.Now.ToShortDateString();
 
                 r_r_betterbuytimes.Text = betterbuytimes.ToString();
@@ -551,23 +663,32 @@ namespace VPet_Simulator.Windows
                 r_r_betterbuymosttype.Text = mostfood.Type.ToString().Translate();
                 r_r_betterbuymostitem.Text = mostfood.TranslateName;
                 r_r_betterbuymosttext.Text = foodtext;
+                r_i_mostfood.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_mostfood_{mostfood.Type}.png"));
 
                 r_r_autobuy.Text = autobuytimes.ToString();
                 r_r_autobuypres.Text = autobuytimesph.ToString("p1");
                 r_r_autobuyrank.Text = autobuytimesphrank.ToString("p1");
                 r_r_autobuytext.Text = autobuytext;
+                r_i_autobuy.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_autobuy_{autobuy_i}.png"));
 
                 r_r_modcount.Text = modworkshop.ToString();
                 r_r_modenablecount.Text = modon.ToString();
                 r_r_modcountrank.Text = modworkshoprank.ToString("p1");
                 r_r_modcounttext.Text = modworkshoptext;
+                r_i_mod.Source = new BitmapImage(new Uri($"pack://application:,,,/Res/img/r_mod_{modworkshop_i}.png"));
 
                 r_r_sleeplength.Text = (mw.GameSavesData.Statistics[(gint)"stat_sleep_time"] / 3600.0).ToString("f1");
-                r_r_movelength.Text = mw.GameSavesData.Statistics[(gint)"stat_move_length"].ToString();
+                r_r_movelength.Text = px_tocm(mw.GameSavesData.Statistics[(gi64)"stat_move_length"], out string cm);
+                r_r_movelengthcm.Text = cm;
                 r_r_saycount.Text = mw.GameSavesData.Statistics[(gint)"stat_say_times"].ToString();
                 r_r_musiccount.Text = mw.GameSavesData.Statistics[(gint)"stat_music"].ToString();
                 r_r_touchtotal.Text = (mw.GameSavesData.Statistics[(gint)"stat_touch_body"] + mw.GameSavesData.Statistics[(gint)"stat_touch_head"]).ToString();
 
+                if (mw.GameSavesData.GameSave.Likability > 100)
+                    r_i_like.Visibility = Visibility.Visible;
+                else
+                    r_i_like.Visibility = Visibility.Collapsed;
+
                 r_r_opencount.Text = mw.GameSavesData.Statistics[(gint)"stat_open_times"].ToString();
                 r_r_bettercount.Text = mw.GameSavesData.Statistics[(gint)"stat_100_all"].ToString();
                 r_r_likecount.Text = liketext;
@@ -577,7 +698,31 @@ namespace VPet_Simulator.Windows
                 btn_r_genRank.IsEnabled = true;
                 btn_r_save.IsEnabled = true;
                 pb_r_genRank.Visibility = Visibility.Collapsed;
+                Width = 800;
             });
         }
+        private string px_tocm(long px, out string cm)
+        {
+            if (px < 37795)
+            {
+                cm = "px";
+                return px.ToString();
+            }
+            else if (px < 3779527)
+            {
+                cm = "cm";
+                return (px * 2.54 / 96).ToString("f1");
+            }
+            else if (px < 377952755)
+            {
+                cm = "m";
+                return (px * 2.54 / 9600).ToString("f1");
+            }
+            else
+            {
+                cm = "km";
+                return (px * 2.54 / 9600000).ToString("f1");
+            }
+        }
     }
 }

VPet-Simulator.Windows/mod/0000_core/lang/en/Prog2312.lps

@@ -45,8 +45,8 @@ We are 伐木累~#We are Family.:|
 同意上传统计数据至Steam排行榜#Agree to upload stats to Steam Leaderboards:|
 你第一次遇到了这只可爱的小东西#Your first encounter with this cute little thing:|
 初次见面，主人~#First encounter, master~:|
-你和#You and:|
-一共生活了#lived together for:|
+你和#You and :|
+一共生活了# lived together for:|
 r天#Days:|
 你陪伴她的时长是#The length of time you stayed with her was:|
 r小时#Hours.:|
@@ -101,3 +101,7 @@ Drink#Drink:|
 Functional#Functional:|
 Drug#Drug:|
 Gift#Gift:|
+孩子学习老不好，多半是废了，快来试试思维驰学习机#The child's learning is not good, mostly waste, come and try the Nintendo switch learning machine:|
+主人还可以再去创意工坊体验更多MOD喵#Master can also go to the workshop to experience more MOD:|
+点击前往查看#Click to view:|
+哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#Humph~Master, my exam results are out, come and see my report card with me:|

VPet-Simulator.Windows/mod/0000_core/lang/zh-Hans/Prog2312.lps

@@ -101,3 +101,7 @@ Drink#饮料:|
 Functional#功能性:|
 Drug#药品:|
 Gift#礼品:|
+孩子学习老不好，多半是废了，快来试试思维驰学习机#孩子学习老不好，多半是废了，快来试试思维驰学习机:|
+主人还可以再去创意工坊体验更多MOD喵#主人还可以再去创意工坊体验更多MOD喵:|
+点击前往查看#点击前往查看:|
+哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵:|

VPet-Simulator.Windows/mod/0000_core/lang/zh-Hant/Prog2312.lps

@@ -101,3 +101,7 @@ Drink#飲料:|
 Functional#功能性:|
 Drug#藥品:|
 Gift#禮品:|
+孩子学习老不好，多半是废了，快来试试思维驰学习机#孩子學習老不好，多半是廢了，快來試試思維馳學習機:|
+主人还可以再去创意工坊体验更多MOD喵#主人還可以再去創意工坊體驗更多MOD喵:|
+点击前往查看#點擊前往查看:|
+哼哼~主人，我的考试成绩出炉了哦，快来和我一起看我的成绩单喵#哼哼~主人，我的考試成績出爐了哦，快來和我一起看我的成績單喵:|