Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang
commit
db4d23bdfa
|
@ -522,10 +522,18 @@ function this.GetOneKeyUpFaXiangByType(_hero)
|
||||||
local yinPower=0
|
local yinPower=0
|
||||||
local curyang
|
local curyang
|
||||||
local yangPower=0
|
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
|
for i, v in pairs(allTreasures) do
|
||||||
if v.faXiangConfig.Type==0
|
if v.faXiangConfig.Type==0
|
||||||
and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession)
|
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)
|
local power=this.CalculateEquipWarForce(v)
|
||||||
--LogError("power=========="..power)
|
--LogError("power=========="..power)
|
||||||
--table.insert(yinList,v)
|
--table.insert(yinList,v)
|
||||||
|
@ -538,7 +546,7 @@ function this.GetOneKeyUpFaXiangByType(_hero)
|
||||||
for i, v in pairs(allTreasures) do
|
for i, v in pairs(allTreasures) do
|
||||||
if v.faXiangConfig.Type==1
|
if v.faXiangConfig.Type==1
|
||||||
and (v.faXiangConfig.Profession==0 or v.faXiangConfig.Profession==_hero.heroConfig.Profession)
|
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)
|
local power=this.CalculateEquipWarForce(v)
|
||||||
-- LogError("power=========="..power)
|
-- LogError("power=========="..power)
|
||||||
--table.insert(yinList,v)
|
--table.insert(yinList,v)
|
||||||
|
|
|
@ -1046,8 +1046,8 @@ function this.UpdateEquipPosHeroData(_equipOrTreasure, _type, _selectEquipDataLi
|
||||||
if FaXiangManager.GetSingleTreasureByIdDyn(curHeroData.faxiang[j]).equipType ==
|
if FaXiangManager.GetSingleTreasureByIdDyn(curHeroData.faxiang[j]).equipType ==
|
||||||
FaXiangManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then
|
FaXiangManager.GetSingleTreasureByIdDyn(_selectEquipDataList[i]).equipType then
|
||||||
FaXiangManager.SetTreasureUpOrDown(curHeroData.faxiang[j], "0")
|
FaXiangManager.SetTreasureUpOrDown(curHeroData.faxiang[j], "0")
|
||||||
--FaXiangManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
FaXiangManager.SetTreasureUpOrDown(_selectEquipDataList[i], curHeroData.dynamicId)
|
||||||
curHeroData.jewels[j] = _selectEquipDataList[i]
|
curHeroData.faxiang[j] = _selectEquipDataList[i]
|
||||||
isadd = false
|
isadd = false
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue