diff --git a/Assets/Art/Sprites/evalulu-logo.png b/Assets/Art/Sprites/evalulu-logo.png
index 63c207eab6e32cd7fd0ea51ccfce2f9830eaac61..4af7ac31df7b594f1e1f61afc1106038f8094d9f 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 f2d84207ef4b7509879821a89fee56cc0d47e5e7..f7f9902e4c1593b23f33d30c842764996e9dcc50 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 f1378d68ee8d282747e4e3dcb95c105d2a5c7131..b38b8a7991fa278636f7f4561e9126ff78555363 100644
--- a/Assets/Resources/Session 2.json
+++ b/Assets/Resources/Session 2.json
@@ -9083,7 +9083,7 @@
},
{
"id": "javatte",
- "image": "M.F.Fd-6.4",
+ "image": "M.F.Fd-6.3",
"son": "javatte_f",
"description": null,
"correct": false
@@ -9143,6 +9143,7 @@
{
"id": "farobe",
"image": "M.F.Fd-7.3",
+ "son": "farobe_m",
"description": null,
"correct": false
},
@@ -9208,7 +9209,6 @@
"miseEnAction": "C.4.MsNC°",
"explication": "C.3.Xplc°Tt_init",
"surlignerExplication": 0.0,
- "transition": "C.7.Trns°",
"randomiser": false,
"enumerer": true,
"surligner": true,
@@ -9253,10 +9253,8 @@
{
"id": "Aki_M",
"type": "training",
- "pret": "ready",
"consigne": "C.Cns_",
"fond": "M.M.Mnstr-9.4",
- "transition": "C.7.Trns°",
"randomiser": false,
"enumerer": true,
"surligner": true,
@@ -9299,6 +9297,7 @@
"enumerer": true,
"surligner": true,
"description": null,
+ "transition": "C.7.Trns°",
"choix": [
{
"id": "Abbey_M",
@@ -9311,7 +9310,7 @@
{
"id": "Amy_M",
"image": "M.F.Fd-1.3",
- "son": "C.E.N_m_150",
+ "son": "C.E.N_m_145",
"description": null,
"correct": false,
"feedback": "C.6.Fb-Gnrq"
@@ -9372,7 +9371,8 @@
{
"id": "Onta_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9405,7 +9405,8 @@
{
"id": "Anfu_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9438,7 +9439,8 @@
{
"id": "Iba_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9471,7 +9473,8 @@
{
"id": "Ever_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9480,7 +9483,7 @@
"choix": [
{
"id": "Ever_F",
- "image": "M.F.Fd-2.5",
+ "image": "M.F.Fd-2.1",
"son": "C.E.N_f_158",
"description": null,
"correct": true
@@ -9504,7 +9507,8 @@
{
"id": "Oona_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9520,7 +9524,7 @@
},
{
"id": "Ivy_F",
- "image": "M.F.Fd-6.3",
+ "image": "M.F.Fd-6.1",
"son": "C.E.N_f_162",
"description": null,
"correct": false
@@ -9537,7 +9541,8 @@
{
"id": "Eighty_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9553,7 +9558,7 @@
},
{
"id": "Eli_M",
- "image": "M.F.Fd-3.6",
+ "image": "M.F.Fd-3.4",
"son": "C.E.N_m_160",
"description": null,
"correct": false
@@ -9580,7 +9585,8 @@
{
"id": "Chivise_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9596,7 +9602,7 @@
},
{
"id": "Chouvere_M",
- "image": "M.F.Fd-3.3",
+ "image": "M.F.Fd-3.2",
"son": "C.F.Fr_m_206",
"description": null,
"correct": false
@@ -9613,7 +9619,8 @@
{
"id": "Depame_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9646,7 +9653,8 @@
{
"id": "Turane_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9655,21 +9663,21 @@
"choix": [
{
"id": "Turane_M",
- "image": "M.F.Fd-1.5",
+ "image": "M.F.Fd-1.0",
"son": "C.F.Fr_m_173",
"description": null,
"correct": true
},
{
"id": "Bussote_M",
- "image": "M.F.Fd-4.6",
+ "image": "M.F.Fd-4.1",
"son": "C.F.Fr_m_177",
"description": null,
"correct": false
},
{
"id": "Burive_M",
- "image": "M.F.Fd-5.0",
+ "image": "M.F.Fd-5.4",
"son": "C.F.Fr_m_178",
"description": null,
"correct": false
@@ -9679,7 +9687,8 @@
{
"id": "Button_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9695,7 +9704,7 @@
},
{
"id": "Behind_M",
- "image": "M.F.Fd-6.3",
+ "image": "M.F.Fd-6.2",
"son": "C.E.N_m_163",
"description": null,
"correct": false
@@ -9712,7 +9721,8 @@
{
"id": "Daily_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9721,7 +9731,7 @@
"choix": [
{
"id": "Daily_F",
- "image": "M.F.Fd-2.5",
+ "image": "M.F.Fd-2.0",
"son": "C.E.N_f_173",
"description": null,
"correct": true
@@ -9755,7 +9765,8 @@
{
"id": "Plumere_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9788,7 +9799,8 @@
{
"id": "Bledi_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9797,7 +9809,7 @@
"choix": [
{
"id": "Bledi_F",
- "image": "M.F.Fd-2.3",
+ "image": "M.F.Fd-2.2",
"son": "C.F.Fr_f_200",
"description": null,
"correct": true
@@ -9821,7 +9833,8 @@
{
"id": "Cradle_M",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9837,7 +9850,7 @@
},
{
"id": "Brainy_M",
- "image": "M.F.Fd-6.3",
+ "image": "M.F.Fd-6.2",
"son": "C.E.N_m_178",
"description": null,
"correct": false
@@ -9854,7 +9867,8 @@
{
"id": "Bristol_F",
"type": "test",
- "consigne": "C.1.Cns_Prv_Init",
+ "consigne": "C.Cns_",
+ "separateur": "C.T",
"fond": "M.M.Mnstr-10.3",
"randomiser": true,
"enumerer": true,
@@ -9863,7 +9877,7 @@
"choix": [
{
"id": "Bristol_F",
- "image": "M.F.Fd-2.5",
+ "image": "M.F.Fd-2.0",
"son": "C.E.N_f_188",
"description": null,
"correct": true
@@ -9927,7 +9941,7 @@
},
{
"id": "laro",
- "image": "M.F.Fd-15.0",
+ "image": "M.F.Fd-8.1",
"son": "laro_f",
"description": null,
"correct": false,
@@ -10186,7 +10200,7 @@
},
{
"id": "vacro",
- "image": "M.F.Fd-10.2",
+ "image": "M.F.Fd-10.1",
"son": "vacro_f",
"description": null,
"correct": false
@@ -10573,7 +10587,7 @@
"modalite": "QCM",
"titre": "Inversion de phonème (tuto)",
"desc": "Écouter, inverser les phonèmes, choisir la bonne réponse",
- "fond": "M.K.LmKtchn",
+ "fond": "M.K.GrnKtchn",
"consigne": "I.1.Cns_Prv",
"randomiser": false,
"items": [
@@ -10697,7 +10711,7 @@
"modalite": "QCM",
"titre": "Inversion niveau 1",
"desc": null,
- "fond": "M.K.LmKtchn",
+ "fond": "M.K.GrnKtchn",
"randomiser": false,
"items": [
{
@@ -10839,7 +10853,7 @@
"modalite": "QCM",
"titre": "Inversion de phonèmes niveau 2",
"desc": null,
- "fond": "M.K.LmKtchn",
+ "fond": "M.K.GrnKtchn",
"randomiser": false,
"items": [
{
@@ -11047,7 +11061,7 @@
"modalite": "QCM",
"titre": "Inversion niveau 3",
"desc": null,
- "fond": "M.K.LmKtchn",
+ "fond": "M.K.GrnKtchn",
"randomiser": false,
"items": [
{
@@ -11253,4 +11267,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/Assets/Resources/Session 3.json b/Assets/Resources/Session 3.json
index f25574d84ab72531bb1c5ae00d1ce61766aeebc0..c5d82961545134694f4ab335b3299e75a4dad97b 100644
--- a/Assets/Resources/Session 3.json
+++ b/Assets/Resources/Session 3.json
@@ -8541,7 +8541,6 @@
"type": "test",
"consigne": "C.Cns_Gnrl",
"fond": "M.M.Mnstr-9.4",
- "transition": "et",
"randomiser": true,
"enumerer": true,
"surligner": true,
@@ -8722,7 +8721,6 @@
"type": "test",
"consigne": "C.Cns_Gnrl",
"fond": "M.M.Mnstr-9.4",
- "transition": "et",
"randomiser": true,
"enumerer": true,
"surligner": true,
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index d407bbbe24d2d97bdff936dcc270397414b75970..0ee90f29dce202e328b399cb76f8bbfcdf60d037 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.6392157, g: 0.05882353, b: 0.26666668, a: 0}
+ m_BackGroundColor: {r: 0.09411765, g: 0.38431373, b: 0.09411765, a: 0}
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 1
+ jsonFileName: Session 2
data:
sessions: []
--- !u!82 &761270580
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 17f6ac2d917c05b33e3bcf8fc842d985cc9e11ff..dea5f0bb172131a115869b3743964d990f1aa3e1 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
- companyName: com.trans3.evalulu_red
- productName: EvaLulu1
+ companyName: com.trans3.evalulu_green
+ productName: EvaLulu2
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}