diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 37973933b1..a1644ffb41 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index ba217bc881..60097731e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -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 () diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua index b361ef5ff6..70f62e01cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangHandBook.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua index b235fbffe2..3c5d3d5e95 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua @@ -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