Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
bf3ae927c8
|
@ -8,6 +8,7 @@ local isGet
|
||||||
local heroSId
|
local heroSId
|
||||||
local heroStar
|
local heroStar
|
||||||
local allSkillDatas = {}
|
local allSkillDatas = {}
|
||||||
|
local breakId,upStarId
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function RoleGetInfoPopup:InitComponent()
|
function RoleGetInfoPopup:InitComponent()
|
||||||
|
|
||||||
|
@ -148,13 +149,6 @@ end
|
||||||
function RoleGetInfoPopup:OnShow()
|
function RoleGetInfoPopup:OnShow()
|
||||||
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSId,heroStar)
|
allSkillDatas = HeroManager.GetCurHeroSidAndCurStarAllSkillDatas(heroSId,heroStar)
|
||||||
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
|
local heroSData=ConfigManager.GetConfigData(ConfigName.HeroConfig, heroSId)
|
||||||
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
|
||||||
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
|
||||||
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
|
|
||||||
if OpenPassiveSkillRules then
|
|
||||||
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,0,0)
|
|
||||||
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
|
||||||
end
|
|
||||||
if isGet then
|
if isGet then
|
||||||
this.GetShowPanelData()
|
this.GetShowPanelData()
|
||||||
--天赋
|
--天赋
|
||||||
|
@ -166,6 +160,14 @@ function RoleGetInfoPopup:OnShow()
|
||||||
this.NoGetShowPanelData()
|
this.NoGetShowPanelData()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local talentBtnImage = heroStar == HeroManager.awakeNextStarIndex and "r_hero_tianfu2_zh" or "r_hero_tianfu1_zh"
|
||||||
|
this.talentBtn:GetComponent("Image").sprite = Util.LoadSprite(talentBtnImage)
|
||||||
|
local OpenPassiveSkillRules = heroStar == HeroManager.awakeNextStarIndex and heroSData.Awaken or heroSData.OpenPassiveSkillRules
|
||||||
|
if OpenPassiveSkillRules then
|
||||||
|
local openlists,compoundOpenNum,compoundNum = HeroManager.GetAllPassiveSkillIds(heroSData,breakId,upStarId)
|
||||||
|
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
|
||||||
|
end
|
||||||
|
|
||||||
--技能 布局变动
|
--技能 布局变动
|
||||||
self.skillLine.gameObject:SetActive(not (heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil))
|
self.skillLine.gameObject:SetActive(not (heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil))
|
||||||
if heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil then
|
if heroSData.OpenPassiveSkillRules == nil and heroSData.EquipTalismana==nil then
|
||||||
|
@ -266,6 +268,8 @@ function this.GetShowPanelData()
|
||||||
this.hp.text=allAddProVal[HeroProType.Hp]
|
this.hp.text=allAddProVal[HeroProType.Hp]
|
||||||
this.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
|
this.phyDef.text=allAddProVal[HeroProType.PhysicalDefence]
|
||||||
this.magDef.text=allAddProVal[HeroProType.MagicDefence]
|
this.magDef.text=allAddProVal[HeroProType.MagicDefence]
|
||||||
|
breakId = heroBackData.breakId
|
||||||
|
upStarId = heroBackData.starBreakId
|
||||||
-- this.speed.text= allAddProVal[HeroProType.Speed]
|
-- this.speed.text= allAddProVal[HeroProType.Speed]
|
||||||
--技能
|
--技能
|
||||||
-- this.selsectSkillImage:SetActive(false)
|
-- this.selsectSkillImage:SetActive(false)
|
||||||
|
@ -352,8 +356,8 @@ function this.CalculateHeroAllProValList(heroConFigData,_starNum,isCalculateStar
|
||||||
-- end
|
-- end
|
||||||
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
|
local heroRankupConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroRankupConfig, "Star", heroConFigData.Star, "LimitStar", _starNum)
|
||||||
local curLvNum=1
|
local curLvNum=1
|
||||||
local breakId = 0
|
breakId = 0
|
||||||
local upStarId = 0
|
upStarId = 0
|
||||||
if isCalculateStarVal then
|
if isCalculateStarVal then
|
||||||
--等级
|
--等级
|
||||||
curLvNum = heroRankupConfig.OpenLevel
|
curLvNum = heroRankupConfig.OpenLevel
|
||||||
|
|
Loading…
Reference in New Issue