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

Resolve WES-145 "Consistency controllers"

Browse Source
This commit is contained in:
Helena Van Breugel
2023-03-30 21:28:48 +00:00
committed by Jelle De Geest
parent 564ec209c7
commit e96f1ff7ca
36 changed files with 989 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Assets/Accounts/Scenes/ChangeUserScreen.unity
View File

@@ -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}

117
Assets/Accounts/Scenes/UserCreationScreen.unity
View File

@@ -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

87
Assets/Accounts/Scenes/UserProgressScreen.unity
View File

@@ -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}