diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
index 6a5080d25a..1de5bd29e1 100644
--- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua
@@ -6,8 +6,9 @@ local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
 local monterViewConfig = ConfigManager.GetConfig(ConfigName.MonsterViewConfig)
 local heroViewConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
 local resConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
-
+this.isMaxMonsterWave = false
 function this.Initialize()
+    this.isMaxMonsterWave = false
     this.monsterWave = 0 -- 当前妖兽波次
     this.m_Jump = false  -- 跳过战斗设置
     this.getRewardWave = {}
@@ -107,6 +108,10 @@ end
 
 --返回当前的怪物组Id
 function this.GetCurWaveMonsterGroupId()
+    if not monsterCampConfig[this.monsterWave] and this.monsterWave > MonsterCampManager.GetMaxNum() then
+        this.monsterWave = MonsterCampManager.GetMaxNum()
+        this.isMaxMonsterWave = true
+    end
     return monsterCampConfig[this.monsterWave].Monster
 end
 
diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
index d0f687f2b4..b91f52b4b4 100644
--- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
@@ -65,9 +65,8 @@ function MonsterCampPanel:BindEvent()
     end)
 
     Util.AddClick(this.btnFight, function ()
-
         -- 打到最高波次时提示
-        if MonsterCampManager.monsterWave > MonsterCampManager.GetMaxNum() then
+        if MonsterCampManager.monsterWave > MonsterCampManager.GetMaxNum() or MonsterCampManager.isMaxMonsterWave then
             PopupTipPanel.ShowTip(Language[11397])
             return
         end