Merge branch 'main' of https://homelab.tailf7f81b.ts.net/tschesky/AppleHillsProduction
This commit is contained in:
@@ -285,8 +285,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 173}
|
m_AnchoredPosition: {x: 0, y: 125}
|
||||||
m_SizeDelta: {x: 600, y: 150}
|
m_SizeDelta: {x: 600, y: 120}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &5545241165728741220
|
--- !u!222 &5545241165728741220
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@@ -343,8 +343,8 @@ MonoBehaviour:
|
|||||||
m_faceColor:
|
m_faceColor:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
rgba: 4294967295
|
rgba: 4294967295
|
||||||
m_fontSize: 150
|
m_fontSize: 125
|
||||||
m_fontSizeBase: 150
|
m_fontSizeBase: 125
|
||||||
m_fontWeight: 400
|
m_fontWeight: 400
|
||||||
m_enableAutoSizing: 0
|
m_enableAutoSizing: 0
|
||||||
m_fontSizeMin: 18
|
m_fontSizeMin: 18
|
||||||
@@ -1053,6 +1053,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_SizeDelta.x
|
propertyPath: m_SizeDelta.x
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4925415087786595420, guid: 1d8cc8d9238eec34b8e600e7050e2979, type: 3}
|
||||||
|
propertyPath: m_fontSize
|
||||||
|
value: 54.45
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5378230129755544441, guid: 1d8cc8d9238eec34b8e600e7050e2979, type: 3}
|
- target: {fileID: 5378230129755544441, guid: 1d8cc8d9238eec34b8e600e7050e2979, type: 3}
|
||||||
propertyPath: m_AnchorMax.x
|
propertyPath: m_AnchorMax.x
|
||||||
value: 0
|
value: 0
|
||||||
|
|||||||
@@ -118,6 +118,13 @@ namespace UI.CardSystem
|
|||||||
public override void TransitionIn()
|
public override void TransitionIn()
|
||||||
{
|
{
|
||||||
base.TransitionIn();
|
base.TransitionIn();
|
||||||
|
|
||||||
|
// Ensure album icon is visible when page opens
|
||||||
|
if (albumIcon != null)
|
||||||
|
{
|
||||||
|
albumIcon.SetActive(true);
|
||||||
|
}
|
||||||
|
|
||||||
InitializeBoosterDisplay();
|
InitializeBoosterDisplay();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -363,6 +370,13 @@ namespace UI.CardSystem
|
|||||||
// Remove from active slots list
|
// Remove from active slots list
|
||||||
_activeBoostersInSlots.Remove(booster);
|
_activeBoostersInSlots.Remove(booster);
|
||||||
|
|
||||||
|
// Hide album icon when booster is placed in center
|
||||||
|
if (albumIcon != null)
|
||||||
|
{
|
||||||
|
albumIcon.SetActive(false);
|
||||||
|
Debug.Log($"[BoosterOpeningPage] Album icon hidden");
|
||||||
|
}
|
||||||
|
|
||||||
// Lock the slot so it can't be dragged out
|
// Lock the slot so it can't be dragged out
|
||||||
Debug.Log($"[BoosterOpeningPage] Locking center slot. IsLocked before: {centerOpeningSlot.IsLocked}");
|
Debug.Log($"[BoosterOpeningPage] Locking center slot. IsLocked before: {centerOpeningSlot.IsLocked}");
|
||||||
centerOpeningSlot.SetLocked(true);
|
centerOpeningSlot.SetLocked(true);
|
||||||
@@ -800,6 +814,13 @@ namespace UI.CardSystem
|
|||||||
// All cards revealed and interacted with, wait a moment
|
// All cards revealed and interacted with, wait a moment
|
||||||
yield return new WaitForSeconds(0.5f);
|
yield return new WaitForSeconds(0.5f);
|
||||||
|
|
||||||
|
// Show album icon before cards start tweening to it
|
||||||
|
if (albumIcon != null)
|
||||||
|
{
|
||||||
|
albumIcon.SetActive(true);
|
||||||
|
Debug.Log($"[BoosterOpeningPage] Album icon shown for card tween target");
|
||||||
|
}
|
||||||
|
|
||||||
// Animate cards to album icon (or center if no icon assigned) with staggered delays
|
// Animate cards to album icon (or center if no icon assigned) with staggered delays
|
||||||
Vector3 targetPosition = albumIcon != null ? albumIcon.transform.position : Vector3.zero;
|
Vector3 targetPosition = albumIcon != null ? albumIcon.transform.position : Vector3.zero;
|
||||||
|
|
||||||
@@ -828,6 +849,8 @@ namespace UI.CardSystem
|
|||||||
_currentRevealedCards.Clear();
|
_currentRevealedCards.Clear();
|
||||||
|
|
||||||
yield return new WaitForSeconds(totalAnimationTime);
|
yield return new WaitForSeconds(totalAnimationTime);
|
||||||
|
|
||||||
|
// Album icon stays visible for next booster (will be hidden when next booster is placed)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user