|
@@ -112,11 +112,11 @@ namespace GFGGame
|
|
|
_ui.m_ComFosterBottom.m_listShowCard.onClickItem.Add(OnClickShowCardListItem);
|
|
|
|
|
|
// _ui.m_loaCard.onClick.Add(OnClickLoaCard);
|
|
|
- _ui.m_loaListener1.onClick.Add(OnClickLoaCard);
|
|
|
- _ui.m_comImgCard.target.onClick.Add(OnClickLoaCard);
|
|
|
+ //_ui.m_loaListener1.onClick.Add(OnClickLoaCard);
|
|
|
+ //_ui.m_comImgCard.target.onClick.Add(OnClickLoaCard);
|
|
|
|
|
|
- _ui.m_loaListener.onClick.Add(OnClickComCard);
|
|
|
- _ui.m_comCard.target.onClick.Add(OnClickComCard);
|
|
|
+ //_ui.m_loaListener.onClick.Add(OnClickComCard);
|
|
|
+ //_ui.m_comCard.target.onClick.Add(OnClickComCard);
|
|
|
|
|
|
_effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderflower, "ui_Activity", "SX_Top_TX");
|
|
|
_effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_ComFosterBottom.m_holderfBgEff, "ui_Activity", "SX_Down_TX");
|
|
@@ -812,41 +812,41 @@ namespace GFGGame
|
|
|
playAni = true;
|
|
|
if (!showCard)
|
|
|
{
|
|
|
- _ui.m_loaListener1.visible = false;
|
|
|
- GTween.To(comCardImgResInitSize, comCardImgResTargetSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
|
- {
|
|
|
- _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
|
- });
|
|
|
-
|
|
|
- GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResTargetSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
|
|
|
- {
|
|
|
- _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
|
- });
|
|
|
- _ui.m_t0.Play(() =>
|
|
|
- {
|
|
|
- playAni = false;
|
|
|
- });
|
|
|
+ //_ui.m_loaListener1.visible = false;
|
|
|
+ //GTween.To(comCardImgResInitSize, comCardImgResTargetSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
|
+ //{
|
|
|
+ // _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
|
+ //});
|
|
|
+
|
|
|
+ //GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResTargetSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
|
|
|
+ //{
|
|
|
+ // _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
|
+ //});
|
|
|
+ //_ui.m_t0.Play(() =>
|
|
|
+ //{
|
|
|
+ // playAni = false;
|
|
|
+ //});
|
|
|
showCard = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- _ui.m_loaListener1.visible = true;
|
|
|
- _ui.m_t1.SetHook("scale", () =>
|
|
|
- {
|
|
|
- GTween.To(comCardImgResTargetSize, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
|
- {
|
|
|
- _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
|
- });
|
|
|
- GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
|
|
|
- {
|
|
|
- _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
|
- });
|
|
|
- });
|
|
|
-
|
|
|
- _ui.m_t1.Play(() =>
|
|
|
- {
|
|
|
- playAni = false;
|
|
|
- });
|
|
|
+ //_ui.m_loaListener1.visible = true;
|
|
|
+ //_ui.m_t1.SetHook("scale", () =>
|
|
|
+ //{
|
|
|
+ // GTween.To(comCardImgResTargetSize, comCardImgResInitSize, 0.5f).SetTarget(_ui.m_comImgCard.m_ComCardImgRes).OnUpdate((GTweener t) =>
|
|
|
+ // {
|
|
|
+ // _ui.m_comImgCard.m_ComCardImgRes.target.size = t.value.vec2;
|
|
|
+ // });
|
|
|
+ // GTween.To(_ui.m_comImgCard.target.scrollPane.posX, (comCardImgResInitSize.x - _ui.target.width) / 2, 0.5f).SetTarget(_ui.m_comImgCard.target.scrollPane).OnUpdate((GTweener t) =>
|
|
|
+ // {
|
|
|
+ // _ui.m_comImgCard.target.scrollPane.posX = t.value.x;
|
|
|
+ // });
|
|
|
+ //});
|
|
|
+
|
|
|
+ //_ui.m_t1.Play(() =>
|
|
|
+ //{
|
|
|
+ // playAni = false;
|
|
|
+ //});
|
|
|
showCard = false;
|
|
|
}
|
|
|
}
|
|
@@ -856,37 +856,37 @@ namespace GFGGame
|
|
|
playAni = true;
|
|
|
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;
|
|
|
- _ui.m_t1.SetValue("scale", scale, scale);
|
|
|
- _ui.m_t1.SetValue("normal", _cardScale, _cardScale);
|
|
|
- _ui.m_t1.Play(() =>
|
|
|
- {
|
|
|
- playAni = false;
|
|
|
+ //float scale = _ui.m_comCard.target.scaleX;
|
|
|
+ //_ui.m_t1.SetValue("scale", scale, scale);
|
|
|
+ //_ui.m_t1.SetValue("normal", _cardScale, _cardScale);
|
|
|
+ //_ui.m_t1.Play(() =>
|
|
|
+ //{
|
|
|
+ // playAni = false;
|
|
|
|
|
|
- });
|
|
|
+ //});
|
|
|
showCard = false;
|
|
|
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- _ui.m_loaListener.visible = false;
|
|
|
+ //_ui.m_loaListener.visible = false;
|
|
|
|
|
|
- float scale = _ui.target.height / 1920;
|
|
|
- _ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
|
|
|
- _ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
|
+ //float scale = _ui.target.height / 1920;
|
|
|
+ //_ui.m_comCard.target.scrollPane.viewWidth = 1080 / scale;
|
|
|
+ //_ui.m_comCard.target.scrollPane.SetPercX(0.5f, true);
|
|
|
|
|
|
- _ui.m_t0.SetValue("scale", scale, scale);
|
|
|
- _ui.m_t0.SetValue("normal", _cardScale, _cardScale);
|
|
|
+ //_ui.m_t0.SetValue("scale", scale, scale);
|
|
|
+ //_ui.m_t0.SetValue("normal", _cardScale, _cardScale);
|
|
|
|
|
|
- _ui.m_t0.Play(() =>
|
|
|
- {
|
|
|
- playAni = false;
|
|
|
+ //_ui.m_t0.Play(() =>
|
|
|
+ //{
|
|
|
+ // playAni = false;
|
|
|
|
|
|
- });
|
|
|
+ //});
|
|
|
showCard = true;
|
|
|
|
|
|
}
|