神王修改
parent
b6983bff6e
commit
97081194d5
|
@ -243,12 +243,11 @@ function HandBookHeroAndEquipListPanel:GetHeroData()
|
||||||
local oneHeroList = {}
|
local oneHeroList = {}
|
||||||
for id, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
|
for id, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
|
||||||
if (not v.Hide or v.Hide == 0) and HeroManager.InVersion(id) then
|
if (not v.Hide or v.Hide == 0) and HeroManager.InVersion(id) then
|
||||||
|
if v.ShenWang>0 and (proId == 0 or v.PropertyName == proId) then
|
||||||
|
table.insert(shenwangList,v)
|
||||||
|
end
|
||||||
if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then
|
if v.Natural == 7 and (proId == 0 or v.PropertyName == proId) then
|
||||||
table.insert(tenHeroList,v)
|
table.insert(tenHeroList,v)
|
||||||
if v.ShenWang>0 then
|
|
||||||
table.insert(shenwangList,v)
|
|
||||||
end
|
|
||||||
elseif v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then
|
elseif v.Natural == 6 and (proId == 0 or v.PropertyName == proId) then
|
||||||
table.insert(sexHeroList,v)
|
table.insert(sexHeroList,v)
|
||||||
-- if v.MaxRank==14 then
|
-- if v.MaxRank==14 then
|
||||||
|
|
|
@ -382,6 +382,7 @@ function HandBookRoleInfoLayout:SkillInfo()
|
||||||
for i = 1, self.skillGrid2.transform.childCount do
|
for i = 1, self.skillGrid2.transform.childCount do
|
||||||
self.skillGrid2.transform:GetChild(i-1).gameObject:SetActive(false)
|
self.skillGrid2.transform:GetChild(i-1).gameObject:SetActive(false)
|
||||||
end
|
end
|
||||||
|
LogError("#skilllist=========================================="..#skillList)
|
||||||
for i = 1, #skillList do
|
for i = 1, #skillList do
|
||||||
if skillList[i] and skillList[i].skillConfig and GetLanguageStrById(skillList[i].skillConfig.Name) then
|
if skillList[i] and skillList[i].skillConfig and GetLanguageStrById(skillList[i].skillConfig.Name) then
|
||||||
local go = self.skillGrid2.transform:GetChild(i-1).gameObject
|
local go = self.skillGrid2.transform:GetChild(i-1).gameObject
|
||||||
|
@ -438,7 +439,7 @@ function HandBookRoleInfoLayout:SkillInfo()
|
||||||
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
|
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
|
||||||
else
|
else
|
||||||
|
|
||||||
local training=HeroManager.GetTrainingPasivvSkill(nextData.needStar,heroConFigData.Id)
|
local training=HeroManager.GetGodKingPasivvSkill(nextData.needStar,heroConFigData.Id)
|
||||||
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData,nil,nil,training)
|
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData,nil,nil,training)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
|
@ -2952,6 +2952,7 @@ function this.GetCurHeroSidAndCurStarAllSkillDatas2(sid, star,star2)
|
||||||
else
|
else
|
||||||
allSkillDatas[skillIndex] = heroSkill
|
allSkillDatas[skillIndex] = heroSkill
|
||||||
skillIndex = skillIndex + 1
|
skillIndex = skillIndex + 1
|
||||||
|
LogError("skillindex======================================="..skillIndex)
|
||||||
list[index]=1
|
list[index]=1
|
||||||
end
|
end
|
||||||
--LogError("index=="..index.." limitstar=="..heroRankUpConfig[index].OpenStar.." star=="..star)
|
--LogError("index=="..index.." limitstar=="..heroRankUpConfig[index].OpenStar.." star=="..star)
|
||||||
|
@ -5386,7 +5387,7 @@ end
|
||||||
function this.GetGodKingPasivvSkill(skillstar,heroConfig)
|
function this.GetGodKingPasivvSkill(skillstar,heroConfig)
|
||||||
local PassSKillList={}
|
local PassSKillList={}
|
||||||
LogError("skillstar======================="..skillstar)
|
LogError("skillstar======================="..skillstar)
|
||||||
local tdata=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ShenWang,"HeroID",heroConfig,"Level",skillstar)
|
local tdata=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ShenWang,"HeroID",heroConfig,"StarShow",skillstar)
|
||||||
if not tdata then
|
if not tdata then
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
|
|
|
@ -124,7 +124,7 @@ function this:OnOpen(...)
|
||||||
this.hintTxt2.gameObject:SetActive(false)
|
this.hintTxt2.gameObject:SetActive(false)
|
||||||
this.line:SetActive(true)
|
this.line:SetActive(true)
|
||||||
this.hintTxt2.text=" ".."修炼解锁后"
|
this.hintTxt2.text=" ".."修炼解锁后"
|
||||||
this.desList[2].des.text = string.format("修炼%s级解锁效果:\n",NumToChinese[trainingDta.Level])..GetCurrSkillConfigDesc(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,trainingDta.PassiveSkill[1]),soulLv)
|
this.desList[2].des.text = string.format("神王+%s解锁效果:\n",trainingDta.Level)..GetCurrSkillConfigDesc(ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,trainingDta.PassiveSkill[1]),soulLv)
|
||||||
else
|
else
|
||||||
this.hintTxt2.gameObject:SetActive(false)
|
this.hintTxt2.gameObject:SetActive(false)
|
||||||
this.line:SetActive(false)
|
this.line:SetActive(false)
|
||||||
|
|
|
@ -217,7 +217,14 @@ function RoleGodKingLayout:UpdataSingleGod2(obj,config)
|
||||||
openTip.text=string.format("%s星开启",config.NeedStar)
|
openTip.text=string.format("%s星开启",config.NeedStar)
|
||||||
else
|
else
|
||||||
openTip.gameObject:SetActive(false)
|
openTip.gameObject:SetActive(false)
|
||||||
btn_up:SetActive(openType and openType==1)
|
|
||||||
|
if self.curHeroData.shenWangLv==config.Level-1 then
|
||||||
|
btn_up:SetActive(openType and openType==1)
|
||||||
|
else
|
||||||
|
btn_up:SetActive(false)
|
||||||
|
openTip.gameObject:SetActive(true)
|
||||||
|
openTip.text="激活上一阶解锁"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogError("count============================"..count)
|
LogError("count============================"..count)
|
||||||
|
@ -244,10 +251,17 @@ function RoleGodKingLayout:UpdataSingleGod2(obj,config)
|
||||||
|
|
||||||
if config.PassiveSkill and #config.PassiveSkill>0 and type(config.PassiveSkill[1])~="userdata" then
|
if config.PassiveSkill and #config.PassiveSkill>0 and type(config.PassiveSkill[1])~="userdata" then
|
||||||
skillObj:SetActive(true)
|
skillObj:SetActive(true)
|
||||||
LogError("config.PassiveSkill[1]======================"..config.PassiveSkill[1])
|
--LogError("config.PassiveSkill[1]======================"..config.PassiveSkill[1])
|
||||||
local skill=ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,config.PassiveSkill[1])
|
local skill=ConfigManager.GetConfigData(ConfigName.PassiveSkillConfig,config.PassiveSkill[1])
|
||||||
if skill then
|
if skill then
|
||||||
skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(skill.Icon))
|
--LogError("GetResourcePath(skill.Icon)==========="..GetResourcePath(skill.Icon))
|
||||||
|
if GetResourcePath(skill.Icon)~="r_shijie_tili" then
|
||||||
|
skillIcon.gameObject:SetActive(true)
|
||||||
|
skillIcon.sprite=self.spLoader:LoadSprite(GetResourcePath(skill.Icon))
|
||||||
|
else
|
||||||
|
skillIcon.gameObject:SetActive(false)
|
||||||
|
end
|
||||||
|
|
||||||
skillName.text=skill.Name
|
skillName.text=skill.Name
|
||||||
skillDes.text=skill.Desc
|
skillDes.text=skill.Desc
|
||||||
end
|
end
|
||||||
|
|
|
@ -454,13 +454,12 @@ function this.SkillInfo()
|
||||||
if skillList2 and skillList2[i] and i>2 then
|
if skillList2 and skillList2[i] and i>2 then
|
||||||
nextData=skillList2[i]
|
nextData=skillList2[i]
|
||||||
nextData.isOpen=skillList2[i].isOpen
|
nextData.isOpen=skillList2[i].isOpen
|
||||||
nextData.needStar=skillList2[i].needStar
|
nextData.needStar= skillList2[i].needStar
|
||||||
--飞升技能
|
--飞升技能
|
||||||
if i==6 then
|
if i==6 then
|
||||||
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
|
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,skillData,1,10,maxLv,i)
|
||||||
else
|
else
|
||||||
local training=HeroManager.GetGodKingPasivvSkill(nextData.needStar,curHeroData.heroConfig.Id)
|
local training=HeroManager.GetGodKingPasivvSkill(nextData.needStar,curHeroData.heroConfig.Id)
|
||||||
training=nil
|
|
||||||
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData,nil,nil,training)
|
panel = UIManager.OpenPanel(UIName.SkillInfoPopup,nextData,1,10,maxLv,i,skillData,nil,nil,training)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue