From fdf82e47ac3e15bcd43411d5cae1e2364af64fde Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Sat, 11 Jul 2020 18:00:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=A7=A3=E3=80=81=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/FindFairy/FindFairyManager.lua | 4 +-- .../~Lua/Modules/Hero/HeroManager.lua | 30 ++++++++++--------- .../Popup/View/GeneralPopup_ResolveRecall.lua | 2 +- .../~Lua/Modules/Resolve/ResolvePanel.lua | 1 + .../ManagedResources/~Lua/View/ItemView.lua | 5 ++-- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua index c668d89b3f..719f959333 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindFairy/FindFairyManager.lua @@ -192,7 +192,7 @@ function this.ResetItemView(root,rewardRoot,itemList,max,scale,sortingOrder,type else for i = 1, #data1 do if itemList[root][i] then - itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2]},scale,false,false,false,sortingOrder) + itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2],data1[i][3],data1[i][4]},scale,false,false,false,sortingOrder) itemList[root][i]:Reset({data1[i][1],data1[i][2]},ItemType.Hero,{false,true,true,true}) itemList[root][i].gameObject:SetActive(true) end @@ -209,7 +209,7 @@ function this.ResetItemView(root,rewardRoot,itemList,max,scale,sortingOrder,type itemList[root][1].gameObject:SetActive(true) else for i = 1, #data1 do - itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2]},scale,false,false,false,sortingOrder) + itemList[root][i]:OnOpen(false, {data1[i][1],data1[i][2],data1[i][3],data1[i][4]},scale,false,false,false,sortingOrder) itemList[root][i]:Reset({data1[i][1],data1[i][2]},ItemType.Hero,{false,true,true,true}) itemList[root][i].gameObject:SetActive(true) end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 2323002e0d..3896d4cffb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2062,20 +2062,21 @@ function this.GetHeroReturnItems(selectHeroData, type) curHeroData.star ) local rewardShowStr1 = {} - rewardShowStr1 = heroReturnConfig.ReturnHero - if rewardShowStr1 then - table.sort( - rewardShowStr1, - function(a, b) - return a[1] < b[1] - end - ) - for i = 1, #rewardShowStr1 do - if rewardShowStr1[i] and rewardShowStr1[i][1] then - table.insert(ShowItemlist, rewardShowStr1[i]) - end - end - end + ShowItemlist[1] = {heroReturnConfig.HeroId,1,curHeroData.star} + -- rewardShowStr1 = heroReturnConfig.ReturnHero + -- if rewardShowStr1 then + -- table.sort( + -- rewardShowStr1, + -- function(a, b) + -- return a[1] < b[1] + -- end + -- ) + -- for i = 1, #rewardShowStr1 do + -- if rewardShowStr1[i] and rewardShowStr1[i][1] then + -- table.insert(ShowItemlist, rewardShowStr1[i]) + -- end + -- end + -- end rewardShowStr1 = heroReturnConfig.RankupReturn if rewardShowStr1 then if rewardShowStr1[1] and rewardShowStr1[2] then @@ -2096,6 +2097,7 @@ function this.GetHeroReturnItems(selectHeroData, type) curReward.id = ShowItemlist[i][1] curReward.num = math.floor(ShowItemlist[i][2]) curReward.itemConfig = itemConfig[curReward.id] + curReward.star = ShowItemlist[i][3] or nil table.insert(dropList, curReward) end return dropList diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua index 3e3e3e380b..f596b3ee20 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveRecall.lua @@ -66,7 +66,7 @@ function this:OnShow(_parent,...) local _data={} for i=1,#dropList do - _data[i]={dropList[i].id,dropList[i].num} + _data[i] = {dropList[i].id,dropList[i].num,nil,dropList[i].star} end FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data) end diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 4e457c0576..85199f50c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -142,6 +142,7 @@ end --切换视图 function this.SwitchView(index) + this.RewardGridGoMov(false) --先执行上一面板关闭逻辑 local oldSelect oldSelect, curIndex = curIndex, index diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index 3304c68432..24ce783acf 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -344,7 +344,8 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) self.num:SetActive(itemNum > 1) self.num:GetComponent("Text").text = PrintWanNum(itemNum) --Util.ClearChild(self.starGrid.transform) - SetHeroStars(self.starGrid, itemConfig[itemSId].HeroStar[2]) + local star = _reward[4] or itemConfig[itemSId].HeroStar[2] + SetHeroStars(self.starGrid, star) self.frame.sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConfigData.Quality)) self.icon.sprite = Util.LoadSprite(GetResourcePath(heroConfigData.Icon)) self.proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(heroConfigData.PropertyName)) @@ -352,7 +353,7 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) --self.heroStage.sprite = Util.LoadSprite(HeroStageSprite[heroConfigData.HeroStage]) self.name:GetComponent("Text").text = heroConfigData.ReadingName Util.AddOnceClick(self.frameBtn, function() - UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id, itemConfig[itemSId].HeroStar[2]) + UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, heroConfigData.Id,star) end) if effectLayer > 0 then self.UI_Effect_Kuang_JinSe:SetActive(heroConfigData.Star == 5)