技能书兑换补充提交

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -873,7 +873,11 @@ namespace GFGEditor
             var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             if (itemCfg.itemType == ConstItemType.ITEM && itemCfg.subType == 1 && itemCfg.rarity >= 3)
             {
-                return ConstFunctionId.SKILLBOOK;
+                ItemExchangeCfg itemExchange = ItemExchangeCfgArray.Instance.GetCfg(itemId);
+                if(itemExchange != null)
+                {
+                    return ConstFunctionId.SKILLBOOK;
+                }
             }
             return null;
         }

GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

@@ -66,18 +66,19 @@ namespace GFGGame
 
         private void RenderListConsumeItem(int index, GObject obj)
         {
-            var itemSkill = (int[][])obj.parent.data;
+            var itemSkill = (int)obj.parent.data;
             UI_ComItem item = UI_ComItem.Proxy(obj);
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemSkill[index][0]);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemSkill);
+            ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(_skillId);
             RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             string ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
             item.m_CountType.selectedIndex = 1;
             item.m_txtDecomCount.text = ItemDataManager.GetItemNum(itemCfg.id).ToString();
-            item.m_txtDecomHasCount.text = "/" +  (itemSkill[index][1]*_nowCount).ToString();
+            item.m_txtDecomHasCount.text = "/" +  (itemExchangeCfg.costNumArr[index] * _nowCount).ToString();
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg.res, ext);
             item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
             if (item.target.data == null)
-                item.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(itemSkill[index][0]); });
+                item.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(itemSkill); });
             item.target.data = index;
             UI_ComItem.ProxyEnd();
         }
@@ -85,13 +86,17 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
+            _maxCount = 0;
+            _nowCount = 0;
+            _ui.m_txtChooseLevel.text = _nowCount.ToString();
         }
 
         private void getMaxCount()
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_skillId);
-            foreach (var info in itemCfg.param1Arr) {
-                long cout = ItemDataManager.GetItemNum(info[0]) / info[1];
+            ItemExchangeCfg itemExchangeCfg = ItemExchangeCfgArray.Instance.GetCfg(_skillId);
+            foreach (var info in itemExchangeCfg.costNumArr) {
+                long cout = ItemDataManager.GetItemNum(itemExchangeCfg.costId) / info;
                 if (_maxCount == 0 || _maxCount > cout)
                     _maxCount = cout;
             }
@@ -105,6 +110,11 @@ namespace GFGGame
         private async void OnBtnUseClick()
         {
             //兑换物品
+            if(_nowCount <= 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("请选择兑换数量");
+                return;
+            }
            await ItemExchangeSProxy.ItemExchange(_skillId, _nowCount);
         }