田野调查

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

@@ -95,25 +95,7 @@ namespace GFGGame
                 return fieldInfos.highestLvls[chapterId];
             }
         }
-        // /// <summary>
-        // /// 根据挑战难度获取副本配置
-        // /// </summary>
-        // /// <param name="difficulty"></param>
-        // /// <returns></returns>
-        // public FieldCfg GetFieldCfgByDifficulty(int difficulty)
-        // {
-        //     return FieldCfgArray.Instance.GetCfgs(difficulty)[0];
-        // }
 
-        // /// <summary>
-        // /// 根据挑战难度获取当前战斗Id
-        // /// </summary>
-        // /// <returns></returns>
-        // public int GetLevelIdByDifficulty(int difficulty, int index)
-        // {
-        //     FieldCfg cfg = GetFieldCfgByDifficulty(difficulty);
-        //     return StoryLevelCfgArray.Instance.GetCfgs(cfg.type, cfg.subType, cfg.id)[index].id;
-        // }
         /// <summary>
         /// 获取任务列表
         /// </summary>

GameClient/Assets/Game/HotUpdate/Views/Field/FieldTaskView.cs

@@ -1,4 +1,5 @@
 
+using System;
 using System.Collections.Generic;
 using FairyGUI;
 using UI.Field;
@@ -47,14 +48,16 @@ namespace GFGGame
         {
             UI_ListItem item = UI_ListItem.Proxy(obj);
 
-            item.m_txtDesc.text = string.Format("{0}难度挑战成功", difficulty[_cfgs[index].subType]);
+            FieldCfg cfg = FieldCfgArray.Instance.GetCfg(_cfgs[index].chapterId);
+
+            item.m_txtDesc.text = string.Format("{0}难度挑战成功", cfg.name);
             item.m_btnGet.m_txtTitle.text = string.Format("每周上限+{0}", _cfgs[index].addRewardLimit);
             item.m_btnGet.m_c1.selectedIndex = FieldDataManager.Instance.GetTaskState(_cfgs[index].id);
             if (item.m_btnGet.target.data == null)
             {
                 item.m_btnGet.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_btnGet.target.data = _cfgs[index].id;//item.m_btnGet.m_c1.selectedIndex;
+            item.m_btnGet.target.data = _cfgs[index].id;
             UI_ListItem.ClearProxy();
         }
         private async void OnBtnGetClick(EventContext context)

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -36,6 +36,7 @@ namespace GFGGame
             FieldDataManager.Instance.fieldInfos.bonusWeekly = 250;
             FieldDataManager.Instance.fieldInfos.bonusMaxLimit = 800;
             FieldDataManager.Instance.fieldInfos.highestLvls = new System.Collections.Generic.Dictionary<int, int>();
+            FieldDataManager.Instance.fieldInfos.taskDic = new System.Collections.Generic.Dictionary<int, int>();
         }
 
         protected override void OnShown()
@@ -70,26 +71,27 @@ namespace GFGGame
 
         private void OnDifficultyChange()
         {
-            FieldCfg cfg = FieldCfgArray.Instance.dataArray[_selectedIndex];
-            bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLvId);
-            if (_ui.m_c1.selectedIndex != ConstInstanceZonesSubType.Normal && !isPass)
+            int priorIndex = _ui.m_c1.selectedIndex - 1;
+            FieldCfg selectCfg = FieldCfgArray.Instance.dataArray[_ui.m_c1.selectedIndex];
+            bool isPass = InstanceZonesDataManager.CheckLevelPass(selectCfg.storyLvId);
+            if (priorIndex >= 0 && !isPass)
             {
+
                 _ui.m_c1.selectedIndex = _selectedIndex;
-                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(cfg.storyLvId);
+                StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(selectCfg.storyLvId);
                 string str = string.Format("完成主线{0}-{1}解锁", storyLevelCfg.chapterId, storyLevelCfg.order);
                 PromptController.Instance.ShowFloatTextPrompt(str);
                 return;
             }
-            int priorIndex = _ui.m_c1.selectedIndex - 1;
             FieldCfg priorfg = priorIndex >= 0 ? FieldCfgArray.Instance.dataArray[priorIndex] : null;
-            if (priorfg != null && _dataManager.GetHighestLvByChapterId(priorfg.id) < cfg.num)
+            if (priorIndex >= 0 && _dataManager.GetHighestLvByChapterId(priorfg.id) < priorfg.num)
             {
                 _ui.m_c1.selectedIndex = _selectedIndex;
                 PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
                 return;
             }
             _selectedIndex = _ui.m_c1.selectedIndex;
-            _curCfg = cfg;
+            _curCfg = FieldCfgArray.Instance.dataArray[_selectedIndex]; ;
             _dataManager.chapterId = _curCfg.id;
             UpdateView();
         }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -40,7 +40,6 @@ namespace GFGGame
             _ui.m_comFabric.m_c1.selectedIndex = isopen;
             isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, false) ? 1 : 0;
             _ui.m_comProperty.m_c1.selectedIndex = isopen;
-            var dataArray = FieldCfgArray.Instance.dataArray;
 
         }