diff --git a/Assets/Accounts/Scenes/ChangeUserScreen.unity b/Assets/Accounts/Scenes/ChangeUserScreen.unity index a701075..1d51329 100644 --- a/Assets/Accounts/Scenes/ChangeUserScreen.unity +++ b/Assets/Accounts/Scenes/ChangeUserScreen.unity @@ -789,11 +789,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -825,11 +825,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Accounts/Scenes/UserCreationScreen.unity b/Assets/Accounts/Scenes/UserCreationScreen.unity index c2139dd..29152a4 100644 --- a/Assets/Accounts/Scenes/UserCreationScreen.unity +++ b/Assets/Accounts/Scenes/UserCreationScreen.unity @@ -326,6 +326,113 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 200054640} m_CullTransparentMesh: 1 +--- !u!1001 &268687073 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 906197777} + m_Modifications: + - target: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_Name + value: ButtonBack + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_SizeDelta.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_AnchoredPosition.y + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} +--- !u!224 &268687074 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + m_PrefabInstance: {fileID: 268687073} + m_PrefabAsset: {fileID: 0} +--- !u!1 &268687075 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8299246693487308514, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} + m_PrefabInstance: {fileID: 268687073} + m_PrefabAsset: {fileID: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -441,7 +548,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 906197777} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -576,7 +683,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 906197777} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -713,7 +820,7 @@ RectTransform: m_Children: - {fileID: 1087307047} m_Father: {fileID: 906197777} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -889,7 +996,7 @@ RectTransform: m_Children: - {fileID: 1229328480} m_Father: {fileID: 906197777} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1020,6 +1127,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 268687074} - {fileID: 629516232} - {fileID: 589847187} - {fileID: 645809400} @@ -1393,6 +1501,7 @@ MonoBehaviour: inputName: {fileID: 645809401} avatarsContainer: {fileID: 1832217925} avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3} + backButton: {fileID: 268687075} --- !u!4 &1787496676 Transform: m_ObjectHideFlags: 0 @@ -1438,7 +1547,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 906197777} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Accounts/Scenes/UserProgressScreen.unity b/Assets/Accounts/Scenes/UserProgressScreen.unity index 70de517..1fc5519 100644 --- a/Assets/Accounts/Scenes/UserProgressScreen.unity +++ b/Assets/Accounts/Scenes/UserProgressScreen.unity @@ -937,11 +937,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -973,11 +973,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Accounts/Scripts/UserCreationScreen.cs b/Assets/Accounts/Scripts/UserCreationScreen.cs index cf185c5..34bf655 100644 --- a/Assets/Accounts/Scripts/UserCreationScreen.cs +++ b/Assets/Accounts/Scripts/UserCreationScreen.cs @@ -44,6 +44,16 @@ public class UserCreationScreen : MonoBehaviour /// private List avatars = new List(); + /// + /// Reference to the back button, so we can deactivate it when the user cannot go back (when no user is found at startup) + /// + public GameObject backButton; + + /// + /// Boolean used to check whether the user can go back to the previous scene + /// + public static bool canGoBack = true; + /// /// Start is called before the first frame update @@ -51,6 +61,10 @@ public class UserCreationScreen : MonoBehaviour void Start() { errorMessage.SetActive(false); + backButton.SetActive(canGoBack); + + // Reset to default value + UserCreationScreen.canGoBack = true; for (int i = 0; i < UserList.AVATARS.Count; i++) { diff --git a/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png b/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png index cd24ff0..e089c93 100644 Binary files a/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png and b/Assets/Common/Images/CourseThumbnails/ClothesThumbnail.png differ diff --git a/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png b/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png index 6bfb013..41b9852 100644 Binary files a/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png and b/Assets/Common/Images/CourseThumbnails/FingerspellingThumbnail.png differ diff --git a/Assets/Common/Images/MinigameThumbnails/Galgje.png b/Assets/Common/Images/MinigameThumbnails/Galgje.png index 5a68fb0..d9ba956 100644 Binary files a/Assets/Common/Images/MinigameThumbnails/Galgje.png and b/Assets/Common/Images/MinigameThumbnails/Galgje.png differ diff --git a/Assets/Common/Images/MinigameThumbnails/JustSign.png b/Assets/Common/Images/MinigameThumbnails/JustSign.png index 0daba54..91f0e90 100644 Binary files a/Assets/Common/Images/MinigameThumbnails/JustSign.png and b/Assets/Common/Images/MinigameThumbnails/JustSign.png differ diff --git a/Assets/Common/Images/MinigameThumbnails/SpellingBee.png b/Assets/Common/Images/MinigameThumbnails/SpellingBee.png index 5d0b09a..808c29d 100644 Binary files a/Assets/Common/Images/MinigameThumbnails/SpellingBee.png and b/Assets/Common/Images/MinigameThumbnails/SpellingBee.png differ diff --git a/Assets/Common/Prefabs/ButtonBack.prefab b/Assets/Common/Prefabs/ButtonBack.prefab index 387158a..2b46bd2 100644 --- a/Assets/Common/Prefabs/ButtonBack.prefab +++ b/Assets/Common/Prefabs/ButtonBack.prefab @@ -37,8 +37,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 300, y: 120} + m_AnchoredPosition: {x: 10, y: -10} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0, y: 1} --- !u!222 &8299246693487308518 CanvasRenderer: @@ -118,7 +118,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 54433152227066563} m_OnClick: m_PersistentCalls: m_Calls: diff --git a/Assets/Common/Prefabs/Course Item.prefab b/Assets/Common/Prefabs/Course Item.prefab index 2f0caf5..7c90bd0 100644 --- a/Assets/Common/Prefabs/Course Item.prefab +++ b/Assets/Common/Prefabs/Course Item.prefab @@ -592,10 +592,10 @@ RectTransform: m_Father: {fileID: 4959898007614330356} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -6} - m_SizeDelta: {x: 256, y: 164} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4959898009379617295 CanvasRenderer: @@ -618,7 +618,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.61960787, b: 0.7411765, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -627,7 +627,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 0} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -671,7 +671,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 64} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7918167783998757471 diff --git a/Assets/Common/Prefabs/Minigame Item.prefab b/Assets/Common/Prefabs/Minigame Item.prefab index 582a3f2..0b2fdaf 100644 --- a/Assets/Common/Prefabs/Minigame Item.prefab +++ b/Assets/Common/Prefabs/Minigame Item.prefab @@ -1,5 +1,140 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &425409310702691282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7578001082699649381} + - component: {fileID: 1032168323822911732} + - component: {fileID: 814674078455998583} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7578001082699649381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425409310702691282} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4484781637876518546} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1032168323822911732 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425409310702691282} + m_CullTransparentMesh: 1 +--- !u!114 &814674078455998583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 425409310702691282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} + m_sharedMaterial: {fileID: -1030930060397404263, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284235525 + m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 35 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4959898007614330357 GameObject: m_ObjectHideFlags: 0 @@ -139,143 +274,8 @@ MonoBehaviour: minigame: {fileID: 0} thumbnail: {fileID: 4959898009379617328} minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2} - title: {fileID: 4959898009362012447} + title: {fileID: 814674078455998583} button: {fileID: 4959898007614330355} ---- !u!1 &4959898009362012417 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4959898009362012416} - - component: {fileID: 4959898009362012446} - - component: {fileID: 4959898009362012447} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4959898009362012416 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4959898009362012417} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4484781637876518546} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4959898009362012446 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4959898009362012417} - m_CullTransparentMesh: 1 ---- !u!114 &4959898009362012447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4959898009362012417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} - m_sharedMaterial: {fileID: -1030930060397404263, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4284235525 - m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 30.78595} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &4959898009379617330 GameObject: m_ObjectHideFlags: 0 @@ -311,8 +311,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: 0, y: -22.5} - m_SizeDelta: {x: 0, y: -45} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: -20, y: -60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4959898009379617295 CanvasRenderer: @@ -335,7 +335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.61960787, b: 0.7411765, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -382,13 +382,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4959898009362012416} + - {fileID: 7578001082699649381} m_Father: {fileID: 4959898007614330356} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 64} m_Pivot: {x: 0.5, y: 1} --- !u!222 &7404719235506382604 diff --git a/Assets/Common/Scenes/CourseActivityScreen.unity b/Assets/Common/Scenes/CourseActivityScreen.unity index 391dda9..4bd0f78 100644 --- a/Assets/Common/Scenes/CourseActivityScreen.unity +++ b/Assets/Common/Scenes/CourseActivityScreen.unity @@ -1283,16 +1283,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.61960787, b: 0.7411765, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f5216ce0bfcecc4da0340703872c4ff, type: 3} + m_Sprite: {fileID: 21300000, guid: 5387f0486602abf479f049d9afa9d3cb, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2391,11 +2391,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -2427,11 +2427,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Common/Scenes/CoursesMenuScreen.unity b/Assets/Common/Scenes/CoursesMenuScreen.unity index 648b110..f99f445 100644 --- a/Assets/Common/Scenes/CoursesMenuScreen.unity +++ b/Assets/Common/Scenes/CoursesMenuScreen.unity @@ -1755,11 +1755,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -1791,11 +1791,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Common/Scenes/ListCoursesScreen.unity b/Assets/Common/Scenes/ListCoursesScreen.unity index 3e00aa2..89479c5 100644 --- a/Assets/Common/Scenes/ListCoursesScreen.unity +++ b/Assets/Common/Scenes/ListCoursesScreen.unity @@ -236,7 +236,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3} propertyPath: m_AnchorMax.x @@ -341,170 +341,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3} m_PrefabInstance: {fileID: 289602554} m_PrefabAsset: {fileID: 0} ---- !u!1 &316289682 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 316289683} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &316289683 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 316289682} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1708714069} - m_Father: {fileID: 357869362} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &357869361 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 357869362} - - component: {fileID: 357869365} - - component: {fileID: 357869364} - - component: {fileID: 357869363} - m_Layer: 5 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &357869362 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357869361} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 316289683} - m_Father: {fileID: 1119454410} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!114 &357869363 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357869361} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1708714070} - m_HandleRect: {fileID: 1708714069} - m_Direction: 0 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &357869364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357869361} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &357869365 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 357869361} - m_CullTransparentMesh: 1 --- !u!1 &364712550 GameObject: m_ObjectHideFlags: 0 @@ -581,82 +417,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 364712550} m_CullTransparentMesh: 1 ---- !u!1 &461792788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 461792789} - - component: {fileID: 461792790} - - component: {fileID: 461792791} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &461792789 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461792788} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1181759420} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00024414062, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &461792790 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461792788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 10 - m_Bottom: 10 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 256, y: 256} - m_Spacing: {x: 10, y: 10} - m_Constraint: 2 - m_ConstraintCount: 3 ---- !u!114 &461792791 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 461792788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -1118,7 +878,7 @@ RectTransform: - {fileID: 745485883} - {fileID: 364712551} - {fileID: 1503088043} - - {fileID: 1119454410} + - {fileID: 1934345758} - {fileID: 1143402633} - {fileID: 289602555} m_Father: {fileID: 1768150806} @@ -1302,115 +1062,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 994710774} m_CullTransparentMesh: 1 ---- !u!1 &1119454409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1119454410} - - component: {fileID: 1119454413} - - component: {fileID: 1119454412} - - component: {fileID: 1119454411} - m_Layer: 5 - m_Name: Courses - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1119454410 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119454409} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1181759420} - - {fileID: 357869362} - m_Father: {fileID: 906197777} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1590, y: 808} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1119454411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119454409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 461792789} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 1181759420} - m_HorizontalScrollbar: {fileID: 357869363} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1119454412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119454409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1119454413 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1119454409} - m_CullTransparentMesh: 1 --- !u!1001 &1143402632 PrefabInstance: m_ObjectHideFlags: 0 @@ -1432,7 +1083,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchorMax.x @@ -1452,11 +1103,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -1488,11 +1139,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1513,97 +1164,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} m_PrefabInstance: {fileID: 1143402632} m_PrefabAsset: {fileID: 0} ---- !u!1 &1181759419 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1181759420} - - component: {fileID: 1181759423} - - component: {fileID: 1181759422} - - component: {fileID: 1181759421} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1181759420 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181759419} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 461792789} - m_Father: {fileID: 1119454410} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1181759421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181759419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &1181759422 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181759419} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1181759423 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181759419} - m_CullTransparentMesh: 1 --- !u!1 &1417412674 GameObject: m_ObjectHideFlags: 0 @@ -1633,7 +1193,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fac0bf527487ad48835aff400b1f762, type: 3} m_Name: m_EditorClassIdentifier: - courseContainer: {fileID: 461792789} + courseContainer: {fileID: 1934345758} courseItemPrefab: {fileID: 4959898007614330357, guid: baf585123c6364d40a17b89676eb350d, type: 3} courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2} --- !u!4 &1417412676 @@ -1827,82 +1387,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1503088042} m_CullTransparentMesh: 1 ---- !u!1 &1708714068 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1708714069} - - component: {fileID: 1708714071} - - component: {fileID: 1708714070} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1708714069 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708714068} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 316289683} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1708714070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708714068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1708714071 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1708714068} - m_CullTransparentMesh: 1 --- !u!1 &1768150802 GameObject: m_ObjectHideFlags: 0 @@ -2004,3 +1488,64 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1934345757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1934345758} + - component: {fileID: 1934345759} + m_Layer: 5 + m_Name: Courses + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1934345758 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934345757} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 906197777} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: -360, y: -320.00003} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1934345759 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1934345757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 10 + m_Top: 10 + m_Bottom: 10 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 350, y: 350} + m_Spacing: {x: 10, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 diff --git a/Assets/Common/Scenes/ListMinigamesScreen.unity b/Assets/Common/Scenes/ListMinigamesScreen.unity index 94f3733..36f5efa 100644 --- a/Assets/Common/Scenes/ListMinigamesScreen.unity +++ b/Assets/Common/Scenes/ListMinigamesScreen.unity @@ -292,43 +292,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &167820757 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 167820758} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &167820758 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 167820757} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1486682951} - m_Father: {fileID: 1354622762} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &238926233 PrefabInstance: m_ObjectHideFlags: 0 @@ -374,7 +337,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3} propertyPath: m_AnchorMax.x @@ -1159,224 +1122,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1099058600} m_CullTransparentMesh: 1 ---- !u!1 &1354622761 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1354622762} - - component: {fileID: 1354622765} - - component: {fileID: 1354622764} - - component: {fileID: 1354622763} - m_Layer: 5 - m_Name: Scrollbar Horizontal - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1354622762 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354622761} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 167820758} - m_Father: {fileID: 1570876499} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 0, y: 20} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1354622763 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354622761} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1486682952} - m_HandleRect: {fileID: 1486682951} - m_Direction: 0 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1354622764 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354622761} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1354622765 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354622761} - m_CullTransparentMesh: 1 ---- !u!1 &1379945946 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1379945947} - - component: {fileID: 1379945950} - - component: {fileID: 1379945949} - - component: {fileID: 1379945948} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1379945947 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1379945946} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1832508913} - m_Father: {fileID: 1570876499} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1379945948 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1379945946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &1379945949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1379945946} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1379945950 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1379945946} - m_CullTransparentMesh: 1 --- !u!1 &1380805076 GameObject: m_ObjectHideFlags: 0 @@ -1410,7 +1155,7 @@ RectTransform: - {fileID: 413373408} - {fileID: 1085573792} - {fileID: 1099058601} - - {fileID: 1570876499} + - {fileID: 2146756454} - {fileID: 1605366630} - {fileID: 238926234} m_Father: {fileID: 79114699} @@ -1459,191 +1204,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1380805076} m_CullTransparentMesh: 1 ---- !u!1 &1486682950 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1486682951} - - component: {fileID: 1486682953} - - component: {fileID: 1486682952} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1486682951 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486682950} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 167820758} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1486682952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486682950} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1486682953 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486682950} - m_CullTransparentMesh: 1 ---- !u!1 &1570876498 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1570876499} - - component: {fileID: 1570876502} - - component: {fileID: 1570876501} - - component: {fileID: 1570876500} - m_Layer: 5 - m_Name: Courses - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1570876499 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570876498} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 1379945947} - - {fileID: 1354622762} - m_Father: {fileID: 1380805077} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1590, y: 808} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1570876500 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570876498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1832508913} - m_Horizontal: 1 - m_Vertical: 0 - m_MovementType: 2 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 1379945947} - m_HorizontalScrollbar: {fileID: 1354622763} - m_VerticalScrollbar: {fileID: 0} - m_HorizontalScrollbarVisibility: 0 - m_VerticalScrollbarVisibility: 0 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1570876501 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570876498} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.8235294, g: 0.8235294, b: 0.8235294, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1570876502 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1570876498} - m_CullTransparentMesh: 1 --- !u!1001 &1605366629 PrefabInstance: m_ObjectHideFlags: 0 @@ -1665,7 +1225,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchorMax.x @@ -1685,11 +1245,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -1721,11 +1281,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1910,7 +1470,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd453d411c3b3e458a7b133764c6b64, type: 3} m_Name: m_EditorClassIdentifier: - minigameContainer: {fileID: 1832508913} + minigameContainer: {fileID: 2146756454} minigameItemPrefab: {fileID: 4959898007614330357, guid: e5eaffcdbecf2ab48a94311753d10e09, type: 3} minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2} --- !u!4 &1821407073 @@ -1928,7 +1488,7 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1832508912 +--- !u!1 &2146756453 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1936,57 +1496,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1832508913} - - component: {fileID: 1832508915} - - component: {fileID: 1832508914} + - component: {fileID: 2146756454} + - component: {fileID: 2146756455} m_Layer: 5 - m_Name: Content + m_Name: Minigames m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1832508913 +--- !u!224 &2146756454 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832508912} + m_GameObject: {fileID: 2146756453} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1379945947} - m_RootOrder: 0 + m_Father: {fileID: 1380805077} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00012207031, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1832508914 + m_AnchoredPosition: {x: -20, y: 0} + m_SizeDelta: {x: -360, y: -320} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2146756455 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832508912} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 2 ---- !u!114 &1832508915 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1832508912} + m_GameObject: {fileID: 2146756453} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} @@ -1997,10 +1542,10 @@ MonoBehaviour: m_Right: 10 m_Top: 10 m_Bottom: 10 - m_ChildAlignment: 0 + m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 256, y: 256} + m_CellSize: {x: 350, y: 350} m_Spacing: {x: 10, y: 10} - m_Constraint: 2 - m_ConstraintCount: 3 + m_Constraint: 0 + m_ConstraintCount: 2 diff --git a/Assets/Common/Scenes/MainMenuScreen.unity b/Assets/Common/Scenes/MainMenuScreen.unity index cea0da6..36cbd13 100644 --- a/Assets/Common/Scenes/MainMenuScreen.unity +++ b/Assets/Common/Scenes/MainMenuScreen.unity @@ -1306,7 +1306,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 10, y: -10} - m_SizeDelta: {x: 64, y: 64} + m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &1377361016 MonoBehaviour: @@ -1536,7 +1536,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Settings + m_text: Instellingen m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} m_sharedMaterial: {fileID: -1030930060397404263, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} @@ -2329,7 +2329,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Minigames + m_text: Spelletjes m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} m_sharedMaterial: {fileID: -1030930060397404263, guid: 3602bedf0ebe5b64596873f09eddf57b, type: 2} diff --git a/Assets/Common/Scenes/MinigameActivityScreen.unity b/Assets/Common/Scenes/MinigameActivityScreen.unity index 959ce22..c56006a 100644 --- a/Assets/Common/Scenes/MinigameActivityScreen.unity +++ b/Assets/Common/Scenes/MinigameActivityScreen.unity @@ -636,16 +636,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.25882354, g: 0.61960787, b: 0.7411765, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f5216ce0bfcecc4da0340703872c4ff, type: 3} + m_Sprite: {fileID: 21300000, guid: 5387f0486602abf479f049d9afa9d3cb, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1268,11 +1268,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -1304,11 +1304,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Common/Scenes/SettingsScreen.unity b/Assets/Common/Scenes/SettingsScreen.unity index 6c73185..060913b 100644 --- a/Assets/Common/Scenes/SettingsScreen.unity +++ b/Assets/Common/Scenes/SettingsScreen.unity @@ -316,11 +316,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -352,11 +352,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Common/Scenes/ThemeSelectionScreen.unity b/Assets/Common/Scenes/ThemeSelectionScreen.unity index f4f41c2..6d8e959 100644 --- a/Assets/Common/Scenes/ThemeSelectionScreen.unity +++ b/Assets/Common/Scenes/ThemeSelectionScreen.unity @@ -232,11 +232,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -268,11 +268,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Common/Scripts/MainMenuScreen.cs b/Assets/Common/Scripts/MainMenuScreen.cs index 0a5481f..5aea710 100644 --- a/Assets/Common/Scripts/MainMenuScreen.cs +++ b/Assets/Common/Scripts/MainMenuScreen.cs @@ -14,6 +14,7 @@ public class MainMenuScreen : MonoBehaviour { if (!File.Exists(PersistentDataController.PATH) || UserList.GetUsers().Count <= 0) { + UserCreationScreen.canGoBack = false; SystemController.GetInstance().LoadNextScene("Accounts/Scenes/UserCreationScreen"); } } diff --git a/Assets/Courses/Prefabs/Sign with Image Panel.prefab b/Assets/Courses/Prefabs/Sign with Image Panel.prefab index 76832d8..2d1e090 100644 --- a/Assets/Courses/Prefabs/Sign with Image Panel.prefab +++ b/Assets/Courses/Prefabs/Sign with Image Panel.prefab @@ -57,7 +57,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 256, y: 256} + m_CellSize: {x: 450, y: 450} m_Spacing: {x: 25, y: 0} m_Constraint: 2 m_ConstraintCount: 1 diff --git a/Assets/Courses/Scenes/CourseScreen.unity b/Assets/Courses/Scenes/CourseScreen.unity index 69b95ed..8aadecf 100644 --- a/Assets/Courses/Scenes/CourseScreen.unity +++ b/Assets/Courses/Scenes/CourseScreen.unity @@ -394,82 +394,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100123244} m_CullTransparentMesh: 1 ---- !u!1 &250984719 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 250984720} - - component: {fileID: 250984722} - - component: {fileID: 250984721} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &250984720 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250984719} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2018448395} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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.5, y: 0.5} ---- !u!114 &250984721 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250984719} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 02283f528ead8084db69c7d8a459f0af, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 0.406 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &250984722 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 250984719} - m_CullTransparentMesh: 1 --- !u!1 &257279696 GameObject: m_ObjectHideFlags: 0 @@ -2249,7 +2173,7 @@ MonoBehaviour: CoursesButton: {fileID: 839294691} timeSpent: {fileID: 77614869} videoPlayer: {fileID: 993952931} - progressBar: {fileID: 1677120325} + progressBar: {fileID: 1614792579} confettiAnimation: {fileID: 257279698} panelSignWithVideoAndImagePrefab: {fileID: 6228868151418550173, guid: ed122bc34368fca4f9c28e96b772da66, type: 3} panelSignWithImagePrefab: {fileID: 1321140593660784785, guid: 41cc30039c205e04baf44453287d6469, type: 3} @@ -2475,11 +2399,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -2511,11 +2435,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2825,9 +2749,9 @@ GameObject: m_Component: - component: {fileID: 1614792576} - component: {fileID: 1614792578} - - component: {fileID: 1614792577} + - component: {fileID: 1614792579} m_Layer: 5 - m_Name: Background + m_Name: Slider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2853,7 +2777,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1614792577 +--- !u!222 &1614792578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1614792575} + m_CullTransparentMesh: 1 +--- !u!114 &1614792579 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2862,7 +2794,7 @@ MonoBehaviour: m_GameObject: {fileID: 1614792575} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: b69b55aa2ac2e0e4592740cf1269d52c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -2873,24 +2805,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 42d6d4c291d8a8a46bd0d545fd445c3d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 + m_Sprite: {fileID: 21300000, guid: 02283f528ead8084db69c7d8a459f0af, type: 3} + m_FillDirection: 0 m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FillCenter: 1 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1614792578 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1614792575} - m_CullTransparentMesh: 1 --- !u!1 &1677120323 GameObject: m_ObjectHideFlags: 0 @@ -2900,6 +2819,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1677120324} + - component: {fileID: 1677120326} - component: {fileID: 1677120325} m_Layer: 5 m_Name: Progress @@ -2921,14 +2841,13 @@ RectTransform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1614792576} - - {fileID: 2018448395} m_Father: {fileID: 1559094126} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 369, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 30, y: -15} + m_SizeDelta: {x: -80, y: 40} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1677120325 MonoBehaviour: @@ -2939,48 +2858,35 @@ MonoBehaviour: m_GameObject: {fileID: 1677120323} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 0 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 250984720} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0.406 - m_OnValueChanged: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 42d6d4c291d8a8a46bd0d545fd445c3d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1677120326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677120323} + m_CullTransparentMesh: 1 --- !u!1 &1697464981 GameObject: m_ObjectHideFlags: 0 @@ -3344,40 +3250,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2017030785} m_CullTransparentMesh: 1 ---- !u!1 &2018448394 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2018448395} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2018448395 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2018448394} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 250984720} - m_Father: {fileID: 1677120324} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Courses/Scripts/CoursesController.cs b/Assets/Courses/Scripts/CoursesController.cs index 0755f72..d0d1e6c 100644 --- a/Assets/Courses/Scripts/CoursesController.cs +++ b/Assets/Courses/Scripts/CoursesController.cs @@ -127,7 +127,7 @@ public class CoursesController : AbstractFeedback /// /// Reference to course progress bar /// - public Slider progressBar; + public SlicedSlider progressBar; /// /// Reference to the animator of the confetti animation @@ -200,7 +200,7 @@ public class CoursesController : AbstractFeedback user.AddCourseProgress(progress); } UserList.Save(); - progressBar.value = progress.progress; + progressBar.fillAmount = progress.progress; currentWordIndex = 0; previousPanel = SetupPanel(); @@ -258,7 +258,7 @@ public class CoursesController : AbstractFeedback return; progress.progress = (float)progress.completedLearnables / (float)maxWords; - progressBar.value = progress.progress; + progressBar.fillAmount = progress.progress; // Update UI if course is not finished yet if (progress.completedLearnables < maxWords) diff --git a/Assets/Courses/Scripts/PanelMultipleChoice.cs b/Assets/Courses/Scripts/PanelMultipleChoice.cs index d107948..3a940a1 100644 --- a/Assets/Courses/Scripts/PanelMultipleChoice.cs +++ b/Assets/Courses/Scripts/PanelMultipleChoice.cs @@ -187,7 +187,7 @@ public class PanelMultipleChoice : MonoBehaviour private IEnumerator GoToNextScreen() { // Wait for 5 seconds - yield return new WaitForSeconds(3.0f); + yield return new WaitForSeconds(1.5f); courseController.NextSign(); } diff --git a/Assets/Hangman/Scenes/HangmanGame.unity b/Assets/Hangman/Scenes/HangmanGame.unity index dda2949..5ece9da 100644 --- a/Assets/Hangman/Scenes/HangmanGame.unity +++ b/Assets/Hangman/Scenes/HangmanGame.unity @@ -6702,11 +6702,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -6738,11 +6738,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/Hangman/Scripts/HangmanController.cs b/Assets/Hangman/Scripts/HangmanController.cs index bcdf4cf..c25473c 100644 --- a/Assets/Hangman/Scripts/HangmanController.cs +++ b/Assets/Hangman/Scripts/HangmanController.cs @@ -384,8 +384,9 @@ public class HangmanController : AbstractFeedback // Then get a random index for a word to pull // First get random index for the themes - int amountThemes = themeList.themes.Count; - int themeIndex = Random.Range(0, amountThemes); + //int amountThemes = themeList.themes.Count; + //int themeIndex = Random.Range(0, amountThemes); + int themeIndex = 0; // Geography theme // Check how many words are in this theme int amountWords = themeList.themes[themeIndex].learnables.Count; diff --git a/Assets/JustSign/Scenes/JustSignGame.unity b/Assets/JustSign/Scenes/JustSignGame.unity index 2080419..6565be8 100644 --- a/Assets/JustSign/Scenes/JustSignGame.unity +++ b/Assets/JustSign/Scenes/JustSignGame.unity @@ -2000,11 +2000,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -2036,11 +2036,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/SpellingBee/Scenes/SpellingBeeGame.unity b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity index 412352c..14f915d 100644 --- a/Assets/SpellingBee/Scenes/SpellingBeeGame.unity +++ b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity @@ -1278,11 +1278,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.x - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_SizeDelta.y - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalPosition.x @@ -1314,11 +1314,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -10 objectReference: {fileID: 0} - target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3} propertyPath: m_LocalEulerAnglesHint.x diff --git a/Assets/SystemArchitecture/Scripts/SlicedSlider.cs b/Assets/SystemArchitecture/Scripts/SlicedSlider.cs new file mode 100644 index 0000000..56fb623 --- /dev/null +++ b/Assets/SystemArchitecture/Scripts/SlicedSlider.cs @@ -0,0 +1,647 @@ +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +#if UNITY_2017_4 || UNITY_2018_2_OR_NEWER +using UnityEngine.U2D; +#endif +using Sprites = UnityEngine.Sprites; + +#if UNITY_EDITOR +using UnityEditor; + +// Custom Editor to order the variables in the Inspector similar to Image component +[CustomEditor(typeof(SlicedSlider)), CanEditMultipleObjects] +public class SlicedSliderEditor : Editor +{ + private SerializedProperty spriteProp, colorProp; + private GUIContent spriteLabel; + + private void OnEnable() + { + spriteProp = serializedObject.FindProperty("m_Sprite"); + colorProp = serializedObject.FindProperty("m_Color"); + spriteLabel = new GUIContent("Source Image"); + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + EditorGUILayout.PropertyField(spriteProp, spriteLabel); + EditorGUILayout.PropertyField(colorProp); + DrawPropertiesExcluding(serializedObject, "m_Script", "m_Sprite", "m_Color", "m_OnCullStateChanged"); + + serializedObject.ApplyModifiedProperties(); + } +} +#endif + +// Credit: https://bitbucket.org/Unity-Technologies/ui/src/2018.4/UnityEngine.UI/UI/Core/Image.cs +[RequireComponent(typeof(CanvasRenderer))] +[AddComponentMenu("UI/Sliced Slider", 11)] +public class SlicedSlider : MaskableGraphic, ISerializationCallbackReceiver, ILayoutElement, ICanvasRaycastFilter +{ + private static class SetPropertyUtility + { + public static bool SetStruct(ref T currentValue, T newValue) where T : struct + { + if (EqualityComparer.Default.Equals(currentValue, newValue)) + return false; + + currentValue = newValue; + return true; + } + + public static bool SetClass(ref T currentValue, T newValue) where T : class + { + if ((currentValue == null && newValue == null) || (currentValue != null && currentValue.Equals(newValue))) + return false; + + currentValue = newValue; + return true; + } + } + + public enum FillDirection { Right = 0, Left = 1, Up = 2, Down = 3 } + + private static readonly Vector3[] s_Vertices = new Vector3[4]; + private static readonly Vector2[] s_UVs = new Vector2[4]; + private static readonly Vector2[] s_SlicedVertices = new Vector2[4]; + private static readonly Vector2[] s_SlicedUVs = new Vector2[4]; + +#pragma warning disable 1692 +#pragma warning disable IDE1006 // Suppress 'Naming rule violation' warnings +#pragma warning disable 0649 + [SerializeField] + private Sprite m_Sprite; + public Sprite sprite + { + get { return m_Sprite; } + set + { + if (SetPropertyUtility.SetClass(ref m_Sprite, value)) + { + SetAllDirty(); + TrackImage(); + } + } + } + + [SerializeField] + private FillDirection m_FillDirection; + public FillDirection fillDirection + { + get { return m_FillDirection; } + set + { + if (SetPropertyUtility.SetStruct(ref m_FillDirection, value)) + SetVerticesDirty(); + } + } + + [Range(0, 1)] + [SerializeField] + private float m_FillAmount = 1f; + public float fillAmount + { + get { return m_FillAmount; } + set + { + if (SetPropertyUtility.SetStruct(ref m_FillAmount, Mathf.Clamp01(value))) + SetVerticesDirty(); + } + } + + [SerializeField] + private bool m_FillCenter = true; + public bool fillCenter + { + get { return m_FillCenter; } + set + { + if (SetPropertyUtility.SetStruct(ref m_FillCenter, value)) + SetVerticesDirty(); + } + } + + [SerializeField] + private float m_PixelsPerUnitMultiplier = 1f; + public float pixelsPerUnitMultiplier + { + get { return m_PixelsPerUnitMultiplier; } + set { m_PixelsPerUnitMultiplier = Mathf.Max(0.01f, value); } + } + + public float pixelsPerUnit + { + get + { + float spritePixelsPerUnit = 100; + if (activeSprite) + spritePixelsPerUnit = activeSprite.pixelsPerUnit; + + float referencePixelsPerUnit = 100; + if (canvas) + referencePixelsPerUnit = canvas.referencePixelsPerUnit; + + return m_PixelsPerUnitMultiplier * spritePixelsPerUnit / referencePixelsPerUnit; + } + } +#pragma warning restore 0649 + + [NonSerialized] + private Sprite m_OverrideSprite; + public Sprite overrideSprite + { + get { return activeSprite; } + set + { + if (SetPropertyUtility.SetClass(ref m_OverrideSprite, value)) + { + SetAllDirty(); + TrackImage(); + } + } + } + + private Sprite activeSprite { get { return m_OverrideSprite != null ? m_OverrideSprite : m_Sprite; } } + + public override Texture mainTexture + { + get + { + if (activeSprite != null) + return activeSprite.texture; + + return material != null && material.mainTexture != null ? material.mainTexture : s_WhiteTexture; + } + } + + public bool hasBorder + { + get + { + if (activeSprite != null) + { + Vector4 v = activeSprite.border; + return v.sqrMagnitude > 0f; + } + + return false; + } + } + + public override Material material + { + get + { + if (m_Material != null) + return m_Material; + + if (activeSprite && activeSprite.associatedAlphaSplitTexture != null) + { +#if UNITY_EDITOR + if (Application.isPlaying) +#endif + return Image.defaultETC1GraphicMaterial; + } + + return defaultMaterial; + } + set { base.material = value; } + } + + public float alphaHitTestMinimumThreshold { get; set; } +#pragma warning restore IDE1006 +#pragma warning restore 1692 + + protected SlicedSlider() + { + useLegacyMeshGeneration = false; + } + + protected override void OnEnable() + { + base.OnEnable(); + TrackImage(); + } + + protected override void OnDisable() + { + base.OnDisable(); + + if (m_Tracked) + UnTrackImage(); + } + +#if UNITY_EDITOR + protected override void OnValidate() + { + base.OnValidate(); + m_PixelsPerUnitMultiplier = Mathf.Max(0.01f, m_PixelsPerUnitMultiplier); + } +#endif + + protected override void OnPopulateMesh(VertexHelper vh) + { + if (activeSprite == null) + { + base.OnPopulateMesh(vh); + return; + } + + GenerateSlicedFilledSprite(vh); + } + + /// + /// Update the renderer's material. + /// + protected override void UpdateMaterial() + { + base.UpdateMaterial(); + + // Check if this sprite has an associated alpha texture (generated when splitting RGBA = RGB + A as two textures without alpha) + if (activeSprite == null) + { + canvasRenderer.SetAlphaTexture(null); + return; + } + + Texture2D alphaTex = activeSprite.associatedAlphaSplitTexture; + if (alphaTex != null) + canvasRenderer.SetAlphaTexture(alphaTex); + } + + private void GenerateSlicedFilledSprite(VertexHelper vh) + { + vh.Clear(); + + if (m_FillAmount < 0.001f) + return; + + Rect rect = GetPixelAdjustedRect(); + Vector4 outer = Sprites.DataUtility.GetOuterUV(activeSprite); + Vector4 padding = Sprites.DataUtility.GetPadding(activeSprite); + + if (!hasBorder) + { + Vector2 size = activeSprite.rect.size; + + int spriteW = Mathf.RoundToInt(size.x); + int spriteH = Mathf.RoundToInt(size.y); + + // Image's dimensions used for drawing. X = left, Y = bottom, Z = right, W = top. + Vector4 vertices = new Vector4( + rect.x + rect.width * (padding.x / spriteW), + rect.y + rect.height * (padding.y / spriteH), + rect.x + rect.width * ((spriteW - padding.z) / spriteW), + rect.y + rect.height * ((spriteH - padding.w) / spriteH)); + + GenerateFilledSprite(vh, vertices, outer, m_FillAmount); + return; + } + + Vector4 inner = Sprites.DataUtility.GetInnerUV(activeSprite); + Vector4 border = GetAdjustedBorders(activeSprite.border / pixelsPerUnit, rect); + + padding = padding / pixelsPerUnit; + + s_SlicedVertices[0] = new Vector2(padding.x, padding.y); + s_SlicedVertices[3] = new Vector2(rect.width - padding.z, rect.height - padding.w); + + s_SlicedVertices[1].x = border.x; + s_SlicedVertices[1].y = border.y; + + s_SlicedVertices[2].x = rect.width - border.z; + s_SlicedVertices[2].y = rect.height - border.w; + + for (int i = 0; i < 4; ++i) + { + s_SlicedVertices[i].x += rect.x; + s_SlicedVertices[i].y += rect.y; + } + + s_SlicedUVs[0] = new Vector2(outer.x, outer.y); + s_SlicedUVs[1] = new Vector2(inner.x, inner.y); + s_SlicedUVs[2] = new Vector2(inner.z, inner.w); + s_SlicedUVs[3] = new Vector2(outer.z, outer.w); + + float rectStartPos; + float _1OverTotalSize; + if (m_FillDirection == FillDirection.Left || m_FillDirection == FillDirection.Right) + { + rectStartPos = s_SlicedVertices[0].x; + + float totalSize = (s_SlicedVertices[3].x - s_SlicedVertices[0].x); + _1OverTotalSize = totalSize > 0f ? 1f / totalSize : 1f; + } + else + { + rectStartPos = s_SlicedVertices[0].y; + + float totalSize = (s_SlicedVertices[3].y - s_SlicedVertices[0].y); + _1OverTotalSize = totalSize > 0f ? 1f / totalSize : 1f; + } + + for (int x = 0; x < 3; x++) + { + int x2 = x + 1; + + for (int y = 0; y < 3; y++) + { + if (!m_FillCenter && x == 1 && y == 1) + continue; + + int y2 = y + 1; + + float sliceStart, sliceEnd; + switch (m_FillDirection) + { + case FillDirection.Right: + sliceStart = (s_SlicedVertices[x].x - rectStartPos) * _1OverTotalSize; + sliceEnd = (s_SlicedVertices[x2].x - rectStartPos) * _1OverTotalSize; + break; + case FillDirection.Up: + sliceStart = (s_SlicedVertices[y].y - rectStartPos) * _1OverTotalSize; + sliceEnd = (s_SlicedVertices[y2].y - rectStartPos) * _1OverTotalSize; + break; + case FillDirection.Left: + sliceStart = 1f - (s_SlicedVertices[x2].x - rectStartPos) * _1OverTotalSize; + sliceEnd = 1f - (s_SlicedVertices[x].x - rectStartPos) * _1OverTotalSize; + break; + case FillDirection.Down: + sliceStart = 1f - (s_SlicedVertices[y2].y - rectStartPos) * _1OverTotalSize; + sliceEnd = 1f - (s_SlicedVertices[y].y - rectStartPos) * _1OverTotalSize; + break; + default: // Just there to get rid of the "Use of unassigned local variable" compiler error + sliceStart = sliceEnd = 0f; + break; + } + + if (sliceStart >= m_FillAmount) + continue; + + Vector4 vertices = new Vector4(s_SlicedVertices[x].x, s_SlicedVertices[y].y, s_SlicedVertices[x2].x, s_SlicedVertices[y2].y); + Vector4 uvs = new Vector4(s_SlicedUVs[x].x, s_SlicedUVs[y].y, s_SlicedUVs[x2].x, s_SlicedUVs[y2].y); + float fillAmount = (m_FillAmount - sliceStart) / (sliceEnd - sliceStart); + + GenerateFilledSprite(vh, vertices, uvs, fillAmount); + } + } + } + + private Vector4 GetAdjustedBorders(Vector4 border, Rect adjustedRect) + { + Rect originalRect = rectTransform.rect; + + for (int axis = 0; axis <= 1; axis++) + { + float borderScaleRatio; + + // The adjusted rect (adjusted for pixel correctness) may be slightly larger than the original rect. + // Adjust the border to match the adjustedRect to avoid small gaps between borders (case 833201). + if (originalRect.size[axis] != 0) + { + borderScaleRatio = adjustedRect.size[axis] / originalRect.size[axis]; + border[axis] *= borderScaleRatio; + border[axis + 2] *= borderScaleRatio; + } + + // If the rect is smaller than the combined borders, then there's not room for the borders at their normal size. + // In order to avoid artefacts with overlapping borders, we scale the borders down to fit. + float combinedBorders = border[axis] + border[axis + 2]; + if (adjustedRect.size[axis] < combinedBorders && combinedBorders != 0) + { + borderScaleRatio = adjustedRect.size[axis] / combinedBorders; + border[axis] *= borderScaleRatio; + border[axis + 2] *= borderScaleRatio; + } + } + + return border; + } + + private void GenerateFilledSprite(VertexHelper vh, Vector4 vertices, Vector4 uvs, float fillAmount) + { + if (m_FillAmount < 0.001f) + return; + + float uvLeft = uvs.x; + float uvBottom = uvs.y; + float uvRight = uvs.z; + float uvTop = uvs.w; + + if (fillAmount < 1f) + { + if (m_FillDirection == FillDirection.Left || m_FillDirection == FillDirection.Right) + { + if (m_FillDirection == FillDirection.Left) + { + vertices.x = vertices.z - (vertices.z - vertices.x) * fillAmount; + uvLeft = uvRight - (uvRight - uvLeft) * fillAmount; + } + else + { + vertices.z = vertices.x + (vertices.z - vertices.x) * fillAmount; + uvRight = uvLeft + (uvRight - uvLeft) * fillAmount; + } + } + else + { + if (m_FillDirection == FillDirection.Down) + { + vertices.y = vertices.w - (vertices.w - vertices.y) * fillAmount; + uvBottom = uvTop - (uvTop - uvBottom) * fillAmount; + } + else + { + vertices.w = vertices.y + (vertices.w - vertices.y) * fillAmount; + uvTop = uvBottom + (uvTop - uvBottom) * fillAmount; + } + } + } + + s_Vertices[0] = new Vector3(vertices.x, vertices.y); + s_Vertices[1] = new Vector3(vertices.x, vertices.w); + s_Vertices[2] = new Vector3(vertices.z, vertices.w); + s_Vertices[3] = new Vector3(vertices.z, vertices.y); + + s_UVs[0] = new Vector2(uvLeft, uvBottom); + s_UVs[1] = new Vector2(uvLeft, uvTop); + s_UVs[2] = new Vector2(uvRight, uvTop); + s_UVs[3] = new Vector2(uvRight, uvBottom); + + int startIndex = vh.currentVertCount; + + for (int i = 0; i < 4; i++) + vh.AddVert(s_Vertices[i], color, s_UVs[i]); + + vh.AddTriangle(startIndex, startIndex + 1, startIndex + 2); + vh.AddTriangle(startIndex + 2, startIndex + 3, startIndex); + } + + int ILayoutElement.layoutPriority { get { return 0; } } + float ILayoutElement.minWidth { get { return 0; } } + float ILayoutElement.minHeight { get { return 0; } } + float ILayoutElement.flexibleWidth { get { return -1; } } + float ILayoutElement.flexibleHeight { get { return -1; } } + + float ILayoutElement.preferredWidth + { + get + { + if (activeSprite == null) + return 0; + + return Sprites.DataUtility.GetMinSize(activeSprite).x / pixelsPerUnit; + } + } + + float ILayoutElement.preferredHeight + { + get + { + if (activeSprite == null) + return 0; + + return Sprites.DataUtility.GetMinSize(activeSprite).y / pixelsPerUnit; + } + } + + void ILayoutElement.CalculateLayoutInputHorizontal() { } + void ILayoutElement.CalculateLayoutInputVertical() { } + + bool ICanvasRaycastFilter.IsRaycastLocationValid(Vector2 screenPoint, Camera eventCamera) + { + if (alphaHitTestMinimumThreshold <= 0) + return true; + + if (alphaHitTestMinimumThreshold > 1) + return false; + + if (activeSprite == null) + return true; + + Vector2 local; + if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, screenPoint, eventCamera, out local)) + return false; + + Rect rect = GetPixelAdjustedRect(); + + // Convert to have lower left corner as reference point. + local.x += rectTransform.pivot.x * rect.width; + local.y += rectTransform.pivot.y * rect.height; + + Rect spriteRect = activeSprite.rect; + Vector4 border = activeSprite.border; + Vector4 adjustedBorder = GetAdjustedBorders(border / pixelsPerUnit, rect); + + for (int i = 0; i < 2; i++) + { + if (local[i] <= adjustedBorder[i]) + continue; + + if (rect.size[i] - local[i] <= adjustedBorder[i + 2]) + { + local[i] -= (rect.size[i] - spriteRect.size[i]); + continue; + } + + float lerp = Mathf.InverseLerp(adjustedBorder[i], rect.size[i] - adjustedBorder[i + 2], local[i]); + local[i] = Mathf.Lerp(border[i], spriteRect.size[i] - border[i + 2], lerp); + } + + // Normalize local coordinates. + Rect textureRect = activeSprite.textureRect; + Vector2 normalized = new Vector2(local.x / textureRect.width, local.y / textureRect.height); + + // Convert to texture space. + float x = Mathf.Lerp(textureRect.x, textureRect.xMax, normalized.x) / activeSprite.texture.width; + float y = Mathf.Lerp(textureRect.y, textureRect.yMax, normalized.y) / activeSprite.texture.height; + + switch (m_FillDirection) + { + case FillDirection.Right: + if (x > m_FillAmount) + return false; + break; + case FillDirection.Left: + if (1f - x > m_FillAmount) + return false; + break; + case FillDirection.Up: + if (y > m_FillAmount) + return false; + break; + case FillDirection.Down: + if (1f - y > m_FillAmount) + return false; + break; + } + + try + { + return activeSprite.texture.GetPixelBilinear(x, y).a >= alphaHitTestMinimumThreshold; + } + catch (UnityException e) + { + Debug.LogError("Using alphaHitTestMinimumThreshold greater than 0 on Image whose sprite texture cannot be read. " + e.Message + " Also make sure to disable sprite packing for this sprite.", this); + return true; + } + } + + void ISerializationCallbackReceiver.OnBeforeSerialize() { } + void ISerializationCallbackReceiver.OnAfterDeserialize() + { + m_FillAmount = Mathf.Clamp01(m_FillAmount); + } + + // Whether this is being tracked for Atlas Binding + private bool m_Tracked = false; + +#if UNITY_2017_4 || UNITY_2018_2_OR_NEWER + private static List m_TrackedTexturelessImages = new List(); + private static bool s_Initialized; +#endif + + private void TrackImage() + { + if (activeSprite != null && activeSprite.texture == null) + { +#if UNITY_2017_4 || UNITY_2018_2_OR_NEWER + if (!s_Initialized) + { + SpriteAtlasManager.atlasRegistered += RebuildImage; + s_Initialized = true; + } + + m_TrackedTexturelessImages.Add(this); +#endif + m_Tracked = true; + } + } + + private void UnTrackImage() + { +#if UNITY_2017_4 || UNITY_2018_2_OR_NEWER + m_TrackedTexturelessImages.Remove(this); +#endif + m_Tracked = false; + } + +#if UNITY_2017_4 || UNITY_2018_2_OR_NEWER + private static void RebuildImage(SpriteAtlas spriteAtlas) + { + for (int i = m_TrackedTexturelessImages.Count - 1; i >= 0; i--) + { + SlicedSlider image = m_TrackedTexturelessImages[i]; + if (spriteAtlas.CanBindTo(image.activeSprite)) + { + image.SetAllDirty(); + m_TrackedTexturelessImages.RemoveAt(i); + } + } + } +#endif +} \ No newline at end of file diff --git a/Assets/SystemArchitecture/Scripts/SlicedSlider.cs.meta b/Assets/SystemArchitecture/Scripts/SlicedSlider.cs.meta new file mode 100644 index 0000000..273acc0 --- /dev/null +++ b/Assets/SystemArchitecture/Scripts/SlicedSlider.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b69b55aa2ac2e0e4592740cf1269d52c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: