|
@@ -537,7 +537,7 @@ namespace GFGGame
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- public void PutOnSuitCfg(int id, bool checkPic, bool noSceneType, int[] excludeType = null)
|
|
|
|
|
|
+ public void PutOnSuitCfg(int id, bool checkPic, bool noSceneType, int[] excludeType = null, bool showOptional = true, bool CheckOwn = true)
|
|
{
|
|
{
|
|
if (_suitId == id)
|
|
if (_suitId == id)
|
|
{
|
|
{
|
|
@@ -548,14 +548,18 @@ namespace GFGGame
|
|
_isPic = HasSuitPicRes && checkPic;
|
|
_isPic = HasSuitPicRes && checkPic;
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
|
|
SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
|
|
List<int> items = new List<int>(suitCfg.partsArr);
|
|
List<int> items = new List<int>(suitCfg.partsArr);
|
|
- if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
|
|
|
|
|
|
+ if(showOptional)
|
|
{
|
|
{
|
|
- items.AddRange(suitCfg.partsOptionalArr);
|
|
|
|
|
|
+
|
|
|
|
+ if (suitCfg.partsOptionalArr != null && suitCfg.partsOptionalArr.Length > 0)
|
|
|
|
+ {
|
|
|
|
+ items.AddRange(suitCfg.partsOptionalArr);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
int subType = 0;
|
|
int subType = 0;
|
|
foreach (int itemID in items)
|
|
foreach (int itemID in items)
|
|
{
|
|
{
|
|
- if (DressUpMenuItemDataManager.CheckHasItem(itemID))
|
|
|
|
|
|
+ if (!CheckOwn || DressUpMenuItemDataManager.CheckHasItem(itemID))
|
|
{
|
|
{
|
|
bool isSceneType = DressUpMenuItemDataManager.CheckIsSceneType(itemID);
|
|
bool isSceneType = DressUpMenuItemDataManager.CheckIsSceneType(itemID);
|
|
subType = ItemUtilCS.GetItemSubType(itemID);
|
|
subType = ItemUtilCS.GetItemSubType(itemID);
|