Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
e0a3b3837c
|
@ -478,7 +478,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: af427fe7944d94d409dd82f68a9a70fa, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: d0a20a3e2c8e1544bb76b617ff1a06cb, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
@ -1349,7 +1349,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -182.6, y: 4.1}
|
||||
m_SizeDelta: {x: 128, y: 40}
|
||||
m_SizeDelta: {x: 190, y: 116}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2680947178696595786
|
||||
CanvasRenderer:
|
||||
|
@ -1379,7 +1379,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: fcd7f98240d96bb46b47fb807d597750, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: 9cb4aa53aa218974fa09913ff23f3fd5, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
|
|
Loading…
Reference in New Issue