Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan
commit
f63bf74d6b
|
@ -303,7 +303,7 @@ function FaXiangStrongPopup:SetScrollPre(go, data, _index)
|
|||
this.treasureDatas[go].transform:SetAsFirstSibling()
|
||||
end
|
||||
this.treasureDatas[go]:OnOpen(false, { data.id, 0 }, 1, false, false, false, 0, data.idDyn)
|
||||
name:GetComponent("Text").text = HeroManager.GetSingleHeroData(data.upHeroDid).heroConfig.ReadingName
|
||||
name:GetComponent("Text").text = SubString2(GetLanguageStrById(HeroManager.GetSingleHeroData(data.upHeroDid).heroConfig.ReadingName),8)
|
||||
Util.AddOnceClick(btn, function()
|
||||
if curEquipData.idDyn == data.idDyn then
|
||||
return
|
||||
|
@ -350,7 +350,8 @@ function FaXiangStrongPopup:SetWindShow(_index)
|
|||
local skillId = skills[curEquipData.refineLv + 1]
|
||||
local des = ""
|
||||
for i = 1, #skillId do
|
||||
des = des .. ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, skillId[i]).Desc
|
||||
LogError(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, skillId[i]).Desc)
|
||||
des = des .. GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, skillId[i]).Desc)
|
||||
end
|
||||
this.hintTxt.text = Language[12677]
|
||||
this.skillInfo.text = "<color=#492E00>" .. Language[12678] .. "</color>" .. des
|
||||
|
@ -383,7 +384,7 @@ function FaXiangStrongPopup:SetWindShow(_index)
|
|||
local skillId = skills[lv]
|
||||
local des = ""
|
||||
for i = 1, #skillId do
|
||||
des = des .. ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, skillId[i]).Desc
|
||||
des = des .. GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig, skillId[i]).Desc)
|
||||
end
|
||||
this.skillInfo.text = "<color=#4BAB60>" .. Language[12681] .. "</color>" .. des
|
||||
this.hintTxt.text = Language[12682]
|
||||
|
|
Loading…
Reference in New Issue