Updates to card testing scene

Assets/Scripts/UI/CardSystem/StateMachine/States/CardDraggingState.cs

@@ -6,15 +6,15 @@ using AppleHills.Core.Settings;
 namespace UI.CardSystem.StateMachine.States
 {
     /// <summary>
-    /// Dragging state - handles card being dragged for album placement.
-    /// Integrates with existing drag/drop system.
+    /// Dragging state - provides visual feedback when card is being dragged.
+    /// The actual drag logic is handled by Card.cs (inherits from DraggableObject).
+    /// This state only manages visual scaling during drag.
     /// </summary>
     public class CardDraggingState : AppleState
     {
         private CardContext _context;
         private ICardSystemSettings _settings;
         private Vector3 _originalScale;
-        private Vector3 _dragStartPosition;
         
         private void Awake()
         {
@@ -24,39 +24,14 @@ namespace UI.CardSystem.StateMachine.States
         
         public override void OnEnterState()
         {
-            // Store original transform
+            // Store original scale
             _originalScale = _context.RootTransform.localScale;
-            _dragStartPosition = _context.RootTransform.position;
             
             // Scale up slightly during drag for visual feedback
+            // DraggableObject handles actual position updates
             _context.RootTransform.localScale = _originalScale * _settings.DragScale;
             
-            Logging.Debug($"[CardDraggingState] Entered drag state for card: {_context.CardData?.Name}");
-        }
-        
-        /// <summary>
-        /// Update drag position (called by external drag handler)
-        /// </summary>
-        public void UpdateDragPosition(Vector3 worldPosition)
-        {
-            _context.RootTransform.position = worldPosition;
-        }
-        
-        /// <summary>
-        /// Called when drag is released and card snaps to slot
-        /// </summary>
-        public void OnDroppedInSlot()
-        {
-            _context.StateMachine.ChangeState("PlacedInSlotState");
-        }
-        
-        /// <summary>
-        /// Called when drag is released but not over valid slot
-        /// </summary>
-        public void OnDroppedOutsideSlot()
-        {
-            // Return to revealed state
-            _context.StateMachine.ChangeState("RevealedState");
+            Logging.Debug($"[CardDraggingState] Entered drag state for card: {_context.CardData?.Name}, scale: {_settings.DragScale}");
         }
         
         private void OnDisable()

Assets/Scripts/UI/CardSystem/StateMachine/States/CardInteractionHandler.cs

@@ -1,65 +0,0 @@
-using UnityEngine;
-using UnityEngine.EventSystems;
-
-namespace UI.CardSystem.StateMachine.States
-{
-    /// <summary>
-    /// Optional helper component for handling drag/drop integration with existing DragDrop system.
-    /// Can be attached to Card root to bridge between state machine and drag system.
-    /// </summary>
-    public class CardInteractionHandler : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler
-    {
-        private CardContext _context;
-        private CardDraggingState _draggingState;
-        private bool _isDragging;
-        
-        private void Awake()
-        {
-            _context = GetComponent<CardContext>();
-        }
-        
-        public void OnBeginDrag(PointerEventData eventData)
-        {
-            // Only allow drag from certain states
-            var currentState = _context.StateMachine.currentState?.name;
-            if (currentState != "RevealedState" && currentState != "PlacedInSlotState")
-            {
-                return;
-            }
-            
-            // Transition to dragging state
-            _context.StateMachine.ChangeState("DraggingState");
-            _draggingState = _context.StateMachine.currentState?.GetComponent<CardDraggingState>();
-            _isDragging = true;
-        }
-        
-        public void OnDrag(PointerEventData eventData)
-        {
-            if (!_isDragging || _draggingState == null) return;
-            
-            // Update drag position
-            Vector3 worldPosition;
-            RectTransformUtility.ScreenPointToWorldPointInRectangle(
-                transform as RectTransform,
-                eventData.position,
-                eventData.pressEventCamera,
-                out worldPosition
-            );
-            
-            _draggingState.UpdateDragPosition(worldPosition);
-        }
-        
-        public void OnEndDrag(PointerEventData eventData)
-        {
-            if (!_isDragging || _draggingState == null) return;
-            
-            _isDragging = false;
-            
-            // Check if dropped over a valid slot
-            // This would integrate with your existing AlbumCardSlot system
-            // For now, just return to revealed state
-            _draggingState.OnDroppedOutsideSlot();
-        }
-    }
-}
-

Assets/Scripts/UI/CardSystem/StateMachine/States/CardInteractionHandler.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 860a5494378b465a9cc05b2b3d585bf9
-timeCreated: 1762884900