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

dev_chengFeng
gaoxin 2021-03-18 14:29:52 +08:00
commit 07c5220c01
3 changed files with 921 additions and 392 deletions

View File

@ -404,7 +404,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &8126913021008556213
RectTransform:
m_ObjectHideFlags: 0
@ -1386,7 +1386,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3210126133790844263}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -1552,10 +1552,10 @@ RectTransform:
m_Father: {fileID: 1759585470645775885}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 500, y: -40}
m_SizeDelta: {x: 1000, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4460466962581947724
CanvasRenderer:
@ -3322,7 +3322,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &637834703727152052
RectTransform:
m_ObjectHideFlags: 0

View File

@ -143,8 +143,8 @@ function GiftView:RefreshOneKeyShow()
-- self.oriPrice.text = Language[10582]..MoneyUtil.GetMoneyMark()..ori
-- self.nowPrice.text = Language[10644]..MoneyUtil.GetMoneyMark()..now
self.oriPrice.text = string.format("价:%s元",ori)
self.nowPrice.text = string.format("价:%s元",now)
self.oriPrice.text = string.format("价:%s元",ori)
self.nowPrice.text = string.format("价:%s元",now)
end
-- 刷新礼包的数据