Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-05-31 11:07:06 +08:00
commit 1b366fb607
2 changed files with 5 additions and 5 deletions

View File

@ -6198,8 +6198,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 83, y: 116.99999}
m_SizeDelta: {x: 33.55, y: 263.8}
m_AnchoredPosition: {x: 79.63, y: 116.99999}
m_SizeDelta: {x: 44.85, y: 263.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3946196506950791481
CanvasRenderer:
@ -6236,11 +6236,11 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text:
LanguageIndex: 0

View File

@ -149,7 +149,7 @@ function this:SetScrollPre(root,data)
itemList[i].Name = Util.GetGameObject(itemList[i].go,"Name"):GetComponent("Text")
end
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,data.Id)
title.text = string.format("值%s现仅需%s",MoneyUtil.GetMoneyUnitNameWithMoney(config.Rebate),MoneyUtil.GetMoneyUnitNameWithMoney(config.Price))
title.text = string.format("\n\n%s\n\n\n\n%s",MoneyUtil.GetMoneyUnitNameWithMoney(config.Rebate),MoneyUtil.GetMoneyUnitNameWithMoney(config.Price))
local rewardArray = data.RewardShow
if not itemsGrid then
itemsGrid = {}