合成修改
parent
32c788b8ac
commit
7749211534
|
@ -64,6 +64,7 @@ function CompoundHeroFirstUpStarListPanel:OnOpen(heroData,_openThisPanel,_curHer
|
||||||
openThisPanel= _openThisPanel
|
openThisPanel= _openThisPanel
|
||||||
curHeroData = _curHeroData
|
curHeroData = _curHeroData
|
||||||
heroDataList = heroData
|
heroDataList = heroData
|
||||||
|
curSelectHeroList = {}
|
||||||
curSelectHeroList[_curHeroData.dynamicId] = _curHeroData
|
curSelectHeroList[_curHeroData.dynamicId] = _curHeroData
|
||||||
this.HeroSortData(heroDataList)
|
this.HeroSortData(heroDataList)
|
||||||
for i, v in pairs(heroDataList) do
|
for i, v in pairs(heroDataList) do
|
||||||
|
|
|
@ -272,19 +272,17 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
|
||||||
local curUpStarData= _curUpStarData.upStarMaterialsData
|
local curUpStarData= _curUpStarData.upStarMaterialsData
|
||||||
if curUpStarData and #curUpStarData>0 then
|
if curUpStarData and #curUpStarData>0 then
|
||||||
for i = 1, #curUpStarData do
|
for i = 1, #curUpStarData do
|
||||||
curSelectUpStarGo = needHeros[i + 1]
|
|
||||||
curSelectUpStarData=curUpStarData[i]
|
curSelectUpStarData=curUpStarData[i]
|
||||||
local upStarHeroListData=_curUpStarData.haveHeroList3[i + 1]
|
local upStarHeroListData=_curUpStarData.haveHeroList3[i + 1]
|
||||||
local curSelectHeroList = {}
|
local curSelectHeroList = {}
|
||||||
if curSelectUpStarData.Issame ==1
|
if curSelectUpStarData.Issame ==1
|
||||||
or curSelectUpStarData.IsId > 0
|
or curSelectUpStarData.IsId > 0
|
||||||
or (curSelectUpStarData.IsSameClan == 1
|
or (curSelectUpStarData.IsSameClan == 1 and curSelectUpStarData.StarLimit == 3 and curSelectHero.heroConfig.Qualiy ~= 3) then
|
||||||
and curSelectUpStarData.StarLimit == 3
|
|
||||||
and curSelectHero.heroConfig.Qualiy ~= 3) then
|
|
||||||
if LengthOfTable(upStarHeroListData) >= _curUpStarData.upStarData[i][4] then
|
if LengthOfTable(upStarHeroListData) >= _curUpStarData.upStarData[i][4] then
|
||||||
|
curSelectUpStarGo = needHeros[i + 1]
|
||||||
for j = 1, LengthOfTable(upStarHeroListData) do
|
for j = 1, LengthOfTable(upStarHeroListData) do
|
||||||
if #curSelectHeroList < _curUpStarData.upStarData[i][4] then
|
if #curSelectHeroList < _curUpStarData.upStarData[i][4] then
|
||||||
if upStarHeroListData[j].lockState == 0 and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId then--upStarHeroListData[i].isFormation == ""
|
if upStarHeroListData[j].lockState == 0 and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId and upStarHeroListData[i].isFormation == "" then
|
||||||
table.insert(curSelectHeroList,upStarHeroListData[j])
|
table.insert(curSelectHeroList,upStarHeroListData[j])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -297,7 +295,6 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
|
||||||
end
|
end
|
||||||
--刷新当前升星坑位英雄的信息
|
--刷新当前升星坑位英雄的信息
|
||||||
function this.UpdateUpStarPosHeroData(curSelectHeroList,_upStarData)
|
function this.UpdateUpStarPosHeroData(curSelectHeroList,_upStarData)
|
||||||
-- LogGreen("LengthOfTable(curSelectHeroList) "..LengthOfTable(curSelectHeroList))
|
|
||||||
local upStarData = _upStarData and _upStarData or curSelectUpStarData
|
local upStarData = _upStarData and _upStarData or curSelectUpStarData
|
||||||
if LengthOfTable(curSelectHeroList) < upStarData[4] then
|
if LengthOfTable(curSelectHeroList) < upStarData[4] then
|
||||||
upStarMaterialIsAll[upStarData[2]]=2
|
upStarMaterialIsAll[upStarData[2]]=2
|
||||||
|
@ -341,9 +338,11 @@ function this.UpdateUpStarPosHeroData2(curSelectHeroList)
|
||||||
else
|
else
|
||||||
for key, value in pairs(curSelectHeroList) do
|
for key, value in pairs(curSelectHeroList) do
|
||||||
curSelectHero = value
|
curSelectHero = value
|
||||||
|
--自动选择进阶妖灵师材料
|
||||||
|
this.compoundHerolv.text=curSelectHero.lv
|
||||||
end
|
end
|
||||||
this.GetAllHeroCompoundData2(curSelectHeroConfig.config,curSelectHeroConfig,true)
|
local _curUpStarData = this.GetAllHeroCompoundData2(curSelectHeroConfig.config,curSelectHeroConfig,true)
|
||||||
if curSelectHero then this.compoundHerolv.text=curSelectHero.lv end
|
if curSelectHero then this.UpdateHeroUpStarData(_curUpStarData) end
|
||||||
Util.GetGameObject(curSelectUpStarGo.transform,"add/add"):SetActive(false)
|
Util.GetGameObject(curSelectUpStarGo.transform,"add/add"):SetActive(false)
|
||||||
Util.GetGameObject(curSelectUpStarGo.transform,"num"):GetComponent("Text").text=string.format("<color=#FFFFFFFF>%s/%s</color>", LengthOfTable(curSelectHeroList),1)
|
Util.GetGameObject(curSelectUpStarGo.transform,"num"):GetComponent("Text").text=string.format("<color=#FFFFFFFF>%s/%s</color>", LengthOfTable(curSelectHeroList),1)
|
||||||
end
|
end
|
||||||
|
|
|
@ -37,7 +37,7 @@ function this:BindEvent()
|
||||||
HeroManager.DeleteHeroDatas(data)
|
HeroManager.DeleteHeroDatas(data)
|
||||||
parent:ClosePanel()
|
parent:ClosePanel()
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
|
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
|
||||||
ResolvePanel.SwitchView(2)
|
ResolvePanel.SwitchView(1)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -39,7 +39,7 @@ function this:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[12276])
|
PopupTipPanel.ShowTip(Language[12276])
|
||||||
parent:ClosePanel()
|
parent:ClosePanel()
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||||
ResolvePanel.SwitchView(1)
|
ResolvePanel.SwitchView(2)
|
||||||
end,0,nil,nil,1)
|
end,0,nil,nil,1)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
Loading…
Reference in New Issue