Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
ZhangBiao 2021-05-31 15:00:43 +08:00
commit f61ac46634
2 changed files with 14 additions and 1 deletions

View File

@ -753,6 +753,19 @@ function EndLessMapView:OnClose()
this.timer:Stop()
this.timer = nil
end
if UIManager.IsOpen(UIName.GeneralBigPopup) then
UIManager.ClosePanel(UIName.GeneralBigPopup)
end
if UIManager.IsOpen(UIName.GeneralPopup) then
UIManager.ClosePanel(UIName.GeneralPopup)
end
if UIManager.IsOpen(UIName.TrialRewardPopup) then
UIManager.ClosePanel(UIName.TrialRewardPopup)
end
if UIManager.IsOpen(UIName.EndLessTreasurePanel) then
UIManager.ClosePanel(UIName.EndLessTreasurePanel)
end
end
function EndLessMapView:OnDestroy()

View File

@ -355,7 +355,7 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar
-- end
-- end
-- end
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum)
local curLvNum=1
breakId = 0
upStarId = 0