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
77 lines
3.0 KiB
C#
77 lines
3.0 KiB
C#
using AppleHills.Data.CardSystem;
|
|
using Core.SaveLoad;
|
|
using UnityEngine;
|
|
|
|
namespace UI.CardSystem.StateMachine.States
|
|
{
|
|
/// <summary>
|
|
/// Revealed state - card is flipped and visible at normal size.
|
|
/// This is the "waiting" state:
|
|
/// - In booster flow: waiting for all cards to finish before animating to album
|
|
/// - In album placement flow: waiting to be dragged to a slot
|
|
/// Shows small idle badges for NEW or REPEAT cards.
|
|
/// </summary>
|
|
public class CardRevealedState : AppleState
|
|
{
|
|
[Header("State-Owned Visuals")]
|
|
[SerializeField] private UnityEngine.GameObject newCardIdleBadge;
|
|
[SerializeField] private UnityEngine.GameObject repeatCardIdleBadge;
|
|
|
|
private CardContext _context;
|
|
|
|
private void Awake()
|
|
{
|
|
_context = GetComponentInParent<CardContext>();
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
// Show appropriate idle badge unless suppressed
|
|
if (_context.BoosterContext.SuppressRevealBadges)
|
|
{
|
|
if (newCardIdleBadge != null) newCardIdleBadge.SetActive(false);
|
|
if (repeatCardIdleBadge != null) repeatCardIdleBadge.SetActive(false);
|
|
}
|
|
else
|
|
{
|
|
bool isNew = Data.CardSystem.CardSystemManager.Instance.IsCardNew(_context.CardData, out CardData existingCard);
|
|
int currentOwnedCount = (existingCard != null) ? existingCard.CopiesOwned : 0;
|
|
if (isNew)
|
|
{
|
|
if (newCardIdleBadge != null) newCardIdleBadge.SetActive(true);
|
|
if (repeatCardIdleBadge != null) repeatCardIdleBadge.SetActive(false);
|
|
}
|
|
else if (currentOwnedCount > 0)
|
|
{
|
|
if (newCardIdleBadge != null) newCardIdleBadge.SetActive(false);
|
|
if (repeatCardIdleBadge != null) repeatCardIdleBadge.SetActive(true);
|
|
}
|
|
else
|
|
{
|
|
if (newCardIdleBadge != null) newCardIdleBadge.SetActive(false);
|
|
if (repeatCardIdleBadge != null) repeatCardIdleBadge.SetActive(false);
|
|
}
|
|
}
|
|
|
|
// Fire reveal flow complete event (signals booster page that this card is done)
|
|
_context.BoosterContext.NotifyRevealComplete();
|
|
}
|
|
|
|
private void OnDisable()
|
|
{
|
|
// Hide badges when leaving state
|
|
if (newCardIdleBadge != null)
|
|
newCardIdleBadge.SetActive(false);
|
|
if (repeatCardIdleBadge != null)
|
|
repeatCardIdleBadge.SetActive(false);
|
|
}
|
|
}
|
|
}
|