Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Controller/GuideController.cs

@@ -74,6 +74,7 @@ namespace GFGGame
             bool isFinishPriorId = cfg.priorId <= 0 || StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_GUIDE + cfg.priorId) > 0;//前置引导已完成
             bool isFinishCurIndex = GuideDataManager.IsGuideIndexFinish(cfg.id, index) == true;//当前index未完成
             bool isFinishPriorIndex = !checkPriorIndex || checkPriorIndex && GuideDataManager.IsGuideIndexFinish(cfg.id, index - 1) == true;//前置index已完成
+            ET.Log.Debug("storyLevelId:" + cfg.storyLevelId + "    time:" + TimeHelper.ClientNowSeconds());
             bool isCfgChapterOpen = MainStoryDataManager.CheckLevelUnlock(cfg.storyLevelId, false);//引导配置关卡已开启
             bool isCfgChapter = MainStoryDataManager.currentLevelCfgId == 0 || MainStoryDataManager.currentLevelCfgId == cfg.storyLevelId;//无选择（进入游戏时无选择）或当前所选择为配置关卡
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -119,6 +119,7 @@ namespace GFGGame
             _ui.m_partsList.target.x = _ui.target.width;
             _ui.m_partsList2.target.x = _ui.target.width;
             this.showListType1();
+
             if (_sceneObject == null)
             {
                 _sceneObject = GameObject.Instantiate(_scenePrefab);
@@ -324,6 +325,7 @@ namespace GFGGame
                 if (_currentList2 != null)
                 {
                     this.showListType2();
+                    // _ui.m_comListType2.m_listType.numItems = _ui.m_comListType2.m_listType.numItems;
                 }
                 else
                 {
@@ -336,6 +338,8 @@ namespace GFGGame
                 this.showListType1();
                 this.hideListType2();
             }
+            // _ui.m_comListType1.m_listType.numItems = _ui.m_comListType1.m_listType.numItems;
+            // this.ShowSubList();
         }
 
         private void OnClickBtnDelete()
@@ -387,11 +391,16 @@ namespace GFGGame
                 _ui.m_comListType1.m_listType.height = maxHeight;
             }
         }
-
+        // private void ShowSubList()
+        // {
+        //     _ui.m_comListType1.m_listType.numItems = _ui.m_comListType1.m_listType.numItems;
+        //     _ui.m_comListType2.m_listType.numItems = _ui.m_comListType2.m_listType.numItems;
+        // }
         private void showListType1()
         {
             _currentList2 = null;
             currentListType = DressUpListType.List1;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length;
             GTween.To(_ui.target.width, listType1X, 0.5f)
                 .SetTarget(_ui.m_comListType1.target)
                 .OnUpdate((GTweener t) =>
@@ -540,7 +549,7 @@ namespace GFGGame
                     _ui.m_partsList2.target.x = t.value.x;
                 });
         }
-        /********************************************************************************************************************************************/
+        /****************************************************************************************************************************/
         private void ListType1Item(int index, GObject item)
         {
             UI_TypeItem typeItem = UI_TypeItem.Proxy(item);
@@ -549,7 +558,7 @@ namespace GFGGame
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             typeItem.target.data = item1.id;
             typeItem.m_imgNeed.visible = false;
-            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSubtypeNew(item1.id);
+            typeItem.m_imgNew.visible = false;// DressUpMenuItemDataManager.CheckIsSubtypeNew(item1.id);
 
             UI_TypeItem.ProxyEnd();
         }
@@ -562,7 +571,7 @@ namespace GFGGame
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
             typeItem.m_imgNeed.visible = false;
-            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSubtypeNew(item2.id);
+            typeItem.m_imgNew.visible = false;//  DressUpMenuItemDataManager.CheckIsSubtypeNew(item2.id);
 
             UI_TypeItem.ProxyEnd();
 
@@ -585,7 +594,7 @@ namespace GFGGame
                 listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
 
                 listItem.m_ScoreType.visible = false;
-
+                listItem.m_imgNew.visible = false;
             }
             else
             {
@@ -604,7 +613,7 @@ namespace GFGGame
                 ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
                 listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + mainScore);
 
-                listItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsDressItemNew(id);
+                listItem.m_imgNew.visible = false;//  DressUpMenuItemDataManager.CheckIsDressItemNew(id);
                 DressUpMenuItemDataManager.RemoveNewDressItem(_currentMenuType, id);
             }
             if (listItem.target.data == null)