From 28c1059fe227a8db9aaa075c3509fbdfa5c2ca1d Mon Sep 17 00:00:00 2001
From: Joywayer <joywayer@163.com>
Date: Wed, 20 May 2026 18:22:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=AD=98=E6=A1=A3?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=92=8C=E5=B7=A5=E5=85=B7=E6=A7=BD=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E6=94=B9=E8=BF=9B=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=BD=AC=E6=8D=A2=EF=BC=8C=E5=A2=9E=E5=BC=BA=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=8F=AF=E8=AF=BB=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/_Game/Scripts/Core/Save/GameSaveManager.cs      | 8 ++++----
 Assets/_Game/Scripts/Equipment/ToolSlotManager.cs      | 4 ++--
 Assets/_Game/Scripts/Progression/AchievementManager.cs | 1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Assets/_Game/Scripts/Core/Save/GameSaveManager.cs b/Assets/_Game/Scripts/Core/Save/GameSaveManager.cs
index 744745c..597ea08 100644
--- a/Assets/_Game/Scripts/Core/Save/GameSaveManager.cs
+++ b/Assets/_Game/Scripts/Core/Save/GameSaveManager.cs
@@ -235,10 +235,10 @@ namespace BaseGames.Core.Save
                 return new SlotSummary
                 {
                     SlotIndex    = slotIndex,
-                    Playtime     = root["Meta"]?["Playtime"]?.Value<float>() ?? 0f,
-                    LastSaved    = root["Meta"]?["LastSaved"]?.Value<string>(),
-                    SceneName    = root["Player"]?["Scene"]?.Value<string>(),
-                    ActiveFormId = root["Player"]?["ActiveFormId"]?.Value<string>(),
+                    Playtime     = (float?)root["Meta"]?["Playtime"]  ?? 0f,
+                    LastSaved    = (string)root["Meta"]?["LastSaved"],
+                    SceneName    = (string)root["Player"]?["Scene"],
+                    ActiveFormId = (string)root["Player"]?["ActiveFormId"],
                 };
             }
             catch { return null; }
diff --git a/Assets/_Game/Scripts/Equipment/ToolSlotManager.cs b/Assets/_Game/Scripts/Equipment/ToolSlotManager.cs
index 9bd2ea3..d3dcff5 100644
--- a/Assets/_Game/Scripts/Equipment/ToolSlotManager.cs
+++ b/Assets/_Game/Scripts/Equipment/ToolSlotManager.cs
@@ -96,9 +96,9 @@ namespace BaseGames.Equipment
 
             // 恢复剩余使用次数（EquipTool 会重置为 maxUses，此处覆盖还原）
             if (data.Tools.ToolStates.TryGetValue("Slot0_Uses", out var uses0))
-                _remainingUses[0] = uses0["uses"]?.Value<int>() ?? _remainingUses[0];
+                _remainingUses[0] = (int?)uses0["uses"] ?? _remainingUses[0];
             if (data.Tools.ToolStates.TryGetValue("Slot1_Uses", out var uses1))
-                _remainingUses[1] = uses1["uses"]?.Value<int>() ?? _remainingUses[1];
+                _remainingUses[1] = (int?)uses1["uses"] ?? _remainingUses[1];
         }
     }
 }
diff --git a/Assets/_Game/Scripts/Progression/AchievementManager.cs b/Assets/_Game/Scripts/Progression/AchievementManager.cs
index 0d379ec..f4696dd 100644
--- a/Assets/_Game/Scripts/Progression/AchievementManager.cs
+++ b/Assets/_Game/Scripts/Progression/AchievementManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using BaseGames.Core;
+using BaseGames.Core.Events;
 using BaseGames.Core.Save;
 using BaseGames.Platform;