From f9fff1466296a988a5c5b1d664f0c23c1f2e851d Mon Sep 17 00:00:00 2001 From: Supaaah1 Date: Tue, 11 Apr 2023 16:57:21 +0200 Subject: [PATCH] Fixed screen scaling --- Assets/Accounts/Scenes/ChangeUserScreen.unity | 4 +-- .../Accounts/Scenes/UserCreationScreen.unity | 25 ++----------------- .../Accounts/Scenes/UserProgressScreen.unity | 4 +-- .../Common/Scenes/CourseActivityScreen.unity | 4 +-- Assets/Common/Scenes/CoursesMenuScreen.unity | 4 +-- Assets/Common/Scenes/ListCoursesScreen.unity | 4 +-- .../Common/Scenes/ListMinigamesScreen.unity | 4 +-- Assets/Common/Scenes/MainMenuScreen.unity | 12 ++++----- .../Scenes/MinigameActivityScreen.unity | 4 +-- Assets/Common/Scenes/SettingsScreen.unity | 4 +-- .../Common/Scenes/ThemeSelectionScreen.unity | 4 +-- Assets/Courses/Scenes/CourseScreen.unity | 6 ++--- Assets/Hangman/Scenes/HangmanGame.unity | 4 +-- Assets/JustSign/Scenes/JustSignGame.unity | 6 ++--- .../SpellingBee/Scenes/SpellingBeeGame.unity | 4 +-- 15 files changed, 36 insertions(+), 57 deletions(-) diff --git a/Assets/Accounts/Scenes/ChangeUserScreen.unity b/Assets/Accounts/Scenes/ChangeUserScreen.unity index d0761e4..a701075 100644 --- a/Assets/Accounts/Scenes/ChangeUserScreen.unity +++ b/Assets/Accounts/Scenes/ChangeUserScreen.unity @@ -1586,10 +1586,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 diff --git a/Assets/Accounts/Scenes/UserCreationScreen.unity b/Assets/Accounts/Scenes/UserCreationScreen.unity index 7943c67..c2139dd 100644 --- a/Assets/Accounts/Scenes/UserCreationScreen.unity +++ b/Assets/Accounts/Scenes/UserCreationScreen.unity @@ -1307,10 +1307,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 @@ -1393,27 +1393,6 @@ MonoBehaviour: inputName: {fileID: 645809401} avatarsContainer: {fileID: 1832217925} avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3} - sprites: - - {fileID: 21300000, guid: 4654657a2ebea444898fa6eeaefcd18d, type: 3} - - {fileID: 21300000, guid: b67b99d98d1ceb1489743bcd78b9ab70, type: 3} - - {fileID: 21300000, guid: e4af402f37099cd4195d7d2654519744, type: 3} - - {fileID: 21300000, guid: 73f4e028d9efb644aa23538a749667c5, type: 3} - - {fileID: 21300000, guid: bc11ff9d6cc35de45ab58f39f13d7142, type: 3} - - {fileID: 21300000, guid: 2b01165a5836ab14593d7a5862bd6793, type: 3} - - {fileID: 21300000, guid: 1a28fa2c46acbb1408633e4e98061d56, type: 3} - - {fileID: 21300000, guid: 8009fc8cfee7ea848a678e056731c02e, type: 3} - - {fileID: 21300000, guid: 7272bfa2b3f87564eb961d41c641479d, type: 3} - - {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3} - - {fileID: 21300000, guid: 439c062e9ba9d0f439dffd41509ceee7, type: 3} - - {fileID: 21300000, guid: 8962e03659a079546810c3ad9c8a211c, type: 3} - - {fileID: 21300000, guid: 182fb89eba9c64041bef31ca35c4bcd8, type: 3} - - {fileID: 21300000, guid: c7006b8cc5cff974b9ff307fe13fdd5e, type: 3} - - {fileID: 21300000, guid: 16f645dc2176fa248af566b5295b451a, type: 3} - - {fileID: 21300000, guid: d574bf2c96bb5b74080b4cf8ca51312d, type: 3} - - {fileID: 21300000, guid: 47a49435e7b8c9a49b162fb4d6f9ceaa, type: 3} - - {fileID: 21300000, guid: e3c4feacdb7710349b326280e2163a84, type: 3} - users: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2} - selectedAvatar: 0 --- !u!4 &1787496676 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Accounts/Scenes/UserProgressScreen.unity b/Assets/Accounts/Scenes/UserProgressScreen.unity index de0d515..70de517 100644 --- a/Assets/Accounts/Scenes/UserProgressScreen.unity +++ b/Assets/Accounts/Scenes/UserProgressScreen.unity @@ -2055,10 +2055,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 diff --git a/Assets/Common/Scenes/CourseActivityScreen.unity b/Assets/Common/Scenes/CourseActivityScreen.unity index 5240683..391dda9 100644 --- a/Assets/Common/Scenes/CourseActivityScreen.unity +++ b/Assets/Common/Scenes/CourseActivityScreen.unity @@ -2297,10 +2297,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 diff --git a/Assets/Common/Scenes/CoursesMenuScreen.unity b/Assets/Common/Scenes/CoursesMenuScreen.unity index 964f250..648b110 100644 --- a/Assets/Common/Scenes/CoursesMenuScreen.unity +++ b/Assets/Common/Scenes/CoursesMenuScreen.unity @@ -1296,10 +1296,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 diff --git a/Assets/Common/Scenes/ListCoursesScreen.unity b/Assets/Common/Scenes/ListCoursesScreen.unity index cd971d1..3e00aa2 100644 --- a/Assets/Common/Scenes/ListCoursesScreen.unity +++ b/Assets/Common/Scenes/ListCoursesScreen.unity @@ -1951,10 +1951,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 diff --git a/Assets/Common/Scenes/ListMinigamesScreen.unity b/Assets/Common/Scenes/ListMinigamesScreen.unity index 7d4246d..94f3733 100644 --- a/Assets/Common/Scenes/ListMinigamesScreen.unity +++ b/Assets/Common/Scenes/ListMinigamesScreen.unity @@ -239,10 +239,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 diff --git a/Assets/Common/Scenes/MainMenuScreen.unity b/Assets/Common/Scenes/MainMenuScreen.unity index 22e74c7..cea0da6 100644 --- a/Assets/Common/Scenes/MainMenuScreen.unity +++ b/Assets/Common/Scenes/MainMenuScreen.unity @@ -1783,8 +1783,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -232.99998, y: 276} - m_SizeDelta: {x: -1330.4485, y: -782.83} + m_AnchoredPosition: {x: -232.99998, y: 342.29248} + m_SizeDelta: {x: -1330.4485, y: -915.41504} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1739303841 MonoBehaviour: @@ -1931,10 +1931,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 @@ -2019,8 +2019,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 206.99998, y: 286.00027} - m_SizeDelta: {x: -1404.1912, y: -802.83057} + m_AnchoredPosition: {x: 206.99998, y: 342.29248} + m_SizeDelta: {x: -1404.1912, y: -915.41504} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1786639648 MonoBehaviour: diff --git a/Assets/Common/Scenes/MinigameActivityScreen.unity b/Assets/Common/Scenes/MinigameActivityScreen.unity index 5a89988..959ce22 100644 --- a/Assets/Common/Scenes/MinigameActivityScreen.unity +++ b/Assets/Common/Scenes/MinigameActivityScreen.unity @@ -1634,10 +1634,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 diff --git a/Assets/Common/Scenes/SettingsScreen.unity b/Assets/Common/Scenes/SettingsScreen.unity index f0187f8..6c73185 100644 --- a/Assets/Common/Scenes/SettingsScreen.unity +++ b/Assets/Common/Scenes/SettingsScreen.unity @@ -580,10 +580,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 diff --git a/Assets/Common/Scenes/ThemeSelectionScreen.unity b/Assets/Common/Scenes/ThemeSelectionScreen.unity index b616962..f4f41c2 100644 --- a/Assets/Common/Scenes/ThemeSelectionScreen.unity +++ b/Assets/Common/Scenes/ThemeSelectionScreen.unity @@ -763,10 +763,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 diff --git a/Assets/Courses/Scenes/CourseScreen.unity b/Assets/Courses/Scenes/CourseScreen.unity index a4d5fd2..69b95ed 100644 --- a/Assets/Courses/Scenes/CourseScreen.unity +++ b/Assets/Courses/Scenes/CourseScreen.unity @@ -1124,7 +1124,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -2681,10 +2681,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 diff --git a/Assets/Hangman/Scenes/HangmanGame.unity b/Assets/Hangman/Scenes/HangmanGame.unity index 366aba8..dda2949 100644 --- a/Assets/Hangman/Scenes/HangmanGame.unity +++ b/Assets/Hangman/Scenes/HangmanGame.unity @@ -6051,10 +6051,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 diff --git a/Assets/JustSign/Scenes/JustSignGame.unity b/Assets/JustSign/Scenes/JustSignGame.unity index bdea336..2080419 100644 --- a/Assets/JustSign/Scenes/JustSignGame.unity +++ b/Assets/JustSign/Scenes/JustSignGame.unity @@ -1082,7 +1082,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -6184,10 +6184,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 diff --git a/Assets/SpellingBee/Scenes/SpellingBeeGame.unity b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity index 16cff95..412352c 100644 --- a/Assets/SpellingBee/Scenes/SpellingBeeGame.unity +++ b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity @@ -4944,10 +4944,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