From c6528e16763a9b67ca95c58f0be7faabc6cda320 Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Wed, 13 Mar 2024 02:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=B7=A5=E4=BD=9C=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=8C=87=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/MainLogic.cs              | 4 ++--
 VPet-Simulator.Core/Graph/GraphHelper.cs              | 5 -----
 VPet-Simulator.Windows.Interface/ExtensionFunction.cs | 2 +-
 VPet-Simulator.Windows/MainWindow.cs                  | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/VPet-Simulator.Core/Display/MainLogic.cs b/VPet-Simulator.Core/Display/MainLogic.cs
index 6c6998a..e519242 100644
--- a/VPet-Simulator.Core/Display/MainLogic.cs
+++ b/VPet-Simulator.Core/Display/MainLogic.cs
@@ -232,7 +232,7 @@ namespace VPet_Simulator.Core
                     }
                     if (addhealth > 0)
                         Core.Save.Health += addhealth * TimePass;
-                    var addmoney = Math.Max(0, TimePass * (nowwork.MoneyBase * (efficiency) + Math.Pow(Core.Save.Level, 0.75) * nowwork.MoneyLevel * (efficiency - 0.5) * 2));
+                    var addmoney = Math.Max(0, nowwork.MoneyBase * (1.500000000 * efficiency - 0.5));
                     if (nowwork.Type == GraphHelper.Work.WorkType.Work)
                         Core.Save.Money += addmoney;
                     else
@@ -564,7 +564,7 @@ namespace VPet_Simulator.Core
             else
                 MessageBoxX.Show(LocalizeCore.Translate("您的桌宠 {0} 生病啦,没法进行{1}", Core.Save.Name,
                   work.NameTrans), LocalizeCore.Translate("{0}取消", work.NameTrans));
-            Visibility = Visibility.Collapsed;
+            ToolBar.Visibility = Visibility.Collapsed;
         }
     }
 }
diff --git a/VPet-Simulator.Core/Graph/GraphHelper.cs b/VPet-Simulator.Core/Graph/GraphHelper.cs
index 68706e5..54f0421 100644
--- a/VPet-Simulator.Core/Graph/GraphHelper.cs
+++ b/VPet-Simulator.Core/Graph/GraphHelper.cs
@@ -107,11 +107,6 @@ namespace VPet_Simulator.Core
             [Line(ignoreCase: true)]
             public string Graph { get; set; }
             /// <summary>
-            /// 工作盈利/学习等级倍率
-            /// </summary>
-            [Line(ignoreCase: true)]
-            public double MoneyLevel { get; set; }
-            /// <summary>
             /// 工作盈利/学习基本倍率
             /// </summary>
             [Line(ignoreCase: true)]
diff --git a/VPet-Simulator.Windows.Interface/ExtensionFunction.cs b/VPet-Simulator.Windows.Interface/ExtensionFunction.cs
index 2e64714..f6f82ef 100644
--- a/VPet-Simulator.Windows.Interface/ExtensionFunction.cs
+++ b/VPet-Simulator.Windows.Interface/ExtensionFunction.cs
@@ -28,7 +28,7 @@ namespace VPet_Simulator.Windows.Interface
             double get = 0;
             foreach (var lv in WorkCalLevel)
             {
-                get += (work.MoneyBase + Math.Sqrt(lv) * work.MoneyLevel) * (1 + work.FinishBonus / 2);
+                get += (work.MoneyBase + Math.Sqrt(lv)) * (1 + work.FinishBonus / 2);
             }
             get /= WorkCalLevel.Length;
             if (work.Type != Work.WorkType.Work)
diff --git a/VPet-Simulator.Windows/MainWindow.cs b/VPet-Simulator.Windows/MainWindow.cs
index 623a5fa..5c6462b 100644
--- a/VPet-Simulator.Windows/MainWindow.cs
+++ b/VPet-Simulator.Windows/MainWindow.cs
@@ -1564,7 +1564,6 @@ namespace VPet_Simulator.Windows
                     {
                         if (work.IsOverLoad())
                         {
-                            work.MoneyLevel = 0.5;
                             work.MoneyBase = 8;
                             if (work.Type == Work.WorkType.Work)
                             {