Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop
This commit is contained in:
commit
e6aa00ecdc
|
|
@ -6063,7 +6063,7 @@ SpriteRenderer:
|
||||||
m_LightmapParameters: {fileID: 0}
|
m_LightmapParameters: {fileID: 0}
|
||||||
m_SortingLayerID: 0
|
m_SortingLayerID: 0
|
||||||
m_SortingLayer: 0
|
m_SortingLayer: 0
|
||||||
m_SortingOrder: -2
|
m_SortingOrder: -3
|
||||||
m_Sprite: {fileID: 21300000, guid: 08d7212f8dfc74ed0b9ded9c125cefef, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 08d7212f8dfc74ed0b9ded9c125cefef, type: 3}
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_FlipX: 0
|
m_FlipX: 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue