【神将觉醒】 提交

dev_chengFeng
zhangqiang 2020-11-10 18:35:37 +08:00
parent 48e6d33b7b
commit 053de93608
4 changed files with 67 additions and 55 deletions

View File

@ -43,6 +43,7 @@ this.heroResolveLicence = {}
--this.specialProVal = {}--减乘
this.awakeStarIndex = 10-- 前端写死觉醒星级标志
this.awakeNextStarIndex = 11-- 前端写死觉醒星级标志
function this.Initialize()
for i = 1, WarPowerTypeAllNum do
this.allProVal[i] = {
@ -570,11 +571,12 @@ function this.UpdateSingleHeroSkillData(_heroDId)
end
heroData.passiveSkillList = {}
--被动技
if heroData.heroConfig.OpenPassiveSkillRules then
for i = 1, #heroData.heroConfig.OpenPassiveSkillRules do
if heroData.heroConfig.OpenPassiveSkillRules[i][1] == heroData.star then
local OpenPassiveSkillRules = heroData.star == this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == heroData.star then
local heroSkill = {}
heroSkill.skillId = heroData.heroConfig.OpenPassiveSkillRules[i][2]
heroSkill.skillId = OpenPassiveSkillRules[i][2]
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
table.insert(heroData.passiveSkillList, heroSkill)
end
@ -2252,11 +2254,12 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas(sid, star)
end
end
end
if curHeroConfig.OpenPassiveSkillRules then
for i = 1, #curHeroConfig.OpenPassiveSkillRules do
if curHeroConfig.OpenPassiveSkillRules[i][1] == star then
local OpenPassiveSkillRules = star == this.awakeNextStarIndex and curHeroConfig.Awaken or curHeroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == star then
local heroSkill = {}
heroSkill.skillId = curHeroConfig.OpenPassiveSkillRules[i][2]
heroSkill.skillId = OpenPassiveSkillRules[i][2]
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
allSkillDatas[skillIndex] = heroSkill
skillIndex = skillIndex + 1
@ -2536,19 +2539,20 @@ end
--更新英雄被动技能
function this.UpdatePassiveHeroSkill(heroData)
heroData.passiveSkillList = {} --被动技
if heroData.heroConfig.OpenPassiveSkillRules then
for i = 1, #heroData.heroConfig.OpenPassiveSkillRules do
if heroData.heroConfig.OpenPassiveSkillRules[i][1] == 1 then --突破
if heroData.breakId >= heroData.heroConfig.OpenPassiveSkillRules[i][2] then
local OpenPassiveSkillRules = heroData.star == this.awakeNextStarIndex and heroData.heroConfig.Awaken or heroData.heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then --突破
if heroData.breakId >= OpenPassiveSkillRules[i][2] then
local heroSkill = {}
heroSkill.skillId = heroData.heroConfig.OpenPassiveSkillRules[i][3]
heroSkill.skillId = OpenPassiveSkillRules[i][3]
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
table.insert(heroData.passiveSkillList, heroSkill)
end
else --升星
if heroData.upStarId >= heroData.heroConfig.OpenPassiveSkillRules[i][2] then
if heroData.upStarId >= OpenPassiveSkillRules[i][2] then
local heroSkill = {}
heroSkill.skillId = heroData.heroConfig.OpenPassiveSkillRules[i][3]
heroSkill.skillId = OpenPassiveSkillRules[i][3]
heroSkill.skillConfig = passiveSkillConfig[heroSkill.skillId]
table.insert(heroData.passiveSkillList, heroSkill)
end
@ -2587,37 +2591,38 @@ function this.GetAllPassiveSkillIds(heroConfig, breakId, upStarId)
--只用于界面升星开放技能提示显示用
local compoundNum = 0
local compoundOPenNum = 0
if heroConfig.OpenPassiveSkillRules then
for i = 1, #heroConfig.OpenPassiveSkillRules do
if heroConfig.OpenPassiveSkillRules[i][1] == 1 then --突破
if breakId >= heroConfig.OpenPassiveSkillRules[i][2] then
-- local openPassiveSkillRules = allPassiveSkillIds,heroConfig.OpenPassiveSkillRules
table.insert(allPassiveSkillIds, heroConfig.OpenPassiveSkillRules[i][3])
if allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] then
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] =
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] + 1
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar == this.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then --突破
if breakId >= OpenPassiveSkillRules[i][2] then
-- local openPassiveSkillRules = allPassiveSkillIds,OpenPassiveSkillRules
table.insert(allPassiveSkillIds, OpenPassiveSkillRules[i][3])
if allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] then
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] =
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] + 1
else
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] = 1
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] = 1
end
end
else --升星
allUpStarOpenData[heroRankUpConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] =
heroConfig.OpenPassiveSkillRules[i]
if upStarId >= heroConfig.OpenPassiveSkillRules[i][2] then
table.insert(allPassiveSkillIds, heroConfig.OpenPassiveSkillRules[i][3])
if allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] then
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] =
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] + 1
allUpStarOpenData[heroRankUpConfig[OpenPassiveSkillRules[i][2]].Phase[2]] =
OpenPassiveSkillRules[i]
if upStarId >= OpenPassiveSkillRules[i][2] then
table.insert(allPassiveSkillIds, OpenPassiveSkillRules[i][3])
if allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] then
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] =
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] + 1
else
allOpenPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] = 1
allOpenPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] = 1
end
end
end
if allPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] then
allPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] =
allPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] + 1
if allPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] then
allPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] =
allPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] + 1
else
allPassiveSkillIdcompound[heroConfig.OpenPassiveSkillRules[i][2]] = 1
allPassiveSkillIdcompound[OpenPassiveSkillRules[i][2]] = 1
end
end
end
@ -2641,7 +2646,7 @@ function this.GetHeroAllPassiveSkillIds(curHeroData)
end
--英雄天赋被动技
if curHeroData.heroConfig.OpenPassiveSkillRules then
local openPassiveSkillRules = curHeroData.heroConfig.OpenPassiveSkillRules
local openPassiveSkillRules = curHeroData.star == this.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
for i = 1, #openPassiveSkillRules do
local skillType = openPassiveSkillRules[i][1]
local skillRanUpId = openPassiveSkillRules[i][2]

View File

@ -90,6 +90,10 @@ function this.UpdateHeroUpStarData()
--进阶属性提升
this.curLvEnd.text= HeroManager.GetCurHeroStarLvEnd(1,curHeroData)
this.nextLvEnd.text= HeroManager.GetCurHeroStarLvEnd(2,curHeroData,curHeroData.breakId,upStarRankUpConfig.Id)
local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules
local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId)
this.talent1Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
this.talent2Progress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
Util.AddOnceClick(this.talentBtn, function()
UIManager.OpenPanel(UIName.RoleAwakeTalentPopup,curHeroData.heroConfig)
end)

View File

@ -545,9 +545,10 @@ function this:UpdateHeroInfoData()
end
--天赋
this.talentBtn:SetActive(curHeroData.heroConfig.OpenPassiveSkillRules ~= nil)
if curHeroData.heroConfig.OpenPassiveSkillRules then
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)
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#curHeroData.heroConfig.OpenPassiveSkillRules - compoundNum
this.talentProgress.text = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum
if allUpStarOpenData[curHeroData.star + 1] then
this.talentTipStr.text = Language[11837].. NumToSimplenessFont[curHeroData.star + 1] ..Language[11838]
else

View File

@ -49,39 +49,41 @@ end
function RoleTalentPopup:GetTalentDataShow()
breakSkillDataList = {}
upStarSkillDataList = {}
if heroConfig.OpenPassiveSkillRules then
for i = 1, #heroConfig.OpenPassiveSkillRules do
if heroConfig.OpenPassiveSkillRules[i][1] == 1 then--突破
local titleStr = NumToSimplenessFont[heroRankupConfig[heroConfig.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11864]
local curBreakId = heroConfig.OpenPassiveSkillRules[i][2]
local heroRankUpConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
local OpenPassiveSkillRules = (upStarId and upStarId ~=0 and heroRankUpConfig[upStarId].OpenStar == HeroManager.awakeNextStarIndex) and heroConfig.Awaken or heroConfig.OpenPassiveSkillRules
if OpenPassiveSkillRules then
for i = 1, #OpenPassiveSkillRules do
if OpenPassiveSkillRules[i][1] == 1 then--突破
local titleStr = NumToSimplenessFont[heroRankupConfig[OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11864]
local curBreakId = OpenPassiveSkillRules[i][2]
if breakId >= curBreakId then
if breakSkillDataList[curBreakId] then
breakSkillDataList[curBreakId] = {index = curBreakId,str = breakSkillDataList[curBreakId].str .. "  <color=#66FF00>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str = breakSkillDataList[curBreakId].str .. "  <color=#66FF00>"..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
else
if breakSkillDataList[curBreakId] then
breakSkillDataList[curBreakId] = {index = curBreakId,str =breakSkillDataList[curBreakId].str .. " <color=#B9AC97>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str =breakSkillDataList[curBreakId].str .. " <color=#B9AC97>"..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
breakSkillDataList[curBreakId] = {index = curBreakId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
end
else--升星
local curUpStarId = heroConfig.OpenPassiveSkillRules[i][2]
local curUpStarId = OpenPassiveSkillRules[i][2]
local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11865]
local _passiveSkillId = passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Id
local _passiveSkillId = passiveSkillConfig[OpenPassiveSkillRules[i][3]].Id
if upStarId >= curUpStarId then
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. "  <color=#66FF00>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. "  <color=#66FF00>"..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#66FF00>"..titleStr..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
else
if upStarSkillDataList[curUpStarId] then
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =upStarSkillDataList[curUpStarId].str .. " <color=#B9AC97>"..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str =upStarSkillDataList[curUpStarId].str .. " <color=#B9AC97>"..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
else
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[heroConfig.OpenPassiveSkillRules[i][3]].Desc.."</color>"}
upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,index = curUpStarId,str ="<color=#B9AC97>"..titleStr..passiveSkillConfig[OpenPassiveSkillRules[i][3]].Desc.."</color>"}
end
end
end