|
@@ -339,8 +339,8 @@ namespace GFGGame
|
|
int type = (int)sender.data;
|
|
int type = (int)sender.data;
|
|
GObject obj = sender.parent;
|
|
GObject obj = sender.parent;
|
|
|
|
|
|
- UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
|
|
|
|
- int index = (int)listItem.target.data;
|
|
|
|
|
|
+ // UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
|
|
|
|
+ int index = (int)obj.data;// (int)listItem.target.data;
|
|
int itemId = upgradeCardItemsArr[index];
|
|
int itemId = upgradeCardItemsArr[index];
|
|
_consumeSelectItem = obj;
|
|
_consumeSelectItem = obj;
|
|
_consumeSelectIndex = type;
|
|
_consumeSelectIndex = type;
|
|
@@ -366,7 +366,9 @@ namespace GFGGame
|
|
if (_consumeSelectIndex == 0)
|
|
if (_consumeSelectIndex == 0)
|
|
{
|
|
{
|
|
UI_ComConsume listItem = UI_ComConsume.Proxy(_consumeSelectItem);
|
|
UI_ComConsume listItem = UI_ComConsume.Proxy(_consumeSelectItem);
|
|
- if (!CommonUtil.Instance.CheckPointIsOnComponent(listItem.m_btnMinus, CommonUtil.Instance.GetMouseV2Point()))
|
|
|
|
|
|
+ bool pointIsOnComponent = CommonUtil.Instance.CheckPointIsOnComponent(listItem.m_btnMinus, CommonUtil.Instance.GetMouseV2Point());
|
|
|
|
+ UI_ComConsume.ProxyEnd();
|
|
|
|
+ if (!pointIsOnComponent)
|
|
{
|
|
{
|
|
Timers.inst.Remove(OnTimedEvent);
|
|
Timers.inst.Remove(OnTimedEvent);
|
|
return;
|
|
return;
|
|
@@ -405,7 +407,7 @@ namespace GFGGame
|
|
{
|
|
{
|
|
UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
|
|
UI_ComConsume listItem = UI_ComConsume.Proxy(obj);
|
|
|
|
|
|
- int index = (int)listItem.target.data;
|
|
|
|
|
|
+ int index = (int)obj.data;
|
|
int itemId = upgradeCardItemsArr[index];
|
|
int itemId = upgradeCardItemsArr[index];
|
|
|
|
|
|
if (itemsCount[index] == ItemDataManager.GetItemNum(itemId))
|
|
if (itemsCount[index] == ItemDataManager.GetItemNum(itemId))
|
|
@@ -431,6 +433,7 @@ namespace GFGGame
|
|
if (IsUpLvLimit(itemId, false)) return false;
|
|
if (IsUpLvLimit(itemId, false)) return false;
|
|
itemsCount[index] = itemsCount[index] + 1;
|
|
itemsCount[index] = itemsCount[index] + 1;
|
|
listItem.m_txtUseCount.text = itemsCount[index].ToString();
|
|
listItem.m_txtUseCount.text = itemsCount[index].ToString();
|
|
|
|
+ UI_ComConsume.ProxyEnd();
|
|
this.UpdatePreView();
|
|
this.UpdatePreView();
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
@@ -449,6 +452,7 @@ namespace GFGGame
|
|
}
|
|
}
|
|
itemsCount[index] = itemsCount[index] - 1;
|
|
itemsCount[index] = itemsCount[index] - 1;
|
|
listItem.m_txtUseCount.text = itemsCount[index].ToString();
|
|
listItem.m_txtUseCount.text = itemsCount[index].ToString();
|
|
|
|
+ UI_ComConsume.ProxyEnd();
|
|
this.UpdatePreView();
|
|
this.UpdatePreView();
|
|
}
|
|
}
|
|
private void UpdatePreView()
|
|
private void UpdatePreView()
|