策划改字段名

GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs

@@ -58,7 +58,7 @@ namespace GFGGame
         private void RenderAFuList(int index, GObject obj)
         {
             UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
-            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res,index+11)[0].resName,"MergeGame");
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res,index+11)[0].resName,"MergeGame");
             if( (index+1) % 5 == 0)
             {
                 item.m_right.visible = false;
@@ -73,7 +73,7 @@ namespace GFGGame
         private void RenderDouBaoList(int index,GObject obj)
         {
             UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
-            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, index+1)[0].resName, "MergeGame");
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, index+1)[0].resName, "MergeGame");
             if ((index + 1) % 5 == 0)
             {
                 item.m_right.visible = false;

GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -91,7 +91,7 @@ namespace GFGGame
         {
             itemNum = 5;
             taskId = MiniGameDateManager.Instance.taskID;
-            _res = MergeGameArray.Instance.GetCfg(taskId).res;
+            _res = MergeGameArray.Instance.GetCfg(taskId).resType;
             maxLv = 5;
             materialID = 0;
             rand = new System.Random();
@@ -158,7 +158,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName, "MergeGame");
+                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, idList[i][j])[0].resName, "MergeGame");
                     }
                 }
             }
@@ -192,7 +192,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.GetCfgsByidAndmaterialId(_res, itemEndInfo + 1)[0].resName, "MergeGame");
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, itemEndInfo + 1)[0].resName, "MergeGame");
                 ShowNewMaterialView(endIndexX, endIndexY);
                  UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
                 itemUI.m_t0.Play();
@@ -214,7 +214,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.GetCfgsByidAndmaterialId(_res, indexID)[0].resName, "MergeGame");
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, indexID)[0].resName, "MergeGame");
 
                 itemEndInfo = indexID;
                 indexID = 0;
@@ -254,9 +254,9 @@ namespace GFGGame
             materialID = id;
             _ui.m_name.text = id.ToString();
             _ui.m_desc.text = id.ToString();
-            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][0]);
+            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, id)[0].bonusSellArr[0][0]);
             _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetCommonGameResPath(itemReward.res);
-            _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][1].ToString();
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, id)[0].bonusSellArr[0][1].ToString();
 
         }
 
@@ -333,7 +333,7 @@ namespace GFGGame
                 {
                     idList[x][y] = num;
                     itemList[x][y].data = num;
-                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, num)[0].resName, "MergeGame");
+                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
                     itemList[x][y].draggable = true;
                     UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
                     itemUI.m_t1.Play();
@@ -394,7 +394,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.GetCfgsByidAndmaterialId(_res, num)[0].resName, "MergeGame");
+                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, num)[0].resName, "MergeGame");
                     UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
                     itemUI.m_t1.Play();
                     UI_MergeGameItemUI.ProxyEnd();
@@ -417,12 +417,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.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, targetID)[0].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.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, targetID)[0].resName, "MergeGame");
                         _ui.m_rewardTwo.m_Count.text = targetNum.ToString();
                         break;
                     default:
@@ -522,7 +522,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.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName,"MergeGame");
+            _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByresTypeAndmaterialId(_res, idList[i][j])[0].resName,"MergeGame");
             UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(_ui.m_newMaterial.target);
             itemUI.m_t0.Play();
             UI_MergeGameItemUI.ProxyEnd();