diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 309624f6f5..51a58bd5c8 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -355,8 +355,8 @@ UIName = { PokemonSingleResultPanel=354,--灵兽 GeneralRewardPopup = 355,--通用奖励领取弹窗 GeneralBigPopup = 357,--通用大弹窗界面 - RoleAwakeTalentPopup = 358,--通用大弹窗界面 - RoleAwakeSuccessPanel = 359,--通用大弹窗界面 + RoleAwakeTalentPopup = 360,--通用大弹窗界面 + RoleAwakeSuccessPanel = 361,--通用大弹窗界面 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index d5d4f7b47c..a00f47ce45 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -392,9 +392,18 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) if curHeroData.lv == curStarRankUpConfig.OpenLevel then _isClicked = false _isReqLvUp = false - MsgPanel.ShowTwo(Language[11847], nil, function() - parent:SetSelectBtn(2) - parent:OnPageTabChange(2) + local showTipStr = "" + local showIndex = 2 + if curHeroData.star == HeroManager.awakeStarIndex then + showTipStr = "觉醒后可以提升等级上限。是否立即前往觉醒界面?" + showIndex = 3 + else + showTipStr = Language[11847] + showIndex = 2 + end + MsgPanel.ShowTwo(showTipStr, nil, function() + parent:SetSelectBtn(showIndex) + parent:OnPageTabChange(showIndex) end,Language[10719],Language[11848]) else if isUpLvMaterials then diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 0570badf0a..f150a1346d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -545,6 +545,8 @@ function this:UpdateHeroInfoData() end --天赋 this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil) + local talentBtnImage = curHeroData.star == HeroManager.awakeNextStarIndex and "r_hero_tianfu1" or "r_hero_tianfu2" + this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage) local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)