法相装备修改提交

dev_chengFeng
wangzhenxing 2023-02-21 14:20:46 +08:00
parent 46ddd9696a
commit 2985c1f5a2
4 changed files with 25 additions and 10 deletions

View File

@ -38,6 +38,19 @@ function newObject(prefab)
return GameObject.Instantiate(prefab)
end
function CheckListIsContainValue1(_list,_value)
if _list and _value then
for key, value in pairs(_list) do
if value ==_value then
return true
end
end
end
return false
end
--适配
function screenAdapte(go)
--if Screen.width > 1080 or Screen.height > 1920 then

View File

@ -121,7 +121,8 @@ function RewardTalismanSingleShowPopup2:BindEvent()
PopupTipPanel.ShowTip("该英雄无法装备此法相")
return
end
if equipConfigData.Job~=0 and self.curHeroData.heroConfig.Job~=equipConfigData.Job then
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
PopupTipPanel.ShowTip("该英雄无法装备此法相")
return
end
@ -200,9 +201,9 @@ function RewardTalismanSingleShowPopup2:BindEvent()
PopupTipPanel.ShowTip("该英雄无法装备此法相")
return
end
if equipConfigData.Job~=0 and self.curHeroData.heroConfig.Job~=equipConfigData.Job then
PopupTipPanel.ShowTip("该英雄无法装备此法相")
return
if not CheckListIsContainValue1(equipConfigData.Job,self.curHeroData.heroConfig.Job) then
PopupTipPanel.ShowTip("该英雄无法装备此法相")
return
end
end
NetManager.WearFaxiangEquipRequest(self.curHeroData.dynamicId,equipIdList,3,function ()

View File

@ -154,9 +154,10 @@ function this.SetScrollPre(root,data)
equipData.id=data.Id
local faxiangConfig=ConfigManager.GetConfigData(ConfigName.FaxiangConfig,data.Id)
equipData.levelPool=faxiangConfig.LevelUpPool
equipData.lv=100
equipData.maxLv=100
equipData.refineLv=3
equipData.lv=faxiangConfig.LevelMax
equipData.maxLv=faxiangConfig.LevelMax
equipData.refinePool=faxiangConfig.Star
equipData.refineLv=faxiangConfig.StarMax
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup2,this,equipData,0,false,nil,nil,7)
end)

View File

@ -613,7 +613,7 @@ function this.GetOneKeyUpFaXiangByType(_hero)
for i, v in pairs(allTreasures) do
if v.faXiangConfig.Type==0
and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession)
and (v.faXiangConfig.Job==0 or v.faXiangConfig.Job==_hero.heroConfig.Job) and v.upHeroDid=="" then
and CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) and v.upHeroDid=="" then
local power=this.CalculateEquipWarForce(v)
--LogError("power=========="..power)
--table.insert(yinList,v)
@ -626,7 +626,7 @@ function this.GetOneKeyUpFaXiangByType(_hero)
for i, v in pairs(allTreasures) do
if v.faXiangConfig.Type==1
and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession)
and (v.faXiangConfig.Job==0 or v.faXiangConfig.Job==_hero.heroConfig.Job) and v.upHeroDid=="" then
and CheckListIsContainValue1(v.faXiangConfig.Job,_hero.heroConfig.Job) and v.upHeroDid=="" then
local power=this.CalculateEquipWarForce(v)
-- LogError("power=========="..power)
--table.insert(yinList,v)
@ -729,7 +729,7 @@ function this.GetAllTreasuresCanUp(_heroData)
for key, value in pairs(allTreasures) do
if (value.upHeroDid == "" or value.upHeroDid == "0")
and (value.faXiangConfig.Profession==0 or value.faXiangConfig.Profession==_heroData.heroConfig.Profession)
and (value.faXiangConfig.Job==0 or value.faXiangConfig.Job==_heroData.heroConfig.Job) then
and CheckListIsContainValue1(value.faXiangConfig.Job,_heroData.heroConfig.Job) then
table.insert(curAllEquipTreasure, value)
end
end