WeSign/unity-application
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Resolve WES-99 "Cc refactor"

Browse Source
This commit is contained in:
Dries Van Schuylenbergh
2023-03-14 10:56:42 +00:00
parent 59d69f7412
commit dfc69ddd76
57 changed files with 733 additions and 1116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Common/Prefabs/ButtonBack.prefab
View File

@@ -148,7 +148,7 @@ GameObject:
- component: {fileID: 8299246693487308515}
- component: {fileID: 8299246693487308518}
- component: {fileID: 8299246693487308512}
- component: {fileID: 4155745828263815687}
- component: {fileID: 4518652150503380115}
m_Layer: 5
m_Name: ButtonBack
m_TagString: Untagged
@@ -229,10 +229,10 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4155745828263815687}
m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
m_MethodName: LoadScene
m_Mode: 5
- m_Target: {fileID: 4518652150503380115}
m_TargetAssemblyTypeName: BackButton, Assembly-CSharp
m_MethodName: Back
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -241,7 +241,7 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &4155745828263815687
--- !u!114 &4518652150503380115
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -250,6 +250,6 @@ MonoBehaviour:
m_GameObject: {fileID: 8299246693487308514}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
m_Script: {fileID: 11500000, guid: c3dd279b546423e4a8a1b28819a6c4a1, type: 3}
m_Name:
m_EditorClassIdentifier:

13
Assets/Common/Prefabs/ButtonUser.prefab
View File

@@ -280,7 +280,6 @@ GameObject:
- component: {fileID: 2823887524698191630}
- component: {fileID: 2823887524698191625}
- component: {fileID: 2823887524698191631}
- component: {fileID: 7528776122952476157}
- component: {fileID: 9192617418029337932}
m_Layer: 5
m_Name: ButtonUser
@@ -376,18 +375,6 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &7528776122952476157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2823887524698191629}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &9192617418029337932
MonoBehaviour:
m_ObjectHideFlags: 0

415
Assets/Common/Prefabs/Theme Item.prefab Normal file
View File

@@ -0,0 +1,415 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1441088451008905842
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1441088451008905841}
- component: {fileID: 1441088451008905847}
- component: {fileID: 1441088451008905840}
m_Layer: 5
m_Name: Title
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1441088451008905841
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451008905842}
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: 1441088452393136276}
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, y: -10}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1441088451008905847
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451008905842}
m_CullTransparentMesh: 1
--- !u!114 &1441088451008905840
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451008905842}
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: <theme title>
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: 4282795590
m_fontColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, 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: 48
m_fontSizeBase: 48
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 &1441088451876307148
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1441088451876307187}
- component: {fileID: 1441088451876307185}
- component: {fileID: 1441088451876307186}
m_Layer: 5
m_Name: Description
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1441088451876307187
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451876307148}
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: 1441088452393136276}
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: 0}
m_SizeDelta: {x: 0, y: 80}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &1441088451876307185
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451876307148}
m_CullTransparentMesh: 1
--- !u!114 &1441088451876307186
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088451876307148}
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: <theme description, which can be very very long and span over multiple
lines>
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: 4282795590
m_fontColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, 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: 36
m_fontSizeBase: 36
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 &1441088452393136277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1441088452393136276}
- component: {fileID: 1441088452393136281}
- component: {fileID: 1441088452393136282}
- component: {fileID: 1441088452393136283}
- component: {fileID: 2691816296520610901}
m_Layer: 5
m_Name: Theme Item
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1441088452393136276
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088452393136277}
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: 1441088451008905841}
- {fileID: 1441088451876307187}
m_Father: {fileID: 0}
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: 0}
m_SizeDelta: {x: 600, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1441088452393136281
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088452393136277}
m_CullTransparentMesh: 1
--- !u!114 &1441088452393136282
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088452393136277}
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!114 &1441088452393136283
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088452393136277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1441088452393136282}
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &2691816296520610901
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1441088452393136277}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4446e36fb27e24d4781dc866e8487e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
courseTitle:
courseDescription:
courseScene:
title: {fileID: 1441088451008905840}
description: {fileID: 1441088451876307186}
button: {fileID: 1441088452393136283}

7
Assets/Common/Prefabs/Theme Item.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 67febbbd89041e243b4e201a9f8d91e9
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Common/Scenes/WebcamAuthorization.unity → Assets/Common/Scenes/Boot.unity
View File

0
Assets/Common/Scenes/WebcamAuthorization.unity.meta → Assets/Common/Scenes/Boot.unity.meta
View File

163
Assets/Common/Scenes/InfoCourse.unity → Assets/Common/Scenes/CourseActivityScreen.unity
View File

@@ -189,7 +189,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &339096154
GameObject:
@@ -610,6 +610,7 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -636,6 +637,8 @@ RectTransform:
- {fileID: 955994878}
- {fileID: 507029407}
- {fileID: 1135894725}
- {fileID: 1774458253}
- {fileID: 1804488336}
m_Father: {fileID: 1768150806}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -682,6 +685,24 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_CullTransparentMesh: 1
--- !u!114 &906197780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ee87f3cdcccf934b82f9531c90f3457, type: 3}
m_Name:
m_EditorClassIdentifier:
courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
title: {fileID: 1168097236}
description: {fileID: 1990031300}
courseImage: {fileID: 755030131}
progressBar: {fileID: 1135894726}
--- !u!1 &955994877
GameObject:
m_ObjectHideFlags: 0
@@ -767,10 +788,10 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1122939481}
m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
m_MethodName: LoadScene
m_Mode: 5
- m_Target: {fileID: 906197780}
m_TargetAssemblyTypeName: CourseActivityScreen, Assembly-CSharp
m_MethodName: StartCourse
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -893,50 +914,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 991775367}
m_CullTransparentMesh: 1
--- !u!1 &1122939480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1122939482}
- component: {fileID: 1122939481}
m_Layer: 0
m_Name: SceneControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1122939481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1122939482
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
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: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1135894724
GameObject:
m_ObjectHideFlags: 0
@@ -1162,56 +1139,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1168097234}
m_CullTransparentMesh: 1
--- !u!1 &1353360909
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1353360911}
- component: {fileID: 1353360910}
m_Layer: 0
m_Name: InfoControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1353360910
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1353360909}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ee87f3cdcccf934b82f9531c90f3457, type: 3}
m_Name:
m_EditorClassIdentifier:
list: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
title: {fileID: 1168097236}
description: {fileID: 1990031300}
courseImage: {fileID: 755030131}
slider: {fileID: 1135894726}
--- !u!4 &1353360911
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1353360909}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1023.27716, y: 547.95337, z: -1.0753342}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1768150802
GameObject:
m_ObjectHideFlags: 0
@@ -1305,10 +1232,8 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 906197777}
- {fileID: 1804488336}
- {fileID: 1774458253}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1320,7 +1245,7 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1768150806}
m_TransformParent: {fileID: 906197777}
m_Modifications:
- target: {fileID: 8299246693487308512, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
@@ -1340,7 +1265,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
propertyPath: m_RootOrder
value: 2
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
propertyPath: m_AnchorMax.x
@@ -1426,8 +1351,12 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1768150806}
m_TransformParent: {fileID: 906197777}
m_Modifications:
- target: {fileID: 1935285004959629519, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2823887524698191629, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_Name
value: ButtonUser
@@ -1442,7 +1371,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_RootOrder
value: 1
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMax.x
@@ -1516,6 +1445,26 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
--- !u!224 &1804488336 stripped
@@ -1535,7 +1484,7 @@ GameObject:
- component: {fileID: 1903244526}
- component: {fileID: 1903244525}
m_Layer: 5
m_Name: ControlsInfo
m_Name: Controls
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
Assets/Common/Scenes/InfoCourse.unity.meta → Assets/Common/Scenes/CourseActivityScreen.unity.meta
View File

24
Assets/Common/Scenes/CoursesScreen.unity → Assets/Common/Scenes/CoursesMenuScreen.unity
View File

@@ -1204,6 +1204,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 906197777}
m_Modifications:
- target: {fileID: 1935285004959629519, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2823887524698191629, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_Name
value: ButtonUser
@@ -1296,6 +1300,26 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: Common/Scenes/StartScreen
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
--- !u!224 &1782112234 stripped

0
Assets/Common/Scenes/CoursesScreen.unity.meta → Assets/Common/Scenes/CoursesMenuScreen.unity.meta
View File

74
Assets/Common/Scenes/StartScreen.unity → Assets/Common/Scenes/MainMenuScreen.unity
View File

@@ -343,10 +343,10 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1122939481}
m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
m_MethodName: LoadScene
m_Mode: 5
- m_Target: {fileID: 906197780}
m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
m_MethodName: GotoMinigames
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -459,7 +459,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &519420028
GameObject:
@@ -1166,10 +1166,10 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1122939481}
m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
m_MethodName: LoadScene
m_Mode: 5
- m_Target: {fileID: 906197780}
m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
m_MethodName: GotoSettings
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1292,50 +1292,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 991775367}
m_CullTransparentMesh: 1
--- !u!1 &1122939480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1122939482}
- component: {fileID: 1122939481}
m_Layer: 0
m_Name: SceneControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1122939481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1122939482
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
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: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1369063653
GameObject:
m_ObjectHideFlags: 0
@@ -1497,7 +1453,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 906197780}
m_TargetAssemblyTypeName: StartScreenManager, Assembly-CSharp
m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
m_MethodName: QuitApplication
m_Mode: 1
m_Arguments:
@@ -1631,10 +1587,10 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1122939481}
m_TargetAssemblyTypeName: ChangeSceneOnClick, Assembly-CSharp
m_MethodName: LoadScene
m_Mode: 5
- m_Target: {fileID: 906197780}
m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
m_MethodName: GotoCourses
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -1851,7 +1807,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

0
Assets/Common/Scenes/StartScreen.unity.meta → Assets/Common/Scenes/MainMenuScreen.unity.meta
View File

153
Assets/Common/Scenes/InfoMinigame.unity → Assets/Common/Scenes/MinigameActivityScreen.unity
View File

@@ -189,7 +189,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &143992426
PrefabInstance:
@@ -198,6 +198,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 906197777}
m_Modifications:
- target: {fileID: 1935285004959629519, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2823887524698191629, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_Name
value: ButtonUser
@@ -290,6 +294,26 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
value: Common/Scenes/StartScreen
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4001770636160324653, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
--- !u!224 &143992427 stripped
@@ -297,59 +321,6 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2823887524698191630, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
m_PrefabInstance: {fileID: 143992426}
m_PrefabAsset: {fileID: 0}
--- !u!1 &351832751
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 351832753}
- component: {fileID: 351832752}
m_Layer: 0
m_Name: InfoControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &351832752
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351832751}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90de9a5c57c2189429073f8aadc9e9b7, type: 3}
m_Name:
m_EditorClassIdentifier:
list: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
title: {fileID: 1168097236}
description: {fileID: 1990031300}
gameImage: {fileID: 755030131}
button: {fileID: 955994879}
controls: {fileID: 915818721}
userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
userContainer: {fileID: 507029407}
prefab: {fileID: 381012861935775045, guid: 154c17a838d2896499bd76d28a584222, type: 3}
--- !u!4 &351832753
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 351832751}
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: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &507029406
GameObject:
m_ObjectHideFlags: 0
@@ -363,7 +334,7 @@ GameObject:
- component: {fileID: 507029408}
- component: {fileID: 507029410}
m_Layer: 5
m_Name: HighScoresTitle
m_Name: Highscores
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -681,6 +652,7 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -754,6 +726,27 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_CullTransparentMesh: 1
--- !u!114 &906197780
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 90de9a5c57c2189429073f8aadc9e9b7, type: 3}
m_Name:
m_EditorClassIdentifier:
minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
title: {fileID: 1168097236}
description: {fileID: 1990031300}
gameImage: {fileID: 755030131}
button: {fileID: 955994879}
controls: {fileID: 915818721}
userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
userContainer: {fileID: 507029407}
prefab: {fileID: 381012861935775045, guid: 154c17a838d2896499bd76d28a584222, type: 3}
--- !u!1 &915818719
GameObject:
m_ObjectHideFlags: 0
@@ -766,7 +759,7 @@ GameObject:
- component: {fileID: 915818722}
- component: {fileID: 915818721}
m_Layer: 5
m_Name: ControlsInfo
m_Name: Controls
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -902,7 +895,7 @@ GameObject:
- component: {fileID: 955994880}
- component: {fileID: 955994879}
m_Layer: 5
m_Name: PlayButton
m_Name: Play Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1088,50 +1081,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 991775367}
m_CullTransparentMesh: 1
--- !u!1 &1122939480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1122939482}
- component: {fileID: 1122939481}
m_Layer: 0
m_Name: SceneControl
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1122939481
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 949ba4da8595d52aebc98e6f9b6a405e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1122939482
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1122939480}
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: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1168097234
GameObject:
m_ObjectHideFlags: 0
@@ -1467,7 +1416,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}

0
Assets/Common/Scenes/InfoMinigame.unity.meta → Assets/Common/Scenes/MinigameActivityScreen.unity.meta
View File

2
Assets/Common/Scenes/ThemeSelection.unity → Assets/Common/Scenes/ThemeSelectionScreen.unity
View File

@@ -706,7 +706,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1768150802}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68caaa5508a4d40448b47630ff86f035, type: 3}
m_Script: {fileID: 11500000, guid: 30d9f9130bf1d414aaad006b2177bdea, type: 3}
m_Name:
m_EditorClassIdentifier:
themePrefab: {fileID: 1441088452393136277, guid: 67febbbd89041e243b4e201a9f8d91e9, type: 3}

0
Assets/Common/Scenes/ThemeSelection.unity.meta → Assets/Common/Scenes/ThemeSelectionScreen.unity.meta
View File

15
Assets/Common/Scripts/BackButton.cs Normal file
View File

@@ -0,0 +1,15 @@
using UnityEngine;
/// <summary>
/// Script managing the default 'back'-button action
/// </summary>
public class BackButton : MonoBehaviour
{
/// <summary>
/// The default 'back'-button action: go back to the previous scene
/// </summary>
public void Back()
{
SystemController.GetInstance().BackToPreviousScene();
}
}

2
Assets/Common/Scripts/ChangeSceneOnClick.cs.meta → Assets/Common/Scripts/BackButton.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 949ba4da8595d52aebc98e6f9b6a405e
guid: c3dd279b546423e4a8a1b28819a6c4a1
MonoImporter:
externalObjects: {}
serializedVersion: 2

5
Assets/Common/Scripts/WebcamAuthorization.cs → Assets/Common/Scripts/BootScreen.cs
View File

@@ -1,12 +1,11 @@
using System.Collections;
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// Authorize and check for available webcam(s)
/// </summary>
public class WebcamAuthorization : MonoBehaviour
public class BootScreen : MonoBehaviour
{
/// <summary>
/// UI Reference to the text object to display an error message
@@ -24,7 +23,7 @@ public class WebcamAuthorization : MonoBehaviour
{
if (0 < WebCamTexture.devices.Length)
{
SceneManager.LoadScene("Common/Scenes/StartScreen");
SystemController.GetInstance().SwapScene("Common/Scenes/MainMenuScreen");
}
else
{

0
Assets/Common/Scripts/WebcamAuthorization.cs.meta → Assets/Common/Scripts/BootScreen.cs.meta
View File

35
Assets/Common/Scripts/ChangeSceneOnClick.cs
View File

@@ -1,35 +0,0 @@
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// Class to handle scene loading callbacks
/// </summary>
public class ChangeSceneOnClick : MonoBehaviour
{
/// <summary>
/// Method used as callback for gameobject onClick events
/// </summary>
/// <param name="sceneName">The path to the new scene (<c>path == $"Assets/{sceneName}"</c>)</param>
public void LoadScene(string sceneName)
{
SceneManager.LoadScene(sceneName);
}
/// <summary>
/// Method used as callback for gameobject onClick events
/// </summary>
/// <param name="scene">Reference to a scene</param>
public void LoadScene(Scene scene)
{
SceneManager.LoadScene(scene.buildIndex);
}
/// <summary>
/// Method used as callback from gameobject onClick events
/// </summary>
/// <param name="buildIndex">Build index of the scene to be loaded</param>
public void LoadScene(int buildIndex)
{
SceneManager.LoadScene(buildIndex);
}
}

29
Assets/Common/Scripts/InfoCourse.cs → Assets/Common/Scripts/CourseActivityScreen.cs
View File

@@ -1,18 +1,16 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using TMPro; // For text
/// <summary>
/// Manager infopage for the Courses
/// </summary>
public class InfoCourse : MonoBehaviour
public class CourseActivityScreen : MonoBehaviour
{
/// <summary>
/// Reference to the courses
/// </summary>
public CourseList list;
public CourseList courseList;
// private float maxvalue; In case we want to change progress e.g. amount of words correct, then change maxvalue amount of words etc.
/// <summary>
@@ -43,17 +41,15 @@ public class InfoCourse : MonoBehaviour
/// <summary>
/// Progress bar Display
/// </summary>
public Slider slider;
// Start is called before the first frame update
public Slider progressBar;
/// <summary>
/// Sets the infopage for a given course
/// </summary>
void Start()
{
int index = list.currentCourseIndex;
Course course = list.courses[index];
int index = courseList.currentCourseIndex;
Course course = courseList.courses[index];
title.text = course.title;
description.text = course.description;
@@ -63,9 +59,16 @@ public class InfoCourse : MonoBehaviour
// Set progress
progress = userList.GetCurrentUser().GetCourseProgress(course.index);
if (progress != null)
slider.value = progress.Get<float>("courseProgress");
progressBar.value = progress.Get<float>("courseProgress");
else
slider.value = 0.0f;
progressBar.value = 0.0f;
}
/// <summary>
/// Callback to start the course
/// </summary>
public void StartCourse()
{
SystemController.GetInstance().LoadNextScene("Courses/Scenes/TemplateCourse");
}
}

0
Assets/Common/Scripts/InfoCourse.cs.meta → Assets/Common/Scripts/CourseActivityScreen.cs.meta
View File

3
Assets/Common/Scripts/CourseItem.cs
View File

@@ -1,6 +1,5 @@
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
/// <summary>
@@ -68,6 +67,6 @@ public class CourseItem : MonoBehaviour
slider.GetComponent<Slider>().value = progress;
// Add click functionality
button.onClick.AddListener(() => SceneManager.LoadScene("Common/Scenes/InfoCourse"));
button.onClick.AddListener(() => SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen"));
}
}

84
Assets/Common/Scripts/CourseScreenManager.cs
View File

@@ -1,84 +0,0 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// CourseScreen scene manager
/// </summary>
public class CourseScreenManager : MonoBehaviour
{
/// <summary>
/// Reference to text that displays when there are no recent courses
/// </summary>
public GameObject noRecentCourses;
/// <summary>
/// Reference to recent-courses-list container object
/// </summary>
public Transform recentCoursesContainer;
/// <summary>
/// Reference to recommended-courses-list container object
/// </summary>
public Transform recommendedCoursesContainer;
/// <summary>
/// Prefab of the course item object
/// </summary>
public GameObject courseItem;
/// <summary>
/// Reference to the users so we can get the current user;
/// </summary>
public UserList userList;
/// <summary>
/// Reference to the courses
/// </summary>
public CourseList courseList;
/// <summary>
/// Start is called before the first frame update
/// </summary>
void Start()
{
User user = userList.GetCurrentUser();
// Recent courses
List<Tuple<CourseIndex, float>> recentCourses = user.GetRecentCourses();
noRecentCourses.SetActive(recentCourses.Count <= 0);
foreach (Tuple<CourseIndex, float> course in recentCourses)
{
// Create instance of prefab
GameObject instance = GameObject.Instantiate(courseItem, recentCoursesContainer);
// Dynamically load appearance
CourseItem item = instance.GetComponent<CourseItem>();
item.course = courseList.courses.Find((j) => j.index == course.Item1);
item.progress = course.Item2;
}
// Recommended courses
List<Tuple<CourseIndex, float>> recommenedCourses = user.GetRecommendedCourses();
foreach (Tuple<CourseIndex, float> course in recommenedCourses)
{
// Create instance of prefab
GameObject instance = GameObject.Instantiate(courseItem, recommendedCoursesContainer);
// Dynamically load appearance
CourseItem item = instance.GetComponent<CourseItem>();
item.course = courseList.courses.Find((j) => j.index == course.Item1);
item.progress = course.Item2;
}
}
/// <summary>
/// Method used as callback for course item onClick events
/// </summary>
/// <param name="sceneName">The path to the new scene (<c>path == $"Assets/{sceneName}"</c>)</param>
public void LoadScene(string sceneName)
{
SceneManager.LoadScene(sceneName);
}
}

8
Assets/Common/Scripts/CourseListManager.cs → Assets/Common/Scripts/ListCoursesScreen.cs
View File

@@ -1,10 +1,9 @@
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// ListCourseScreen scene manager
/// </summary>
public class CourseListManager : MonoBehaviour
public class ListCoursesScreen : MonoBehaviour
{
/// <summary>
/// Reference to the course-list container object
@@ -40,9 +39,8 @@ public class CourseListManager : MonoBehaviour
/// <summary>
/// Method used as callback for course item onClick events
/// </summary>
/// <param name="sceneName">The path to the new scene (<c>path == $"Assets/{sceneName}"</c>)</param>
public void LoadScene(string sceneName)
public void GotoCourseInfo()
{
SceneManager.LoadScene(sceneName);
SystemController.GetInstance().LoadNextScene("Common/Scenes/CourseActivityScreen");
}
}

0
Assets/Common/Scripts/CourseListManager.cs.meta → Assets/Common/Scripts/ListCoursesScreen.cs.meta
View File

5
Assets/Common/Scripts/MinigameListManager.cs → Assets/Common/Scripts/ListMinigamesScreen.cs
View File

@@ -1,10 +1,9 @@
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// ListMinigameScreen scene manager
/// </summary>
public class MinigameListManager : MonoBehaviour
public class ListMinigamesScreen : MonoBehaviour
{
/// <summary>
/// Reference to minigame-list container object
@@ -43,6 +42,6 @@ public class MinigameListManager : MonoBehaviour
/// <param name="sceneName">The path to the new scene (<c>path == $"Assets/{sceneName}"</c>)</param>
public void LoadScene(string sceneName)
{
SceneManager.LoadScene(sceneName);
SystemController.GetInstance().LoadNextScene(sceneName);
}
}

0
Assets/Common/Scripts/MinigameListManager.cs.meta → Assets/Common/Scripts/ListMinigamesScreen.cs.meta
View File

57
Assets/Common/Scripts/MainMenuScreen.cs Normal file
View File

@@ -0,0 +1,57 @@
using System.IO;
using UnityEngine;
/// <summary>
/// StartScreen scene manager
/// </summary>
public class MainMenuScreen : MonoBehaviour
{
/// <summary>
/// Referece to the userlist to check whether an user account is present
/// </summary>
public UserList userList;
/// <summary>
/// Check on load whether a user is already present,
/// if not load the UserCreationScreen scene so the user can create a new account
/// </summary>
void Awake()
{
if (!File.Exists(UserList.PATH) || userList.GetUsers().Count <= 0)
{
SystemController.GetInstance().LoadNextScene("Accounts/Scenes/UserCreationScreen");
}
}
/// <summary>
/// Quit the application
/// </summary>
public void QuitApplication()
{
Application.Quit();
}
/// <summary>
/// Load the `CoursesMenuScreen` scene
/// </summary>
public void GotoCourses()
{
SystemController.GetInstance().LoadNextScene("Common/Scenes/CoursesMenuScreen");
}
/// <summary>
/// Load the `ListMinigamesScreen` scene
/// </summary>
public void GotoMinigames()
{
SystemController.GetInstance().LoadNextScene("Common/Scenes/ListMinigamesScreen");
}
/// <summary>
/// Load the `SettingsScreen` scene
/// </summary>
public void GotoSettings()
{
SystemController.GetInstance().LoadNextScene("Common/Scenes/SettingsScreen");
}
}

0
Assets/Common/Scripts/StartScreenManager.cs.meta → Assets/Common/Scripts/MainMenuScreen.cs.meta
View File

1
Assets/Common/Scripts/Minigame.cs
View File

@@ -40,5 +40,4 @@ public class Minigame : ScriptableObject
/// An explanation on how to play the game and score points
/// </summary>
public string controls;
}

45
Assets/Common/Scripts/InfoMinigame.cs → Assets/Common/Scripts/MinigameActivityScreen.cs
View File

@@ -1,23 +1,19 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using TMPro;
using UnityEditor;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using static GameController;
/// <summary>
/// Manager infopage for the Minigames
/// </summary>
public class InfoMinigame : MonoBehaviour
public class MinigameActivityScreen : MonoBehaviour
{
/// <summary>
/// Reference to the Minigames
/// </summary>
public MinigameList list;
public MinigameList minigameList;
/// <summary>
/// Title Display
@@ -44,8 +40,6 @@ public class InfoMinigame : MonoBehaviour
/// </summary>
public TMP_Text controls;
// Scores for each user
/// <summary>
/// Reference to the users
/// </summary>
@@ -66,7 +60,6 @@ public class InfoMinigame : MonoBehaviour
/// </summary>
public GameObject prefab;
// Start is called before the first frame update
/// <summary>
/// Sets the infopage for a given minigame
/// </summary>
@@ -82,9 +75,9 @@ public class InfoMinigame : MonoBehaviour
private void GenerateContent()
{
// Get current minigame
int index = list.currentMinigameIndex;
Minigame minigame = list.minigames[index];
int index = minigameList.currentMinigameIndex;
Minigame minigame = minigameList.minigames[index];
// Set main screen
title.text = minigame.title;
description.text = minigame.description;
@@ -92,10 +85,13 @@ public class InfoMinigame : MonoBehaviour
controls.text = minigame.controls;
// Add click
if (minigame.needsTheme) {
button.onClick.AddListener(() => SceneManager.LoadScene("Common/Scenes/ThemeSelection"));
} else {
button.onClick.AddListener(() => SceneManager.LoadScene(minigame.minigameEntryPoint));
if (minigame.needsTheme)
{
button.onClick.AddListener(() => SystemController.GetInstance().LoadNextScene("Common/Scenes/ThemeSelectionScreen"));
}
else
{
button.onClick.AddListener(() => SystemController.GetInstance().LoadNextScene(minigame.minigameEntryPoint));
}
}
@@ -108,10 +104,10 @@ public class InfoMinigame : MonoBehaviour
private void GenerateHighScores()
{
// Get current minigame
int index = list.currentMinigameIndex;
Minigame minigame = list.minigames[index];
int index = minigameList.currentMinigameIndex;
Minigame minigame = minigameList.minigames[index];
List<Tuple<string, Sprite, Score>> allScores = new List<Tuple<string, Sprite, Score>>();
List<Tuple<string, Sprite, GameController.Score>> allScores = new List<Tuple<string, Sprite, GameController.Score>>();
foreach (User user in userList.GetUsers())
{
// Get user's progress for this minigame
@@ -119,10 +115,10 @@ public class InfoMinigame : MonoBehaviour
if (progress != null)
{
// Add scores to dictionary
List<Score> scores = progress.Get<List<Score>>("scores");
foreach (Score score in scores)
List<GameController.Score> scores = progress.Get<List<GameController.Score>>("scores");
foreach (GameController.Score score in scores)
{
allScores.Add(new Tuple<string, Sprite, Score>(user.username, user.avatar, score));
allScores.Add(new Tuple<string, Sprite, GameController.Score>(user.username, user.avatar, score));
}
}
}
@@ -131,17 +127,16 @@ public class InfoMinigame : MonoBehaviour
allScores.Sort((a, b) => b.Item3.scoreValue.CompareTo(a.Item3.scoreValue));
// Instantiate scoreboard entries
foreach (Tuple<string, Sprite, Score> tup in allScores.Take(3))
foreach (Tuple<string, Sprite, GameController.Score> tup in allScores.Take(3))
{
string username = tup.Item1;
Sprite sprite = tup.Item2;
Score score = tup.Item3;
GameController.Score score = tup.Item3;
GameObject instance = GameObject.Instantiate(prefab, userContainer);
instance.transform.Find("Title").GetComponent<TMP_Text>().text = username;
instance.transform.Find("Avatar").GetComponent<Image>().sprite = sprite;
instance.transform.Find("Score").GetComponent<TMP_Text>().text = score.scoreValue.ToString();
}
}
}

0
Assets/Common/Scripts/InfoMinigame.cs.meta → Assets/Common/Scripts/MinigameActivityScreen.cs.meta
View File

11
Assets/Common/Scripts/MinigameItem.cs
View File

@@ -1,14 +1,12 @@
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
using System.Collections.Generic;
/// <summary>
/// Handles the display of minigames in the ListMinigameScreen scene
/// </summary>
public class MinigameItem : MonoBehaviour
{
{
/// <summary>
/// Reference to the minigame object
/// </summary>
@@ -46,11 +44,12 @@ public class MinigameItem : MonoBehaviour
// Set appearance
thumbnail.sprite = minigame.thumbnail;
title.text = minigame.title;
// Add click functionality
button.onClick.AddListener(() => {
button.onClick.AddListener(() =>
{
PlayerPrefs.SetString("gamePath", minigame.minigameEntryPoint);
SceneManager.LoadScene("Common/Scenes/InfoMinigame");
SystemController.GetInstance().LoadNextScene("Common/Scenes/MinigameActivityScreen");
});
}
}

31
Assets/Common/Scripts/StartScreenManager.cs
View File

@@ -1,31 +0,0 @@
using System.IO;
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// StartScreen scene manager
/// </summary>
public class StartScreenManager : MonoBehaviour
{
/// <summary>
/// Referece to the userlist to check whether an user account is present
/// </summary>
public UserList userList;
/// <summary>
/// Check on load whether a user is already present,
/// if not load the UserCreationScreen scene so the user can create a new account
/// </summary>
void Awake()
{
if (!File.Exists(UserList.PATH) || userList.GetUsers().Count <= 0)
{
SceneManager.LoadScene("Accounts/Scenes/UserCreationScreen");
}
}
public void QuitApplication()
{
Application.Quit();
}
}

104
Assets/Common/Scripts/SystemController.cs Normal file
View File

@@ -0,0 +1,104 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// SystemController singleton
/// </summary>
public class SystemController
{
/// <summary>
/// The instance controlling the singleton
/// </summary>
private static SystemController instance = null;
/// <summary>
/// Stack of the loaded scenes, used to easily go back to previous scenes
/// </summary>
private Stack<int> sceneStack = new Stack<int>();
/// <summary>
/// Get the instance loaded by the singleton
/// </summary>
/// <returns>SystemController instance</returns>
public static SystemController GetInstance()
{
// Create a new instance if non exists
if (instance == null)
{
instance = new SystemController();
instance.sceneStack.Push(SceneManager.GetActiveScene().buildIndex);
}
return instance;
}
/// <summary>
/// Load the scene and push on the stack
/// </summary>
/// <param name="scenePath">Path of the scene</param>
public void LoadNextScene(string scenePath)
{
LoadNextScene(SceneUtility.GetBuildIndexByScenePath(scenePath));
}
/// <summary>
/// Load the scene and push on the stack
/// </summary>
/// <param name="sceneIndex">Buildindex of the scene</param>
public void LoadNextScene(int sceneIndex)
{
sceneStack.Push(sceneIndex);
SceneManager.LoadScene(sceneIndex);
}
/// <summary>
/// Swap the current scene with the new scene on the stack
/// </summary>
/// <param name="scenePath">Path of the scene</param>
public void SwapScene(string scenePath)
{
SwapScene(SceneUtility.GetBuildIndexByScenePath(scenePath));
}
/// <summary>
/// Swap the current scene with the new scene on the stack
/// </summary>
/// <param name="sceneIndex">Buildindex of the scene</param>
public void SwapScene(int sceneIndex)
{
sceneStack.Pop();
LoadNextScene(sceneIndex);
}
/// <summary>
/// Go back to the previous scene and unload the current scene
/// </summary>
public void BackToPreviousScene()
{
sceneStack.Pop();
if (sceneStack.Count > 0) SceneManager.LoadScene(sceneStack.Peek());
else Application.Quit();
}
/// <summary>
/// Go back to a specific scene, unloading all the scenes on the way
/// </summary>
/// <param name="scenePath">Path of the scene</param>
public void BackToScene(string scenePath)
{
BackToScene(SceneUtility.GetBuildIndexByScenePath(scenePath));
}
/// <summary>
/// Go back to a specific scene, unloading all the scene on the way
/// </summary>
/// <param name="sceneIndex">Buildindex of the scene</param>
public void BackToScene(int sceneIndex)
{
while (0 < sceneStack.Count && sceneStack.Peek() != sceneIndex) sceneStack.Pop();
if (sceneStack.Count > 0) SceneManager.LoadScene(sceneStack.Peek());
else Application.Quit();
}
}

2
Assets/Common/Scripts/CourseScreenManager.cs.meta → Assets/Common/Scripts/SystemController.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 00e2726fda637a1488461b7a43e46343
guid: e901944427bb1104a881881efebd3737
MonoImporter:
externalObjects: {}
serializedVersion: 2

15
Assets/Common/Scripts/ThemeSelectionController.cs → Assets/Common/Scripts/ThemeSelectionScreen.cs
View File

@@ -1,12 +1,10 @@
using UnityEngine;
using UnityEngine.SceneManagement;
/// <summary>
/// Controller for the theme selection screen
/// ThemeSelectionScreen scene manager
/// </summary>
public class ThemeSelectionController : MonoBehaviour
public class ThemeSelectionScreen : MonoBehaviour
{
[Header("Theme Selection")]
/// <summary>
/// Theme prefab
/// </summary>
@@ -18,9 +16,9 @@ public class ThemeSelectionController : MonoBehaviour
public Transform themesContainer;
/// <summary>
/// Function that is called upon loading the scene
/// Start is called before the first frame update
/// </summary>
public void Start()
void Start()
{
// TODO: change to ScriptableObject
ThemeList themeList = ThemeLoader.LoadJson();
@@ -41,11 +39,12 @@ public class ThemeSelectionController : MonoBehaviour
}
/// <summary>
/// Function that is called upon a button click
/// Load the game with a specified theme
/// </summary>
/// <param name="clickedTheme">Name of the clicked theme</param>
public void OnButtonClick(string clickedTheme)
{
PlayerPrefs.SetString("themeName", clickedTheme);
SceneManager.LoadScene(PlayerPrefs.GetString("gamePath"));
SystemController.GetInstance().SwapScene(PlayerPrefs.GetString("gamePath"));
}
}

2
Assets/Common/Scripts/ThemeSelectionController.cs.meta → Assets/Common/Scripts/ThemeSelectionScreen.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 68caaa5508a4d40448b47630ff86f035
guid: 30d9f9130bf1d414aaad006b2177bdea
MonoImporter:
externalObjects: {}
serializedVersion: 2

5
Assets/Common/Scripts/UserButton.cs
View File

@@ -1,6 +1,5 @@
using TMPro;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
/// <summary>
@@ -44,7 +43,7 @@ public class UserButton : MonoBehaviour
/// </summary>
public void OpenProgressCallback()
{
SceneManager.LoadScene("Accounts/Scenes/UserProgressScreen");
SystemController.GetInstance().LoadNextScene("Accounts/Scenes/UserProgressScreen");
}
/// <summary>
@@ -52,7 +51,7 @@ public class UserButton : MonoBehaviour
/// </summary>
public void ChangeUserCallback()
{
SceneManager.LoadScene("Accounts/Scenes/ChangeUserScreen");
SystemController.GetInstance().LoadNextScene("Accounts/Scenes/ChangeUserScreen");
}
/// <summary>