From 2ae8314154cd6cc0fdbb00d89d1fd83b601850a9 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Mon, 24 Jul 2023 11:53:55 +1000
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=90=E8=97=8F=E5=80=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/ToolBar.xaml    | 23 ++++++++++++++-------
 VPet-Simulator.Core/Display/ToolBar.xaml.cs |  4 ++++
 VPet-Simulator.Core/Handle/GameSave.cs      |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml b/VPet-Simulator.Core/Display/ToolBar.xaml
index e60192e..0c17820 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml
@@ -15,9 +15,9 @@
     </UserControl.Resources>
     <Grid x:Name="MainGrid" x:FieldModifier="public">
         <Border x:Name="BdrPanel" VerticalAlignment="Bottom" Margin="0,0,0,55" TextBlock.FontSize="24"
-                Visibility="Collapsed" TextElement.FontSize="24" BorderBrush="{DynamicResource DARKPrimaryDarker}"
-                BorderThickness="1" Background="{DynamicResource DARKPrimaryText}" CornerRadius="5"
-                MouseLeave="MenuPanel_MouseLeave" x:FieldModifier="public">
+                TextElement.FontSize="24" BorderBrush="{DynamicResource DARKPrimaryDarker}" BorderThickness="1"
+                Background="{DynamicResource DARKPrimaryText}" CornerRadius="5" MouseLeave="MenuPanel_MouseLeave"
+                x:FieldModifier="public" Visibility="Collapsed">
             <Grid Margin="15">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
@@ -79,19 +79,28 @@
                 <TextBlock x:Name="tFeeling" Grid.Row="5" Grid.Column="4" HorizontalAlignment="Right" Text="+1/t"
                         Foreground="{DynamicResource DARKPrimary}" />
                 <TextBlock Grid.Row="6" Text="{ll:Str 饱腹度}" VerticalAlignment="Center" />
+                <ProgressBar x:Name="pStrengthFoodMax" Grid.Row="6" Grid.Column="2" Value="90" FontSize="20" Height="20"
+                        VerticalAlignment="Center" Maximum="100" pu:ProgressBarHelper.CornerRadius="10" Opacity="0.5"
+                        Foreground="{DynamicResource ProgressBarForeground}" Background="#FFDDDDDD" />
                 <ProgressBar x:Name="pStrengthFood" Grid.Row="6" Grid.Column="2" Value="80" FontSize="20" Height="20"
                         VerticalAlignment="Center" Maximum="100" pu:ProgressBarHelper.CornerRadius="10"
                         Foreground="{DynamicResource ProgressBarForeground}"
                         pu:ProgressBarHelper.IsPercentVisible="True"
-                        pu:ProgressBarHelper.GeneratingPercentText="PgbHunger_GeneratingPercentText" />
+                        pu:ProgressBarHelper.GeneratingPercentText="PgbHunger_GeneratingPercentText"
+                        Background="{x:Null}" />
+
                 <TextBlock x:Name="tStrengthFood" Grid.Row="6" Grid.Column="4" HorizontalAlignment="Right" Text="+1/t"
                         Foreground="{DynamicResource DARKPrimary}" />
                 <TextBlock Grid.Row="7" Text="{ll:Str 口渴度}" VerticalAlignment="Center" />
+                <ProgressBar x:Name="pStrengthDrinkMax" Grid.Row="7" Grid.Column="2" Value="90" FontSize="20"
+                        Height="20" VerticalAlignment="Center" Maximum="100" pu:ProgressBarHelper.CornerRadius="10"
+                        Opacity="0.5" Foreground="{DynamicResource ProgressBarForeground}" Background="#FFDDDDDD" />
                 <ProgressBar x:Name="pStrengthDrink" Grid.Row="7" Grid.Column="2" Value="20" FontSize="20" Height="20"
                         VerticalAlignment="Center" Maximum="100" pu:ProgressBarHelper.CornerRadius="10"
                         Foreground="{DynamicResource ProgressBarForeground}"
                         pu:ProgressBarHelper.IsPercentVisible="True"
-                        pu:ProgressBarHelper.GeneratingPercentText="PgbThirsty_GeneratingPercentText" />
+                        pu:ProgressBarHelper.GeneratingPercentText="PgbThirsty_GeneratingPercentText"
+                        Background="{x:Null}" />
                 <TextBlock x:Name="tStrengthDrink" Grid.Row="7" Grid.Column="4" HorizontalAlignment="Right" Text="+1/t"
                         Foreground="{DynamicResource DARKPrimary}" />
             </Grid>
@@ -113,8 +122,8 @@
                 <MenuItem x:Name="MenuWork" Header="{ll:Str 工作}" HorizontalContentAlignment="Center" />
                 <!--<MenuItem Header="说话" HorizontalContentAlignment="Center" IsEnabled="False" />-->
             </MenuItem>
-            <MenuItem x:Name="MenuDIY" Header="{ll:Str 自定}" HorizontalContentAlignment="Center"
-                    x:FieldModifier="public" Padding="0" />
+            <MenuItem x:Name="MenuDIY" Header="{ll:Str 自定}" HorizontalContentAlignment="Center" x:FieldModifier="public"
+                    Padding="0" />
             <MenuItem x:Name="MenuSetting" Header="{ll:Str 系统}" HorizontalContentAlignment="Center"
                     x:FieldModifier="public" Padding="0">
                 <MenuItem x:Name="MenuMODConfig" Header="{ll:Str MOD设置}" HorizontalContentAlignment="Center"
diff --git a/VPet-Simulator.Core/Display/ToolBar.xaml.cs b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
index 0976125..c7138de 100644
--- a/VPet-Simulator.Core/Display/ToolBar.xaml.cs
+++ b/VPet-Simulator.Core/Display/ToolBar.xaml.cs
@@ -171,6 +171,9 @@ namespace VPet_Simulator.Core
                 pFeeling.Value = m.Core.Save.Feeling;
                 pStrengthFood.Value = m.Core.Save.StrengthFood;
                 pStrengthDrink.Value = m.Core.Save.StrengthDrink;
+                pStrengthFoodMax.Value = Math.Min(100, m.Core.Save.StrengthFood + m.Core.Save.StoreStrengthFood);
+                pStrengthDrinkMax.Value = Math.Min(100, m.Core.Save.StrengthDrink + m.Core.Save.StoreStrengthDrink);
+
                 if (Math.Abs(m.Core.Save.ChangeStrength) > 1)
                     tStrength.Text = $"{m.Core.Save.ChangeStrength:f1}/t";
                 else
@@ -187,6 +190,7 @@ namespace VPet_Simulator.Core
                     tStrengthFood.Text = $"{m.Core.Save.ChangeStrengthFood:f1}/t";
                 else
                     tStrengthFood.Text = $"{m.Core.Save.ChangeStrengthFood:f2}/t";
+
             }
         }
 
diff --git a/VPet-Simulator.Core/Handle/GameSave.cs b/VPet-Simulator.Core/Handle/GameSave.cs
index e67d9b6..b0c0cbd 100644
--- a/VPet-Simulator.Core/Handle/GameSave.cs
+++ b/VPet-Simulator.Core/Handle/GameSave.cs
@@ -282,7 +282,7 @@ namespace VPet_Simulator.Core
         /// </summary>
         public ModeType CalMode()
         {
-            int realhel = 60 - (Feeling >= 80 ? 20 : 0) - (Likability >= 80 ? 20 : (Likability >= 40 ? 10 : 0));
+            int realhel = 60 - (Feeling >= 80 ? 12 : 0) - (Likability >= 80 ? 12 : (Likability >= 40 ? 6 : 0));
             //先从最次的开始
             if (Health <= realhel)
             {