Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021
This commit is contained in:
		@@ -362,7 +362,7 @@ RectTransform:
 | 
				
			|||||||
  m_RootOrder: 0
 | 
					  m_RootOrder: 0
 | 
				
			||||||
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
					  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 | 
				
			||||||
  m_AnchorMin: {x: 0, y: 0}
 | 
					  m_AnchorMin: {x: 0, y: 0}
 | 
				
			||||||
  m_AnchorMax: {x: 0, y: 0}
 | 
					  m_AnchorMax: {x: 1, y: 1}
 | 
				
			||||||
  m_AnchoredPosition: {x: 0, y: 0}
 | 
					  m_AnchoredPosition: {x: 0, y: 0}
 | 
				
			||||||
  m_SizeDelta: {x: 20, y: 20}
 | 
					  m_SizeDelta: {x: 20, y: 20}
 | 
				
			||||||
  m_Pivot: {x: 0.5, y: 0.5}
 | 
					  m_Pivot: {x: 0.5, y: 0.5}
 | 
				
			||||||
@@ -1756,7 +1756,7 @@ GameObject:
 | 
				
			|||||||
  m_Icon: {fileID: 0}
 | 
					  m_Icon: {fileID: 0}
 | 
				
			||||||
  m_NavMeshLayer: 0
 | 
					  m_NavMeshLayer: 0
 | 
				
			||||||
  m_StaticEditorFlags: 0
 | 
					  m_StaticEditorFlags: 0
 | 
				
			||||||
  m_IsActive: 0
 | 
					  m_IsActive: 1
 | 
				
			||||||
--- !u!224 &824343031
 | 
					--- !u!224 &824343031
 | 
				
			||||||
RectTransform:
 | 
					RectTransform:
 | 
				
			||||||
  m_ObjectHideFlags: 0
 | 
					  m_ObjectHideFlags: 0
 | 
				
			||||||
@@ -2114,7 +2114,7 @@ GameObject:
 | 
				
			|||||||
  m_Icon: {fileID: 0}
 | 
					  m_Icon: {fileID: 0}
 | 
				
			||||||
  m_NavMeshLayer: 0
 | 
					  m_NavMeshLayer: 0
 | 
				
			||||||
  m_StaticEditorFlags: 0
 | 
					  m_StaticEditorFlags: 0
 | 
				
			||||||
  m_IsActive: 1
 | 
					  m_IsActive: 0
 | 
				
			||||||
--- !u!224 &1137272331
 | 
					--- !u!224 &1137272331
 | 
				
			||||||
RectTransform:
 | 
					RectTransform:
 | 
				
			||||||
  m_ObjectHideFlags: 0
 | 
					  m_ObjectHideFlags: 0
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user