Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

gaoxin 2020-09-24 16:29:55 +08:00
commit 3462835c8f
2 changed files with 10 additions and 1 deletions

View File

@ -258,8 +258,10 @@ function this:ShowTime(curType)
this.remainTime.text = Language[12321]..TimeToDHMS(0)
self.timer:Stop()
self.timer = nil
this.RefreshTime()
this.RefreshTime()
return
end
timeDown = timeDown - 1
this.remainTime.text = Language[12321]..TimeToDHMS(timeDown)
end, 1, -1, true)

View File

@ -53,6 +53,10 @@ function TreasureStorePopup:OnClose()
end
function TreasureStorePopup:OnDestroy()
if this.timer then
this.timer:Stop()
this.timer = nil
end
this.scrollView=nil
itemsGrid = nil
end
@ -112,6 +116,9 @@ function this:SetScrollPre(root,data)
title.text = data.Name
local rewardArray = data.RewardShow
if not itemsGrid then
itemsGrid = {}
end
--滚动条复用重设itemview
if not itemsGrid[root] then
itemsGrid[root] = {}