Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop

* 'develop' of https://bitbucket.org/usaya/popcorn:
  フライパンのレイヤー調整
This commit is contained in:
kimura 2021-10-26 12:12:00 +09:00
commit 22267e2275
2 changed files with 8 additions and 3 deletions

View File

@ -69,7 +69,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 2
m_SortingOrder: 5
m_Sprite: {fileID: 21300000, guid: 30fe9eb289f0c9d46867ba412a44c86b, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

View File

@ -2035,8 +2035,8 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1928679190}
- {fileID: 657773246}
- {fileID: 7182226549102099027}
- {fileID: 657773246}
m_Father: {fileID: 420543917}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -4719,6 +4719,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6748722530719482901, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
type: 3}
propertyPath: m_SortingOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8572098596071958738, guid: b6b05cbc51c744ac2ad95a8b229d4ddd,
type: 3}
propertyPath: m_RootOrder
@ -4899,7 +4904,7 @@ RectTransform:
- {fileID: 1601191536}
- {fileID: 250366630}
m_Father: {fileID: 676036207}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}