合成修改

dev_chengFeng
zhangqiang 2020-08-08 19:27:10 +08:00
parent 32c788b8ac
commit 7749211534
4 changed files with 10 additions and 10 deletions

View File

@ -64,6 +64,7 @@ function CompoundHeroFirstUpStarListPanel:OnOpen(heroData,_openThisPanel,_curHer
openThisPanel= _openThisPanel
curHeroData = _curHeroData
heroDataList = heroData
curSelectHeroList = {}
curSelectHeroList[_curHeroData.dynamicId] = _curHeroData
this.HeroSortData(heroDataList)
for i, v in pairs(heroDataList) do

View File

@ -272,19 +272,17 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
local curUpStarData= _curUpStarData.upStarMaterialsData
if curUpStarData and #curUpStarData>0 then
for i = 1, #curUpStarData do
curSelectUpStarGo = needHeros[i + 1]
curSelectUpStarData=curUpStarData[i]
local upStarHeroListData=_curUpStarData.haveHeroList3[i + 1]
local curSelectHeroList = {}
if curSelectUpStarData.Issame ==1
or curSelectUpStarData.IsId > 0
or (curSelectUpStarData.IsSameClan == 1
and curSelectUpStarData.StarLimit == 3
and curSelectHero.heroConfig.Qualiy ~= 3) then
or (curSelectUpStarData.IsSameClan == 1 and curSelectUpStarData.StarLimit == 3 and curSelectHero.heroConfig.Qualiy ~= 3) then
if LengthOfTable(upStarHeroListData) >= _curUpStarData.upStarData[i][4] then
curSelectUpStarGo = needHeros[i + 1]
for j = 1, LengthOfTable(upStarHeroListData) do
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])
end
end
@ -297,7 +295,6 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
end
--刷新当前升星坑位英雄的信息
function this.UpdateUpStarPosHeroData(curSelectHeroList,_upStarData)
-- LogGreen("LengthOfTable(curSelectHeroList) "..LengthOfTable(curSelectHeroList))
local upStarData = _upStarData and _upStarData or curSelectUpStarData
if LengthOfTable(curSelectHeroList) < upStarData[4] then
upStarMaterialIsAll[upStarData[2]]=2
@ -341,9 +338,11 @@ function this.UpdateUpStarPosHeroData2(curSelectHeroList)
else
for key, value in pairs(curSelectHeroList) do
curSelectHero = value
--自动选择进阶妖灵师材料
this.compoundHerolv.text=curSelectHero.lv
end
this.GetAllHeroCompoundData2(curSelectHeroConfig.config,curSelectHeroConfig,true)
if curSelectHero then this.compoundHerolv.text=curSelectHero.lv end
local _curUpStarData = this.GetAllHeroCompoundData2(curSelectHeroConfig.config,curSelectHeroConfig,true)
if curSelectHero then this.UpdateHeroUpStarData(_curUpStarData) end
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)
end

View File

@ -37,7 +37,7 @@ function this:BindEvent()
HeroManager.DeleteHeroDatas(data)
parent:ClosePanel()
UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function ()
ResolvePanel.SwitchView(2)
ResolvePanel.SwitchView(1)
end)
end)
end)

View File

@ -39,7 +39,7 @@ function this:BindEvent()
PopupTipPanel.ShowTip(Language[12276])
parent:ClosePanel()
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
ResolvePanel.SwitchView(1)
ResolvePanel.SwitchView(2)
end,0,nil,nil,1)
end)
end)