tschesky
235fa04eba
- **Refactored Card Placement Flow** - Separated card presentation from orchestration logic - Extracted `CornerCardManager` for pending card lifecycle (spawn, shuffle, rebuild) - Extracted `AlbumNavigationService` for book page navigation and zone mapping - Extracted `CardEnlargeController` for backdrop management and card reparenting - Implemented controller pattern (non-MonoBehaviour) for complex logic - Cards now unparent from slots before rebuild to prevent premature destruction - **Improved Corner Card Display** - Fixed cards spawning on top of each other during rebuild - Implemented shuffle-to-front logic (remaining cards occupy slots 0→1→2) - Added smart card selection (prioritizes cards matching current album page) - Pending cards now removed from queue immediately on drag start - Corner cards rebuild after each placement with proper slot reassignment - **Enhanced Album Card Viewing** - Added dramatic scale increase when viewing cards from album slots - Implemented shrink animation when dismissing enlarged cards - Cards transition: `PlacedInSlotState` → `AlbumEnlargedState` → `PlacedInSlotState` - Backdrop shows/hides with card enlarge/shrink cycle - Cards reparent to enlarged container while viewing, return to slot after - **State Machine Improvements** - Added `CardStateNames` constants for type-safe state transitions - Implemented `ICardClickHandler` and `ICardStateDragHandler` interfaces - State transitions now use cached property indices - `BoosterCardContext` separated from `CardContext` for single responsibility - **Code Cleanup** - Identified unused `SlotContainerHelper.cs` (superseded by `CornerCardManager`) - Identified unused `BoosterPackDraggable.canOpenOnDrop` field - Identified unused `AlbumViewPage._previousInputMode` (hardcoded value) - Identified unused `Card.OnPlacedInAlbumSlot` event (no subscribers) Co-authored-by: Michal Pikulski <michal.a.pikulski@gmail.com> Co-authored-by: Michal Pikulski <michal@foolhardyhorizons.com> Reviewed-on: #59
81 lines
2.6 KiB
C#
81 lines
2.6 KiB
C#
using Core.SaveLoad;
|
|
using UnityEngine;
|
|
using AppleHills.Core.Settings;
|
|
using Core;
|
|
|
|
namespace UI.CardSystem.StateMachine.States
|
|
{
|
|
/// <summary>
|
|
/// Enlarged state for NEW cards - shows "NEW CARD" badge and waits for tap to dismiss.
|
|
/// Owns the NewCardBadge as a child GameObject.
|
|
/// </summary>
|
|
public class CardEnlargedNewState : AppleState, ICardClickHandler
|
|
{
|
|
[Header("State-Owned Visuals")]
|
|
[SerializeField] private GameObject newCardBadge;
|
|
|
|
private CardContext _context;
|
|
private ICardSystemSettings _settings;
|
|
|
|
private void Awake()
|
|
{
|
|
_context = GetComponentInParent<CardContext>();
|
|
_settings = GameManager.GetSettingsObject<ICardSystemSettings>();
|
|
}
|
|
|
|
public override void OnEnterState()
|
|
{
|
|
// Ensure card front is visible and facing camera
|
|
if (_context.CardDisplay != null)
|
|
{
|
|
_context.CardDisplay.gameObject.SetActive(true);
|
|
_context.CardDisplay.transform.localRotation = Quaternion.Euler(0, 0, 0);
|
|
}
|
|
|
|
// Check if we're already enlarged (coming from upgrade flow)
|
|
bool alreadyEnlarged = _context.RootTransform.localScale.x >= _settings.NewCardEnlargedScale * 0.9f;
|
|
|
|
if (!alreadyEnlarged)
|
|
{
|
|
// Normal flow - enlarge the card
|
|
if (_context.Animator != null)
|
|
{
|
|
_context.Animator.PlayEnlarge(_settings.NewCardEnlargedScale);
|
|
}
|
|
}
|
|
|
|
// Show NEW badge
|
|
if (newCardBadge != null)
|
|
{
|
|
newCardBadge.SetActive(true);
|
|
}
|
|
}
|
|
|
|
public void OnCardClicked(CardContext context)
|
|
{
|
|
// Tap to dismiss - shrink back to original scale and transition to revealed state
|
|
if (context.Animator != null)
|
|
{
|
|
context.Animator.PlayShrink(context.OriginalScale, onComplete: () =>
|
|
{
|
|
context.StateMachine.ChangeState(CardStateNames.Revealed);
|
|
});
|
|
}
|
|
else
|
|
{
|
|
// Fallback if no animator
|
|
context.StateMachine.ChangeState(CardStateNames.Revealed);
|
|
}
|
|
}
|
|
|
|
private void OnDisable()
|
|
{
|
|
// Hide NEW badge when leaving state
|
|
if (newCardBadge != null)
|
|
{
|
|
newCardBadge.SetActive(false);
|
|
}
|
|
}
|
|
}
|
|
}
|