Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020
This commit is contained in:
@@ -921,7 +921,7 @@ MonoBehaviour:
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_DynamicPixelsPerUnit: 16
|
||||
--- !u!223 &1820456177
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -931,7 +931,7 @@ Canvas:
|
||||
m_GameObject: {fileID: 1820456174}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 1
|
||||
m_RenderMode: 2
|
||||
m_Camera: {fileID: 998016119}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
@@ -951,8 +951,8 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1820456174}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 0.0625, y: 0.0625, z: 0.0625}
|
||||
m_Children:
|
||||
- {fileID: 1392404506}
|
||||
- {fileID: 2106947133}
|
||||
@@ -963,8 +963,8 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 256, y: 240}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!95 &1820456179
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
|
||||
Reference in New Issue
Block a user