卡牌展示大小调整

FGUIProject/assets/Card/CardFosterUI.xml

@@ -32,8 +32,8 @@
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="15" label2="scale" ease="Linear"/>
-    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="18" ease="Cubic.In"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="18" ease="Cubic.In"/>
+    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="20" ease="Cubic.In"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="20" ease="Cubic.In"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="12" label2="normal" ease="Linear"/>

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

@@ -556,6 +556,8 @@ namespace GFGGame
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             int lvLimit = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).cardLeverLimit;
+            int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
+            lvLimit = Mathf.Min(lvLimit, maxLv);
             int needExp = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(_cardData.itemCfg.rarity, lvLimit).needExp;
 
             if (_showLv > lvLimit || _showLv == lvLimit && _comFosterBottom.m_barLv.value + itemCfg.cardUpLvExp > needExp)