MPV of save/load system

Assets/Scripts/Data/CardSystem/CardSystemManager.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using AppleHills.Data.CardSystem;
 using Bootstrap;
 using Core;
+using Core.SaveLoad;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
@@ -36,6 +37,9 @@ namespace Data.CardSystem
         public event Action<CardData> OnCardRarityUpgraded;
         public event Action<int> OnBoosterCountChanged;
 
+        // Keep a reference to unsubscribe safely
+        private Action<string> _onSaveDataLoadedHandler;
+
         private void Awake()
         {
             _instance = this;
@@ -49,9 +53,6 @@ namespace Data.CardSystem
             // Load card definitions from Addressables
             LoadCardDefinitionsFromAddressables();
             
-            // Build lookup dictionary
-            BuildDefinitionLookup();
-            
             Logging.Debug("[CardSystemManager] Post-boot initialization complete");
         }
 
@@ -87,9 +88,54 @@ namespace Data.CardSystem
                         }
                     }
                 }
+
+                // Build lookup now that cards are loaded
+                BuildDefinitionLookup();
+
+                // Apply saved state when save data is available
+                if (SaveLoadManager.Instance != null)
+                {
+                    if (SaveLoadManager.Instance.IsSaveDataLoaded)
+                    {
+                        ApplySavedCardStateIfAvailable();
+                    }
+                    else
+                    {
+                        SaveLoadManager.Instance.OnLoadCompleted += OnSaveDataLoadedHandler;
+                    }
+                }
             }
         }
-        
+
+        private void OnDestroy()
+        {
+            if (SaveLoadManager.Instance != null)
+            {
+                SaveLoadManager.Instance.OnLoadCompleted -= OnSaveDataLoadedHandler;
+            }
+        }
+
+        // Apply saved state if present in the SaveLoadManager
+        private void ApplySavedCardStateIfAvailable()
+        {
+            var data = SaveLoadManager.Instance?.currentSaveData;
+            if (data?.cardCollection != null)
+            {
+                ApplyCardCollectionState(data.cardCollection);
+                Logging.Debug("[CardSystemManager] Applied saved card collection state after loading definitions");
+            }
+        }
+
+        // Event handler for when save data load completes
+        private void OnSaveDataLoadedHandler(string slot)
+        {
+            ApplySavedCardStateIfAvailable();
+            if (SaveLoadManager.Instance != null)
+            {
+                SaveLoadManager.Instance.OnLoadCompleted -= OnSaveDataLoadedHandler;
+            }
+        }
+
         /// <summary>
         /// Builds a lookup dictionary for quick access to card definitions by ID
         /// </summary>
@@ -383,5 +429,58 @@ namespace Data.CardSystem
             
             return (float)collectedOfRarity / totalOfRarity * 100f;
         }
+        
+        /// <summary>
+        /// Export current card collection to a serializable snapshot
+        /// </summary>
+        public CardCollectionState ExportCardCollectionState()
+        {
+            var state = new CardCollectionState
+            {
+                boosterPackCount = playerInventory.BoosterPackCount,
+                cards = new List<SavedCardEntry>()
+            };
+
+            foreach (var card in playerInventory.CollectedCards.Values)
+            {
+                if (string.IsNullOrEmpty(card.DefinitionId)) continue;
+                state.cards.Add(new SavedCardEntry
+                {
+                    definitionId = card.DefinitionId,
+                    rarity = card.Rarity,
+                    copiesOwned = card.CopiesOwned
+                });
+            }
+            return state;
+        }
+
+        /// <summary>
+        /// Apply a previously saved snapshot to the runtime inventory
+        /// </summary>
+        public void ApplyCardCollectionState(CardCollectionState state)
+        {
+            if (state == null) return;
+
+            playerInventory.ClearAllCards();
+            playerInventory.BoosterPackCount = state.boosterPackCount;
+            OnBoosterCountChanged?.Invoke(playerInventory.BoosterPackCount);
+
+            foreach (var entry in state.cards)
+            {
+                if (string.IsNullOrEmpty(entry.definitionId)) continue;
+                if (_definitionLookup.TryGetValue(entry.definitionId, out var def))
+                {
+                    // Create from definition to ensure links, then overwrite runtime fields
+                    var cd = def.CreateCardData();
+                    cd.Rarity = entry.rarity;
+                    cd.CopiesOwned = entry.copiesOwned;
+                    playerInventory.AddCard(cd);
+                }
+                else
+                {
+                    Logging.Warning($"[CardSystemManager] Saved card definition not found: {entry.definitionId}");
+                }
+            }
+        }
     }
 }