From 51e89fea297926964b8c1f6289177693af26dcab Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 21 Feb 2022 14:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E8=A7=89=E9=86=92=E5=90=8E?= =?UTF-8?q?=E5=A4=A9=E8=B5=8B=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/functions.lua | 17 +++++++++++++++++ .../Modules/RoleInfo/RoleAwakeTalentPopup.lua | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index d3106351c2..caba89afef 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -573,6 +573,23 @@ function GetPassiveByMaxStar(heroConfig,list) return aaa end +function GetPassiveByMaxStar2(heroConfig,list,star) + --local OpenPassiveSkillRules = list + local heroRankUp=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star) + if not heroRankUp then + list=heroConfig.OpenPassiveSkillRules + end + local aaa={} + if list then + for i = 1,#list do + if list[i][2]<=heroRankUp.Id then + table.insert(aaa,list[i]) + end + end + end + return aaa +end + --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua index c347fce0b6..074bd14cea 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeTalentPopup.lua @@ -100,7 +100,7 @@ function this.GetNewTalentDataShow() local upStarSkillDataList = {} if heroConfig.Awaken then local Awaken=heroConfig.Awaken - Awaken=GetPassiveByMaxStar(heroConfig,heroConfig.Awaken) + Awaken=GetPassiveByMaxStar2(heroConfig,heroConfig.Awaken,11) for i = 1, #Awaken do local Desc = GetLanguageStrById(passiveSkillConfig[Awaken[i][3]].Desc) if heroConfig.Awaken[i][1] == 1 then--突破