Merge branch 'china/dev' into china/dev-c
commit
d6cad28914
|
@ -234,6 +234,7 @@ end
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function RoleInfoPanel:OnOpen(_curHeroData, _heroDatas,_isUpZhen,_index)
|
function RoleInfoPanel:OnOpen(_curHeroData, _heroDatas,_isUpZhen,_index)
|
||||||
curHeroData, heroDatas,isUpZhen = _curHeroData, _heroDatas,_isUpZhen
|
curHeroData, heroDatas,isUpZhen = _curHeroData, _heroDatas,_isUpZhen
|
||||||
|
|
||||||
if _index and _index > 0 then
|
if _index and _index > 0 then
|
||||||
_CurPageIndex = _index
|
_CurPageIndex = _index
|
||||||
else
|
else
|
||||||
|
@ -506,7 +507,9 @@ end
|
||||||
|
|
||||||
function this:UpdateHeroInfoData()
|
function this:UpdateHeroInfoData()
|
||||||
this:UpdateBtnList()
|
this:UpdateBtnList()
|
||||||
|
for k,v in pairs(this.PageList) do
|
||||||
|
v:OnHide()
|
||||||
|
end
|
||||||
if _CurPageIndex == 5 then
|
if _CurPageIndex == 5 then
|
||||||
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.HeroSkin,"HeroId",curHeroData.id)
|
||||||
local HeoSkin = {}
|
local HeoSkin = {}
|
||||||
|
|
Loading…
Reference in New Issue