田野调查

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

@@ -15,8 +15,6 @@ namespace GFGEditor
             needPowerDic.Clear();
             var dataArray = FieldCfgArray.Instance.dataArray;
 
-            // for (int i = dataArray.Length - 1; i >= 0; i--)
-            // {
             for (int i = 0; i < dataArray.Length; i++)
             {
                 FieldCfg cfg = dataArray[i];
@@ -39,8 +37,8 @@ namespace GFGEditor
                     var num = numDic[cfg.id];
                     var needPower = needPowerDic[cfg.id];
 
-                    var names = new string[] { nameof(cfg.num), nameof(cfg.needPower) };
-                    var values = new string[] { "" + num, "" + needPower };
+                    var names = new string[] { nameof(cfg.num) };
+                    var values = new string[] { "" + num };
                     SQLiteHelper.Instance.UpdateValues(nameof(FieldCfgArray), names, values, nameof(cfg.id), cfg.id.ToString());
                 }
             }

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

@@ -139,9 +139,9 @@ namespace GFGGame
             FieldCfg selectCfg1 = FieldCfgArray.Instance.dataArray[1];
             FieldCfg selectCfg2 = FieldCfgArray.Instance.dataArray[2];
 
-            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", GlobalCfgArray.globalCfg.fieldRewardConsumeArr[0]);
-            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", GlobalCfgArray.globalCfg.fieldRewardConsumeArr[1]);
-            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", GlobalCfgArray.globalCfg.fieldRewardConsumeArr[2]);
+            _ui.m_btn0.m_txtConsume.text = string.Format("x{0}", selectCfg0.needPower);
+            _ui.m_btn1.m_txtConsume.text = string.Format("x{0}", selectCfg1.needPower);
+            _ui.m_btn2.m_txtConsume.text = string.Format("x{0}", selectCfg2.needPower);
 
             bool isPass0 = selectCfg0.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg0.storyLvId);
             bool isPass1 = selectCfg1.storyLvId == 0 || InstanceZonesDataManager.CheckLevelPass(selectCfg1.storyLvId);

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

@@ -166,8 +166,13 @@ namespace GFGGame
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
             {
                 Timers.inst.Remove(OnClickBtnClose);
-
-                if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId).num)
+                // if (RoleDataManager.power < _curCfg.needPower)
+                // {
+                //     PromptController.Instance.ShowFloatTextPrompt("体力不足");
+                //     return;
+                // }
+                FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId);
+                if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.num || RoleDataManager.power < fieldCfg.needPower)
                 {
                     ViewManager.Show<FieldView>();
                     if (FieldDataManager.Instance.currFightLv <= 1) return;