更新服装数量计算

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -155,11 +155,13 @@ namespace GFGEditor
 
         private static void HandleItemAndDressUpTable(ItemCfg itemCfg, ref int count)
         {
-            if (itemCfg.isHide > 0 || itemCfg.mainScore == 0)
+            // 除去初始衣装
+            if (DressUpMenuItemDataManager.defaultID.Contains(itemCfg.id))
             {
                 return;
             }
-            if (itemCfg.itemType == ConstItemType.DRESS_UP)
+
+                if (itemCfg.itemType == ConstItemType.DRESS_UP)
             {
                 // 服装
                 bool isDressUp = Array.IndexOf(DressUpMenuItemDataManager.dressUpGuideSubType, itemCfg.subType) >= 0;

GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -759,14 +759,14 @@ namespace GFGGame
         }
 
         // 默认的不显示
-        private static List<int> defaultID = new List<int> { 10000, 20000, 30000, 50000, 60000 };
+        public static List<int> defaultID = new List<int> { 10000, 20000, 30000, 50000, 60000 };
         private static bool CanShow(ItemCfg item)
         {
             if (defaultID.Contains(item.id))
             {
                 return false;
             }
-            return (item.isHide <= 0 && item.mainScore > 0);
+            return item.isHide <= 0;
         }
 
         public static List<int> GetAllDressUpGuideIdListBySubTypes(List<int> subTypes)

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -56,8 +56,7 @@ namespace GFGGame
             _ui.m_c1.selectedPage = _activityId.ToString();
             
             _activityCfg = ActivityOpenCfgArray.Instance.GetCfg(_activityId);
-            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_" + _activityCfg.res);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hb_ychm"); 
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath(_activityCfg.res); 
             UpdateRedDot();
             Timers.inst.Add(1, 0, UpdateTime);
         }