|
@@ -286,12 +286,14 @@ namespace GFGGame
|
|
|
|
|
|
_showLv = isPreview == true ? lv : _cardData.lv;
|
|
|
_showExp = isPreview == true ? exp : _cardData.exp;
|
|
|
+
|
|
|
CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgByrarityAndcardLvl(_cardData.itemCfg.rarity, _showLv);
|
|
|
if (cardLvCfg == null)
|
|
|
{
|
|
|
ET.Log.Error("卡牌" + _cardData.id + " 没有 " + _showLv + " 级等级配置");
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
_comFosterBottom.m_barLv.max = cardLvCfg.needExp;
|
|
|
_comFosterBottom.m_barLv.value = _showExp;
|
|
|
EffectUIPool.Recycle(_effectUI6);
|
|
@@ -581,8 +583,8 @@ namespace GFGGame
|
|
|
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)
|
|
|
+
|
|
|
+ if (_showLv >= lvLimit && _comFosterBottom.m_barLv.value + itemCfg.cardUpLvExp > needExp)
|
|
|
{
|
|
|
if (!showTips) return true;
|
|
|
|
|
@@ -597,7 +599,8 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级可继续升级词牌", roleLv));
|
|
|
+ if(_showLv < maxLv)
|
|
|
+ PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级可继续升级词牌", roleLv));
|
|
|
|
|
|
return true;
|
|
|
}
|