Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop
* 'develop' of https://bitbucket.org/usaya/popcorn: 畑 機械の吐出口の重なり調整
This commit is contained in:
		
						commit
						2a95ed4bb6
					
				|  | @ -1416,7 +1416,7 @@ SpriteRenderer: | ||||||
|   m_LightmapParameters: {fileID: 0} |   m_LightmapParameters: {fileID: 0} | ||||||
|   m_SortingLayerID: 0 |   m_SortingLayerID: 0 | ||||||
|   m_SortingLayer: 0 |   m_SortingLayer: 0 | ||||||
|   m_SortingOrder: 20 |   m_SortingOrder: 25 | ||||||
|   m_Sprite: {fileID: 21300000, guid: 56fc59b88ba3745bd993cf3d7e2387ac, type: 3} |   m_Sprite: {fileID: 21300000, guid: 56fc59b88ba3745bd993cf3d7e2387ac, 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