Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
46bdf8c271
|
@ -250,7 +250,7 @@ function HandBookHeroInfoPanel:UpdateBtnList()
|
|||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",heroConFigData.Id)
|
||||
local HeoSkin = {}
|
||||
for i = 1 ,#configs do
|
||||
if not HeoSkin[configs[i].Type] and configs[i].Show then
|
||||
if not HeoSkin[configs[i].Type] and configs[i].Show == 1 then
|
||||
HeoSkin[configs[i].Type] = configs[i]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -58,7 +58,7 @@ function HandBookRoleSkinPanel:SetData(_sortinglayer,_parent,_curHerodata)
|
|||
local tempskins = {}
|
||||
for i = 1 ,#configs do
|
||||
--LogGreen("configs[i].Type:"..configs[i].Type)
|
||||
if not tempskins[configs[i].Type] and configs[i].Show then
|
||||
if not tempskins[configs[i].Type] and configs[i].Show == 1 then
|
||||
tempskins[configs[i].Type] = configs[i]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -247,6 +247,10 @@ function ScrollCycleView:OnClose()
|
|||
self.goItemList = {}
|
||||
self.goItemDataRefList = {}
|
||||
self.dataList = {}
|
||||
if self.co then
|
||||
coroutine.stop(self.co)
|
||||
self.co = nil
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue