diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua index 551f71e047..d07a757757 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua @@ -16,7 +16,6 @@ local canHelpPower = 0 local rate = 0 local waveId = 0 local curType = 0 -local configData = {} local redTrailType = { [1] = RedPointType.PersonTrailHelp, [2] = RedPointType.BuddishTrailHelp, @@ -79,7 +78,6 @@ function this:OnShow(_parent,...) friendHelpHeros = args[3] myHeros = args[4] this:SetMyHeightPower() - configData = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"FloorId",waveId,"CampId",curType) this.titleText.text = FourElementName[curType] rate = tonumber(string.format("%.2f",ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1).HelpFightMax / 10000)) canHelpPower = heightPower*rate diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua index f7f25d4e3c..8e0dd3e068 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/FourElementMonsterCampPanel.lua @@ -99,6 +99,10 @@ function FourElementMonsterCampPanel:BindEvent() PopupTipPanel.ShowTip("今日挑战次数不足") return end + if not ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",trailData.monsterWave + 1) then + PopupTipPanel.ShowTip("已通关全部层数,无法继续挑战") + return + end if FormationManager.CheckFormationValid(curType + 2000) then MonsterCampManager.ExecuteFightBattle(trailData.monsterWave + 1 ,0,function() this:OnShow() end,curType,true) else diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index 0a9439fd96..9615b75b09 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -73,9 +73,7 @@ end function MonsterCampMainPanel:OnShow() local totalWaves = MonsterCampManager.GetFourElementTotalWave() - LogGreen(totalWaves.." totalWaves") local nextWaves = SacredTreeManager.NextAttriFloor() - LogGreen(nextWaves.." nextWaves") this.waveNum.text = MonsterCampManager.monsterWave this.btnShenYingText.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels this.shenYingProgressText.text = string.format("四灵试炼进度:%d/%d",totalWaves,nextWaves) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index 372e1e52f1..b77d4177fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -90,7 +90,10 @@ end --得到从第1层到当前层的数据 function this.GetFourElementMonstersInfo(curType,curWave) local monsterInfo = {} - local data = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",curWave) + local data = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",curWave) + if not data then + data = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",curWave - 1) + end for i = 1, curWave + data.UpLimitWave do local tempData = this.GetFourElementMonsterInfoByWave(curType,i) if tempData then @@ -101,7 +104,7 @@ function this.GetFourElementMonstersInfo(curType,curWave) end function this.GetFourElementMonsterInfoByWave(curType,wave) - local tempConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",wave) + local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.CampTowerConfig,"CampId",curType,"FloorId",wave) if not tempConfig then return nil end diff --git a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua index c440244b35..c08b617588 100644 --- a/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SacredTree/SacredTreeManager.lua @@ -103,6 +103,7 @@ function this.NextAttriFloor() return num end end + return attriConfig.PropertyUnlcokLevels[#attriConfig.PropertyUnlcokLevels][2] end --获取当前等级加成的属性 diff --git a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua index 05447c5a34..c6e5f77d47 100644 --- a/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/FourElementSingleWave.lua @@ -120,7 +120,7 @@ function FourElementSingleWave:OnOpen() else x() end - elseif self.data.wave == self.trailData.monsterWave + 1 then + elseif self.data.wave == self.trailData.monsterWave + 1 then if self.trailData.canFightTime > 0 then UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.FOUR_ELEMENT, self.trailData.fourElementType,self.data.wave) -- if LengthOfTable(FormationManager.GetWuJinFormationHeroIds(self.trailData.fourElementType + 2000)) > 0 then