Mirrored_Repos/VPet
1
0
Fork 0
mirror of https://github.com/LorisYounger/VPet.git synced 2024-08-30 18:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复数据计算设置bug

Browse Source
This commit is contained in:
ZouJin 2023-06-10 20:05:01 +10:00
parent a6d171d1a0
commit dfc75030e8
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
VPet-Simulator.Core/Display/MainLogic.cs
View File

@ -128,8 +128,8 @@ namespace VPet_Simulator.Core
Core.Save.Money += addmoney;
WorkTimer.GetCount += addmoney;
}
Core.Save.StrengthChangeFood(-TimePass * 3);
Core.Save.StrengthChangeDrink(-TimePass);
Core.Save.StrengthChangeFood(-TimePass * 4);
Core.Save.StrengthChangeDrink(-TimePass * 3);
break;
case WorkingState.WorkTWO:
//工作2 更加消耗体力
@ -156,8 +156,8 @@ namespace VPet_Simulator.Core
Core.Save.Money += addmoney;
WorkTimer.GetCount += addmoney;
}
Core.Save.StrengthChangeFood(-TimePass * 4);
Core.Save.StrengthChangeDrink(-TimePass * 6);
Core.Save.StrengthChangeFood(-TimePass * 5);
Core.Save.StrengthChangeDrink(-TimePass * 8);
break;
case WorkingState.Study:
//学习
@ -186,7 +186,7 @@ namespace VPet_Simulator.Core
WorkTimer.GetCount += addmoney;
}
Core.Save.StrengthChangeFood(-TimePass * 3);
Core.Save.StrengthChangeDrink(-TimePass * 2);
Core.Save.StrengthChangeDrink(-TimePass * 4);
goto default;
default://默认
//饮食等乱七八糟的消耗
@ -201,8 +201,8 @@ namespace VPet_Simulator.Core
Core.Save.Health -= Function.Rnd.Next(0, 1) * TimePass;
}
Core.Save.StrengthChangeFood(-TimePass * 2);
Core.Save.StrengthChangeDrink(-TimePass);
break;
Core.Save.StrengthChangeDrink(-TimePass * 2);
break;
}
//if (Core.GameSave.Strength <= 40)

8
VPet-Simulator.Core/Display/ToolBar.xaml.cs
View File

@ -59,19 +59,19 @@ namespace VPet_Simulator.Core
pFeeling.Value = m.Core.Save.Feeling;
pStrengthFood.Value = m.Core.Save.StrengthFood;
pStrengthDrink.Value = m.Core.Save.StrengthDrink;
if (m.Core.Save.ChangeStrength < 1)
if (Math.Abs(m.Core.Save.ChangeStrength) > 1)
tStrength.Text = $"{m.Core.Save.ChangeStrength:f1}/t";
else
tStrength.Text = $"{m.Core.Save.ChangeStrength:f2}/t";
if (m.Core.Save.ChangeFeeling < 1)
if (Math.Abs(m.Core.Save.ChangeFeeling) > 1)
tFeeling.Text = $"{m.Core.Save.ChangeFeeling:f1}/t";
else
tFeeling.Text = $"{m.Core.Save.ChangeFeeling:f2}/t";
if (m.Core.Save.ChangeStrengthDrink < 1)
if (Math.Abs(m.Core.Save.ChangeStrengthDrink) > 1)
tStrengthDrink.Text = $"{m.Core.Save.ChangeStrengthDrink:f1}/t";
else
tStrengthDrink.Text = $"{m.Core.Save.ChangeStrengthDrink:f2}/t";
if (m.Core.Save.ChangeStrengthFood < 1)
if (Math.Abs(m.Core.Save.ChangeStrengthFood) > 1)
tStrengthFood.Text = $"{m.Core.Save.ChangeStrengthFood:f1}/t";
else
tStrengthFood.Text = $"{m.Core.Save.ChangeStrengthFood:f2}/t";

3
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml
View File

@ -295,7 +295,8 @@
BoxHeight="18" ToggleSize="14" ToggleShadowColor="{x:Null}"
ToggleBrush="{DynamicResource PrimaryDark}"
CheckedToggleBrush="{DynamicResource DARKPrimaryText}" Margin="10,0,0,0"
ToolTip="启用数据计算,桌宠会有状态变化,需要按时投喂等.&#13;如果嫌麻烦可以关掉" Checked="CalFunctionBox_Checked" />
ToolTip="启用数据计算,桌宠会有状态变化,需要按时投喂等.&#13;如果嫌麻烦可以关掉" Checked="CalFunctionBox_Checked"
Unchecked="CalFunctionBox_Checked" />
<Grid Grid.Column="2" Grid.Row="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />

2
VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs
View File

@ -784,7 +784,7 @@ namespace VPet_Simulator.Windows
{
if (!AllowChange)
return;
MessageBoxX.Show("由于没做完,暂不支持数据计算\n敬请期待后续更新", "没做完!", MessageBoxButton.OK, MessageBoxIcon.Warning);
//MessageBoxX.Show("由于没做完,暂不支持数据计算\n敬请期待后续更新", "没做完!", MessageBoxButton.OK, MessageBoxIcon.Warning);
mw.Set.EnableFunction = CalFunctionBox.IsChecked.Value;
}