|
@@ -47,18 +47,6 @@ namespace GFGGame
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- public bool HasSuitActionRes
|
|
|
|
- {
|
|
|
|
- get
|
|
|
|
- {
|
|
|
|
- if (_dressUpData.suitId > 0)
|
|
|
|
- {
|
|
|
|
- return SuitCfgArray.Instance.CheckSuitHasAction(_dressUpData.suitId);
|
|
|
|
- }
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
public List<int> itemList
|
|
public List<int> itemList
|
|
{
|
|
{
|
|
get
|
|
get
|
|
@@ -305,7 +293,8 @@ namespace GFGGame
|
|
}
|
|
}
|
|
TakeOffAll(false);
|
|
TakeOffAll(false);
|
|
_dressUpData.suitId = id;
|
|
_dressUpData.suitId = id;
|
|
- _dressUpData.actionId = (HasSuitActionRes && tryShowAction) ? id : 0;
|
|
|
|
|
|
+ bool hasSuitActionRes = DressUpMenuSuitDataManager.CheckSuitHasAction(_dressUpData.suitId);
|
|
|
|
+ _dressUpData.actionId = (hasSuitActionRes && tryShowAction) ? id : 0;
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.suitId);
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.suitId);
|
|
List<int> items = new List<int>(suitCfg.partsArr);
|
|
List<int> items = new List<int>(suitCfg.partsArr);
|
|
if (showOptional)
|
|
if (showOptional)
|
|
@@ -538,8 +527,8 @@ namespace GFGGame
|
|
if (IsAction)
|
|
if (IsAction)
|
|
{
|
|
{
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.actionId);
|
|
- var hasAniRes = !string.IsNullOrEmpty(suitCfg.aniRes);
|
|
|
|
- var res = hasAniRes ? suitCfg.aniRes : suitCfg.picRes;
|
|
|
|
|
|
+ var hasAniRes = ResPathUtil.CheckDressUpAnimationExist(suitCfg.aniRes);
|
|
|
|
+ var res = hasAniRes ? suitCfg.aniRes : null;
|
|
DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, suitCfg.effRes, false, _roleObj);
|
|
DressUpUtil.UpdateWholeBody(res, _sceneObj, hasAniRes, suitCfg.effRes, false, _roleObj);
|
|
}
|
|
}
|
|
else
|
|
else
|