浏览代码

自由换穿戴装套装后部件未勾选

zhaoyang 3 年之前
父节点
当前提交
39fbdef762

+ 8 - 0
GameClient/Assets/Game/HotUpdate/DressUp/DressUpObjDataCache.cs

@@ -183,6 +183,14 @@ namespace GFGGame
             {
                 return true;
             }
+            // if (suitId > 0)
+            // {
+            //     int[] suitparts = SuitCfgArray.Instance.GetCfg(suitId).partsArr;
+            //     if (Array.IndexOf(suitparts, id) >= 0)
+            //     {
+            //         return true;
+            //     }
+            // }
             return _equipDatas.Contains(id);
         }
 

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -529,7 +529,7 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
             iconRes = itemCfg.res;
             partName = itemCfg.name;
-            listItem.m_iconSelected.visible = EquipDataCache.cacher.CheckDressUpItemIsOn(id);
+            listItem.m_iconSelected.visible = !_ui.m_btnAction.grayed || EquipDataCache.cacher.CheckDressUpItemIsOn(id);
             listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
             RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
             ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType);
@@ -585,7 +585,6 @@ namespace GFGGame
 
                 bool isPutOn = EquipDataCache.cacher.CheckDressUpItemIsOn(id);//非套装金判断是否穿戴
                 bool isSuit = !DressUpMenuItemDataManager.CheckIsSceneType(id) && suitId > 0 && SuitCfgManager.Instance.GetItemSuitId(id) == suitId;//非场景类, 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
-                isSuit = !DressUpMenuItemDataManager.CheckIsSceneType(id) && suitId > 0 && SuitCfgManager.Instance.GetItemSuitId(id) == id;
                 bool isSceneSuit = DressUpMenuItemDataManager.CheckIsSceneType(id) && suitId > 0 && isPutOn;//场景类, 若当前穿戴套装要判断item是否属已穿戴
                 listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;