Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
f61ac46634
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue