Browse Source

必需品跳转合成选中对应物品

zhaoyang 3 years ago
parent
commit
48a2af1905

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/StorageDataManager.cs

@@ -24,7 +24,7 @@ namespace GFGGame
         {
         {
             if (!_storangeInfoById.ContainsKey(key))
             if (!_storangeInfoById.ContainsKey(key))
             {
             {
-                return -1;
+                return 0;
             }
             }
 
 
             return _storangeInfoById[key];
             return _storangeInfoById[key];

+ 5 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -40,6 +40,7 @@ namespace GFGGame
         private ValueBarController _valueBarController;
         private ValueBarController _valueBarController;
         private GLoader _imgSelected;
         private GLoader _imgSelected;
         private int _suitId;
         private int _suitId;
+        private int _itemId;
         private int[] _items;
         private int[] _items;
         private int _selectedItemId;
         private int _selectedItemId;
         private GComponent _selectedListItem;
         private GComponent _selectedListItem;
@@ -106,7 +107,8 @@ namespace GFGGame
         protected override void OnShown()
         protected override void OnShown()
         {
         {
             base.OnShown();
             base.OnShown();
-            _suitId = (int)this.viewData;
+            _suitId = (int)(this.viewData as object[])[0];
+            _selectedItemId = (this.viewData as object[]).Length > 1 ? (int)(this.viewData as object[])[1] : 0;
             _valueBarController.OnShown();
             _valueBarController.OnShown();
             UpdateClothingList(false);
             UpdateClothingList(false);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemNumChanged);
@@ -148,7 +150,7 @@ namespace GFGGame
             }
             }
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_selectedItemId);
             //合成消耗判断
             //合成消耗判断
-            if(ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
+            if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum)
             {
             {
                 PromptController.Instance.ShowFloatTextPrompt("消耗不足!", MessageType.WARNING);
                 PromptController.Instance.ShowFloatTextPrompt("消耗不足!", MessageType.WARNING);
                 return;
                 return;
@@ -382,7 +384,7 @@ namespace GFGGame
             }
             }
             if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 9, "这里可以查看合成需要的材料,和材料的获取途径");
             if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 9, "这里可以查看合成需要的材料,和材料的获取途径");
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 10, "点击合成物品");
             GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 10, "点击合成物品");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 11, "获得必需品啦,继续通关主线剧情吧");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 11, "获得必需品啦,继续通关主线剧情吧", -1, true, 180);
         }
         }
     }
     }
 }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -129,7 +129,7 @@ namespace GFGGame
             {
             {
                 if (!isLock)
                 if (!isLock)
                 {
                 {
-                    ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId, new object[] { ViewName.SUIT_SYNTHETIC_LIST_VIEW, this.viewData });
+                    ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId }, new object[] { ViewName.SUIT_SYNTHETIC_LIST_VIEW, this.viewData });
                 }
                 }
             });
             });
 
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -143,7 +143,7 @@ namespace GFGGame
                     if (suitId > 0)
                     if (suitId > 0)
                     {
                     {
                         this.Hide();
                         this.Hide();
-                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, suitId, _fromeViewDatas);
+                        ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId, _itemId }, _fromeViewDatas);
                     }
                     }
                     break;
                     break;
                 case ConstFunctionId.ZHAI_XING:
                 case ConstFunctionId.ZHAI_XING: