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)