Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -372,6 +372,7 @@ namespace GFGEditor
         private static string GetStoryLevelApproach(int itemId)
         {
             List<string> approachs = new List<string>();
+            StoryChapterCfg chapterCfg = new StoryChapterCfg();
             StoryLevelCfgArray manager = StoryLevelCfgArray.Instance;
             StoryLevelCfg[] dataArray = manager.dataArray;
             foreach (StoryLevelCfg cfg in dataArray)
@@ -384,11 +385,14 @@ namespace GFGEditor
                 {
 
                 }
-                bool result = CheckItemInBonus(itemId, cfg);
-                if (result)
-                {
-                    string approach = "JU_QING_GUAN_QIA=" + cfg.id;
-                    approachs.Add(approach);
+                chapterCfg = StoryChapterCfgArray.Instance.GetCfg(cfg.chapterId);
+                if (chapterCfg != null) {
+                    bool result = CheckItemInBonus(itemId, cfg);
+                    if (result)
+                    {
+                        string approach = "JU_QING_GUAN_QIA=" + cfg.id;
+                        approachs.Add(approach);
+                    }
                 }
             }
             if (approachs.Count > 0)

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

@@ -57,7 +57,7 @@ namespace GFGGame
             if (cfg.special <= 0) return false;
             if (cfg.guideKey == ConstGuideId.SUIT_LIST_VIEW)
             {
-                return FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false);
+                return FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ClothingListView).Name, false) && SuitUtil.GetClothingFosterHasSuitId();
             }
             return false;
 
@@ -69,7 +69,6 @@ namespace GFGGame
             {
                 return false;
             }
-
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(guideKey);
             if (cfg == null || GuideDataManager.currentGuideId != 0 && GuideDataManager.currentGuideId != cfg.id) return false;
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);

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

@@ -267,7 +267,7 @@ namespace GFGGame
             List<int> itemList = new List<int>();
             foreach (int subType in itemListDic.Keys)
             {
-                DressUpMenuItemDataManager.SortItemListByHighScore(itemListDic[subType]);
+                //DressUpMenuItemDataManager.SortItemListByHighScore(itemListDic[subType]);
                 if (subType == ConstDressUpItemType.TE_SHU)
                 {
                     int max = Math.Min(itemListDic[subType].Count, 5);

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

@@ -279,10 +279,9 @@ namespace GFGGame
         }
         private static void CheckUpLv(object param)
         {
-            if (GuideDataManager.currentGuideId > 0) return;
+            if (GuideDataManager.currentGuideId > 0) return;//在新手引导中不弹
             if (ViewManager.isViewOpen(typeof(FunctionOpenView).Name)) return;//等功能开启展示完成后再展示角色升级
             if (ViewManager.isViewOpen(typeof(StoryFightSingleScoreView).Name)) return;//战斗界面关闭前不弹升级
-            if (ViewManager.isViewOpen(typeof(StoryFightTargetScoreView).Name)) return;//战斗界面关闭前不弹升级
 
             if (InstanceZonesDataManager.isQuicklyFighting == true) return;//速刷中不弹
             if (InstanceZonesDataManager.isResultFighting == true) return;//结算中经验进度结束前不弹

GameClient/Assets/Game/HotUpdate/Utils/SuitUtil.cs

@@ -291,6 +291,19 @@ namespace GFGGame
             return result;
         }
 
+        //判断服装升级引导是否开启
+        public static bool GetClothingFosterHasSuitId()
+        {
+            SuitFosterListCfg[] dataArray = SuitFosterListCfgArray.Instance.dataArray;
+            foreach (SuitFosterListCfg suitCfg in dataArray)
+            {
+                if (DressUpMenuSuitDataManager.CheckHaveSuit(suitCfg.suitId))
+                    return true;
+            }
+
+            return false;
+        }
+
         public static List<int> GetSuitIdList(bool notGet, bool haveGot, int typeId, int sortIndex)
         {
 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -90,15 +90,17 @@ namespace GFGGame
                 if (levelCfg.type == ConstInstanceZonesType.Story)
                 {
                     var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
-                    string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.order);
-                    string level = NumberUtil.GetChiniseNumberText(levelCfg.order);
-                    if (levelCfg.subType == ConstInstanceZonesSubType.Normal)
-                    {
-                        listItem.m_txtSourceName.text = string.Format(gameFunctionCfg.name, chapter, level);
-                    }
-                    else if (levelCfg.subType == ConstInstanceZonesSubType.Hard)
-                    {
-                        listItem.m_txtSourceName.text = string.Format("精英" + gameFunctionCfg.name, chapter, level);
+                    if (chapterCfg != null) { 
+                        string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.order);
+                        string level = NumberUtil.GetChiniseNumberText(levelCfg.order);
+                        if (levelCfg.subType == ConstInstanceZonesSubType.Normal)
+                        {
+                            listItem.m_txtSourceName.text = string.Format(gameFunctionCfg.name, chapter, level);
+                        }
+                        else if (levelCfg.subType == ConstInstanceZonesSubType.Hard)
+                        {
+                            listItem.m_txtSourceName.text = string.Format("精英" + gameFunctionCfg.name, chapter, level);
+                        }
                     }
                 }
                 else if (levelCfg.type == ConstInstanceZonesType.Studio)

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs

@@ -77,7 +77,8 @@ namespace GFGGame
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
                 || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
-                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
+                || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0
+                || GuideDataManager.IsGuideFinish(ConstGuideId.FIELD) <= 0)
             {
                 UpdateToCheckGuide(null);
             }

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -197,7 +197,7 @@ namespace GFGGame
             if (index < 0) return;
             _ui.m_listBg.ScrollToView(index, true);
 
-            if (_activityId > 0 && _curIndex == LuckyBoxDataManager.BOX_ID_2)
+            if (_activityId > 0 && index + 1 == LuckyBoxDataManager.BOX_ID_2)
                 GetWishingPoolInfo(_activityId);
         }
 
@@ -208,7 +208,7 @@ namespace GFGGame
             index = Mathf.Min(_ui.m_listBg.numItems - 1, index);
             _ui.m_listBg.ScrollToView(index, true);
 
-            if (_activityId > 0 && _curIndex == LuckyBoxDataManager.BOX_ID_2)
+            if (_activityId > 0 && index + 1 == LuckyBoxDataManager.BOX_ID_2)
                 GetWishingPoolInfo(_activityId);
         }
 
@@ -624,7 +624,9 @@ namespace GFGGame
 
             GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 1, "“摘星”里可以通过星辰的力量获得服饰。", -1, true, _ui.target.height - 600);
             GuideController.TryGuide(btnBuyTen, ConstGuideId.LUCKY_BOX, 2, "点击摘取十次。");
+            GuideController.TryCompleteGuide( ConstGuideId.LUCKY_BOX, 2);
         }
+
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -129,8 +129,9 @@ namespace GFGGame
 
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
             newIndex = StoryUtil.GetChapterOrder(chapterCfg.id);
-            indexY = 115.0f * (float)StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id).Count;
+            indexY = 111.0f * Mathf.Max(0, (float)StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterCfg.type, chapterCfg.subType, chapterCfg.id).Count - 5);
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
+            _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 
@@ -141,16 +142,6 @@ namespace GFGGame
             _ui.target.touchable = true;
 
             Timers.inst.AddUpdate(CheckGuide);
-
-            int chapterNum = StoryChapterCfgArray.Instance.GetCfgsBysubType(currentDifficulty).Count;
-            if (MainStoryDataManager.CurrentChapterOrder == chapterNum)
-            {
-                _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
-            }
-            else
-            {
-                _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
-            }
         }
 
         protected override void OnHide()
@@ -231,7 +222,12 @@ namespace GFGGame
             float starPosY = _ui.m_chapter.m_compChapterScroll.m_imgBegin.y;
             int lineGap = 4500 / list.Count;
 
-            _comEff.visible = false;
+            StoryLevelCfg lastLevelCfg = list[list.Count - 1];
+            if (lastLevelCfg != null && MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
+            {
+                _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
+            }
+                _comEff.visible = false;
             _effFirst.visible = false;
             for (int i = 0; i < 20; i++)
             {
@@ -349,15 +345,15 @@ namespace GFGGame
             }
             yield return new WaitForEndOfFrame();
 
-            _ui.m_chapter.m_compChapterScroll.target.y =Mathf.Max(1 , _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
+            _ui.m_chapter.m_compChapterScroll.target.y = 0; //Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height);
 
-            if(gamey != null)
+            if (gamey != null)
                 gamey.transform.position = new Vector3(0, indexY, 0);
         }
 
         private void SetContainerY(object param = null)
         {
-            _ui.m_chapter.m_compChapterScroll.target.y = Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height - 1);
+            _ui.m_chapter.m_compChapterScroll.target.y = 1; //Mathf.Max(0, _ui.m_chapter.target.height - _ui.m_chapter.m_compChapterScroll.target.height - 1);
         }
 
         private void HideEffect(object param = null)

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -298,7 +298,7 @@ namespace GFGGame
             for (int i = 0; i < _chapterCfgs.Count; i++)
             {
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
-                if (i == _chapterCfgs.Count - 1)
+                if (i == _chapterCfgs.Count - 1 && MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
                     ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id, 0 });
                     isOpen = false;