Almost working card state machine
This commit is contained in:
@@ -37,10 +37,7 @@ namespace UI.CardSystem
|
||||
|
||||
// Events
|
||||
public event Action<CardDisplay> OnCardClicked;
|
||||
|
||||
// Preview mode tracking for click forwarding
|
||||
private bool _isPreviewMode;
|
||||
private AlbumCardSlot _previewSlot;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Sets up the card display with the given card data
|
||||
@@ -88,46 +85,7 @@ namespace UI.CardSystem
|
||||
Logging.Debug($"[CardDisplay] Updated visuals for card: {cardData.Name} (Rarity: {cardData.Rarity}, Zone: {cardData.Zone})");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Apply preview visuals - black tint to card image and question marks for name
|
||||
/// Used for empty slot previews to show locked/unknown cards
|
||||
/// </summary>
|
||||
public void SetPreviewVisuals()
|
||||
{
|
||||
// Set card name to question marks
|
||||
if (cardNameText != null)
|
||||
{
|
||||
cardNameText.text = "??????";
|
||||
}
|
||||
|
||||
// Apply black non-opaque tint to card image
|
||||
if (cardImage != null)
|
||||
{
|
||||
cardImage.color = Color.black;
|
||||
}
|
||||
|
||||
Logging.Debug($"[CardDisplay] Applied preview visuals (black tint and ?????? name)");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Reset preview visuals back to normal
|
||||
/// </summary>
|
||||
public void ClearPreviewVisuals()
|
||||
{
|
||||
// Restore normal card name
|
||||
if (cardData != null && cardNameText != null)
|
||||
{
|
||||
cardNameText.text = cardData.Name ?? "Unknown Card";
|
||||
}
|
||||
|
||||
// Reset card image color to white (normal)
|
||||
if (cardImage != null)
|
||||
{
|
||||
cardImage.color = Color.white;
|
||||
}
|
||||
|
||||
Logging.Debug($"[CardDisplay] Cleared preview visuals");
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Updates the card name text
|
||||
@@ -281,50 +239,11 @@ namespace UI.CardSystem
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Enable preview mode - when clicked, forwards click to the associated slot
|
||||
/// </summary>
|
||||
public void SetPreviewMode(bool isEnabled, AlbumCardSlot slot = null)
|
||||
{
|
||||
_isPreviewMode = isEnabled;
|
||||
_previewSlot = slot;
|
||||
|
||||
// Enable raycast targets on images so this CardDisplay can receive clicks
|
||||
if (cardImage != null) cardImage.raycastTarget = isEnabled;
|
||||
if (frameImage != null) frameImage.raycastTarget = isEnabled;
|
||||
if (overlayImage != null) overlayImage.raycastTarget = isEnabled;
|
||||
if (backgroundImage != null) backgroundImage.raycastTarget = isEnabled;
|
||||
if (zoneShapeImage != null) zoneShapeImage.raycastTarget = isEnabled;
|
||||
|
||||
Logging.Debug($"[CardDisplay] Preview mode {(isEnabled ? "enabled" : "disabled")}, slot: {(slot != null ? slot.name : "NULL")}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Handle click on CardDisplay - forward to preview slot if in preview mode
|
||||
/// Handle pointer click - simply emit the click event
|
||||
/// </summary>
|
||||
public void OnPointerClick(PointerEventData eventData)
|
||||
{
|
||||
Logging.Debug($"[CLICK-TRACE-CARDDISPLAY] OnPointerClick on {name}, _isPreviewMode={_isPreviewMode}, _previewSlot={((_previewSlot != null) ? _previewSlot.name : "NULL")}");
|
||||
|
||||
if (_isPreviewMode && _previewSlot != null)
|
||||
{
|
||||
Logging.Debug($"[CLICK-TRACE-CARDDISPLAY] {name} - In preview mode, calling DismissPreview on slot: {_previewSlot.name}");
|
||||
_previewSlot.DismissPreview();
|
||||
}
|
||||
else
|
||||
{
|
||||
// Not in preview mode - forward click to parent AlbumCard (if it exists)
|
||||
AlbumCard parentAlbumCard = GetComponentInParent<AlbumCard>();
|
||||
if (parentAlbumCard != null)
|
||||
{
|
||||
Logging.Debug($"[CLICK-TRACE-CARDDISPLAY] {name} - Forwarding click to parent AlbumCard");
|
||||
parentAlbumCard.OnPointerClick(eventData);
|
||||
}
|
||||
else
|
||||
{
|
||||
Logging.Debug($"[CLICK-TRACE-CARDDISPLAY] {name} - No parent AlbumCard, firing OnCardClicked event");
|
||||
OnCardClicked?.Invoke(this);
|
||||
}
|
||||
}
|
||||
OnCardClicked?.Invoke(this);
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
|
||||
Reference in New Issue
Block a user