|
@@ -231,9 +231,9 @@ namespace GFGGame
|
|
|
itemList[endIndexX][endIndexY].data = itemEndInfo + 1;
|
|
|
itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, itemEndInfo + 1).resName, "MergeGame");
|
|
|
ShowNewMaterialView(endIndexX, endIndexY);
|
|
|
- UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
|
|
|
- itemUI.m_t0.Play();
|
|
|
- UI_MergeGameItemUI.ProxyEnd();
|
|
|
+ //UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
|
|
|
+ //itemUI.m_t0.Play();
|
|
|
+ //UI_MergeGameItemUI.ProxyEnd();
|
|
|
|
|
|
if(InspectionTasks())
|
|
|
{
|