Merge remote-tracking branch 'remotes/origin/master' into ios_test

GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -169,7 +169,15 @@ namespace GFGGame
             {
                 _ui.m_comCost.target.visible = true;
                 _ui.m_txtRmbCost.visible = false;
-                ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, _shopCfg.CostIdReal, (int)_buyCount * _shopCfg.Price);
+                if(_shopCfg.menu1 == 5)
+                {
+                    ItemCfg costItemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.menu2 == 0 || _shopCfg.menu2 == ArenaDataManager.Instance.SeasonId ? _shopCfg.CostIdReal : _shopCfg.oldSeasonCostId);
+                    ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, costItemCfg.id, (int)_buyCount * _shopCfg.Price);
+                }
+                else
+                {
+                    ItemUtil.UpdateItemNeedNum(_ui.m_comCost.target, _shopCfg.CostIdReal, (int)_buyCount * _shopCfg.Price);
+                }
             }
         }