From 311439c88563ebd6faab89db1f1ffd6ade601d4c Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 26 Apr 2022 17:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A9=E5=AE=AB=E5=95=86=E5=BA=97?= =?UTF-8?q?=E3=80=91=E5=8E=BB=E6=8E=89=E5=B7=B2=E8=8E=B7=E5=BE=97=E5=8F=98?= =?UTF-8?q?=E8=BA=AB=E5=8D=A1=E7=9A=84=E8=B4=AD=E4=B9=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/RewardItemSingleShowPopup.lua | 5 ----- Assets/ManagedResources/~Lua/View/ShopView.lua | 14 +++++++------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index a0f1de4f1e..873ffaffa2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -465,12 +465,10 @@ function RewardItemSingleShowPopup:OnShow() this.armorType.gameObject:SetActive(true) this.armorLanTuNum.gameObject:SetActive(true) this.armorType.text = this.getType()--道具类型显示 - LogError("11111111111") this.armorLanTuNum.text = Language[11516] .. BagManager.GetItemCountById(itemSid) this.armorInfoText.text = string.gsub(GetLanguageStrById(itemConfigData.ItemDescribe), "\\n", "") local jumpDataList = itemConfigData.Jump local jumpSortData = creatJumpData(jumpDataList) - LogError("222222222") for i = 1, #jumpSortData do if jumpSortData[i].id > 0 then -- type 大于 10000为活动 直接显示按钮,如果小于1000 为功能 开启才显示 @@ -496,7 +494,6 @@ function RewardItemSingleShowPopup:OnShow() end end end - LogError("33333333") this.scroll:GetComponent("RectTransform").sizeDelta = Vector2.New(912.8,600) -- if jumpDataList and #jumpDataList then -- this.equipProGrid:GetComponent("RectTransform").sizeDelta = Vector2.New(807.7,this.equipProGridCom.spacing*(#jumpDataList)) @@ -518,7 +515,6 @@ function RewardItemSingleShowPopup:OnShow() else this.checkHero:SetActive(false) end - LogError("44444444444444") -- 判断是否要显示等级限制 this.armorLock.gameObject:SetActive(false) if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then @@ -526,7 +522,6 @@ function RewardItemSingleShowPopup:OnShow() this.armorLock.text = string.format("等级达%s后可以使用", UIColorStr.RED, itemConfigData.UseLevel) end ForceRebuildLayout(this.equipProGrid.transform) - LogError("5555555555") end --获取道具种类 diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index b02d13d088..998dbfb8c0 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -605,13 +605,13 @@ function this:ShopItemAdapter(shopItem, itemData) PopupTipPanel.ShowTip(Language[12039]) end) Util.AddOnceClick(bg, function() - if con.ItemType == ItemType.Incarnation then - local num = BagManager.GetItemCountById(con.Id) - if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then - PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") - return - end - end + -- if con.ItemType == ItemType.Incarnation then + -- local num = BagManager.GetItemCountById(con.Id) + -- if num > 0 or IncarnationManager.GetStatusByItemId(con.Id) >= 0 then + -- PopupTipPanel.ShowTip("无法选择已获取过的变身卡!") + -- return + -- end + -- end -- 售空 if isEmpty then PopupTipPanel.ShowTip(Language[12039])