Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
58b5702a30
|
@ -378,7 +378,7 @@ function this.GetSkillsData()
|
|||
|
||||
if curHeroData.heroConfig.OpenSkillRules then
|
||||
for i = 1, #curHeroData.heroConfig.OpenSkillRules do
|
||||
if not skillIdList[curHeroData.heroConfig.OpenSkillRules[i][2]] then
|
||||
if curHeroData.heroConfig.OpenSkillRules[i][1] == curHeroData.star then
|
||||
local heroSkill = {}
|
||||
heroSkill.skillId = curHeroData.heroConfig.OpenSkillRules[i][2]
|
||||
heroSkill.skillConfig = skillConfig[heroSkill.skillId]
|
||||
|
@ -392,7 +392,6 @@ function this.GetSkillsData()
|
|||
heroSkill.state = 0
|
||||
end
|
||||
heroSkill.quality = 0 --是否白金背景框
|
||||
skillIdList[curHeroData.heroConfig.OpenSkillRules[i][2]] = curHeroData.heroConfig.OpenSkillRules[i][2]
|
||||
table.insert(skillList, heroSkill)
|
||||
end
|
||||
end
|
||||
|
@ -755,8 +754,8 @@ function this:UpdateHeroUpLvAndBreakData()
|
|||
this.upLvBtnText.text=Language[11063]
|
||||
if isHeroUpStar and curStarRankUpConfig and curHeroData.lv >= curStarRankUpConfig.OpenLevel then--当前突破全部完成
|
||||
this.tipUpLv.text=Language[11804]
|
||||
this.tipUpLv.gameObject:SetActive(true)
|
||||
this.itemGrid.gameObject:SetActive(false)
|
||||
this.tipUpLv.gameObject:SetActive(false)
|
||||
this.itemGrid.gameObject:SetActive(true)
|
||||
else
|
||||
this.itemGrid.gameObject:SetActive(true)
|
||||
this.tipUpLv.gameObject:SetActive(false)
|
||||
|
|
Loading…
Reference in New Issue