Merge branch 'tcx_xiyou_yueNan' of http://192.168.1.21:3000/root/miduo_client into tcx_xiyou_yueNan

# Conflicts:
#	Assets/ManagedResources/ArtFont_en/icon_chenghao35_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_dongtian_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_fudi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_Resource_Coin_luofu_en.png.meta
xiyou_yueNanZhengshi
zhangjiannan 2024-12-16 10:56:13 +08:00
commit 4a15c6fc41
4 changed files with 1531 additions and 1515 deletions

View File

@ -58,7 +58,7 @@ function WishGemBuyTenPanel:BindEvent()
end)
Util.AddClick(this.openTenAgainButton, function()
if BagManager.GetItemCountById(itemId) < itemNum then
PopupTipPanel.ShowTip(GetLanguageStrById(ItemConfig[itemId].Name) .. Language[10584])
PopupTipPanel.ShowTip(GetLanguageStrById(ItemConfig[itemId].Name).." " .. Language[10584])
return
end
NetManager.GemNewDrawRequest(this.recruitType, 10, function(msg)