合成跳转查阅建档

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

@@ -101,10 +101,25 @@ namespace GFGGame
         {
 
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(levelId);
-            bool isPass = InstanceZonesDataManager.CheckLevelPass(storyLevelCfg.needStoryLevelId);
+            StudioCfg cfg = StudioCfgArray.Instance.GetCfg(storyLevelCfg.chapterId);
+            int needStoryLevelId = 0;
+            if (cfg.funId == typeof(StudioFilingView).Name)
+            {
+                needStoryLevelId = cfg.storyLevelId;
+            }
+            else
+            {
+                needStoryLevelId = storyLevelCfg.needStoryLevelId;
+            }
+            bool isPass = InstanceZonesDataManager.CheckLevelPass(needStoryLevelId);
+            StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(needStoryLevelId);
+            if (!isPass && needStoryLevelCfg != null) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
+
+
             bool isRoleLv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) >= storyLevelCfg.needRoleLv;
-            bool isLastPast = true;
+            if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
 
+            bool isLastPast = true;
             List<StoryLevelCfg> storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(storyLevelCfg.type, storyLevelCfg.subType, storyLevelCfg.chapterId);
             int index = storyLevelCfgs.IndexOf(storyLevelCfg);
             if (index > 0 && index < storyLevelCfgs.Count)
@@ -112,11 +127,9 @@ namespace GFGGame
                 isLastPast = InstanceZonesDataManager.CheckLevelPass(storyLevelCfgs[index - 1].id);
 
             }
-            content = "";
-            if (!isRoleLv) content = string.Format("主角等级达到{0}级解锁", storyLevelCfg.needRoleLv);
             if (!isLastPast) content = string.Format("需通关{0}", storyLevelCfgs[index].name);
-            StoryLevelCfg needStoryLevelCfg = StoryLevelCfgArray.Instance.GetCfg(storyLevelCfg.needStoryLevelId);
-            if (!isPass && needStoryLevelCfg != null) content = string.Format("完成主线{0}-{1}解锁", needStoryLevelCfg.chapterId, needStoryLevelCfg.order);
+
+            content = "";
             canFight = isPass && isRoleLv && isLastPast;
         }
 

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

@@ -204,9 +204,10 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
-                            ViewManager.Show<StudioFilingView>();
+                            ViewManager.Show<StudioFilingView>(null, _fromeViewDatas);
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel);
+                            isJump = true;
                         }
                         else
                         {