diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua index 4ff014058a..bfcbbcd28b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalentPopup.lua @@ -114,17 +114,17 @@ function RoleTalentPopup:GetTalentDataShow() LogError("upstarid=="..upStarId.." curupstarid=="..curUpStarId) if upStarId >= curUpStarId then if upStarSkillDataList[curUpStarId] then - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. ""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc)..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = "".. GetLanguageStrById(upStarSkillDataList[curUpStarId].str) ..""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc),isHide=true} else openNum=openNum+1 - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =""..GetLanguageStrById(titleStr)..""..""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc)..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =""..GetLanguageStrById(titleStr)..""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc),isHide=true} end else if upStarSkillDataList[curUpStarId] then - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. ""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc)..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. ""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."",isHide=false} else openNum=openNum+1 - upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =""..GetLanguageStrById(titleStr)..""..""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc)..""} + upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =""..GetLanguageStrById(titleStr)..""..""..GetLanguageStrById(passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc).."",isHide=false} end end end @@ -181,6 +181,7 @@ function RoleTalentPopup:GetTalentDataShow() local go = self.upStarSkillGoList[i] go.gameObject:SetActive(true) local flyImg= Util.GetGameObject(go, "flyImg") + local mask= Util.GetGameObject(go, "mask") local kongStr = "" if passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1 then kongStr = Language[11835] @@ -192,9 +193,11 @@ function RoleTalentPopup:GetTalentDataShow() kongStr ="" flyImg.gameObject:SetActive(false) end + -- mask:SetActive(not upStarSkillDataList2[i].isHide) -- Util.GetGameObject(go.transform, "Image"):SetActive(passiveSkillLogicConfig[upStarSkillDataList2[i].passiveSkillId].Judge == 1) -- Util.GetGameObject(go.transform, "Image"):SetActive(false) go:GetComponent("Text").text = kongStr .. upStarSkillDataList2[i].str + --Util.GetGameObject(go,"mask/upText"):GetComponent("Text").text = kongStr .. upStarSkillDataList2[i].str end end