|
@@ -658,6 +658,7 @@ namespace GFGGame
|
|
float scale = _ui.target.height / comCardImgResInitSize.y;
|
|
float scale = _ui.target.height / comCardImgResInitSize.y;
|
|
if (!showCard)
|
|
if (!showCard)
|
|
{
|
|
{
|
|
|
|
+ _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) =>
|
|
{
|
|
{
|
|
@@ -668,11 +669,15 @@ namespace GFGGame
|
|
{
|
|
{
|
|
_ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
_ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
});
|
|
});
|
|
- _ui.m_t0.Play();
|
|
|
|
|
|
+ _ui.m_t0.Play(() =>
|
|
|
|
+ {
|
|
|
|
+ _ui.target.touchable = true;
|
|
|
|
+ });
|
|
showCard = true;
|
|
showCard = true;
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
|
|
+ _ui.target.touchable = false;
|
|
_ui.m_loaListener1.visible = true;
|
|
_ui.m_loaListener1.visible = true;
|
|
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) =>
|
|
{
|
|
{
|
|
@@ -682,7 +687,10 @@ namespace GFGGame
|
|
{
|
|
{
|
|
_ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
_ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
});
|
|
});
|
|
- _ui.m_t1.Play();
|
|
|
|
|
|
+ _ui.m_t1.Play(() =>
|
|
|
|
+ {
|
|
|
|
+ _ui.target.touchable = true;
|
|
|
|
+ });
|
|
showCard = false;
|
|
showCard = false;
|
|
}
|
|
}
|
|
}
|
|
}
|