From 7749211534134f01b7c276b8e09c8be54f4824e7 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Sat, 8 Aug 2020 19:27:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E6=88=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompoundHeroFirstUpStarListPanel.lua | 1 + .../CompoundHero/view/CompoundHero_Compound.lua | 15 +++++++-------- .../Popup/View/GeneralPopup_ResolveDismantle.lua | 2 +- .../Popup/View/GeneralPopup_ResolveRecall.lua | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua index 81cfc33e7c..0ca7e832c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index d81693e754..6d6735e013 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -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("%s/%s", LengthOfTable(curSelectHeroList),1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index c492aaa391..df16de5410 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua index 2eeae2ac4d..eae60d6c9f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua @@ -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)