From 22ad34291b57e8b81f5d145b4a55e314ea23f7e8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 10 Aug 2020 14:16:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8C=AE=E7=A5=AD=20=E5=92=8C=20=E5=90=9E?= =?UTF-8?q?=E5=8D=A1=20=E6=8E=89=E8=90=BD=E8=BA=AB=E4=B8=8A=E8=A3=85?= =?UTF-8?q?=E5=A4=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Bag/BagManager.lua | 12 +++++++++++- .../~Lua/Modules/Popup/RewardItemPopup.lua | 2 +- .../Popup/View/GeneralPopup_ResolveDismantle.lua | 1 + .../~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 4fca6984a3..0609b9c2dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -10,6 +10,7 @@ this.mapShotTimeItemData = {} this.tianFuMaterial = {} this.needEndingTime = 0 +this.dropIsSHowEquipPrint = true--显示掉落时是否显示装备和魂印 function this.Initialize() this.isBagPanel = false end @@ -703,7 +704,12 @@ function this.GetItemListFromTempBag(drop, isSave) itemdata.frame = GetQuantityImageByquality(itemdata.configData.Quantity) itemdata.icon = GetResourcePath(itemdata.configData.ResourceID) itemdata.num = drop.itemlist[i].itemNum - table.insert(itemDataList, itemdata) + -- LogGreen("itemdata.configData.ItemType "..itemdata.configData.ItemType.." this.dropIsSHowEquipPrint "..tostring(this.dropIsSHowEquipPrint)) + if itemdata.configData.ItemType ~= ItemType.Equip or itemdata.configData.ItemType ~= ItemType.HunYin then + table.insert(itemDataList, itemdata) + elseif this.dropIsSHowEquipPrint then--献祭 升星吞卡 掉落身上装备和魂印 但是不显示 前端做处理 + table.insert(itemDataList, itemdata) + end end end if drop.equipId ~= nil and #drop.equipId > 0 then @@ -992,4 +998,8 @@ function this.BagIndicationRefresh(msg) CheckRedPointStatus(RedPointType.Bag_HeroDebris) CheckRedPointStatus(RedPointType.Bag_BoxAndBlueprint) end + +function this.SetDropIsSHowEquipPrint(dropIsSHowEquipPrint) + this.dropIsSHowEquipPrint = dropIsSHowEquipPrint +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index 5af1f27b33..bf49b22805 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -463,7 +463,7 @@ function RewardItemPopup:ItemDataListSort(itemDataList) end --界面关闭时调用(用于子类重写) function RewardItemPopup:OnClose() - + BagManager.SetDropIsSHowEquipPrint(true) local fightConFigData = ConfigManager.GetConfigData(ConfigName.MainLevelConfig, FightPointPassManager.curOpenFight) if compShowType == 1 then compShowType = 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua index dbd2495c69..00960b491e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveDismantle.lua @@ -36,6 +36,7 @@ function this:BindEvent() NetManager.UseAndPriceItemRequest(3, data, function(msg) HeroManager.DeleteHeroDatas(data) parent:ClosePanel() + BagManager.SetDropIsSHowEquipPrint(false) UIManager.OpenPanel(UIName.RewardItemPopup,msg,1,function () ResolvePanel.SwitchView(2) end) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 1279c3a421..e26c1a80b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -1278,6 +1278,7 @@ function RoleInfoPanel:StarUpClick() UIManager.OpenPanel(UIName.RoleUpStarSuccessPanel,curHeroData,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function () local dropItemTabs = BagManager.GetTableByBackDropData(msg) if #dropItemTabs > 0 then + BagManager.SetDropIsSHowEquipPrint(false) UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1, function () self:DeleteUpStarMaterials() end)