diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua index 0ebc05dc67..b87ec7f565 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua @@ -494,10 +494,18 @@ function this.GetOneKeyUpFaXiangByType(_hero) local yinPower=0 local curyang local yangPower=0 + for i = 1, #_hero.faxiang do + local heroFaxiang=allTreasures[_hero.faxiang[i]] + if heroFaxiang.equipType==0 then + yinPower=this.CalculateEquipWarForce(heroFaxiang) + else + yangPower=this.CalculateEquipWarForce(heroFaxiang) + end + end 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.Profession==_hero.heroConfig.Job) then + and (v.faXiangConfig.Job==0 or v.faXiangConfig.Profession==_hero.heroConfig.Job) and v.upHeroDid=="" then local power=this.CalculateEquipWarForce(v) --LogError("power=========="..power) --table.insert(yinList,v) @@ -510,7 +518,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.Profession==_hero.heroConfig.Job) then + and (v.faXiangConfig.Job==0 or v.faXiangConfig.Profession==_hero.heroConfig.Job) and v.upHeroDid=="" then local power=this.CalculateEquipWarForce(v) -- LogError("power=========="..power) --table.insert(yinList,v) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 8b8b19fe53..ccb9611199 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -1044,8 +1044,8 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi if FaXiangManager.GetSingleTreasureByIdDyn(curHeroData.faxiang[j]).equipType == FaXiangManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then FaXiangManager.SetTreasureUpOrDown(curHeroData.faxiang[j], "0") - --FaXiangManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId) - curHeroData.jewels[j] = _selectEquipDataList[i] + FaXiangManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId) + curHeroData.faxiang[j] = _selectEquipDataList[i] isadd = false break end