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

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -2,7 +2,6 @@
 using UI.Card;
 using UI.CommonGame;
 using UI_ComConsume = UI.Card.UI_ComConsume;
-using UI.ClothingSynthetic;
 using System.Collections.Generic;
 using UnityEngine;
 using System.Linq;
@@ -280,7 +279,6 @@ namespace GFGGame
 
             _ui.m_ComFosterTop.m_c1.selectedIndex = _ui.m_ComFosterBottom.m_c_from.selectedIndex;
             _nowIndex = _cardData.index;
-            _ui.m_cardSyntheticBtn.icon = "ui://ClothingSynthetic/kphc_huimeng";
             RefCardFosterInfo();
         }
         protected override void AddEventListener()

GameClient/Assets/Game/HotUpdate/Views/ClothingUpgarde/ClothingUpgradeView.cs

@@ -152,7 +152,7 @@ namespace GFGGame
                     {
                         count = 0;
                     }
-                    item.m_txtCount.text = collegeBoostNextCfg.consumeArr[i][1].ToString() + "/" + count.ToString();
+                    item.m_txtCount.text = count.ToString() + "/" + collegeBoostNextCfg.consumeArr[i][1].ToString();
                     item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
                     item.m_ShowName.selectedIndex = 1;
                     item.m_txtName.text = itemCfg.name;