diff --git a/Assets/Resources/one_for_all.json b/Assets/Resources/one_for_all.json
index 7f2a22e4755e7d9d1a2a984bcb7a471691f6acb9..17907fa8eecb936857a00eac70241f0e65e6a679 100644
--- a/Assets/Resources/one_for_all.json
+++ b/Assets/Resources/one_for_all.json
@@ -10737,688 +10737,6 @@
}
]
},
- {
- "id": "Tuto.fusion",
- "modalite": "QCM",
- "titre": "Tutoriel fusion de syllabes",
- "desc": null,
- "fond": "M.K.BlKtchn",
- "consigne": "F.1.Cns_Prv",
- "randomiser": false,
- "items": [
- {
- "id": "e.tuto.fusion",
- "type": "tuto",
- "pret": "ready",
- "consigne": "F.2.Cns_Tt",
- "fond": "M.M.Mnstr-2.3",
- "miseEnAction": "F.4.MsNC°",
- "explication": "F.3.Xplc°",
- "surlignerExplication": 0.85,
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "lara",
- "image": "M.F.Fd-4.2",
- "son": "lara_f",
- "description": null,
- "correct": true,
- "feedback": "F.5.Fb_+tt"
- },
- {
- "id": "rala",
- "image": "M.F.Fd-15.0",
- "son": "rala_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- },
- {
- "id": "laro",
- "image": "M.F.Fd-8.1",
- "son": "laro_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- }
- ]
- },
- {
- "id": "train.fusion.fr",
- "type": "training",
- "consigne": "F.6.Cns_N-s",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "inso",
- "image": "M.F.Fd-2.2",
- "son": "inso_f",
- "description": null,
- "correct": true,
- "feedback": "F.8.Fb_+trn"
- },
- {
- "id": "ossin",
- "image": "M.F.Fd-17.4",
- "son": "ossin_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- },
- {
- "id": "onsa",
- "image": "M.F.Fd-9.3",
- "son": "onsa_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- }
- ]
- },
- {
- "id": "train.fusion.en",
- "type": "training",
- "consigne": "F.7.Cns_T-b",
- "fond": "M.M.Mnstr-2.3",
- "transition": "F.10.Trns°Glp",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "taboo",
- "image": "M.F.Fd-4.1",
- "son": "taboo_f",
- "description": null,
- "correct": true,
- "feedback": "F.8.Fb_+trn"
- },
- {
- "id": "boota",
- "image": "M.F.Fd-7.3",
- "son": "boota_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- },
- {
- "id": "teeba",
- "image": "M.F.Fd-3.4",
- "son": "teeba_f",
- "description": null,
- "correct": false,
- "feedback": "F.9.Fb_-trn"
- }
- ]
- }
- ]
- },
- {
- "id": "fus1",
- "modalite": "QCM",
- "titre": "Fusion Niveau 1",
- "desc": null,
- "fond": "M.K.BlKtchn",
- "randomiser": false,
- "items": [
- {
- "id": "chibou",
- "type": "test",
- "consigne": "chi-bou_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "chibou",
- "image": "M.F.Fd-6.0",
- "son": "chibou_f",
- "description": null,
- "correct": true
- },
- {
- "id": "bouchi",
- "image": "M.F.Fd-8.2",
- "son": "bouchi_f",
- "description": null,
- "correct": false
- },
- {
- "id": "bicho",
- "image": "M.F.Fd-11.4",
- "son": "bicho_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "today",
- "type": "test",
- "consigne": "To-day_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "today",
- "image": "M.F.Fd-7.3",
- "son": "today_f",
- "description": null,
- "correct": true
- },
- {
- "id": "dayto",
- "image": "M.F.Fd-10.0",
- "son": "dayto_f",
- "description": null,
- "correct": false
- },
- {
- "id": "doty",
- "image": "M.F.Fd-12.4",
- "son": "doty_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "muro",
- "type": "test",
- "consigne": "Mu-ro_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "muro",
- "image": "M.F.Fd-13.4",
- "son": "muro_m",
- "description": null,
- "correct": true
- },
- {
- "id": "romu",
- "image": "M.F.Fd-6.3",
- "son": "romu_m",
- "description": null,
- "correct": false
- },
- {
- "id": "rimo",
- "image": "M.F.Fd-7.0",
- "son": "rimo_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "beevoy",
- "type": "test",
- "consigne": "Bee-voy_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "beevoy",
- "image": "M.F.Fd-9.4",
- "son": "beevoy_m",
- "description": null,
- "correct": true
- },
- {
- "id": "voybee",
- "image": "M.F.Fd-11.2",
- "son": "voybee_m",
- "description": null,
- "correct": false
- },
- {
- "id": "bayvee",
- "image": "M.F.Fd-6.1",
- "son": "bayvee_m",
- "description": null,
- "correct": false
- }
- ]
- }
- ]
- },
- {
- "id": "fus2",
- "modalite": "QCM",
- "titre": "Fusion Niveau 2",
- "desc": null,
- "fond": "M.K.BlKtchn",
- "randomiser": false,
- "items": [
- {
- "id": "varac2",
- "type": "test",
- "consigne": "Va-rac_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "varac2",
- "image": "M.F.Fd-12.2",
- "son": "varac_f",
- "description": null,
- "correct": true
- },
- {
- "id": "ravac",
- "image": "M.F.Fd-8.0",
- "son": "ravac_f",
- "description": null,
- "correct": false
- },
- {
- "id": "vacro",
- "image": "M.F.Fd-10.1",
- "son": "vacro_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "peafowl",
- "type": "test",
- "consigne": "pea-fowl_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "peafowl",
- "image": "M.F.Fd-6.2",
- "son": "peafowl_m",
- "description": null,
- "correct": true
- },
- {
- "id": "feapowl",
- "image": "M.F.Fd-13.0",
- "son": "feapowl_m",
- "description": null,
- "correct": false
- },
- {
- "id": "foopowl",
- "image": "M.F.Fd-9.3",
- "son": "foopowl_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "léviche",
- "type": "test",
- "consigne": "Le-viche_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "leviche",
- "image": "M.F.Fd-12.0",
- "son": "leviche_m",
- "description": null,
- "correct": true
- },
- {
- "id": "vichle",
- "image": "M.F.Fd-7.4",
- "son": "vichle_m",
- "description": null,
- "correct": false
- },
- {
- "id": "vichale",
- "image": "M.F.Fd-11.3",
- "son": "vichale_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "sabine",
- "type": "test",
- "consigne": "Sa-bine _f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "sabine",
- "image": "M.F.Fd-8.3",
- "son": "sabine_f",
- "description": null,
- "correct": true
- },
- {
- "id": "sinabe",
- "image": "M.F.Fd-9.0",
- "son": "sinabe_f",
- "description": null,
- "correct": false
- },
- {
- "id": "soybane",
- "image": "M.F.Fd-13.2",
- "son": "soybane_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "pinsote",
- "type": "test",
- "consigne": "Pin-sote_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "pinsote",
- "image": "M.F.Fd-9.2",
- "son": "pinsote_f",
- "description": null,
- "correct": true
- },
- {
- "id": "tinposse",
- "image": "M.F.Fd-12.3",
- "son": "tinposse_f",
- "description": null,
- "correct": false
- },
- {
- "id": "patosse",
- "image": "M.F.Fd-8.4",
- "son": "patosse_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "lookup",
- "type": "test",
- "consigne": "Loo-kup_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "lookup",
- "image": "M.F.Fd-7.2",
- "son": "lookup_m",
- "description": null,
- "correct": true
- },
- {
- "id": "kuloop^",
- "image": "M.F.Fd-6.0",
- "son": "kuloop_m",
- "description": null,
- "correct": false
- },
- {
- "id": "lookype",
- "image": "M.F.Fd-9.4",
- "son": "lookype_m",
- "description": null,
- "correct": false
- }
- ]
- }
- ]
- },
- {
- "id": "fus3",
- "modalite": "QCM",
- "titre": "Fusion Niveau 3",
- "desc": null,
- "fond": "M.K.BlKtchn",
- "randomiser": false,
- "items": [
- {
- "id": "seflase",
- "type": "test",
- "consigne": "Se-flase_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "seflase",
- "image": "M.F.Fd-10.4",
- "son": "seflase_m",
- "description": null,
- "correct": true
- },
- {
- "id": "zaflesse",
- "image": "M.F.Fd-8.3",
- "son": "zaflèsse_m",
- "description": null,
- "correct": false
- },
- {
- "id": "flasseze",
- "image": "M.F.Fd-7.0",
- "son": "flassèze_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "nightly",
- "type": "test",
- "consigne": "Nigh-tly_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "nightly",
- "image": "M.F.Fd-13.0",
- "son": "nightly_f",
- "description": null,
- "correct": true
- },
- {
- "id": "lighnit",
- "image": "M.F.Fd-9.4",
- "son": "lighnit_f",
- "description": null,
- "correct": false
- },
- {
- "id": "nitighl",
- "image": "M.F.Fd-6.2",
- "son": "nitighl_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "cruzelle",
- "type": "test",
- "consigne": "Cru-zelle_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "cruzelle",
- "image": "M.F.Fd-11.3",
- "son": "cruzelle_f",
- "description": null,
- "correct": true
- },
- {
- "id": "zucrelle",
- "image": "M.F.Fd-7.2",
- "son": "zucrelle_f",
- "description": null,
- "correct": false
- },
- {
- "id": "ruzelc",
- "image": "M.F.Fd-13.4",
- "son": "Ruzelc_f",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "speedo",
- "type": "test",
- "consigne": "Spee-do_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "speedo",
- "image": "M.F.Fd-6.4",
- "son": "speedo_m",
- "description": null,
- "correct": true
- },
- {
- "id": "deespo",
- "image": "M.F.Fd-12.0",
- "son": "deespo_m",
- "description": null,
- "correct": false
- },
- {
- "id": "spodee",
- "image": "M.F.Fd-10.3",
- "son": "spodee_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "glitan",
- "type": "test",
- "consigne": "Gli-tan_m",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "glitan",
- "image": "M.F.Fd-7.0",
- "son": "glitan_m",
- "description": null,
- "correct": true
- },
- {
- "id": "ganlite",
- "image": "M.F.Fd-10.4",
- "son": "ganlite_m",
- "description": null,
- "correct": false
- },
- {
- "id": "tangli",
- "image": "M.F.Fd-8.2",
- "son": "tangli_m",
- "description": null,
- "correct": false
- }
- ]
- },
- {
- "id": "result",
- "type": "test",
- "consigne": "Re-sult_f",
- "fond": "M.M.Mnstr-2.3",
- "randomiser": true,
- "enumerer": true,
- "surligner": true,
- "description": null,
- "choix": [
- {
- "id": "result",
- "image": "M.F.Fd-9.2",
- "son": "result_f",
- "description": null,
- "correct": true
- },
- {
- "id": "zultry",
- "image": "M.F.Fd-13.3",
- "son": "zultry_f",
- "description": null,
- "correct": false
- },
- {
- "id": "rusilt",
- "image": "M.F.Fd-11.0",
- "son": "rusilt_f",
- "description": null,
- "correct": false
- }
- ]
- }
- ]
- },
{
"id": "InvPhon_tuto",
"modalite": "QCM",
diff --git a/Assets/Scenes/SplashScreen.unity b/Assets/Scenes/SplashScreen.unity
index d086ff0a2cd419d5542cfa6926cd2cfd3ae588d0..c9e1ab773e011111312557ff7a580793ad7143c8 100644
--- a/Assets/Scenes/SplashScreen.unity
+++ b/Assets/Scenes/SplashScreen.unity
@@ -609,7 +609,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text: v1.9
+ m_text: v1.10
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 03b521bb73d5e30aaefb10f6ad823293efd9b7b8..1c9ce9389db9f88d118dd66cdcf8ce7d0b7643c7 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,7 @@ PlayerSettings:
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
- bundleVersion: 1.9
+ bundleVersion: 1.10
preloadedAssets: []
metroInputSource: 0
wsaTransparentSwapchain: 0
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 2ae98f89fa124b340a390cb0b30e70699f2ec1ae..8a690f1ac0880dc77d94faac5df59477a9d6707a 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -18,13 +18,13 @@ EditorUserSettings:
value: 5254025f52035803555609204677074444164f7c2f797664757a1861e1e66268
flags: 0
RecentlyUsedSceneGuid-4:
- value: 52045152560d5d025858542140750e44404f4d2b74797431292b1f66b1e5373c
+ value: 51530603000d5e0a5c0c5a7044705c44404f1a7d7b2d20607a714d66b4b9626a
flags: 0
RecentlyUsedSceneGuid-5:
- value: 51530603000d5e0a5c0c5a7044705c44404f1a7d7b2d20607a714d66b4b9626a
+ value: 5057510250560c5d5d0a0a7312225d44424e4d737e7b246928781f61b6e4373c
flags: 0
RecentlyUsedSceneGuid-6:
- value: 5057510250560c5d5d0a0a7312225d44424e4d737e7b246928781f61b6e4373c
+ value: 52045152560d5d025858542140750e44404f4d2b74797431292b1f66b1e5373c
flags: 0
RecentlyUsedSceneGuid-7:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661