diff --git a/Assets/Resources/rimes.json b/Assets/Resources/rimes.json
index 735a750b3080e744e635c8dffa36abe5782a0fe5..25dd7c57ad89b5692d4f3297b1e04aa30f7ecd2f 100644
--- a/Assets/Resources/rimes.json
+++ b/Assets/Resources/rimes.json
@@ -293,8 +293,6 @@
"modalite":"QCM",
"consigne":"consRime",
"randomiser":false,
- "explication":"bimo+selo",
- "miseEnAction":"action selo",
"items":[
{
"id":"tutoRime",
@@ -303,6 +301,9 @@
"fond":"tutoRimeCons",
"enumerer":true,
"surligner":true,
+ "explication":"bimo+selo",
+ "surlignerExplication":1.2,
+ "miseEnAction":"action selo",
"choix":[
{
"id":"tutoRimeApe",
@@ -325,10 +326,7 @@
"correct":true,
"feedback":"fb+selo"
}
- ],
- "explication":"bimo+selo",
- "surlignerExplication":1.2,
- "miseEnAction":"action selo"
+ ]
},
{
"id":"trainRime1",
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 2aca67fde16c051ead390ec09e21f642a7586871..6bbf5009d5bcba29e9572bdc8380d7d823f3cd27 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -606,7 +606,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3c4520771b043844483afc6db50e0401, type: 3}
m_Name:
m_EditorClassIdentifier:
- jsonFileName: rimes
+ jsonFileName: raven
data:
sessions: []
--- !u!82 &761270580
diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
index bb2cbbfc8f3ef457174ac6eb1a152405ce14e48d..489620f631ae816a72ec210d3431c3c32918cc74 100644
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -24,7 +24,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 1621
+ controlID: 683
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -45,9 +45,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 336
+ x: 337
y: 131
- width: 1472
+ width: 1471
height: 940
m_SerializedDataModeController:
m_DataMode: 0
@@ -92,7 +92,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 0
+ m_EnableMouseInput: 1
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -101,23 +101,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 1472
+ width: 1471
height: 919
m_Scale: {x: 0.7658333, y: 0.7658333}
- m_Translation: {x: 736, y: 459.5}
+ m_Translation: {x: 735.5, y: 459.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -961.0446
+ x: -960.3917
y: -600
- width: 1922.0892
+ width: 1920.7834
height: 1200
m_MinimalGUI: 1
m_defaultScale: 0.7658333
- m_LastWindowPixelSize: {x: 1472, y: 940}
+ m_LastWindowPixelSize: {x: 1471, y: 940}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -147,7 +147,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 1622
+ controlID: 627
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -172,7 +172,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 1623
+ controlID: 603
--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -190,10 +190,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 336
+ width: 337
height: 961
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 6}
m_Panes:
- {fileID: 6}
@@ -221,7 +221,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 131
- width: 335
+ width: 336
height: 940
m_SerializedDataModeController:
m_DataMode: 0
@@ -238,7 +238,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 06fbffff
+ m_ExpandedIDs: b8b3feffa0b4feff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -277,9 +277,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 336
+ x: 337
y: 0
- width: 1474
+ width: 1473
height: 961
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@@ -747,7 +747,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 1
m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
- m_Name: ConsoleWindow
+ m_Name: ProjectBrowser
m_EditorClassIdentifier:
m_Children: []
m_Position:
@@ -756,14 +756,14 @@ MonoBehaviour:
y: 961
width: 1810
height: 328
- m_MinSize: {x: 101, y: 121}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 11}
+ m_MinSize: {x: 230, y: 250}
+ m_MaxSize: {x: 10000, y: 10000}
+ m_ActualView: {fileID: 10}
m_Panes:
- {fileID: 10}
- {fileID: 11}
- m_Selected: 1
- m_LastSelected: 0
+ m_Selected: 0
+ m_LastSelected: 1
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -785,9 +785,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 470.4
- width: 1040.6
- height: 305
+ y: 1092
+ width: 1809
+ height: 307
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -809,7 +809,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Resources
+ - Assets/Scenes
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -817,16 +817,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Resources
+ - Assets/Scenes
m_LastFoldersGridSize: -1
- m_LastProjectPath: C:\Users\guill\OneDrive\Bureau\LUCIOLE\EVALULU\lulu-testing
+ m_LastProjectPath: "/home/loizbek/Syst\xE8me/_Code/_Travail/evalulu"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
- m_SelectedIDs: 82800000
- m_LastClickedID: 32898
- m_ExpandedIDs: 00000000ac810000
+ m_SelectedIDs: 8c410000
+ m_LastClickedID: 16780
+ m_ExpandedIDs: 00000000d040000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -854,7 +854,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000ac810000
+ m_ExpandedIDs: 00000000d040000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -879,9 +879,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 40800000
- m_LastClickedInstanceID: 32832
- m_HadKeyboardFocusLastEvent: 1
+ m_SelectedInstanceIDs: 0ace0000
+ m_LastClickedInstanceID: 52746
+ m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -963,8 +963,8 @@ MonoBehaviour:
y: 0
width: 750
height: 1289
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -1010,7 +1010,7 @@ MonoBehaviour:
m_CachedPref: 160
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
- m_LastInspectedObjectInstanceID: -1
+ m_LastInspectedObjectInstanceID: 52746
m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
index 1674334c9501e8eae52ad8b24a45ee9dbe00858e..618187bd1b9957a730afaee8a94a06241a1c6e51 100644
--- a/UserSettings/Layouts/default-2022.dwlt
+++ b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 2560
height: 1339
m_ShowMode: 4
- m_Title: Game
+ m_Title: Console
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 100}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 1799
+ controlID: 857
--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 1716
+ controlID: 858
--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 1717
+ controlID: 812
--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -187,10 +187,10 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 0
- width: 336
+ width: 337
height: 961
- m_MinSize: {x: 201, y: 221}
- m_MaxSize: {x: 4001, y: 4021}
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -211,9 +211,9 @@ MonoBehaviour:
m_Children: []
m_Position:
serializedVersion: 2
- x: 336
+ x: 337
y: 0
- width: 1474
+ width: 1473
height: 961
m_MinSize: {x: 202, y: 221}
m_MaxSize: {x: 4002, y: 4021}
@@ -269,8 +269,8 @@ MonoBehaviour:
y: 0
width: 750
height: 1289
- m_MinSize: {x: 276, y: 71}
- m_MaxSize: {x: 4001, y: 4021}
+ m_MinSize: {x: 275, y: 50}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 17}
m_Panes:
- {fileID: 17}
@@ -296,9 +296,9 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 336
+ x: 337
y: 131
- width: 1472
+ width: 1471
height: 940
m_SerializedDataModeController:
m_DataMode: 0
@@ -320,7 +320,7 @@ MonoBehaviour:
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
- m_EnterPlayModeBehavior: 1
+ m_EnterPlayModeBehavior: 0
m_UseMipMap: 0
m_VSyncEnabled: 0
m_Gizmos: 0
@@ -352,23 +352,23 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 21
- width: 1472
+ width: 1471
height: 919
m_Scale: {x: 0.7658333, y: 0.7658333}
- m_Translation: {x: 736, y: 459.5}
+ m_Translation: {x: 735.5, y: 459.5}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -961.0446
+ x: -960.3917
y: -600
- width: 1922.0892
+ width: 1920.7834
height: 1200
m_MinimalGUI: 1
m_defaultScale: 0.7658333
- m_LastWindowPixelSize: {x: 1472, y: 940}
+ m_LastWindowPixelSize: {x: 1471, y: 940}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -396,7 +396,7 @@ MonoBehaviour:
serializedVersion: 2
x: 0
y: 131
- width: 335
+ width: 336
height: 940
m_SerializedDataModeController:
m_DataMode: 0
@@ -411,9 +411,9 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs:
- m_LastClickedID: 0
- m_ExpandedIDs: 06fbffff
+ m_SelectedIDs: 0ace0000
+ m_LastClickedID: 52746
+ m_ExpandedIDs: b8b3feffa0b4feff
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -906,9 +906,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 470.4
- width: 1040.6
- height: 305
+ y: 1092
+ width: 1809
+ height: 307
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -930,7 +930,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- - Assets/Resources
+ - Assets/Scenes
m_Globs: []
m_OriginalText:
m_ImportLogFlags: 0
@@ -938,16 +938,16 @@ MonoBehaviour:
m_ViewMode: 1
m_StartGridSize: 64
m_LastFolders:
- - Assets/Resources
+ - Assets/Scenes
m_LastFoldersGridSize: -1
- m_LastProjectPath: C:\Users\guill\OneDrive\Bureau\LUCIOLE\EVALULU\lulu-testing
+ m_LastProjectPath: "/home/loizbek/Syst\xE8me/_Code/_Travail/evalulu"
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 79}
- m_SelectedIDs: 82800000
- m_LastClickedID: 32898
- m_ExpandedIDs: 00000000ac810000
+ m_SelectedIDs: 8c410000
+ m_LastClickedID: 16780
+ m_ExpandedIDs: 00000000d040000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -975,7 +975,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000ac810000
+ m_ExpandedIDs: 00000000d040000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1000,9 +1000,9 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 40800000
- m_LastClickedInstanceID: 32832
- m_HadKeyboardFocusLastEvent: 1
+ m_SelectedInstanceIDs: 0ace0000
+ m_LastClickedInstanceID: 52746
+ m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
m_UserAcceptedRename: 0