|
@@ -181,7 +181,7 @@ namespace GFGGame
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, idList[i][j])[0].resName, "MergeGame");
|
|
|
+ itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, idList[i][j]).resName, "MergeGame");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -215,7 +215,7 @@ namespace GFGGame
|
|
|
itemList[indexX][indexY].GetChild("icon").icon = "";
|
|
|
idList[endIndexX][endIndexY] = itemEndInfo + 1;
|
|
|
itemList[endIndexX][endIndexY].data = itemEndInfo + 1;
|
|
|
- itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, itemEndInfo + 1)[0].resName, "MergeGame");
|
|
|
+ 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();
|
|
@@ -243,7 +243,7 @@ namespace GFGGame
|
|
|
itemList[indexX][indexY].GetChild("icon").icon = "";
|
|
|
idList[endIndexX][endIndexY] = indexID;
|
|
|
itemList[endIndexX][endIndexY].data = indexID;
|
|
|
- itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, indexID)[0].resName, "MergeGame");
|
|
|
+ itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, indexID).resName, "MergeGame");
|
|
|
|
|
|
itemEndInfo = indexID;
|
|
|
indexID = 0;
|
|
@@ -290,9 +290,9 @@ namespace GFGGame
|
|
|
materialID = id;
|
|
|
_ui.m_name.text = id.ToString();
|
|
|
_ui.m_desc.text = id.ToString();
|
|
|
- ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, id)[0].bonusSellArr[0][0]);
|
|
|
+ ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][0]);
|
|
|
_ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetCommonGameResPath(itemReward.res);
|
|
|
- _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, id)[0].bonusSellArr[0][1].ToString();
|
|
|
+ _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, id).bonusSellArr[0][1].ToString();
|
|
|
|
|
|
}
|
|
|
|
|
@@ -347,7 +347,7 @@ namespace GFGGame
|
|
|
{
|
|
|
idList[x][y] = num;
|
|
|
itemList[x][y].data = num;
|
|
|
- itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
|
|
|
+ itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, num).resName, "MergeGame");
|
|
|
itemList[x][y].draggable = true;
|
|
|
UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
|
|
|
itemUI.m_t1.Play();
|
|
@@ -391,7 +391,7 @@ namespace GFGGame
|
|
|
idList[x][y] = num;
|
|
|
itemList[x][y].data = num;
|
|
|
itemList[x][y].draggable = true;
|
|
|
- itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
|
|
|
+ itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, num).resName, "MergeGame");
|
|
|
UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
|
|
|
itemUI.m_t1.Play();
|
|
|
UI_MergeGameItemUI.ProxyEnd();
|
|
@@ -429,12 +429,12 @@ namespace GFGGame
|
|
|
case 0:
|
|
|
_ui.m_rewardOne.target.visible = true;
|
|
|
_ui.m_rewardTwo.target.visible = false;
|
|
|
- _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, targetID)[0].resName, "MergeGame");
|
|
|
+ _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, targetID).resName, "MergeGame");
|
|
|
_ui.m_rewardOne.m_Count.text = targetNum.ToString();
|
|
|
break;
|
|
|
case 1:
|
|
|
_ui.m_rewardTwo.target.visible = true;
|
|
|
- _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, targetID)[0].resName, "MergeGame");
|
|
|
+ _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, targetID).resName, "MergeGame");
|
|
|
_ui.m_rewardTwo.m_Count.text = targetNum.ToString();
|
|
|
break;
|
|
|
default:
|
|
@@ -551,7 +551,7 @@ namespace GFGGame
|
|
|
_ui.m_newMaterial.target.x = itemList[i][j].x + _ui.m_rangeDown.x;
|
|
|
_ui.m_newMaterial.target.y = itemList[i][j].y + _ui.m_rangeDown.y;
|
|
|
_ui.m_newMaterial.target.visible = true;
|
|
|
- _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, idList[i][j])[0].resName,"MergeGame");
|
|
|
+ _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, idList[i][j]).resName,"MergeGame");
|
|
|
UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(_ui.m_newMaterial.target);
|
|
|
itemUI.m_t0.Play();
|
|
|
UI_MergeGameItemUI.ProxyEnd();
|