Browse Source

合成补充

zhangyuqian 10 months ago
parent
commit
094e4d647c

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
                 item.target.onClick.Add(OnClickItem);
                 item.target.onClick.Add(OnClickItem);
             }
             }
             item.target.data = index + 1;
             item.target.data = index + 1;
-            int id = index + 1 + 10;
+            int id = index + 1;
             if (MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(id))
             if (MiniGameDateManager.Instance.NewItemIdDic.ContainsKey(id))
             {
             {
                 if (MiniGameDateManager.Instance.NewItemIdDic[id] == 1)
                 if (MiniGameDateManager.Instance.NewItemIdDic[id] == 1)

+ 7 - 4
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -75,7 +75,6 @@ namespace GFGGame
         {
         {
             base.OnShown();
             base.OnShown();
             _valueBarController.OnShown();
             _valueBarController.OnShown();
-            _valueBarController.UpdateList(new List<int>() {propID});
             //进入这个界面的时候向后台获取任务id和历史id列表
             //进入这个界面的时候向后台获取任务id和历史id列表
             idList = MiniGameDateManager.Instance.GetIdListToLL();
             idList = MiniGameDateManager.Instance.GetIdListToLL();
             canBtn = true;
             canBtn = true;
@@ -121,6 +120,10 @@ namespace GFGGame
         {
         {
             itemNum = 5;
             itemNum = 5;
             taskId = MiniGameDateManager.Instance.taskID;
             taskId = MiniGameDateManager.Instance.taskID;
+            MergeGame mergeCfg = MergeGameArray.Instance.GetCfg(taskId);
+            propID = mergeCfg.comsumeBuyArr[0][0];
+            int sellId = mergeCfg.bonusWinArr[0][0];
+            _valueBarController.UpdateList(new List<int>() { propID, sellId });
             _res = MergeGameArray.Instance.GetCfg(taskId).resType;
             _res = MergeGameArray.Instance.GetCfg(taskId).resType;
             maxLv = 5;
             maxLv = 5;
             materialID = 0;
             materialID = 0;
@@ -254,14 +257,14 @@ namespace GFGGame
                 itemList[endIndexX][endIndexY].data = indexID;
                 itemList[endIndexX][endIndexY].data = indexID;
                 itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, indexID).resName, "MergeGame");
                 itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgByresTypeAndmaterialld(_res, indexID).resName, "MergeGame");
 
 
-                itemEndInfo = indexID;
-                indexID = 0;
-
                 bool result = await MiniGameProxy.ReqMergeGame(indexID, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
                 bool result = await MiniGameProxy.ReqMergeGame(indexID, itemEndInfo, afterIDList, MiniGameDateManager.Instance.GetListByll(idList));
                 if(result)
                 if(result)
                 {
                 {
                     idList = MiniGameDateManager.Instance.GetIdListToLL();
                     idList = MiniGameDateManager.Instance.GetIdListToLL();
                 }
                 }
+
+                itemEndInfo = indexID;
+                indexID = 0;
             }
             }
 
 
             item.x = startX;
             item.x = startX;