From 17ebbc1872897e7b02642dde6eea5139dea33048 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 6 Sep 2021 18:17:38 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=81=B5?= =?UTF-8?q?=E5=85=BD=E5=95=86=E5=9F=8E=E5=95=86=E5=93=81=E4=B8=8A=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BD=93=E5=89=8D=E5=B7=B2=E6=9C=89=E7=9A=84=E7=81=B5?= =?UTF-8?q?=E5=85=BD=E7=A2=8E=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/ShopView/ShopView.prefab | 4 ++-- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/View/ShopView.lua | 8 +++++++- Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index f11f95ba50..af9d3645f4 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -3955,8 +3955,8 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 0.7 m_Text: "\u8FD9\u662F\u4E94\u4E2A\u5B57" LanguageIndex: 10412 --- !u!1 &3020615136999118653 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 125f0f64e4..d739f2ed5b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1144,6 +1144,7 @@ UIColorStr = { GREEN = "#57c88a", NOT_ENOUGH_RED = "#C51B20FF", YELLOW = "#E8B546", + BLACK = "#000000" } --编队面板类型(前端用) diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 41d2344d46..b8661e727b 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -463,7 +463,13 @@ function this:ShopItemAdapter(shopItem, itemData) local costId, price = ShopManager.calculateBuyCost(self.ShopType, itemData.id, 1) local goods = ShopManager.GetShopItemGoodsInfo(itemData.id) - itemName.text = SubString2(GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]).Name),8)--itemInfo.GoodsName + local con = ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]) + itemName.text = SubString2(GetLanguageStrById(con.Name),8) + if con.ItemType == ItemType.LingShouChip then + local haveCount = BagManager.GetTotalItemNum(con.Id) + itemName.text = itemName.text.."\n"..string.format("%s(%s/%s)",UIColorStr.BLACK, "25", "拥有:", haveCount, con.UsePerCount) + end + --itemInfo.GoodsName -- 折扣 if price == 0 then discountbg:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index 96f854eddf..7c112ce8f7 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -478,7 +478,12 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) local costId, price = ShopManager.calculateBuyCost(self.ShopType, itemData.id, 1) local goods = ShopManager.GetShopItemGoodsInfo(itemData.id) - itemName.text = ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]).Name--itemInfo.GoodsName + local con = ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]) + itemName.text = SubString2(GetLanguageStrById(con.Name),8) + if con.ItemType == ItemType.LingShouChip then + local haveCount = BagManager.GetTotalItemNum(con.Id) + itemName.text = itemName.text.."\n"..string.format("%s(%s/%s)",UIColorStr.BLACK, "25", "拥有:", haveCount, con.UsePerCount) + end -- 折扣 if price == 0 then discountbg:SetActive(true)