diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index 68022df589..3bb080e24e 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -192,7 +192,11 @@ function this:Refresh() elseif curType == 3 then local specialConfig = ConfigManager.GetConfigData(ConfigName.SpecialConfig,93).Value local num = tonumber(specialConfig) +<<<<<<< HEAD local value = fightLevelConfig[FightPointPassManager.curOpenFight].SortId +======= + local value = fightLevelConfig[FightPointPassManager.lastPassFightId].SortId - 1 +>>>>>>> 3ab4d7d0c... 心魔试炼 提交 local value2 = ConfigManager.GetConfigDataByKey(ConfigName.MainLevelConfig,"SortId",math.floor(value/num)*num).Name this.tip.text ="恭喜您通关"..value2..",我们为您准备了超值礼包,帮助您快速通关" elseif curType == 4 then @@ -201,12 +205,12 @@ function this:Refresh() local nums = string.split(str[1],"#") local canGet = false local value = MonsterCampManager.monsterWave - local value2 - if value < tonumber(nums[#nums]) then - local temp = tonumber(nums[#nums]) -tonumber(nums[#nums-1]) + local value2 = 0 + if value <= tonumber(nums[#nums]) then + local temp = tonumber(nums[#nums]) - tonumber(nums[#nums-1]) value2 = math.floor(value/temp) * temp else - value2 = math.floor(value - tonumber(nums[#nums])/tonumber(str[2]))* tonumber(str[2]) + tonumber(nums[#nums]) + value2 = math.floor((value - tonumber(nums[#nums]))/tonumber(str[2]))* tonumber(str[2]) + tonumber(nums[#nums]) end this.tip.text ="恭喜您通过心魔试炼"..value2.."层,我们为您准备了超值礼包,帮助您快速通关" else