diff --git a/Assets/Art/Sprites/evalulu-logo.png b/Assets/Art/Sprites/evalulu-logo.png
index 586ea44d5db0d3bda7f78a8005d11d9c234a35a8..b65f5ff8c665536059c591929b5cb17eb4b68835 100644
Binary files a/Assets/Art/Sprites/evalulu-logo.png and b/Assets/Art/Sprites/evalulu-logo.png differ
diff --git a/Assets/Art/Sprites/evalulu-splash.png b/Assets/Art/Sprites/evalulu-splash.png
index 91d599d2f948f9e6832a42e966f14a7382f1ab48..363caa8f6547dac222a3b47342d2dfc86d9ec5b3 100644
Binary files a/Assets/Art/Sprites/evalulu-splash.png and b/Assets/Art/Sprites/evalulu-splash.png differ
diff --git a/Assets/Resources/Session 2.json b/Assets/Resources/Session 2.json
index b38b8a7991fa278636f7f4561e9126ff78555363..dec97b123032d8831de6779ffaf5952968af458a 100644
--- a/Assets/Resources/Session 2.json
+++ b/Assets/Resources/Session 2.json
@@ -9258,7 +9258,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
diff --git a/Assets/Resources/Session 3.json b/Assets/Resources/Session 3.json
index c5d82961545134694f4ab335b3299e75a4dad97b..0becf52d7691d503de2e92ea787af804c556ba38 100644
--- a/Assets/Resources/Session 3.json
+++ b/Assets/Resources/Session 3.json
@@ -30,7 +30,7 @@
"snd_path": "Rime/h_en/En_M_ 21C"
},
"C.1.Cns_Prv": {
- "snd_path": "CateInit/1. Consigne epreuve"
+ "snd_path": "CateFin/1. Consigne epreuve"
},
"C.1.Cns_Prv_Init": {
"snd_path": "CateInit/1. Consigne epreuve"
@@ -8152,7 +8152,7 @@
"titre": "Tutoriel Categorisation Finale",
"desc": null,
"fond": "M.K.PrplKtchn",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.1.Cns_Prv",
"randomiser": false,
"items": [
{
@@ -8164,7 +8164,6 @@
"miseEnAction": "C.4.MsNC°",
"explication": "C.3.Xplc°",
"surlignerExplication": 0.0,
- "transition": "C.5.Trns°",
"randomiser": false,
"enumerer": true,
"surligner": true,
@@ -8208,11 +8207,10 @@
"type": "training",
"consigne": "C.Cns_Gnrl",
"fond": "M.M.Mnstr-9.4",
- "transition": "C.5.Trns°",
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8250,7 +8248,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8330,7 +8328,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8364,7 +8362,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8398,7 +8396,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8432,13 +8430,13 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
"id": "Rand_M",
"image": "M.F.Fd-1.2",
- "son": "C.E.N_m_262",
+ "son": "C.E.N_m_261",
"description": null,
"correct": true
},
@@ -8466,7 +8464,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8500,7 +8498,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8544,7 +8542,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8578,7 +8576,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8612,7 +8610,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8623,16 +8621,16 @@
"correct": true
},
{
- "id": "Itoq_M",
+ "id": "Itog_M",
"image": "M.F.Fd-2.4",
"son": "C.F.Fr_m_292",
"description": null,
"correct": false
},
{
- "id": "Ecaq_M",
+ "id": "Ecag_M",
"image": "M.F.Fd-3.0",
- "son": "C.F.Fr_m_29F3",
+ "son": "C.F.Fr_m_293",
"description": null,
"correct": false
}
@@ -8646,7 +8644,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8680,7 +8678,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8724,7 +8722,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8758,27 +8756,27 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
"id": "Jivote_M",
"image": "M.F.Fd-1.0",
- "son": "C.F.Fr_m_303",
+ "son": "C.F.Fr_m_312",
"description": null,
"correct": true
},
{
"id": "Ponlade_M",
"image": "M.F.Fd-5.2",
- "son": "C.F.Fr_m_304",
+ "son": "C.F.Fr_m_313",
"description": null,
"correct": false
},
{
"id": "Sanide_M",
"image": "M.F.Fd-6.4",
- "son": "C.F.Fr_m_305",
+ "son": "C.F.Fr_m_314",
"description": null,
"correct": false
}
@@ -8792,7 +8790,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8826,7 +8824,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -8916,7 +8914,7 @@
"id": "e.seg.train.fr",
"type": "training",
"consigne": "seg_ouma_Frf",
- "fond": "M.K.YllwKtchn",
+ "fond": "M.M.Mnstr-6.3",
"randomiser": true,
"cible": "S.F.Fr_f_326",
"bloqueErreurs": false,
@@ -8961,7 +8959,7 @@
"id": "e.seg.train.en",
"type": "training",
"consigne": "seg_eelo_Enm",
- "fond": "M.K.YllwKtchn",
+ "fond": "M.M.Mnstr-6.3",
"transition": "S.7.Trns°",
"randomiser": true,
"cible": "S.E.N_m_304",
diff --git a/Assets/Resources/_old jsons/2.2. cat ini.json b/Assets/Resources/_old jsons/2.2. cat ini.json
index d680c20d5e69167289f93809f9eee2b3a334c09f..6f99a2be1dea8ef485bfbc52195f6eb1f957bda9 100644
--- a/Assets/Resources/_old jsons/2.2. cat ini.json
+++ b/Assets/Resources/_old jsons/2.2. cat ini.json
@@ -7499,7 +7499,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -7553,7 +7553,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -7592,7 +7592,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
diff --git a/Assets/Resources/_old jsons/3.1. cat_final.json b/Assets/Resources/_old jsons/3.1. cat_final.json
index 98b327245c11ff171284c8694d2e856fdec6dd95..186982ff21e7319c0a1fe94f0972e857a224cb51 100644
--- a/Assets/Resources/_old jsons/3.1. cat_final.json
+++ b/Assets/Resources/_old jsons/3.1. cat_final.json
@@ -5902,7 +5902,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -5948,7 +5948,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -5986,7 +5986,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6067,7 +6067,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6101,7 +6101,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6135,7 +6135,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6169,7 +6169,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6203,7 +6203,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6237,7 +6237,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6271,7 +6271,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6305,7 +6305,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6339,7 +6339,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6417,7 +6417,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6451,7 +6451,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6485,7 +6485,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6519,7 +6519,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6553,7 +6553,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6587,7 +6587,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6621,7 +6621,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6655,7 +6655,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6689,7 +6689,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6767,7 +6767,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6801,7 +6801,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6835,7 +6835,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6869,7 +6869,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6903,7 +6903,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6937,7 +6937,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -6971,7 +6971,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -7005,7 +7005,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -7039,7 +7039,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
diff --git a/Assets/Resources/_old jsons/test_full_test.json b/Assets/Resources/_old jsons/test_full_test.json
index ddd0494daa7da769232aeecdc7f09fac9a09549a..57a0c23724e26759401027362ee1cee71e83a1a1 100644
--- a/Assets/Resources/_old jsons/test_full_test.json
+++ b/Assets/Resources/_old jsons/test_full_test.json
@@ -9669,7 +9669,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -9723,7 +9723,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -9762,7 +9762,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12208,7 +12208,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12254,7 +12254,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12292,7 +12292,7 @@
"randomiser": false,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12373,7 +12373,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12407,7 +12407,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12441,7 +12441,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12475,7 +12475,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12509,7 +12509,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12543,7 +12543,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12577,7 +12577,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12611,7 +12611,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12645,7 +12645,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12723,7 +12723,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12757,7 +12757,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12791,7 +12791,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12825,7 +12825,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12859,7 +12859,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12893,7 +12893,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12927,7 +12927,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12961,7 +12961,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -12995,7 +12995,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13073,7 +13073,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13107,7 +13107,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13141,7 +13141,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13175,7 +13175,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13209,7 +13209,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13243,7 +13243,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13277,7 +13277,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13311,7 +13311,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
@@ -13345,7 +13345,7 @@
"randomiser": true,
"enumerer": true,
"surligner": true,
- "separateurChoix": "et",
+
"description": null,
"choix": [
{
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index b9869a2085522a7b943f9b725c0614272fcc6121..9ab193c289639f171d6d6151d85ef24419d14e1c 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -586,7 +586,7 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 2
- m_BackGroundColor: {r: 0.29803923, g: 0.11764706, b: 0.47843137, a: 0}
+ m_BackGroundColor: {r: 0, g: 0.14901961, b: 0.60784316, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -982,7 +982,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3c4520771b043844483afc6db50e0401, type: 3}
m_Name:
m_EditorClassIdentifier:
- jsonFileName: Session 4
+ jsonFileName: Session 3
data:
sessions: []
--- !u!82 &761270580
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 337ad1155d1e82a208d86f0c2156c448d88ce133..67812ae48cd92bcc430cdc12a616ef58b90e4848 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
- companyName: com.trans3.evalulu_purple
- productName: EvaLulu4
+ companyName: com.trans3.evalulu_blue
+ productName: EvaLulu3
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}