|
@@ -103,8 +103,6 @@ namespace GFGGame
|
|
|
|
|
|
EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
|
|
|
// EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
|
|
|
- _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
|
|
|
- _comStarCousumeGold = UI_ComCostCurrencyWithHas.Proxy(_comFosterBottom.m_comStarCousumeGold);
|
|
|
|
|
|
}
|
|
|
|
|
@@ -112,8 +110,10 @@ namespace GFGGame
|
|
|
protected override void OnShown()
|
|
|
{
|
|
|
base.OnShown();
|
|
|
- _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
|
|
|
+ _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
|
|
|
+ _comStarCousumeGold = UI_ComCostCurrencyWithHas.Proxy(_comFosterBottom.m_comStarCousumeGold);
|
|
|
|
|
|
+ _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
|
|
|
_cardData = CardDataManager.GetCardDataById((this.viewData as CardData).id);
|
|
|
|
|
|
playAni = false;
|
|
@@ -259,20 +259,25 @@ namespace GFGGame
|
|
|
if (listItem.m_btnMinus.data == null)
|
|
|
{
|
|
|
|
|
|
- listItem.m_btnMinus.onTouchBegin.Add(() => OnClickItemConsumsBegin(obj, 0));
|
|
|
- listItem.m_btnMinus.onTouchEnd.Add(() => OnClickItemLvConsumsEnd());
|
|
|
+ listItem.m_btnMinus.onTouchBegin.Add(OnClickItemConsumsBegin);
|
|
|
+ listItem.m_btnMinus.onTouchEnd.Add(OnClickItemLvConsumsEnd);
|
|
|
}
|
|
|
if (listItem.m_loaBg.data == null)
|
|
|
{
|
|
|
- listItem.m_loaBg.onTouchBegin.Add(() => OnClickItemConsumsBegin(obj, 1));
|
|
|
- listItem.m_loaBg.onTouchEnd.Add(() => OnClickItemLvConsumsEnd());
|
|
|
+ listItem.m_loaBg.onTouchBegin.Add(OnClickItemConsumsBegin);
|
|
|
+ listItem.m_loaBg.onTouchEnd.Add(OnClickItemLvConsumsEnd);
|
|
|
}
|
|
|
- listItem.m_btnMinus.data = index;
|
|
|
- listItem.m_loaBg.data = index;
|
|
|
+ listItem.m_btnMinus.data = 0;
|
|
|
+ listItem.m_loaBg.data = 1;
|
|
|
UI_ComConsume.ProxyEnd();
|
|
|
}
|
|
|
- private void OnClickItemConsumsBegin(GObject obj, int type)
|
|
|
+ private void OnClickItemConsumsBegin(EventContext context)
|
|
|
{
|
|
|
+ // GObject obj, int type
|
|
|
+ GObject sender = context.sender as GObject;
|
|
|
+ int type = (int)sender.data;
|
|
|
+ GObject obj = sender.parent;
|
|
|
+
|
|
|
UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
|
|
|
int index = (int)listItem.target.data;
|
|
|
int itemId = upgradeCardItemsArr[index];
|
|
@@ -749,6 +754,7 @@ namespace GFGGame
|
|
|
|
|
|
private void OnChangeCtrlTab()
|
|
|
{
|
|
|
+ _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
|
|
|
this.UpdateCommon();
|
|
|
if (_comFosterBottom.m_ctrlTab.selectedIndex == 0)
|
|
|
{
|
|
@@ -790,8 +796,8 @@ namespace GFGGame
|
|
|
EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateUpStarView);
|
|
|
EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
|
|
|
Timers.inst.Remove(OnTimedEvent);
|
|
|
-
|
|
|
- //_timer.Stop();
|
|
|
+ UI_ComCostCurrency.ProxyEnd();
|
|
|
+ UI_ComCostCurrencyWithHas.ProxyEnd();
|
|
|
_comFosterBottom.m_listLvConsume.numItems = 0;
|
|
|
}
|
|
|
protected override void UpdateToCheckGuide(object param)
|