|
@@ -125,7 +125,7 @@ namespace GFGGame
|
|
|
_ui.m_loaGuide.visible = true;
|
|
|
InstanceZonesDataManager.usedRecommend = false;
|
|
|
// _ui.m_comboBox.title = "我的套装";
|
|
|
- _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制:{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
|
|
|
+ // _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制:{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
|
|
|
_ui.m_txtRecommendCount.SetVar("v1", "" + GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.RecommendCount)).FlushVars();
|
|
|
_ui.m_txtRecommendCount.SetVar("v2", GlobalCfgArray.globalCfg.recommendCount.ToString()).FlushVars();
|
|
|
|
|
@@ -427,7 +427,9 @@ namespace GFGGame
|
|
|
int _suitId = MyDressUpHelper.dressUpObj.suitId;
|
|
|
bool isNoSuit = _fightCfg.needSuitId > 0 && _suitId != _fightCfg.needSuitId;//需要套装但未穿套装
|
|
|
|
|
|
- bool isNoItem = _fightCfg.needItemId > 0 && (_suitId <= 0 && !MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(_fightCfg.needItemId) || _suitId > 0 && Array.IndexOf(SuitCfgArray.Instance.GetCfg(_suitId).partsArr, _fightCfg.needItemId) < 0);
|
|
|
+ bool isDressUpItem = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(_fightCfg.needItemId);
|
|
|
+ bool isIncludeItem = _suitId > 0 && Array.IndexOf(SuitCfgArray.Instance.GetCfg(_suitId).partsArr, _fightCfg.needItemId) >= 0;
|
|
|
+ bool isNoItem = _fightCfg.needItemId > 0 && !isDressUpItem && !isIncludeItem;
|
|
|
|
|
|
if (isNoSuit || isNoItem)
|
|
|
{
|