|
@@ -39,6 +39,7 @@ namespace GFGGame
|
|
|
|
|
|
private float _cardScale = 0.8f;
|
|
private float _cardScale = 0.8f;
|
|
private bool showCard = false;
|
|
private bool showCard = false;
|
|
|
|
+ private bool playAni = false;
|
|
|
|
|
|
private Vector2 comCardImgResInitSize;
|
|
private Vector2 comCardImgResInitSize;
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
@@ -115,6 +116,7 @@ namespace GFGGame
|
|
|
|
|
|
_cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
|
|
_cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
|
|
|
|
|
|
|
|
+ playAni = false;
|
|
comCardImgResInitSize = Vector2.zero;
|
|
comCardImgResInitSize = Vector2.zero;
|
|
_cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
|
|
_cardScale = _ui.target.height * 0.8f / _ui.target.initHeight;
|
|
showCard = false;
|
|
showCard = false;
|
|
@@ -657,10 +659,12 @@ namespace GFGGame
|
|
}
|
|
}
|
|
private void OnClickLoaCard()
|
|
private void OnClickLoaCard()
|
|
{
|
|
{
|
|
|
|
+ if (playAni) return;
|
|
|
|
+ playAni = true;
|
|
float scale = _ui.target.height / comCardImgResInitSize.y;
|
|
float scale = _ui.target.height / comCardImgResInitSize.y;
|
|
if (!showCard)
|
|
if (!showCard)
|
|
{
|
|
{
|
|
- _ui.target.touchable = false;
|
|
|
|
|
|
+ // _ui.target.touchable = false;
|
|
_ui.m_loaListener1.visible = false;
|
|
_ui.m_loaListener1.visible = false;
|
|
GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize * scale, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize * scale, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
{
|
|
{
|
|
@@ -673,14 +677,15 @@ namespace GFGGame
|
|
});
|
|
});
|
|
_ui.m_t0.Play(() =>
|
|
_ui.m_t0.Play(() =>
|
|
{
|
|
{
|
|
- _ui.target.touchable = true;
|
|
|
|
|
|
+ playAni = false;
|
|
});
|
|
});
|
|
showCard = true;
|
|
showCard = true;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- _ui.target.touchable = false;
|
|
|
|
|
|
+ // _ui.target.touchable = false;
|
|
_ui.m_loaListener1.visible = true;
|
|
_ui.m_loaListener1.visible = true;
|
|
|
|
+ _ui.m_loaListener1.touchable = false;
|
|
GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
GTween.To(_ui.m_comImgCard.m_ComCardImgRes.target.size, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
{
|
|
{
|
|
_ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
_ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
@@ -691,29 +696,37 @@ namespace GFGGame
|
|
});
|
|
});
|
|
_ui.m_t1.Play(() =>
|
|
_ui.m_t1.Play(() =>
|
|
{
|
|
{
|
|
- _ui.target.touchable = true;
|
|
|
|
|
|
+ playAni = false;
|
|
|
|
+ // _ui.target.touchable = true;
|
|
});
|
|
});
|
|
showCard = false;
|
|
showCard = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
private void OnClickComCard()
|
|
private void OnClickComCard()
|
|
{
|
|
{
|
|
-
|
|
|
|
|
|
+ if (playAni) return;
|
|
|
|
+ playAni = true;
|
|
if (showCard)
|
|
if (showCard)
|
|
{
|
|
{
|
|
_ui.m_loaListener.visible = true;
|
|
_ui.m_loaListener.visible = true;
|
|
|
|
+
|
|
_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
|
|
|
|
float scale = _ui.m_comCard.target.scaleX;
|
|
float scale = _ui.m_comCard.target.scaleX;
|
|
_ui.m_t1.SetValue("scale", scale, scale);
|
|
_ui.m_t1.SetValue("scale", scale, scale);
|
|
_ui.m_t1.SetValue("normal", _cardScale, _cardScale);
|
|
_ui.m_t1.SetValue("normal", _cardScale, _cardScale);
|
|
- _ui.m_t1.Play();
|
|
|
|
|
|
+ _ui.m_t1.Play(() =>
|
|
|
|
+ {
|
|
|
|
+ playAni = false;
|
|
|
|
+
|
|
|
|
+ });
|
|
showCard = false;
|
|
showCard = false;
|
|
|
|
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
_ui.m_loaListener.visible = false;
|
|
_ui.m_loaListener.visible = false;
|
|
|
|
+
|
|
float scale = _ui.target.height / 1920;
|
|
float scale = _ui.target.height / 1920;
|
|
_ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
|
|
_ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
|
|
_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
@@ -721,7 +734,11 @@ namespace GFGGame
|
|
_ui.m_t0.SetValue("scale", scale, scale);
|
|
_ui.m_t0.SetValue("scale", scale, scale);
|
|
_ui.m_t0.SetValue("normal", _cardScale, _cardScale);
|
|
_ui.m_t0.SetValue("normal", _cardScale, _cardScale);
|
|
|
|
|
|
- _ui.m_t0.Play();
|
|
|
|
|
|
+ _ui.m_t0.Play(() =>
|
|
|
|
+ {
|
|
|
|
+ playAni = false;
|
|
|
|
+
|
|
|
|
+ });
|
|
showCard = true;
|
|
showCard = true;
|
|
|
|
|
|
}
|
|
}
|