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

修复超模检查判断错误

Browse Source
This commit is contained in:
ZouJin 2023-09-17 23:49:08 +08:00
parent 214c72720d
commit 0152ba8278
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VPet-Simulator.Windows.Interface/ExtensionFunction.cs
View File

@ -20,7 +20,7 @@ namespace VPet_Simulator.Windows.Interface
/// <returns>是否超模</returns> /// <returns>是否超模</returns>
public static bool IsOverLoad(this Work work) public static bool IsOverLoad(this Work work)
{//判断这个工作是否超模 {//判断这个工作是否超模
if (work.FinishBonus <= 0) if (work.FinishBonus < 0)
return true; return true;
var spend = ((work.StrengthFood >= 0 ? 1 : -1) * Math.Pow(work.StrengthFood * 2 + 1, 2) / 6 + var spend = ((work.StrengthFood >= 0 ? 1 : -1) * Math.Pow(work.StrengthFood * 2 + 1, 2) / 6 +
(work.StrengthDrink >= 0 ? 1 : -1) * Math.Pow(work.StrengthDrink * 2 + 1, 2) / 9 + (work.StrengthDrink >= 0 ? 1 : -1) * Math.Pow(work.StrengthDrink * 2 + 1, 2) / 9 +

12
VPet-Simulator.Windows/MainWindow.cs
View File

@ -48,7 +48,7 @@ namespace VPet_Simulator.Windows
/// <summary> /// <summary>
/// 版本号 /// 版本号
/// </summary> /// </summary>
public int version { get; } = 105; public int version { get; } = 106;
/// <summary> /// <summary>
/// 版本号 /// 版本号
/// </summary> /// </summary>
@ -875,16 +875,18 @@ namespace VPet_Simulator.Windows
//看看是否超模 //看看是否超模
if (HashCheck && work.IsOverLoad()) if (HashCheck && work.IsOverLoad())
{ {
var spend = (Math.Pow(work.StrengthFood * 2 + 1, 2) / 6 + Math.Pow(work.StrengthDrink * 2 + 1, 2) / 9 + var spend = ((work.StrengthFood >= 0 ? 1 : -1) * Math.Pow(work.StrengthFood * 2 + 1, 2) / 6 +
Math.Pow(work.Feeling * 2 + 1, 2) / 12) * (Math.Pow(work.LevelLimit / 2 + 1, 0.5) / 4 + 1) - 0.5; (work.StrengthDrink >= 0 ? 1 : -1) * Math.Pow(work.StrengthDrink * 2 + 1, 2) / 9 +
(work.Feeling >= 0 ? 1 : -1) * Math.Pow((work.Type == Work.WorkType.Play ? -1 : 1) * work.Feeling * 2 + 1, 2) / 12) *
(Math.Pow(work.LevelLimit / 2 + 1, 0.5) / 4 + 1) - 0.5;
var get = (work.MoneyBase + work.MoneyLevel * 10) * (work.MoneyLevel + 1) * (1 + work.FinishBonus / 2); var get = (work.MoneyBase + work.MoneyLevel * 10) * (work.MoneyLevel + 1) * (1 + work.FinishBonus / 2);
if (work.Type != Work.WorkType.Work) if (work.Type != Work.WorkType.Work)
{ {
get /= 12;//经验值换算 get /= 12;//经验值换算
} }
var rel = get / spend; var rel = get / spend;
if (MessageBoxX.Show("当前工作数据属性超模,是否继续工作?\n超模工作可能会导致游戏发生不可预料的错误\n超模工作不影响大部分成就解锁\n当前数据比率 {0:f2}\n推荐比率<1.5" if (MessageBoxX.Show("当前工作数据属性超模,是否继续工作?\n超模工作可能会导致游戏发生不可预料的错误\n超模工作不影响大部分成就解锁\n当前数据比率 {0:f2} 推荐<1.5\n盈利速度:{1:f0} 推荐<{2}"
.Translate(rel), "超模工作提醒".Translate(), MessageBoxButton.YesNo) != MessageBoxResult.Yes) .Translate(rel, get, (work.LevelLimit + 4) * 6), "超模工作提醒".Translate(), MessageBoxButton.YesNo) != MessageBoxResult.Yes)
{ {
return false; return false;
} }