From 3ae13a9762c79300792477d8f8d9e6f1f202c2f2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Fri, 17 Jul 2020 11:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E5=85=85=E8=8B=B1=E9=9B=84=E5=8D=81?= =?UTF-8?q?=E7=BA=A7=E5=B1=9E=E6=80=A7=E5=A4=A9=E8=B5=8B=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Popup/RoleGetInfoPopup.lua | 50 +++++++++++++------ 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua index f6a7cc4828..993ab9f79c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua @@ -136,6 +136,15 @@ function RoleGetInfoPopup:OnShow() local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId) if isGet then this.GetShowPanelData() + --天赋 + this.talentBtn:SetActive(heroSData.OpenPassiveSkillRules ~= nil) + if heroSData.OpenPassiveSkillRules then + local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0) + this.talentProgress.text = #openlists - compoundOpenNum .."/"..#heroSData.OpenPassiveSkillRules - compoundNum + end + Util.AddOnceClick(this.talentBtn,function() + UIManager.OpenPanel(UIName.RoleTalentPopup,heroSData,0,0) + end) else this.NoGetShowPanelData() end @@ -189,16 +198,6 @@ function RoleGetInfoPopup:OnShow() end) end end - - --天赋 - this.talentBtn:SetActive(heroSData.OpenPassiveSkillRules ~= nil) - if heroSData.OpenPassiveSkillRules then - local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0) - this.talentProgress.text = #openlists - compoundOpenNum .."/"..#heroSData.OpenPassiveSkillRules - compoundNum - end - Util.AddOnceClick(this.talentBtn,function() - UIManager.OpenPanel(UIName.RoleTalentPopup,heroSData,0,0) - end) --法宝 self.talismanBtn.gameObject:SetActive(heroSData.EquipTalismana~=nil) if heroSData.EquipTalismana~=nil then @@ -314,14 +313,33 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar for i, v in ConfigPairs(propertyConfig) do allAddProVal[i] = 0 end - local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum) - local curLvNum = 1 + -- local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "OpenStar", _starNum) + -- local curLvNum = 1 + -- local breakId = 0 + -- local upStarId = 0 + -- if isCalculateStarVal then + -- curLvNum = heroLevelConfig[heroRankupConfig.OpenLevel].CharacterLevelPara + -- for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroRankupConfig)) do + -- if v.Star == heroConFigData.Star then + -- if v.Type == 1 then + -- breakId = v.Id + -- end + -- if v.Type == 2 then + -- upStarId = v.Id + -- end + -- end + -- end + -- end + local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum) + local curLvNum=1 local breakId = 0 local upStarId = 0 if isCalculateStarVal then - curLvNum = heroLevelConfig[heroRankupConfig.OpenLevel].CharacterLevelPara + --等级 + curLvNum = heroRankupConfig.OpenLevel + --解锁天赋 for i, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroRankupConfig)) do - if v.Star == heroConFigData.Star then + if v.OpenStar == _starNum and v.Star==heroConFigData.Star then if v.Type == 1 then breakId = v.Id end @@ -330,6 +348,9 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar end end end + if breakId==0 then + breakId=6 + end end allAddProVal[HeroProType.Attack]=HeroManager.CalculateProVal(heroConFigData.Attack, curLvNum, breakId,upStarId,HeroProType.Attack) allAddProVal[HeroProType.Hp]=HeroManager.CalculateProVal(heroConFigData.Hp, curLvNum, breakId,upStarId,HeroProType.Hp) @@ -344,7 +365,6 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar -- allAddProVal[heroConFigData.SecondaryFactor[i][1]] = heroConFigData.SecondaryFactor[i][2] -- end -- end - Util.AddOnceClick(this.talentBtn,function() UIManager.OpenPanel(UIName.RoleTalentPopup,heroConFigData,breakId,upStarId) end)