Merge branch 'master' of https://github.com/Fishrock123/GGJ2020

Fishrock123 · Feb 2, 2020 · c38bb78 · c38bb78
2 parents 0c20ef8 + e175f39
commit c38bb78
Show file tree

Hide file tree

Showing 10 changed files with 207 additions and 421 deletions.
diff --git a/Assets/Resources/game_over.png b/Assets/Resources/game_over.png
diff --git a/Assets/Resources/game_over.png.meta b/Assets/Resources/game_over.png.meta
diff --git a/Assets/Scenes/FinalScene.unity b/Assets/Scenes/FinalScene.unity
@@ -214,10 +214,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3