From 5b3c82f0b3bf7df3a78f08a2ee2bf8e7de94ac82 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 15 Feb 2022 10:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E5=9B=BE=E9=89=B4=E8=A7=89=E9=86=92=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua index 7e87a06079..c347fce0b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua @@ -99,20 +99,22 @@ function this.GetNewTalentDataShow() local breakSkillDataList = {} local upStarSkillDataList = {} if heroConfig.Awaken then - for i = 1, #heroConfig.Awaken do - local Desc = GetLanguageStrById(passiveSkillConfig[heroConfig.Awaken[i][3]].Desc) + local Awaken=heroConfig.Awaken + Awaken=GetPassiveByMaxStar(heroConfig,heroConfig.Awaken) + for i = 1, #Awaken do + local Desc = GetLanguageStrById(passiveSkillConfig[Awaken[i][3]].Desc) if heroConfig.Awaken[i][1] == 1 then--突破 - local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.Awaken[i][2]].Phase[2]] .. Language[11795] - local curBreakId = heroConfig.Awaken[i][2] + local titleStr = NumToSimplenessFont[heroRankupConfig[Awaken[i][2]].Phase[2]] .. Language[11795] + local curBreakId = Awaken[i][2] if breakSkillDataList[curBreakId] then breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str = GetLanguageStrById(breakSkillDataList[curBreakId].str) .. "  "..Desc..""} else breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str =""..titleStr..Desc..""} end else--升星 - local curUpStarId = heroConfig.Awaken[i][2] + local curUpStarId = Awaken[i][2] local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792] - local _passiveSkillId = passiveSkillConfig[heroConfig.Awaken[i][3]].Id + local _passiveSkillId = passiveSkillConfig[Awaken[i][3]].Id if upStarSkillDataList[curUpStarId] then upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = GetLanguageStrById(upStarSkillDataList[curUpStarId].str) .. "  "..Desc..""} else