From dd1493ee90913e9cb7c75d7c585662a3084e6d99 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 Aug 2020 15:14:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A2=8E=E7=89=87=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E3=80=91=E7=A1=AE=E8=AE=A4=E8=B4=AD=E4=B9=B0=E5=92=8C=E7=A2=8E?= =?UTF-8?q?=E7=89=87=E5=90=88=E6=88=90=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=A2=8E=E7=89=87=E9=81=93=E5=85=B7=E7=9A=84=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E7=A2=8E=E7=89=87=E8=BE=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 8 ++++---- .../~Lua/Modules/Shop/ShopBuyPopup.lua | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 7fbe74f3d4..fd073fd8d3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -5081,9 +5081,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40005, y: -73.150055} + m_AnchoredPosition: {x: 0.000057485686, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &5729675956691850897 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19668,9 +19668,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 316.40002, y: -73.150055} + m_AnchoredPosition: {x: 0.000028742843, y: -73.150055} m_SizeDelta: {x: 0, y: 151} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &4796361513380277662 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua index 0c4c5b56e1..eb0d893dcb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua @@ -94,6 +94,7 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) this.shopType = shopType this.shopItemId = shopItemId this.shopItemInfo = ShopManager.GetShopItemInfo(shopItemId) + LogGreen(shopItemId..":shopItemId") this.shopItemData = ShopManager.GetShopItemData(shopType, shopItemId) -- 商品基础信息显示 @@ -104,7 +105,14 @@ function ShopBuyPopup:OnOpen(shopType, shopItemId) local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) this.itemContent.text = string.gsub(itemConfig[goodsId].ItemDescribe, "\\n", "\n") this.itemIcon.sprite = SetIcon(goodsId) - this.itemBg.sprite = SetFrame(goodsId) + if itemConfig[this.shopItemInfo.Goods[1][1]].ItemType == 2 then + this.itemBg.sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[this.shopItemInfo.Goods[1][1]].Quantity)) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(true) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):GetComponent("Image").sprite = Util.LoadSprite(GetJobSpriteStrByJobNum(itemConfig[this.shopItemInfo.Goods[1][1]].PropertyName)) + else + this.itemBg.sprite = SetFrame(goodsId) + Util.GetGameObject(self.gameObject, "tipImage/item/proima"):SetActive(false) + end this.itemNum.text = this.goods[1][2] -- 计算最大可购买的数量 local countLimitNum = ShopManager.GetShopItemLimitBuyCount(shopItemId)