副本关卡

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 302fafaa594449df3fb3d2c8f58cfdf4e156bb4b
+Subproject commit c32c82947d1eff12e36f1e7e6c12e614a0b3b4f8

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

@@ -39,8 +39,8 @@ namespace GFGGame
         {
             get
             {
-                CalculateHelper.GetStoryChapterLevel(_currentLevelCfgId, out int chapterID, out int levelOrder);
-                return levelOrder;
+                var levelCfg = StoryLevelCfgArray.Instance.GetCfg(_currentLevelCfgId);
+                return levelCfg.order;
             }
         }
 
@@ -111,8 +111,8 @@ namespace GFGGame
             var star = 0;
             foreach (var item in _starDic)
             {
-                CalculateHelper.GetStoryChapterLevel(item.Key, out var tempChapter, out var levelOrder);
-                if (tempChapter == chapterID)
+                var levelCfg = StoryLevelCfgArray.Instance.GetCfg(item.Key);
+                if (levelCfg.chapterId == chapterID)
                 {
                     star += item.Value;
                 }
@@ -252,11 +252,12 @@ namespace GFGGame
             return true;
         }
 
-        public static int GetCanFightTime(int levelID)
+        public static int GetCanFightTime(int levelCfgId)
         {
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
+            var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
             int times = (int)Math.Floor((float)GameGlobal.myNumericComponent.GetAsInt(NumericType.Power) / levelCfg.power);
             return times;
         }
+
     }
 }

GameClient/Assets/Game/HotUpdate/ServerProxy/StorySProxy.cs

@@ -66,8 +66,8 @@ namespace GFGGame
                     //更新数据
                     InstanceZonesDataManager.TryUpdateScore(response.LevelCfgId, response.Score);
                     InstanceZonesDataManager.TryUpdateLevelStar(response.LevelCfgId, response.Star);
-                    CalculateHelper.GetStoryChapterLevel(response.LevelCfgId, out var chapter, out var level);
-                    StoryDataManager.UpdateBoxBonusStates(chapter, response.BoxStates);
+                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+                    StoryDataManager.UpdateBoxBonusStates(levelCfg.chapterId, response.BoxStates);
                     //展示奖励
                     List<ItemData> bonusList = StoryBonusDataCache.GetBonusList(response.LevelCfgId, response.HasOnceBonus);
                     if(response.RandomBonusList != null)

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

@@ -78,10 +78,19 @@ namespace GFGGame
             {
                 string value = infos[1];
                 var levelCfgId = int.Parse(value);
-                CalculateHelper.GetStoryChapterLevel(levelCfgId, out int chapterInt, out int levelInt);
-                string chapter = NumberUtil.GetChiniseNumberText(chapterInt);
-                string level = NumberUtil.GetChiniseNumberText(levelInt);
-                listItem.target.text = string.Format(gameFunctionCfg.name, chapter, level);
+                var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+                if(levelCfg.type == ConstInstanceZonesType.Story)
+                {
+                    var chapterCfg = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                    string chapter = NumberUtil.GetChiniseNumberText(chapterCfg.order);
+                    string level = NumberUtil.GetChiniseNumberText(levelCfg.order);
+                    listItem.target.text = string.Format(gameFunctionCfg.name, chapter, level);
+                }
+                else if(levelCfg.type == ConstInstanceZonesType.Studio)
+                {
+                    var studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
+                    listItem.target.text = studioCfg.name;
+                }
             }
             else
             {
@@ -106,13 +115,21 @@ namespace GFGGame
                 case ConstFunctionId.JU_QING_GUAN_QIA:
                     string value = infos[1];
                     var levelCfgId = int.Parse(value);
-                    CalculateHelper.GetStoryChapterLevel(levelCfgId, out int chapterInt, out int levelInt);
-                    if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                    var levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelCfgId);
+
+                    if (levelCfg.type == ConstInstanceZonesType.Story)
+                    {
+                        if ((string)_fromeViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                        {
+                            //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
+                            _fromeViewDatas = null;
+                        }
+                        ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, levelCfg.chapterId, _fromeViewDatas, true);
+                    }
+                    else if (levelCfg.type == ConstInstanceZonesType.Studio)
                     {
-                        //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
-                        _fromeViewDatas = null;
+                        //TO DO
                     }
-                    ViewManager.Show(ViewName.STORY_CHAPTER_VIEW, chapterInt, _fromeViewDatas, true);
                     StoryController.ShowLevelView(levelCfgId);
                     break;
                 case ConstFunctionId.FU_ZHUANG_HE_CHENG: