diff --git a/Assets/Accounts/Scenes/ChangeUserScreen.unity b/Assets/Accounts/Scenes/ChangeUserScreen.unity
index 77c4ac2..931a20d 100644
--- a/Assets/Accounts/Scenes/ChangeUserScreen.unity
+++ b/Assets/Accounts/Scenes/ChangeUserScreen.unity
@@ -867,7 +867,7 @@ GameObject:
- component: {fileID: 840332114}
- component: {fileID: 840332113}
m_Layer: 5
- m_Name: Button
+ m_Name: ContinueButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -938,8 +938,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: ChangeUserScreen, Assembly-CSharp
+ - m_Target: {fileID: 2129020786}
+ m_TargetAssemblyTypeName: ChangeUserScreen, AccountsScripts
m_MethodName: IChooseYou
m_Mode: 1
m_Arguments:
@@ -999,7 +999,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -1045,14 +1044,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1070,22 +1069,6 @@ 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: 3a7f31ce7a41c294b95cb1f9fbec207f, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- userPrefab: {fileID: 7566391564300576383, guid: f5103a1b6ba1b0445a0d049203b9b6b2, type: 3}
- usersContainer: {fileID: 1438010722}
- error: {fileID: 1815188481}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
--- !u!1 &1143249623
GameObject:
m_ObjectHideFlags: 0
@@ -1099,7 +1082,7 @@ GameObject:
- component: {fileID: 1143249626}
- component: {fileID: 1143249625}
m_Layer: 5
- m_Name: Button (1)
+ m_Name: CreateUserButton
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1170,8 +1153,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: ChangeUserScreen, Assembly-CSharp
+ - m_Target: {fileID: 2129020786}
+ m_TargetAssemblyTypeName: ChangeUserScreen, AccountsScripts
m_MethodName: GotoUserCreation
m_Mode: 1
m_Arguments:
@@ -1654,7 +1637,7 @@ RectTransform:
- {fileID: 906197777}
- {fileID: 1815188482}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1905,3 +1888,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109596086}
m_CullTransparentMesh: 1
+--- !u!1 &2129020785
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2129020787}
+ - component: {fileID: 2129020786}
+ m_Layer: 0
+ m_Name: ChangeUserController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &2129020786
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2129020785}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3a7f31ce7a41c294b95cb1f9fbec207f, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ userPrefab: {fileID: 7566391564300576383, guid: f5103a1b6ba1b0445a0d049203b9b6b2, type: 3}
+ usersContainer: {fileID: 1438010722}
+ error: {fileID: 1815188481}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+--- !u!4 &2129020787
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2129020785}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Accounts/Scenes/UserCreationScreen.unity b/Assets/Accounts/Scenes/UserCreationScreen.unity
index e9392cd..7943c67 100644
--- a/Assets/Accounts/Scenes/UserCreationScreen.unity
+++ b/Assets/Accounts/Scenes/UserCreationScreen.unity
@@ -940,8 +940,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: UserCreationScreen, Assembly-CSharp
+ - m_Target: {fileID: 1787496675}
+ m_TargetAssemblyTypeName: UserCreationScreen, AccountsScripts
m_MethodName: CreateUser
m_Mode: 1
m_Arguments:
@@ -1001,7 +1001,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -1047,14 +1046,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1072,43 +1071,6 @@ 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: fc3902e35c042b14f83b24498d31d587, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- errorMessage: {fileID: 589847186}
- inputName: {fileID: 645809401}
- avatarsContainer: {fileID: 1832217925}
- avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3}
- sprites:
- - {fileID: 21300000, guid: 4654657a2ebea444898fa6eeaefcd18d, type: 3}
- - {fileID: 21300000, guid: b67b99d98d1ceb1489743bcd78b9ab70, type: 3}
- - {fileID: 21300000, guid: e4af402f37099cd4195d7d2654519744, type: 3}
- - {fileID: 21300000, guid: 73f4e028d9efb644aa23538a749667c5, type: 3}
- - {fileID: 21300000, guid: bc11ff9d6cc35de45ab58f39f13d7142, type: 3}
- - {fileID: 21300000, guid: 2b01165a5836ab14593d7a5862bd6793, type: 3}
- - {fileID: 21300000, guid: 1a28fa2c46acbb1408633e4e98061d56, type: 3}
- - {fileID: 21300000, guid: 8009fc8cfee7ea848a678e056731c02e, type: 3}
- - {fileID: 21300000, guid: 7272bfa2b3f87564eb961d41c641479d, type: 3}
- - {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3}
- - {fileID: 21300000, guid: 439c062e9ba9d0f439dffd41509ceee7, type: 3}
- - {fileID: 21300000, guid: 8962e03659a079546810c3ad9c8a211c, type: 3}
- - {fileID: 21300000, guid: 182fb89eba9c64041bef31ca35c4bcd8, type: 3}
- - {fileID: 21300000, guid: c7006b8cc5cff974b9ff307fe13fdd5e, type: 3}
- - {fileID: 21300000, guid: 16f645dc2176fa248af566b5295b451a, type: 3}
- - {fileID: 21300000, guid: d574bf2c96bb5b74080b4cf8ca51312d, type: 3}
- - {fileID: 21300000, guid: 47a49435e7b8c9a49b162fb4d6f9ceaa, type: 3}
- - {fileID: 21300000, guid: e3c4feacdb7710349b326280e2163a84, type: 3}
- users: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- selectedAvatar: 0
--- !u!1 &1087307046
GameObject:
m_ObjectHideFlags: 0
@@ -1391,13 +1353,82 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
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, y: 0}
+--- !u!1 &1787496674
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1787496676}
+ - component: {fileID: 1787496675}
+ m_Layer: 0
+ m_Name: UserCreationController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1787496675
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1787496674}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fc3902e35c042b14f83b24498d31d587, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ errorMessage: {fileID: 589847186}
+ inputName: {fileID: 645809401}
+ avatarsContainer: {fileID: 1832217925}
+ avatarPrefab: {fileID: 6263784960026409964, guid: c09ef5423059da444ad7743174e9f077, type: 3}
+ sprites:
+ - {fileID: 21300000, guid: 4654657a2ebea444898fa6eeaefcd18d, type: 3}
+ - {fileID: 21300000, guid: b67b99d98d1ceb1489743bcd78b9ab70, type: 3}
+ - {fileID: 21300000, guid: e4af402f37099cd4195d7d2654519744, type: 3}
+ - {fileID: 21300000, guid: 73f4e028d9efb644aa23538a749667c5, type: 3}
+ - {fileID: 21300000, guid: bc11ff9d6cc35de45ab58f39f13d7142, type: 3}
+ - {fileID: 21300000, guid: 2b01165a5836ab14593d7a5862bd6793, type: 3}
+ - {fileID: 21300000, guid: 1a28fa2c46acbb1408633e4e98061d56, type: 3}
+ - {fileID: 21300000, guid: 8009fc8cfee7ea848a678e056731c02e, type: 3}
+ - {fileID: 21300000, guid: 7272bfa2b3f87564eb961d41c641479d, type: 3}
+ - {fileID: 21300000, guid: 1a4d7d2fe1dc58448b2c0451d2924003, type: 3}
+ - {fileID: 21300000, guid: 439c062e9ba9d0f439dffd41509ceee7, type: 3}
+ - {fileID: 21300000, guid: 8962e03659a079546810c3ad9c8a211c, type: 3}
+ - {fileID: 21300000, guid: 182fb89eba9c64041bef31ca35c4bcd8, type: 3}
+ - {fileID: 21300000, guid: c7006b8cc5cff974b9ff307fe13fdd5e, type: 3}
+ - {fileID: 21300000, guid: 16f645dc2176fa248af566b5295b451a, type: 3}
+ - {fileID: 21300000, guid: d574bf2c96bb5b74080b4cf8ca51312d, type: 3}
+ - {fileID: 21300000, guid: 47a49435e7b8c9a49b162fb4d6f9ceaa, type: 3}
+ - {fileID: 21300000, guid: e3c4feacdb7710349b326280e2163a84, type: 3}
+ users: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ selectedAvatar: 0
+--- !u!4 &1787496676
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1787496674}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1832217924
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Accounts/Scenes/UserProgressScreen.unity b/Assets/Accounts/Scenes/UserProgressScreen.unity
index ecf1d23..c8ab280 100644
--- a/Assets/Accounts/Scenes/UserProgressScreen.unity
+++ b/Assets/Accounts/Scenes/UserProgressScreen.unity
@@ -487,6 +487,62 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &400519678
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 400519680}
+ - component: {fileID: 400519679}
+ m_Layer: 0
+ m_Name: UserProgressController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &400519679
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 400519678}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a59f8e8c48fbd4444a41df01694d13a7, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ username: {fileID: 1021209698}
+ avatar: {fileID: 1873954004}
+ playtime: {fileID: 1716832605}
+ highscoreMarker: {fileID: 7141392721760992647, guid: c54186c4d7aafd5459b0097d481b8fbf, type: 3}
+ courseCardPrefab: {fileID: 5101881939626277738, guid: b953de8778612cd449ba1999c4f7b8c4, type: 3}
+ coursesContainer: {fileID: 1487493400}
+ emptyCourses: {fileID: 494202816}
+ minigameCardPrefab: {fileID: 5101881939626277738, guid: af026fa8050694c4f816aa0c615e1992, type: 3}
+ minigamesContainer: {fileID: 67107106}
+ emptyMinigames: {fileID: 505387970}
+ progressGraph: {fileID: 913667425}
+--- !u!4 &400519680
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 400519678}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &494202816
GameObject:
m_ObjectHideFlags: 0
@@ -958,7 +1014,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -1005,14 +1060,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1030,30 +1085,6 @@ 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: a59f8e8c48fbd4444a41df01694d13a7, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- username: {fileID: 1021209698}
- avatar: {fileID: 1873954004}
- playtime: {fileID: 1716832605}
- highscoreMarker: {fileID: 7141392721760992647, guid: c54186c4d7aafd5459b0097d481b8fbf, type: 3}
- courseCardPrefab: {fileID: 5101881939626277738, guid: b953de8778612cd449ba1999c4f7b8c4, type: 3}
- coursesContainer: {fileID: 1487493400}
- emptyCourses: {fileID: 494202816}
- minigameCardPrefab: {fileID: 5101881939626277738, guid: af026fa8050694c4f816aa0c615e1992, type: 3}
- minigamesContainer: {fileID: 67107106}
- emptyMinigames: {fileID: 505387970}
- progressGraph: {fileID: 913667425}
--- !u!1 &909961605
GameObject:
m_ObjectHideFlags: 0
@@ -2075,7 +2106,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Common/PlayModeTests/CourseActivityTests.cs b/Assets/Common/PlayModeTests/CourseActivityTests.cs
index 1d20c5a..2125822 100644
--- a/Assets/Common/PlayModeTests/CourseActivityTests.cs
+++ b/Assets/Common/PlayModeTests/CourseActivityTests.cs
@@ -34,7 +34,7 @@ public class CourseActivityTests
courseActivityScreen.StartCourse();
yield return new WaitForSeconds(0.2f);
- var templateCourse = (TemplateCourse) GameObject.FindObjectOfType(typeof(TemplateCourse));
+ var templateCourse = (CoursesController) GameObject.FindObjectOfType(typeof(CoursesController));
Assert.IsNotNull(templateCourse);
}
}
diff --git a/Assets/Common/Scenes/Boot.unity b/Assets/Common/Scenes/Boot.unity
index bd3e0a4..4f95155 100644
--- a/Assets/Common/Scenes/Boot.unity
+++ b/Assets/Common/Scenes/Boot.unity
@@ -218,7 +218,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -285,19 +284,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_CullTransparentMesh: 1
---- !u!114 &906197780
+--- !u!1 &1427583093
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1427583095}
+ - component: {fileID: 1427583094}
+ m_Layer: 0
+ m_Name: BootController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1427583094
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 906197776}
+ m_GameObject: {fileID: 1427583093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f8891598d17bbfb439850bda8d767724, type: 3}
m_Name:
m_EditorClassIdentifier:
errorText: {fileID: 1663223260}
+--- !u!4 &1427583095
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1427583093}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 1163.7855, y: 783.33215, z: -9.387665}
+ 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 &1663223258
GameObject:
m_ObjectHideFlags: 0
@@ -527,7 +558,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Common/Scenes/CourseActivityScreen.unity b/Assets/Common/Scenes/CourseActivityScreen.unity
index cf70ce7..acdde89 100644
--- a/Assets/Common/Scenes/CourseActivityScreen.unity
+++ b/Assets/Common/Scenes/CourseActivityScreen.unity
@@ -610,7 +610,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -661,14 +660,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -686,26 +685,6 @@ 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:
- playButton: {fileID: 8656706101895896161}
- previewButton: {fileID: 1796657466}
- 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 &1135894724
GameObject:
m_ObjectHideFlags: 0
@@ -931,6 +910,58 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1168097234}
m_CullTransparentMesh: 1
+--- !u!1 &1451507143
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1451507145}
+ - component: {fileID: 1451507144}
+ m_Layer: 0
+ m_Name: CourseActivityController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1451507144
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1451507143}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4ee87f3cdcccf934b82f9531c90f3457, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ playButton: {fileID: 8656706101895896161}
+ previewButton: {fileID: 1796657466}
+ 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!4 &1451507145
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1451507143}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1768150802
GameObject:
m_ObjectHideFlags: 0
@@ -1025,7 +1056,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -1223,7 +1254,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
+ - m_Target: {fileID: 1451507144}
m_TargetAssemblyTypeName: CourseActivityScreen, CommonScripts
m_MethodName: StartCourse
m_Mode: 1
@@ -2068,7 +2099,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
+ - m_Target: {fileID: 1451507144}
m_TargetAssemblyTypeName: CourseActivityScreen, CommonScripts
m_MethodName: StartCourse
m_Mode: 1
diff --git a/Assets/Common/Scenes/CoursesMenuScreen.unity b/Assets/Common/Scenes/CoursesMenuScreen.unity
index 34133a6..469f91f 100644
--- a/Assets/Common/Scenes/CoursesMenuScreen.unity
+++ b/Assets/Common/Scenes/CoursesMenuScreen.unity
@@ -619,7 +619,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -668,14 +667,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -693,24 +692,6 @@ 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: 00e2726fda637a1488461b7a43e46343, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- noRecentCourses: {fileID: 922270550}
- recentCoursesContainer: {fileID: 1737823345}
- recommendedCoursesContainer: {fileID: 809758278}
- courseItem: {fileID: 4959898007614330357, guid: baf585123c6364d40a17b89676eb350d, type: 3}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
--- !u!1 &922270550
GameObject:
m_ObjectHideFlags: 0
@@ -894,6 +875,56 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1048519161}
m_CullTransparentMesh: 1
+--- !u!1 &1216747365
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1216747367}
+ - component: {fileID: 1216747366}
+ m_Layer: 0
+ m_Name: CoursesMenuController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1216747366
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1216747365}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 00e2726fda637a1488461b7a43e46343, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ noRecentCourses: {fileID: 922270550}
+ recentCoursesContainer: {fileID: 1737823345}
+ recommendedCoursesContainer: {fileID: 809758278}
+ courseItem: {fileID: 4959898007614330357, guid: baf585123c6364d40a17b89676eb350d, type: 3}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
+--- !u!4 &1216747367
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1216747365}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!224 &1301399289 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8299246693487308515, guid: 3bccdf365a4fbea4d8fa1aa461d3dc5c, type: 3}
@@ -983,7 +1014,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
+ - m_Target: {fileID: 1216747366}
m_TargetAssemblyTypeName: CourseMenuScreen, CommonScripts
m_MethodName: GotoListOfCourses
m_Mode: 1
@@ -1190,7 +1221,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Common/Scenes/ListCoursesScreen.unity b/Assets/Common/Scenes/ListCoursesScreen.unity
index 38501ab..da21d15 100644
--- a/Assets/Common/Scenes/ListCoursesScreen.unity
+++ b/Assets/Common/Scenes/ListCoursesScreen.unity
@@ -885,7 +885,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -930,14 +929,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -955,22 +954,6 @@ 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: 0fac0bf527487ad48835aff400b1f762, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- courseContainer: {fileID: 461792789}
- courseItemPrefab: {fileID: 4959898007614330357, guid: baf585123c6364d40a17b89676eb350d, type: 3}
- courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
--- !u!1 &994710774
GameObject:
m_ObjectHideFlags: 0
@@ -1412,6 +1395,54 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1181759419}
m_CullTransparentMesh: 1
+--- !u!1 &1417412674
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1417412676}
+ - component: {fileID: 1417412675}
+ m_Layer: 0
+ m_Name: ListCoursesController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1417412675
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1417412674}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0fac0bf527487ad48835aff400b1f762, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ courseContainer: {fileID: 461792789}
+ courseItemPrefab: {fileID: 4959898007614330357, guid: baf585123c6364d40a17b89676eb350d, type: 3}
+ courseList: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
+--- !u!4 &1417412676
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1417412674}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1503088042
GameObject:
m_ObjectHideFlags: 0
@@ -1758,7 +1789,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Common/Scenes/ListMinigamesScreen.unity b/Assets/Common/Scenes/ListMinigamesScreen.unity
index 01e71d4..611651d 100644
--- a/Assets/Common/Scenes/ListMinigamesScreen.unity
+++ b/Assets/Common/Scenes/ListMinigamesScreen.unity
@@ -285,7 +285,7 @@ RectTransform:
m_Children:
- {fileID: 1380805077}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -336,6 +336,30 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 1380805077}
m_Modifications:
+ - target: {fileID: 1769699556132214506, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1769699556132214506, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1769699556132214506, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1769699556132214506, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1769699556132214506, guid: 53b0d00ac817ebf43b61bea2d160dd66, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - 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
@@ -428,6 +452,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 &238926234 stripped
@@ -1133,7 +1177,6 @@ GameObject:
- component: {fileID: 1380805077}
- component: {fileID: 1380805080}
- component: {fileID: 1380805079}
- - component: {fileID: 1380805081}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -1178,14 +1221,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1203,21 +1246,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1380805076}
m_CullTransparentMesh: 1
---- !u!114 &1380805081
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1380805076}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2dd453d411c3b3e458a7b133764c6b64, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- minigameContainer: {fileID: 1832508913}
- minigameItemPrefab: {fileID: 4959898007614330357, guid: e5eaffcdbecf2ab48a94311753d10e09, type: 3}
- minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
--- !u!1 &1486682950
GameObject:
m_ObjectHideFlags: 0
@@ -1644,6 +1672,53 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1654299744}
m_CullTransparentMesh: 1
+--- !u!1 &1821407071
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1821407073}
+ - component: {fileID: 1821407072}
+ m_Layer: 0
+ m_Name: ListMinigamesController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1821407072
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1821407071}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2dd453d411c3b3e458a7b133764c6b64, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ minigameContainer: {fileID: 1832508913}
+ minigameItemPrefab: {fileID: 4959898007614330357, guid: e5eaffcdbecf2ab48a94311753d10e09, type: 3}
+ minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
+--- !u!4 &1821407073
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1821407071}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1832508912
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Common/Scenes/MainMenuScreen.unity b/Assets/Common/Scenes/MainMenuScreen.unity
index cad3aeb..acad91e 100644
--- a/Assets/Common/Scenes/MainMenuScreen.unity
+++ b/Assets/Common/Scenes/MainMenuScreen.unity
@@ -258,6 +258,51 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 37409563}
m_CullTransparentMesh: 1
+--- !u!1 &61972067
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 61972069}
+ - component: {fileID: 61972068}
+ m_Layer: 0
+ m_Name: MainMenuController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &61972068
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 61972067}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e7cdd358c46e3f94398d91b7118e6d39, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+--- !u!4 &61972069
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 61972067}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &108186280
GameObject:
m_ObjectHideFlags: 0
@@ -343,8 +388,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
+ - m_Target: {fileID: 61972068}
+ m_TargetAssemblyTypeName: MainMenuScreen, CommonScripts
m_MethodName: GotoMinigames
m_Mode: 1
m_Arguments:
@@ -996,7 +1041,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -1043,14 +1087,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1068,19 +1112,6 @@ 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: e7cdd358c46e3f94398d91b7118e6d39, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
--- !u!1 &955994877
GameObject:
m_ObjectHideFlags: 0
@@ -1166,8 +1197,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
+ - m_Target: {fileID: 61972068}
+ m_TargetAssemblyTypeName: MainMenuScreen, CommonScripts
m_MethodName: GotoSettings
m_Mode: 1
m_Arguments:
@@ -1452,8 +1483,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
+ - m_Target: {fileID: 61972068}
+ m_TargetAssemblyTypeName: MainMenuScreen, CommonScripts
m_MethodName: QuitApplication
m_Mode: 1
m_Arguments:
@@ -1587,8 +1618,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 906197780}
- m_TargetAssemblyTypeName: MainMenuScreen, Assembly-CSharp
+ - m_Target: {fileID: 61972068}
+ m_TargetAssemblyTypeName: MainMenuScreen, CommonScripts
m_MethodName: GotoCourses
m_Mode: 1
m_Arguments:
@@ -1807,7 +1838,7 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
diff --git a/Assets/Common/Scenes/MinigameActivityScreen.unity b/Assets/Common/Scenes/MinigameActivityScreen.unity
index c9fdc82..bc3e91e 100644
--- a/Assets/Common/Scenes/MinigameActivityScreen.unity
+++ b/Assets/Common/Scenes/MinigameActivityScreen.unity
@@ -672,7 +672,6 @@ GameObject:
- component: {fileID: 906197777}
- component: {fileID: 906197779}
- component: {fileID: 906197778}
- - component: {fileID: 906197780}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -721,14 +720,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -746,27 +745,6 @@ 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
@@ -1436,13 +1414,66 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
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, y: 0}
+--- !u!1 &1874965509
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1874965511}
+ - component: {fileID: 1874965510}
+ m_Layer: 0
+ m_Name: MinigameActivityController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1874965510
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1874965509}
+ 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!4 &1874965511
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1874965509}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -51.51357, y: 13.6327915, z: -0.6560367}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1966196596
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Common/Scenes/SettingsScreen.unity b/Assets/Common/Scenes/SettingsScreen.unity
index 95115ee..d451811 100644
--- a/Assets/Common/Scenes/SettingsScreen.unity
+++ b/Assets/Common/Scenes/SettingsScreen.unity
@@ -434,14 +434,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/Common/Scenes/ThemeSelectionScreen.unity b/Assets/Common/Scenes/ThemeSelectionScreen.unity
index 589e613..585f212 100644
--- a/Assets/Common/Scenes/ThemeSelectionScreen.unity
+++ b/Assets/Common/Scenes/ThemeSelectionScreen.unity
@@ -570,14 +570,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -595,6 +595,53 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 906197776}
m_CullTransparentMesh: 1
+--- !u!1 &1183799206
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1183799208}
+ - component: {fileID: 1183799207}
+ m_Layer: 0
+ m_Name: ThemeSelectionController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1183799207
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1183799206}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 30d9f9130bf1d414aaad006b2177bdea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ themePrefab: {fileID: 1441088452393136277, guid: 67febbbd89041e243b4e201a9f8d91e9, type: 3}
+ themesContainer: {fileID: 1939390636}
+ minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
+--- !u!4 &1183799208
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1183799206}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 960, y: 540, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1768150802
GameObject:
m_ObjectHideFlags: 0
@@ -607,7 +654,6 @@ GameObject:
- component: {fileID: 1768150805}
- component: {fileID: 1768150804}
- component: {fileID: 1768150803}
- - component: {fileID: 1768150807}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -690,28 +736,13 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
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, y: 0}
---- !u!114 &1768150807
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1768150802}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 30d9f9130bf1d414aaad006b2177bdea, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- themePrefab: {fileID: 1441088452393136277, guid: 67febbbd89041e243b4e201a9f8d91e9, type: 3}
- themesContainer: {fileID: 1939390636}
- minigameList: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
--- !u!1 &1939390635
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Common/Scripts/CourseActivityScreen.cs b/Assets/Common/Scripts/CourseActivityScreen.cs
index 40302fa..aec384a 100644
--- a/Assets/Common/Scripts/CourseActivityScreen.cs
+++ b/Assets/Common/Scripts/CourseActivityScreen.cs
@@ -79,6 +79,6 @@ public class CourseActivityScreen : MonoBehaviour
///
public void StartCourse()
{
- SystemController.GetInstance().LoadNextScene("Courses/Scenes/TemplateCourse");
+ SystemController.GetInstance().LoadNextScene("Courses/Scenes/CourseScreen");
}
}
diff --git a/Assets/Courses/PlayModeTests/BasicTests.cs b/Assets/Courses/PlayModeTests/BasicTests.cs
index 28331c9..6d4d054 100644
--- a/Assets/Courses/PlayModeTests/BasicTests.cs
+++ b/Assets/Courses/PlayModeTests/BasicTests.cs
@@ -12,7 +12,7 @@ public class BasicTests
[UnityTest]
public IEnumerator BasicTestsWithEnumeratorPasses()
{
- SceneManager.LoadScene("TemplateCourse");
+ SceneManager.LoadScene("CourseScreen");
// Use the Assert class to test conditions.
// Use yield to skip a frame.
yield return null;
diff --git a/Assets/Courses/Scenes/TemplateCourse.unity b/Assets/Courses/Scenes/CourseScreen.unity
similarity index 98%
rename from Assets/Courses/Scenes/TemplateCourse.unity
rename to Assets/Courses/Scenes/CourseScreen.unity
index b64e582..8f81fd0 100644
--- a/Assets/Courses/Scenes/TemplateCourse.unity
+++ b/Assets/Courses/Scenes/CourseScreen.unity
@@ -405,7 +405,6 @@ GameObject:
- component: {fileID: 301088548}
- component: {fileID: 301088550}
- component: {fileID: 301088549}
- - component: {fileID: 301088551}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
@@ -453,14 +452,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.4627451}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -478,34 +477,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 301088547}
m_CullTransparentMesh: 0
---- !u!114 &301088551
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 301088547}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 6b3f784c065813a4a8364b1299284816, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- previewModel: {fileID: 5022602860645237092, guid: e6d85df707405ad4f97c23b07227ee99, type: 3}
- feedbackProgressBar: {fileID: 4318122121437849759}
- previewMessage: {fileID: 2070775951}
- player: {fileID: 993952931}
- button: {fileID: 1159630774}
- pauseSprite: {fileID: 21300000, guid: 43db869a07cf51f45a411b6e4a417743, type: 3}
- wordImage: {fileID: 2145235737}
- title: {fileID: 388014849}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- courselist: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
- ResultPanel: {fileID: 1383144366}
- ResultsTitle: {fileID: 822960079}
- ResultsDecription: {fileID: 100123246}
- CoursesButton: {fileID: 839294691}
- timeSpent: {fileID: 77614869}
- feedback: {fileID: 1714882683}
--- !u!1 &361280475
GameObject:
m_ObjectHideFlags: 0
@@ -851,8 +822,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4294128680
+ m_fontColor: {r: 0.15730685, g: 0.20309335, b: 0.9528302, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1222,9 +1193,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 301088551}
+ - m_Target: {fileID: 1122267055}
m_TargetAssemblyTypeName: TemplateCourse, Assembly-CSharp
- m_MethodName: Back
+ m_MethodName:
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -1320,7 +1291,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &892938733
GameObject:
@@ -1521,13 +1492,73 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993952930}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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: 3
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1122267055
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1122267057}
+ - component: {fileID: 1122267056}
+ m_Layer: 0
+ m_Name: CourseController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1122267056
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1122267055}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6b3f784c065813a4a8364b1299284816, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ previewModel: {fileID: 5022602860645237092, guid: e6d85df707405ad4f97c23b07227ee99, type: 3}
+ feedbackProgressBar: {fileID: 4318122121437849759}
+ previewMessage: {fileID: 2070775951}
+ player: {fileID: 993952931}
+ button: {fileID: 1159630774}
+ pauseSprite: {fileID: 21300000, guid: 43db869a07cf51f45a411b6e4a417743, type: 3}
+ wordImage: {fileID: 2145235737}
+ title: {fileID: 388014849}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ courselist: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
+ ResultPanel: {fileID: 1383144366}
+ ResultsTitle: {fileID: 822960079}
+ ResultsDecription: {fileID: 100123246}
+ CoursesButton: {fileID: 839294691}
+ timeSpent: {fileID: 77614869}
+ feedback: {fileID: 1714882683}
+--- !u!4 &1122267057
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1122267055}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 960, y: 540, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1159630772
GameObject:
@@ -2241,7 +2272,7 @@ RectTransform:
- {fileID: 388014848}
- {fileID: 1383144367}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -2483,8 +2514,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 301088551}
- m_TargetAssemblyTypeName: TemplateCourse, Assembly-CSharp
+ - m_Target: {fileID: 1122267056}
+ m_TargetAssemblyTypeName: TemplateCourse, CourseScripts
m_MethodName: NextSign
m_Mode: 1
m_Arguments:
diff --git a/Assets/Courses/Scenes/TemplateCourse.unity.meta b/Assets/Courses/Scenes/CourseScreen.unity.meta
similarity index 100%
rename from Assets/Courses/Scenes/TemplateCourse.unity.meta
rename to Assets/Courses/Scenes/CourseScreen.unity.meta
diff --git a/Assets/Courses/Scripts/TemplateCourse.cs b/Assets/Courses/Scripts/CoursesController.cs
similarity index 99%
rename from Assets/Courses/Scripts/TemplateCourse.cs
rename to Assets/Courses/Scripts/CoursesController.cs
index 19b417a..19446c7 100644
--- a/Assets/Courses/Scripts/TemplateCourse.cs
+++ b/Assets/Courses/Scripts/CoursesController.cs
@@ -8,7 +8,7 @@ using UnityEngine.Video;
///
/// TemplateCourse scene manager
///
-public class TemplateCourse : MonoBehaviour
+public class CoursesController : MonoBehaviour
{
// vvv TEMPORARY STUFF vvv
public NNModel previewModel;
diff --git a/Assets/Courses/Scripts/TemplateCourse.cs.meta b/Assets/Courses/Scripts/CoursesController.cs.meta
similarity index 100%
rename from Assets/Courses/Scripts/TemplateCourse.cs.meta
rename to Assets/Courses/Scripts/CoursesController.cs.meta
diff --git a/Assets/Hangman/Scenes/Hangman.unity b/Assets/Hangman/Scenes/HangmanGame.unity
similarity index 98%
rename from Assets/Hangman/Scenes/Hangman.unity
rename to Assets/Hangman/Scenes/HangmanGame.unity
index 073a6fb..ccd072b 100644
--- a/Assets/Hangman/Scenes/Hangman.unity
+++ b/Assets/Hangman/Scenes/HangmanGame.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+ m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -335,8 +335,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4288255380
+ m_fontColor: {r: 0.5803922, g: 0.58431375, b: 0.6, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -460,14 +460,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -553,7 +553,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColor: {r: 0.5803922, g: 0.58431375, b: 0.6, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1112,8 +1112,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1286703100}
- m_TargetAssemblyTypeName: HangmanGameController, Assembly-CSharp
+ - m_Target: {fileID: 1664482727}
+ m_TargetAssemblyTypeName: HangmanController, Assembly-CSharp
m_MethodName: GoToInput
m_Mode: 1
m_Arguments:
@@ -1149,7 +1149,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.62352943, g: 0.90588236, b: 0.9607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1460,8 +1460,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4279009266
+ m_fontColor: {r: 0.9490196, g: 0.49803922, b: 0.047058824, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1738,7 +1738,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColor: {r: 0.5803922, g: 0.58431375, b: 0.6, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2008,7 +2008,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -2570,7 +2570,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &896343212
GameObject:
@@ -3085,7 +3085,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColor: {r: 0.9490196, g: 0.49803922, b: 0.047058824, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -3342,8 +3342,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4288255380
+ m_fontColor: {r: 0.5803922, g: 0.58431375, b: 0.6, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -3422,7 +3422,6 @@ GameObject:
- component: {fileID: 1286703098}
- component: {fileID: 1286703097}
- component: {fileID: 1286703096}
- - component: {fileID: 1286703100}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -3507,51 +3506,13 @@ RectTransform:
- {fileID: 1892638588}
- {fileID: 56162990}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 4
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, y: 0}
---- !u!114 &1286703100
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1286703095}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2db44635e0eb1e9429a2e6195785364d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- themelist: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
- letterPrefab: {fileID: 4639383499500021565, guid: c3e66e8957864914cb022af914df6a28, type: 3}
- letterContainer: {fileID: 1870283439}
- hangmanImage: {fileID: 2039368312}
- images: {fileID: 11400000, guid: b472de3ef0c50c0449bad9ff8511056c, type: 2}
- gamePanel: {fileID: 1559552485}
- playerPanel: {fileID: 1892638587}
- inputPanel: {fileID: 56162989}
- inputTextField: {fileID: 1268894660}
- endText: {fileID: 828446579}
- gameEndedPanel: {fileID: 1943022819}
- replayButton: {fileID: 1233450537}
- lettersText: {fileID: 503048506}
- lettersRightText: {fileID: 1858710649}
- lettersWrongText: {fileID: 1503832331}
- accuracyText: {fileID: 2001212058}
- wordsText: {fileID: 1704021883}
- scoreText: {fileID: 90551462}
- minigame: {fileID: 11400000, guid: 165c1d9867275924d9720d409e935f95, type: 2}
- minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- Scoreboard: {fileID: 1007532375}
- EntriesGrid: {fileID: 1391137944}
- scoreboardEntry: {fileID: 9154151134820372555, guid: d4a3a228b08d61847acc6da35b44e52c, type: 3}
- feedback: {fileID: 5233312447513285388}
- gottogamebutton: {fileID: 1581633295}
--- !u!1001 &1290865991
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3748,7 +3709,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4281479730
- m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -4618,100 +4579,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1503832329}
m_CullTransparentMesh: 1
---- !u!1 &1541179826
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1541179828}
- - component: {fileID: 1541179827}
- m_Layer: 0
- m_Name: Directional Light
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!108 &1541179827
-Light:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1541179826}
- m_Enabled: 1
- serializedVersion: 10
- m_Type: 1
- m_Shape: 0
- m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 1
- m_Range: 10
- m_SpotAngle: 30
- m_InnerSpotAngle: 21.80208
- m_CookieSize: 10
- m_Shadows:
- m_Type: 2
- m_Resolution: -1
- m_CustomResolution: -1
- m_Strength: 1
- m_Bias: 0.05
- m_NormalBias: 0.4
- m_NearPlane: 0.2
- m_CullingMatrixOverride:
- e00: 1
- e01: 0
- e02: 0
- e03: 0
- e10: 0
- e11: 1
- e12: 0
- e13: 0
- e20: 0
- e21: 0
- e22: 1
- e23: 0
- e30: 0
- e31: 0
- e32: 0
- e33: 1
- m_UseCullingMatrixOverride: 0
- m_Cookie: {fileID: 0}
- m_DrawHalo: 0
- m_Flare: {fileID: 0}
- m_RenderMode: 0
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingLayerMask: 1
- m_Lightmapping: 4
- m_LightShadowCasterMode: 0
- m_AreaSize: {x: 1, y: 1}
- m_BounceIntensity: 1
- m_ColorTemperature: 6570
- m_UseColorTemperature: 0
- m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
- m_UseBoundingSphereOverride: 0
- m_UseViewFrustumForShadowCasterCull: 1
- m_ShadowRadius: 0
- m_ShadowAngle: 0
---- !u!4 &1541179828
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1541179826}
- m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
- m_LocalPosition: {x: 0, y: 3, 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: 50, y: -30, z: 0}
--- !u!1 &1554139452
GameObject:
m_ObjectHideFlags: 0
@@ -4841,14 +4708,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -4950,8 +4817,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1286703100}
- m_TargetAssemblyTypeName: HangmanGameController, Assembly-CSharp
+ - m_Target: {fileID: 1664482727}
+ m_TargetAssemblyTypeName: HangmanController, Assembly-CSharp
m_MethodName: TwoPlayer
m_Mode: 1
m_Arguments:
@@ -5218,6 +5085,76 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1649505743}
m_CullTransparentMesh: 1
+--- !u!1 &1664482725
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1664482726}
+ - component: {fileID: 1664482727}
+ m_Layer: 0
+ m_Name: HangmanController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1664482726
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1664482725}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1664482727
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1664482725}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2db44635e0eb1e9429a2e6195785364d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ themelist: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
+ letterPrefab: {fileID: 4639383499500021565, guid: c3e66e8957864914cb022af914df6a28, type: 3}
+ letterContainer: {fileID: 1870283439}
+ hangmanImage: {fileID: 2039368312}
+ images: {fileID: 11400000, guid: b472de3ef0c50c0449bad9ff8511056c, type: 2}
+ gamePanel: {fileID: 1559552485}
+ playerPanel: {fileID: 1892638587}
+ inputPanel: {fileID: 56162989}
+ inputTextField: {fileID: 1268894660}
+ endText: {fileID: 828446579}
+ gameEndedPanel: {fileID: 1943022819}
+ replayButton: {fileID: 1233450537}
+ lettersText: {fileID: 503048506}
+ lettersRightText: {fileID: 1858710649}
+ lettersWrongText: {fileID: 1503832331}
+ accuracyText: {fileID: 2001212058}
+ wordsText: {fileID: 1704021883}
+ scoreText: {fileID: 90551462}
+ minigame: {fileID: 11400000, guid: 165c1d9867275924d9720d409e935f95, type: 2}
+ minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ Scoreboard: {fileID: 1007532375}
+ EntriesGrid: {fileID: 1391137944}
+ scoreboardEntry: {fileID: 9154151134820372555, guid: d4a3a228b08d61847acc6da35b44e52c, type: 3}
+ feedback: {fileID: 5233312447513285388}
+ gottogamebutton: {fileID: 1581633295}
--- !u!1 &1678036720
GameObject:
m_ObjectHideFlags: 0
@@ -5380,8 +5317,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4290616898
+ m_fontColor: {r: 0.25882354, g: 0.61960787, b: 0.7411765, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -5668,8 +5605,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1286703100}
- m_TargetAssemblyTypeName: HangmanGameController, Assembly-CSharp
+ - m_Target: {fileID: 1664482727}
+ m_TargetAssemblyTypeName: HangmanController, Assembly-CSharp
m_MethodName: SinglePlayer
m_Mode: 1
m_Arguments:
@@ -5693,7 +5630,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.62352943, g: 0.90588236, b: 0.9607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -6033,14 +5970,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6264,7 +6201,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2001212056
GameObject:
@@ -6598,7 +6535,7 @@ RectTransform:
- {fileID: 5233312448025626847}
- {fileID: 5233312447201393292}
m_Father: {fileID: 0}
- m_RootOrder: 3
+ 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}
@@ -6736,7 +6673,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4282188031
- m_fontColor: {r: 1, g: 0, b: 0.23945475, a: 1}
+ m_fontColor: {r: 0.5803922, g: 0.58431375, b: 0.6, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
diff --git a/Assets/Hangman/Scenes/Hangman.unity.meta b/Assets/Hangman/Scenes/HangmanGame.unity.meta
similarity index 100%
rename from Assets/Hangman/Scenes/Hangman.unity.meta
rename to Assets/Hangman/Scenes/HangmanGame.unity.meta
diff --git a/Assets/Hangman/ScriptableObjects/Hangman.asset b/Assets/Hangman/ScriptableObjects/Hangman.asset
index 178e614..6c3581f 100644
--- a/Assets/Hangman/ScriptableObjects/Hangman.asset
+++ b/Assets/Hangman/ScriptableObjects/Hangman.asset
@@ -18,7 +18,7 @@ MonoBehaviour:
letters te raden. Kan jij het woord vinden voordat je mannetje hangt?"
themeList: {fileID: 0}
thumbnail: {fileID: 21300000, guid: 8aef73fa49ca4a346aaffdec4cc00970, type: 3}
- minigameEntryPoint: Hangman/Scenes/Hangman
+ minigameEntryPoint: Hangman/Scenes/HangmanGame
controls: Spel de letters die je wilt raden met vingerspelling. Na 10 foute keuzes
is het spel gedaan. Hoe meer letters je correct spelt, hoe meer punten je krijgt,
verder krijg je ook extra punten als je weinig fouten maakt. Voor multiplayer
diff --git a/Assets/Hangman/Scripts/HangmanGameController.cs b/Assets/Hangman/Scripts/HangmanController.cs
similarity index 99%
rename from Assets/Hangman/Scripts/HangmanGameController.cs
rename to Assets/Hangman/Scripts/HangmanController.cs
index 9771fc6..f4280b2 100644
--- a/Assets/Hangman/Scripts/HangmanGameController.cs
+++ b/Assets/Hangman/Scripts/HangmanController.cs
@@ -5,7 +5,7 @@ using TMPro;
using UnityEngine;
using UnityEngine.UI;
-public class HangmanGameController : MonoBehaviour
+public class HangmanController : MonoBehaviour
{
///
/// The scriptable with all the themes, will be used to select a random word for hangman.
diff --git a/Assets/Hangman/Scripts/HangmanGameController.cs.meta b/Assets/Hangman/Scripts/HangmanController.cs.meta
similarity index 100%
rename from Assets/Hangman/Scripts/HangmanGameController.cs.meta
rename to Assets/Hangman/Scripts/HangmanController.cs.meta
diff --git a/Assets/JustSign/Scenes/Game.unity b/Assets/JustSign/Scenes/JustSignGame.unity
similarity index 99%
rename from Assets/JustSign/Scenes/Game.unity
rename to Assets/JustSign/Scenes/JustSignGame.unity
index ca91f71..590bfc5 100644
--- a/Assets/JustSign/Scenes/Game.unity
+++ b/Assets/JustSign/Scenes/JustSignGame.unity
@@ -2635,6 +2635,71 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Padding: {x: 0, y: 0, z: 0, w: 0}
m_Softness: {x: 5, y: 5}
+--- !u!1 &864622804
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 864622806}
+ - component: {fileID: 864622805}
+ m_Layer: 0
+ m_Name: JustSignController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &864622805
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 864622804}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9ede962218eda88668cd8032b921aada, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ canvas: {fileID: 1768150805}
+ answerField: {fileID: 114026902}
+ feedBack: {fileID: 128049076}
+ scoreDisplay: {fileID: 1627575593}
+ minigame: {fileID: 11400000, guid: e726e0b93ea88465db7ee27605deb83f, type: 2}
+ minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
+ songList: {fileID: 11400000, guid: 4f0ce70309bb901feb28199a82a7d195, type: 2}
+ hitZone: {fileID: 2012531007}
+ symbolPrefab: {fileID: 4639383499500021565, guid: f3117b0203a1342a48a95904347b03c8, type: 3}
+ symbolContainer: {fileID: 1768150806}
+ scoreboardEntriesContainer: {fileID: 2498222377153197597}
+ scoreboardEntry: {fileID: 9154151134820372555, guid: d4a3a228b08d61847acc6da35b44e52c, type: 3}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ lpmText: {fileID: 2498222377094258231}
+ perfectSignsText: {fileID: 2498222378642934129}
+ goodSignsText: {fileID: 524776817}
+ mehSignsText: {fileID: 6218584}
+ terribleSignsText: {fileID: 1343527143}
+ notFoundSignsText: {fileID: 850357042}
+ scoreText: {fileID: 2498222378754007924}
+ gameEndedPanel: {fileID: 2498222378566216023}
+--- !u!4 &864622806
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 864622804}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 960, y: 540, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &885086520
GameObject:
m_ObjectHideFlags: 0
@@ -2909,7 +2974,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.39215687}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -5457,7 +5522,7 @@ MonoBehaviour:
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -6116,7 +6181,6 @@ GameObject:
- component: {fileID: 1768150805}
- component: {fileID: 1768150804}
- component: {fileID: 1768150803}
- - component: {fileID: 1768150807}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -6199,46 +6263,13 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
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, y: 0}
---- !u!114 &1768150807
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1768150802}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9ede962218eda88668cd8032b921aada, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- canvas: {fileID: 1768150805}
- answerField: {fileID: 114026902}
- feedBack: {fileID: 128049076}
- scoreDisplay: {fileID: 1627575593}
- minigame: {fileID: 11400000, guid: e726e0b93ea88465db7ee27605deb83f, type: 2}
- minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
- songList: {fileID: 11400000, guid: 4f0ce70309bb901feb28199a82a7d195, type: 2}
- hitZone: {fileID: 2012531007}
- symbolPrefab: {fileID: 4639383499500021565, guid: f3117b0203a1342a48a95904347b03c8, type: 3}
- symbolContainer: {fileID: 1768150806}
- scoreboardEntriesContainer: {fileID: 2498222377153197597}
- scoreboardEntry: {fileID: 9154151134820372555, guid: d4a3a228b08d61847acc6da35b44e52c, type: 3}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- lpmText: {fileID: 2498222377094258231}
- perfectSignsText: {fileID: 2498222378642934129}
- goodSignsText: {fileID: 524776817}
- mehSignsText: {fileID: 6218584}
- terribleSignsText: {fileID: 1343527143}
- notFoundSignsText: {fileID: 850357042}
- scoreText: {fileID: 2498222378754007924}
- gameEndedPanel: {fileID: 2498222378566216023}
--- !u!1 &1898716846
GameObject:
m_ObjectHideFlags: 0
@@ -7857,7 +7888,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1768150807}
+ - m_Target: {fileID: 864622805}
m_TargetAssemblyTypeName: JustSignController, Assembly-CSharp
m_MethodName: Start
m_Mode: 1
diff --git a/Assets/JustSign/Scenes/Game.unity.meta b/Assets/JustSign/Scenes/JustSignGame.unity.meta
similarity index 100%
rename from Assets/JustSign/Scenes/Game.unity.meta
rename to Assets/JustSign/Scenes/JustSignGame.unity.meta
diff --git a/Assets/JustSign/ScriptableObjects/JustSign.asset b/Assets/JustSign/ScriptableObjects/JustSign.asset
index 7e48dc5..1530906 100644
--- a/Assets/JustSign/ScriptableObjects/JustSign.asset
+++ b/Assets/JustSign/ScriptableObjects/JustSign.asset
@@ -17,5 +17,5 @@ MonoBehaviour:
description: A rhythm game
themeList: {fileID: 11400000, guid: a96bdbd3b1486d947a196fa1eb41d90b, type: 2}
thumbnail: {fileID: 21300000, guid: 6d405f607ae817744b49f921f0611088, type: 3}
- minigameEntryPoint: JustSign/Scenes/Game
+ minigameEntryPoint: JustSign/Scenes/JustSignGame
controls: In this game, you will perform signs to the beat of the music.
diff --git a/Assets/SpellingBee/PlayModeTests/GameEndedPanelTests.cs b/Assets/SpellingBee/PlayModeTests/GameEndedPanelTests.cs
index 0f9a041..5ab2d69 100644
--- a/Assets/SpellingBee/PlayModeTests/GameEndedPanelTests.cs
+++ b/Assets/SpellingBee/PlayModeTests/GameEndedPanelTests.cs
@@ -23,22 +23,22 @@ public class GameEndedPanelTests
writer.Write(oneUser);
}
- SystemController.GetInstance().LoadNextScene("SpellingBee/Scenes/Game");
+ SystemController.GetInstance().LoadNextScene("SpellingBee/Scenes/SpellingBeeGame");
yield return new WaitForSeconds(0.2f);
}
[UnityTest]
public IEnumerator ScoreTest()
{
- GameController gameController = (GameController)GameObject.FindObjectOfType(typeof(GameController));
- gameController.NextWord();
- gameController.NextLetter(false);
- gameController.NextLetter(true);
- gameController.NextLetter(false);
+ SpellingBeeController spellingBeeController = (SpellingBeeController)GameObject.FindObjectOfType(typeof(SpellingBeeController));
+ spellingBeeController.NextWord();
+ spellingBeeController.NextLetter(false);
+ spellingBeeController.NextLetter(true);
+ spellingBeeController.NextLetter(false);
yield return new WaitForSeconds(1f);
- gameController.ActivateWin();
+ spellingBeeController.ActivateWin();
GameEndedPanel gameEndedPanel = (GameEndedPanel)GameObject.FindObjectOfType(typeof(GameEndedPanel));
Assert.NotNull(gameEndedPanel);
diff --git a/Assets/SpellingBee/PlayModeTests/GameControllerTests.cs b/Assets/SpellingBee/PlayModeTests/SpellingBeeControllerTests.cs
similarity index 64%
rename from Assets/SpellingBee/PlayModeTests/GameControllerTests.cs
rename to Assets/SpellingBee/PlayModeTests/SpellingBeeControllerTests.cs
index b115206..5049f44 100644
--- a/Assets/SpellingBee/PlayModeTests/GameControllerTests.cs
+++ b/Assets/SpellingBee/PlayModeTests/SpellingBeeControllerTests.cs
@@ -9,7 +9,7 @@ using UnityEngine.TestTools;
using UnityEngine.SceneManagement;
-public class GameControllerTests
+public class SpellingBeeControllerTests
{
[UnitySetUp]
@@ -23,27 +23,27 @@ public class GameControllerTests
writer.Write(oneUser);
}
- SystemController.GetInstance().LoadNextScene("SpellingBee/Scenes/Game");
+ SystemController.GetInstance().LoadNextScene("SpellingBee/Scenes/SpellingBeeGame");
yield return new WaitForSeconds(0.2f);
}
[UnityTest]
public IEnumerator CheckScoreTest()
{
- GameController gameController = (GameController)GameObject.FindObjectOfType(typeof(GameController));
+ SpellingBeeController spellingBeeController = (SpellingBeeController)GameObject.FindObjectOfType(typeof(SpellingBeeController));
yield return new WaitForSeconds(0.2f);
- Assert.AreEqual(0, gameController.CalculateScore());
- gameController.NextWord();
- Assert.AreEqual(5, gameController.CalculateScore());
- gameController.NextLetter(true);
- Assert.AreEqual(6, gameController.CalculateScore());
+ Assert.AreEqual(0, spellingBeeController.CalculateScore());
+ spellingBeeController.NextWord();
+ Assert.AreEqual(5, spellingBeeController.CalculateScore());
+ spellingBeeController.NextLetter(true);
+ Assert.AreEqual(6, spellingBeeController.CalculateScore());
}
[UnityTest]
public IEnumerator ActivateGameOverTest()
{
- GameController gameController = (GameController)GameObject.FindObjectOfType(typeof(GameController));
- gameController.ActivateGameOver();
+ SpellingBeeController spellingBeeController = (SpellingBeeController)GameObject.FindObjectOfType(typeof(SpellingBeeController));
+ spellingBeeController.ActivateGameOver();
yield return new WaitForSeconds(0.2f);
GameEndedPanel gameEndedPanel = (GameEndedPanel)GameObject.FindObjectOfType(typeof(GameEndedPanel));
@@ -55,8 +55,8 @@ public class GameControllerTests
[UnityTest]
public IEnumerator ActivateWinTests()
{
- GameController gameController = (GameController)GameObject.FindObjectOfType(typeof(GameController));
- gameController.ActivateWin();
+ SpellingBeeController spellingBeeController = (SpellingBeeController)GameObject.FindObjectOfType(typeof(SpellingBeeController));
+ spellingBeeController.ActivateWin();
yield return new WaitForSeconds(0.2f);
GameEndedPanel gameEndedPanel = (GameEndedPanel)GameObject.FindObjectOfType(typeof(GameEndedPanel));
@@ -67,8 +67,8 @@ public class GameControllerTests
[UnityTest]
public IEnumerator CheckGameOverTest()
{
- GameController gameController = (GameController)GameObject.FindObjectOfType(typeof(GameController));
- gameController.AddSeconds(-60);
+ SpellingBeeController spellingBeeController = (SpellingBeeController)GameObject.FindObjectOfType(typeof(SpellingBeeController));
+ spellingBeeController.AddSeconds(-60);
yield return new WaitForSeconds(0.1f);
GameEndedPanel gameEndedPanel = (GameEndedPanel)GameObject.FindObjectOfType(typeof(GameEndedPanel));
diff --git a/Assets/SpellingBee/PlayModeTests/GameControllerTests.cs.meta b/Assets/SpellingBee/PlayModeTests/SpellingBeeControllerTests.cs.meta
similarity index 100%
rename from Assets/SpellingBee/PlayModeTests/GameControllerTests.cs.meta
rename to Assets/SpellingBee/PlayModeTests/SpellingBeeControllerTests.cs.meta
diff --git a/Assets/SpellingBee/Scenes/Game.unity b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity
similarity index 99%
rename from Assets/SpellingBee/Scenes/Game.unity
rename to Assets/SpellingBee/Scenes/SpellingBeeGame.unity
index 274be82..64d9253 100644
--- a/Assets/SpellingBee/Scenes/Game.unity
+++ b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity
@@ -1604,14 +1604,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+ m_Color: {r: 0.9607843, g: 0.9607843, b: 0.9607843, 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_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@@ -3142,8 +3142,8 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1768150807}
- m_TargetAssemblyTypeName: GameController, SpellingBeeScripts
+ - m_Target: {fileID: 1496768391}
+ m_TargetAssemblyTypeName: SpellingBeeController, SpellingBeeScripts
m_MethodName: Start
m_Mode: 1
m_Arguments:
@@ -3540,6 +3540,62 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1422864840}
m_CullTransparentMesh: 1
+--- !u!1 &1496768389
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1496768390}
+ - component: {fileID: 1496768391}
+ m_Layer: 0
+ m_Name: SpellingBeeController
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1496768390
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1496768389}
+ 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: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1496768391
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1496768389}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 44fbed5ae228de39b9f727def7578d06, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ themeList: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
+ userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
+ minigame: {fileID: 11400000, guid: 8a087d241d652634eb4f6352267ea7dc, type: 2}
+ minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
+ letterPrefab: {fileID: 4639383499500021565, guid: c3e66e8957864914cb022af914df6a28, type: 3}
+ letterContainer: {fileID: 1346005056}
+ wordImage: {fileID: 1338727891}
+ timerText: {fileID: 1843239267}
+ bonusTimeText: {fileID: 1812475780}
+ Scoreboard: {fileID: 862382568}
+ feedback: {fileID: 967164045}
+ gameEndedPanel: {fileID: 757133117}
--- !u!1 &1499197558
GameObject:
m_ObjectHideFlags: 0
@@ -4451,7 +4507,6 @@ GameObject:
- component: {fileID: 1768150805}
- component: {fileID: 1768150804}
- component: {fileID: 1768150803}
- - component: {fileID: 1768150807}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -4534,37 +4589,13 @@ RectTransform:
m_Children:
- {fileID: 906197777}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 4
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, y: 0}
---- !u!114 &1768150807
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1768150802}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 44fbed5ae228de39b9f727def7578d06, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- themeList: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
- userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
- minigame: {fileID: 11400000, guid: 8a087d241d652634eb4f6352267ea7dc, type: 2}
- minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
- letterPrefab: {fileID: 4639383499500021565, guid: c3e66e8957864914cb022af914df6a28, type: 3}
- letterContainer: {fileID: 1346005056}
- wordImage: {fileID: 1338727891}
- timerText: {fileID: 1843239267}
- bonusTimeText: {fileID: 1812475780}
- Scoreboard: {fileID: 862382568}
- feedback: {fileID: 967164045}
- gameEndedPanel: {fileID: 757133117}
--- !u!1 &1812475780
GameObject:
m_ObjectHideFlags: 0
@@ -4632,8 +4663,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4280090368
- m_fontColor: {r: 0, g: 1, b: 0.11084986, a: 1}
+ rgba: 4284404875
+ m_fontColor: {r: 0.54509807, g: 0.83137256, b: 0.36862746, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -4747,8 +4778,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4284235525
+ m_fontColor: {r: 0.019607844, g: 0.24705882, b: 0.36078432, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
diff --git a/Assets/SpellingBee/Scenes/Game.unity.meta b/Assets/SpellingBee/Scenes/SpellingBeeGame.unity.meta
similarity index 100%
rename from Assets/SpellingBee/Scenes/Game.unity.meta
rename to Assets/SpellingBee/Scenes/SpellingBeeGame.unity.meta
diff --git a/Assets/SpellingBee/ScriptableObjects/SpellingBee.asset b/Assets/SpellingBee/ScriptableObjects/SpellingBee.asset
index f35d4e6..09382d5 100644
--- a/Assets/SpellingBee/ScriptableObjects/SpellingBee.asset
+++ b/Assets/SpellingBee/ScriptableObjects/SpellingBee.asset
@@ -18,7 +18,7 @@ MonoBehaviour:
je zo snel mogelijk moet spellen met behulp van het vingeralfabet
themeList: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
thumbnail: {fileID: 21300000, guid: f2a020e24bfa24842bccecf6b36d5b79, type: 3}
- minigameEntryPoint: SpellingBee/Scenes/Game
+ minigameEntryPoint: SpellingBee/Scenes/SpellingBeeGame
controls: Je begint dit spel met 5 seconden tijd, voor elk juist antwoord krijg
je extra tijd. Hoe sneller je het spel uitspeelt, hoe meer punten je scoort.
Verloopt de timer, dan heb je het spelletje verloren
diff --git a/Assets/SpellingBee/Scripts/GameController.cs b/Assets/SpellingBee/Scripts/SpellingBeeController.cs
similarity index 99%
rename from Assets/SpellingBee/Scripts/GameController.cs
rename to Assets/SpellingBee/Scripts/SpellingBeeController.cs
index d0605fc..0da99a5 100644
--- a/Assets/SpellingBee/Scripts/GameController.cs
+++ b/Assets/SpellingBee/Scripts/SpellingBeeController.cs
@@ -6,7 +6,7 @@ using TMPro;
using UnityEngine;
using UnityEngine.UI;
-public partial class GameController : MonoBehaviour
+public partial class SpellingBeeController : MonoBehaviour
{
///
/// All of the words that can be used in this session
diff --git a/Assets/SpellingBee/Scripts/GameController.cs.meta b/Assets/SpellingBee/Scripts/SpellingBeeController.cs.meta
similarity index 100%
rename from Assets/SpellingBee/Scripts/GameController.cs.meta
rename to Assets/SpellingBee/Scripts/SpellingBeeController.cs.meta
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index bf86ff2..ebaed27 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -39,21 +39,21 @@ EditorBuildSettings:
path: Assets/Common/Scenes/MinigameActivityScreen.unity
guid: 8e27404f21454dc4583f76b4c7df0c30
- enabled: 1
- path: Assets/JustSign/Scenes/Game.unity
+ path: Assets/JustSign/Scenes/JustSignGame.unity
guid: 1283017ac1c1f6226854442564bd7e3d
- enabled: 1
path: Assets/Common/Scenes/ThemeSelectionScreen.unity
guid: 2dfa1265c9d65014c90941ac4240a977
- enabled: 1
- path: Assets/Courses/Scenes/TemplateCourse.unity
+ path: Assets/Courses/Scenes/CourseScreen.unity
guid: 2cda990e2423bbf4892e6590ba056729
- enabled: 1
- path: Assets/SpellingBee/Scenes/Game.unity
+ path: Assets/SpellingBee/Scenes/SpellingBeeGame.unity
guid: 652195ae9a0ff3ad18f6338db6a909bd
- enabled: 1
- path: Assets/Hangman/Scenes/Hangman.unity
+ path: Assets/Hangman/Scenes/HangmanGame.unity
guid: 5ddd59ce344ac51459725a4878330faf
- enabled: 1
- path: Assets/JustSign/Scenes/Game.unity
+ path: Assets/JustSign/Scenes/JustSignGame.unity
guid: 1283017ac1c1f6226854442564bd7e3d
m_configObjects: {}