From 2801b31053693f1bde76d29dbbf3588a6daacf1f Mon Sep 17 00:00:00 2001
From: Guillaume Meinesz <guillaume.meinesz@gmail.com>
Date: Mon, 8 Jan 2024 17:46:28 +0100
Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20ecran=20pause=20/=20fin=20d?=
=?UTF-8?q?e=20session=20dernier=20item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1) ecran de pause sur FIN si on se reconnecte apres la dernier item/derniere session , on ne reboucle plus sur la session 0
2) information progression sur l'écran de pause
---
...valuluScript_SendTracesFromHMSceneStart.cs | 8 +-
Assets/GestionProgression.cs | 5 +-
Assets/Scenes/FinScreen.unity | 697 ------------------
Assets/Scenes/FinScreen.unity.meta | 7 -
Assets/Scenes/MainScene.unity | 150 +++-
Assets/SplashScreenScript.cs | 12 +-
Assets/mainManager.cs | 84 ++-
UserSettings/EditorUserSettings.asset | 4 +-
UserSettings/Layouts/default-2022.dwlt | 90 +--
9 files changed, 283 insertions(+), 774 deletions(-)
delete mode 100644 Assets/Scenes/FinScreen.unity
delete mode 100644 Assets/Scenes/FinScreen.unity.meta
diff --git a/Assets/EvaluluScript_SendTracesFromHMSceneStart.cs b/Assets/EvaluluScript_SendTracesFromHMSceneStart.cs
index db51956e..924d3480 100644
--- a/Assets/EvaluluScript_SendTracesFromHMSceneStart.cs
+++ b/Assets/EvaluluScript_SendTracesFromHMSceneStart.cs
@@ -129,7 +129,7 @@ public class EvaluluScript_SendTracesFromHMSceneStart : MonoBehaviour
string logincodeuser = data.loginCode;
// Faire quelque chose avec les valeurs, par exemple, les imprimer dans la console
- if (teacherCode == HM_DataController.currentTeacherAccount.teacherCode && logincodeuser == HM_DataController.currentChildUser.loginCode)
+ if (HM_DataController.currentTeacherAccount !=null && teacherCode == HM_DataController.currentTeacherAccount.teacherCode && logincodeuser == HM_DataController.currentChildUser.loginCode)
{
path_andteacherid_and_userid aaa = new path_andteacherid_and_userid();
aaa.path = filePath;
@@ -163,6 +163,10 @@ public class EvaluluScript_SendTracesFromHMSceneStart : MonoBehaviour
{
uploadOnefichierTraceToHM();
}
+ else
+ {
+ endAllUploads();
+ }
}
@@ -271,8 +275,6 @@ public class EvaluluScript_SendTracesFromHMSceneStart : MonoBehaviour
File.Delete(currentlySentTemporaryFilePath);
}
}
-
-
////Debug.Log("ToDeleteOriginalFilePath = " + fichierOriginal);
// et on supprime le fichier original vu qu'il a été mis dans l'archive
if (File.Exists(currentlySentFilePath))
diff --git a/Assets/GestionProgression.cs b/Assets/GestionProgression.cs
index ae70b941..be708bb1 100644
--- a/Assets/GestionProgression.cs
+++ b/Assets/GestionProgression.cs
@@ -21,7 +21,10 @@ public class GestionProgression : MonoBehaviour
if(dd.clef == mM.clefPourSauvegardeUtilisateur)
{
foundinside = true;
- dd.NumeroSession = numeroSession3;
+ if(numeroSession3> dd.NumeroSession)
+ {
+ dd.NumeroSession = numeroSession3;
+ }
}
}
if (!foundinside)
diff --git a/Assets/Scenes/FinScreen.unity b/Assets/Scenes/FinScreen.unity
deleted file mode 100644
index f22025d1..00000000
--- a/Assets/Scenes/FinScreen.unity
+++ /dev/null
@@ -1,697 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!29 &1
-OcclusionCullingSettings:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_OcclusionBakeSettings:
- smallestOccluder: 5
- smallestHole: 0.25
- backfaceThreshold: 100
- m_SceneGUID: 00000000000000000000000000000000
- m_OcclusionCullingData: {fileID: 0}
---- !u!104 &2
-RenderSettings:
- m_ObjectHideFlags: 0
- serializedVersion: 9
- m_Fog: 0
- m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- m_FogMode: 3
- m_FogDensity: 0.01
- m_LinearFogStart: 0
- m_LinearFogEnd: 300
- m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
- m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
- m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
- m_AmbientIntensity: 1
- m_AmbientMode: 3
- m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
- m_SkyboxMaterial: {fileID: 0}
- m_HaloStrength: 0.5
- m_FlareStrength: 1
- m_FlareFadeSpeed: 3
- m_HaloTexture: {fileID: 0}
- m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
- m_DefaultReflectionMode: 0
- m_DefaultReflectionResolution: 128
- m_ReflectionBounces: 1
- m_ReflectionIntensity: 1
- m_CustomReflection: {fileID: 0}
- m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
- m_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
- m_ObjectHideFlags: 0
- serializedVersion: 12
- m_GIWorkflowMode: 1
- m_GISettings:
- serializedVersion: 2
- m_BounceScale: 1
- m_IndirectOutputScale: 1
- m_AlbedoBoost: 1
- m_EnvironmentLightingMode: 0
- m_EnableBakedLightmaps: 0
- m_EnableRealtimeLightmaps: 0
- m_LightmapEditorSettings:
- serializedVersion: 12
- m_Resolution: 2
- m_BakeResolution: 40
- m_AtlasSize: 1024
- m_AO: 0
- m_AOMaxDistance: 1
- m_CompAOExponent: 1
- m_CompAOExponentDirect: 0
- m_ExtractAmbientOcclusion: 0
- m_Padding: 2
- m_LightmapParameters: {fileID: 0}
- m_LightmapsBakeMode: 1
- m_TextureCompression: 1
- m_FinalGather: 0
- m_FinalGatherFiltering: 1
- m_FinalGatherRayCount: 256
- m_ReflectionCompression: 2
- m_MixedBakeMode: 2
- m_BakeBackend: 1
- m_PVRSampling: 1
- m_PVRDirectSampleCount: 32
- m_PVRSampleCount: 512
- m_PVRBounces: 2
- m_PVREnvironmentSampleCount: 256
- m_PVREnvironmentReferencePointCount: 2048
- m_PVRFilteringMode: 1
- m_PVRDenoiserTypeDirect: 1
- m_PVRDenoiserTypeIndirect: 1
- m_PVRDenoiserTypeAO: 1
- m_PVRFilterTypeDirect: 0
- m_PVRFilterTypeIndirect: 0
- m_PVRFilterTypeAO: 0
- m_PVREnvironmentMIS: 1
- m_PVRCulling: 1
- m_PVRFilteringGaussRadiusDirect: 1
- m_PVRFilteringGaussRadiusIndirect: 5
- m_PVRFilteringGaussRadiusAO: 2
- m_PVRFilteringAtrousPositionSigmaDirect: 0.5
- m_PVRFilteringAtrousPositionSigmaIndirect: 2
- m_PVRFilteringAtrousPositionSigmaAO: 1
- m_ExportTrainingData: 0
- m_TrainingDataDestination: TrainingData
- m_LightProbeSampleCountMultiplier: 4
- m_LightingDataAsset: {fileID: 0}
- m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
- serializedVersion: 2
- m_ObjectHideFlags: 0
- m_BuildSettings:
- serializedVersion: 3
- agentTypeID: 0
- agentRadius: 0.5
- agentHeight: 2
- agentSlope: 45
- agentClimb: 0.4
- ledgeDropHeight: 0
- maxJumpAcrossDistance: 0
- minRegionArea: 2
- manualCellSize: 0
- cellSize: 0.16666667
- manualTileSize: 0
- tileSize: 256
- buildHeightMesh: 0
- maxJobWorkers: 0
- preserveTilesOutsideBounds: 0
- debug:
- m_Flags: 0
- m_NavMeshData: {fileID: 0}
---- !u!1 &200091216
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 200091217}
- - component: {fileID: 200091219}
- - component: {fileID: 200091218}
- m_Layer: 5
- m_Name: Fond (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &200091217
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 200091216}
- 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: 651187263}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &200091218
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 200091216}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.19215688, b: 0.30980393, 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: 7482667652216324306, guid: 82b6766659a607d4fa1390153d3ea221, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &200091219
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 200091216}
- m_CullTransparentMesh: 1
---- !u!1 &449536029
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 449536032}
- - component: {fileID: 449536031}
- - component: {fileID: 449536030}
- m_Layer: 0
- m_Name: EventSystem
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &449536030
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 449536029}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_SendPointerHoverToParent: 1
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &449536031
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 449536029}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
---- !u!4 &449536032
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 449536029}
- serializedVersion: 2
- 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &556683065
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 556683066}
- - component: {fileID: 556683068}
- - component: {fileID: 556683067}
- m_Layer: 5
- m_Name: ImageLuciole (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &556683066
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 556683065}
- 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: 651187263}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &556683067
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 556683065}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, 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: 21300000, guid: 898bf2e505eed6e0c9f938f98997d834, type: 3}
- m_Type: 0
- m_PreserveAspect: 1
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &556683068
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 556683065}
- m_CullTransparentMesh: 1
---- !u!1 &651187262
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 651187263}
- - component: {fileID: 651187266}
- - component: {fileID: 651187265}
- - component: {fileID: 651187264}
- - component: {fileID: 651187267}
- m_Layer: 5
- m_Name: Canvas
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &651187263
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 651187262}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0, y: 0, z: 0}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 200091217}
- - {fileID: 556683066}
- - {fileID: 2091683021}
- m_Father: {fileID: 0}
- 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!114 &651187264
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 651187262}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
---- !u!114 &651187265
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 651187262}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_UiScaleMode: 0
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
- m_PresetInfoIsWorld: 0
---- !u!223 &651187266
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 651187262}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 0
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: 25
- m_UpdateRectTransformForStandalone: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!114 &651187267
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 651187262}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f32ba5333f5ed594993ec1bf35724497, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- timeToElapseBeforeNextScene: 2
- version_text:
---- !u!1 &1299876371
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1299876374}
- - component: {fileID: 1299876373}
- - component: {fileID: 1299876372}
- m_Layer: 0
- m_Name: Main Camera
- m_TagString: MainCamera
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!81 &1299876372
-AudioListener:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1299876371}
- m_Enabled: 1
---- !u!20 &1299876373
-Camera:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1299876371}
- m_Enabled: 1
- serializedVersion: 2
- m_ClearFlags: 1
- m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
- m_projectionMatrixMode: 1
- m_GateFitMode: 2
- m_FOVAxisMode: 0
- m_Iso: 200
- m_ShutterSpeed: 0.005
- m_Aperture: 16
- m_FocusDistance: 10
- m_FocalLength: 50
- m_BladeCount: 5
- m_Curvature: {x: 2, y: 11}
- m_BarrelClipping: 0.25
- m_Anamorphism: 0
- m_SensorSize: {x: 36, y: 24}
- m_LensShift: {x: 0, y: 0}
- m_NormalizedViewPortRect:
- serializedVersion: 2
- x: 0
- y: 0
- width: 1
- height: 1
- near clip plane: 0.3
- far clip plane: 1000
- field of view: 60
- orthographic: 1
- orthographic size: 5
- m_Depth: -1
- m_CullingMask:
- serializedVersion: 2
- m_Bits: 4294967295
- m_RenderingPath: -1
- m_TargetTexture: {fileID: 0}
- m_TargetDisplay: 0
- m_TargetEye: 3
- m_HDR: 1
- m_AllowMSAA: 1
- m_AllowDynamicResolution: 0
- m_ForceIntoRT: 0
- m_OcclusionCulling: 1
- m_StereoConvergence: 10
- m_StereoSeparation: 0.022
---- !u!4 &1299876374
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1299876371}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -10}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2091683020
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2091683021}
- - component: {fileID: 2091683023}
- - component: {fileID: 2091683022}
- m_Layer: 5
- m_Name: Text (TMP)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2091683021
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2091683020}
- 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: 651187263}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.05, y: 0}
- m_AnchorMax: {x: 0.95, y: 0.15}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2091683022
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2091683020}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, 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_text: 'FIN DE SESSION
-
- Lancement de la reconnexion'
- m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_fontSharedMaterials: []
- m_fontMaterial: {fileID: 0}
- m_fontMaterials: []
- m_fontColor32:
- serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
- m_enableVertexGradient: 0
- m_colorMode: 3
- m_fontColorGradient:
- topLeft: {r: 1, g: 1, b: 1, a: 1}
- topRight: {r: 1, g: 1, b: 1, a: 1}
- bottomLeft: {r: 1, g: 1, b: 1, a: 1}
- bottomRight: {r: 1, g: 1, b: 1, a: 1}
- m_fontColorGradientPreset: {fileID: 0}
- m_spriteAsset: {fileID: 0}
- m_tintAllSprites: 0
- m_StyleSheet: {fileID: 0}
- m_TextStyleHashCode: -1183493901
- m_overrideHtmlColors: 0
- m_faceColor:
- serializedVersion: 2
- rgba: 4294967295
- m_fontSize: 35.95
- m_fontSizeBase: 36
- m_fontWeight: 400
- m_enableAutoSizing: 1
- m_fontSizeMin: 18
- m_fontSizeMax: 72
- m_fontStyle: 0
- m_HorizontalAlignment: 4
- m_VerticalAlignment: 512
- m_textAlignment: 65535
- m_characterSpacing: 0
- m_wordSpacing: 0
- m_lineSpacing: 0
- m_lineSpacingMax: 0
- m_paragraphSpacing: 0
- m_charWidthMaxAdj: 0
- m_enableWordWrapping: 1
- m_wordWrappingRatios: 0.4
- m_overflowMode: 0
- m_linkedTextComponent: {fileID: 0}
- parentLinkedComponent: {fileID: 0}
- m_enableKerning: 1
- m_enableExtraPadding: 0
- checkPaddingRequired: 0
- m_isRichText: 1
- m_parseCtrlCharacters: 1
- m_isOrthographic: 1
- m_isCullingEnabled: 0
- m_horizontalMapping: 0
- m_verticalMapping: 0
- m_uvLineOffset: 0
- m_geometrySortingOrder: 0
- m_IsTextObjectScaleStatic: 0
- m_VertexBufferAutoSizeReduction: 0
- m_useMaxVisibleDescender: 1
- m_pageToDisplay: 1
- m_margin: {x: 0, y: 0, z: 0, w: 0}
- m_isUsingLegacyAnimationComponent: 0
- m_isVolumetricText: 0
- m_hasFontAssetChanged: 0
- m_baseMaterial: {fileID: 0}
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &2091683023
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2091683020}
- m_CullTransparentMesh: 1
---- !u!1660057539 &9223372036854775807
-SceneRoots:
- m_ObjectHideFlags: 0
- m_Roots:
- - {fileID: 651187263}
- - {fileID: 1299876374}
- - {fileID: 449536032}
diff --git a/Assets/Scenes/FinScreen.unity.meta b/Assets/Scenes/FinScreen.unity.meta
deleted file mode 100644
index bed79446..00000000
--- a/Assets/Scenes/FinScreen.unity.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1e69761888eb64842a76c10483e2cf60
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index a9fd80c4..afb1279e 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -304,6 +304,7 @@ RectTransform:
- {fileID: 231950887}
- {fileID: 1511890673}
- {fileID: 2130757247}
+ - {fileID: 743562595}
- {fileID: 1277173682}
- {fileID: 834236341}
- {fileID: 1079179181}
@@ -500,7 +501,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36.4
+ m_fontSize: 34.45
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -1487,7 +1488,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1622342606050405238, guid: d2cfb9fe5fe33e648ad7a1a7f16e43f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.000030517578
+ value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 1622342606050405238, guid: d2cfb9fe5fe33e648ad7a1a7f16e43f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4153,6 +4154,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 9085209344251126382, guid: d2cfb9fe5fe33e648ad7a1a7f16e43f2, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -12.599976
+ objectReference: {fileID: 0}
- target: {fileID: 9103235354127013563, guid: d2cfb9fe5fe33e648ad7a1a7f16e43f2, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -4275,6 +4280,140 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 1622342606050405238, guid: d2cfb9fe5fe33e648ad7a1a7f16e43f2, type: 3}
m_PrefabInstance: {fileID: 630393582}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &743562594
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 743562595}
+ - component: {fileID: 743562597}
+ - component: {fileID: 743562596}
+ m_Layer: 5
+ m_Name: Text_session_actuelle_item_actuel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &743562595
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 743562594}
+ 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: 234776228}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.55, y: 0.5}
+ m_AnchorMax: {x: 0.95, y: 0.85}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &743562596
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 743562594}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, 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_text: "Session\nN\xB01/12 \n\nquestion\nN\xB012/23"
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 0c5c68d23af64f34e9ad709563fc4123, type: 2}
+ m_sharedMaterial: {fileID: 21403368916384852, guid: 0c5c68d23af64f34e9ad709563fc4123, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 0}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 37.15
+ m_fontSizeBase: 36
+ m_fontWeight: 400
+ m_enableAutoSizing: 1
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 4
+ m_VerticalAlignment: 256
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &743562597
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 743562594}
+ m_CullTransparentMesh: 1
--- !u!1 &761270575
GameObject:
m_ObjectHideFlags: 0
@@ -4391,6 +4530,7 @@ MonoBehaviour:
boutonDeconnexion: {fileID: 1079179180}
BoutonsessionActuelleTexte: {fileID: 454583531}
BoutonnextsessionTexte: {fileID: 1336072441}
+ infoSessionItemEnCours: {fileID: 743562596}
--- !u!4 &761270577
Transform:
m_ObjectHideFlags: 0
@@ -5217,7 +5357,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36.75
+ m_fontSize: 39.35
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -5471,7 +5611,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 36.35
+ m_fontSize: 34.4
m_fontSizeBase: 24
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -5957,7 +6097,7 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4280180190
+ rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
diff --git a/Assets/SplashScreenScript.cs b/Assets/SplashScreenScript.cs
index acbd7083..0a3d9386 100644
--- a/Assets/SplashScreenScript.cs
+++ b/Assets/SplashScreenScript.cs
@@ -7,11 +7,13 @@ public class SplashScreenScript : MonoBehaviour
// Start is called before the first frame update
void Start()
{
+ timeElapsed = 0.0f;
+ timeToElapseBeforeNextScene = 1.0f;
Debug.LogError("splashscren");
//Session.saveNewTraces(updateVersionLuciole(), "S_SPlashScreen","Nav_Scenes","Ouverture");
}
private float timeElapsed = 0.0f;
- public float timeToElapseBeforeNextScene = 2.0f;
+ public float timeToElapseBeforeNextScene = 1.0f;
public static bool mode_Plugin_HM = true;// mode plugin Humansmatter
[SerializeField] public string version_text;
@@ -28,11 +30,17 @@ public class SplashScreenScript : MonoBehaviour
{
if (timeElapsed > timeToElapseBeforeNextScene)
{
- //Debug.Log("splashscreenfinished");
+ Debug.Log("splashscreenfinished");
if (mode_Plugin_HM)
+ {
SceneManager.LoadScene("TRANS3_PluginHM/Scenes/HM_SceneStart");
+ }
+
else
+ {
SceneManager.LoadScene("Scenes/MainScene");
+ }
+
}
else
{
diff --git a/Assets/mainManager.cs b/Assets/mainManager.cs
index a599bd0d..1a188676 100644
--- a/Assets/mainManager.cs
+++ b/Assets/mainManager.cs
@@ -91,15 +91,24 @@ public class mainManager : MonoBehaviour
{
Debug.Log("CLEF "+ clefPourSauvegardeUtilisateur +" NOT FOUND starting with session N °0");
}
-
+ toutessessionsacheves = false;
if (currentSession >= jsonStructureScript.data.sessions.Count)
{
- currentSession = 0;
+ toutessessionsacheves = true;
+ Debug.Log("Current session is done ");
+ currentSession = jsonStructureScript.data.sessions.Count-1;
+ s = jsonStructureScript.data.sessions[currentSession];
+ currentEpreuve = s.epreuves.Count - 1;
+ e = s.epreuves[currentEpreuve];
+ currentItem = e.items.Count - 1;
+ i = e.items[currentItem];
+ ouvrirMenu(false);
+ }
+ else
+ {
+ playSteps();
}
- newSystemeDeTraces.sendThisUserTracesToHMPlugin();
- // on check si dans les TRACES, une epreuve a deja ete faite. Si c'est le cas et s'il y a une epreuve apres ce N� dans le json structure, alors on set currentEpreuve accordingly
- playSteps();
}
private void resetClasse()
{
@@ -436,7 +445,7 @@ public class mainManager : MonoBehaviour
{
// deuxieme clic et troiseme clic
compteurclickcoinDroitHautToUnlockCheat++;
- if (compteurclickcoinDroitHautToUnlockCheat >= 3) //au troisieme clic
+ if (compteurclickcoinDroitHautToUnlockCheat >= 5) //au troisieme clic
{
boutonCheatNextImage.color = Color.white; // on rend visible le bouton cheat
}
@@ -640,9 +649,12 @@ public class mainManager : MonoBehaviour
public GameObject boutonDeconnexion;
public TextMeshProUGUI BoutonsessionActuelleTexte;
public TextMeshProUGUI BoutonnextsessionTexte;
+ public TextMeshProUGUI infoSessionItemEnCours;
+ private bool toutessessionsacheves;
public void ouvrirMenu (bool findesession=false)
{
+ Debug.Log("ouvrirMenu");
boutonDeconnexion.SetActive(false);
boutonSessionSuivante.SetActive(false);
@@ -654,6 +666,41 @@ public class mainManager : MonoBehaviour
{
int sessionActuelle = currentSession + 1;
BoutonsessionActuelleTexte.text = "Retour session en cours " + sessionActuelle.ToString() + "/" + jsonStructureScript.data.sessions.Count.ToString();
+ infoSessionItemEnCours.text = "Session\nN°"+sessionActuelle.ToString() + "/" + jsonStructureScript.data.sessions.Count.ToString();
+
+ int nbItemsPasses = 0;
+ bool nbitempassesReached = false;
+ int nbItemsTotauxDansCetteSession = 0;
+
+ foreach (Epreuve epp in s.epreuves)
+ {
+ foreach (EpreuveItem eii in epp.items)
+ {
+
+
+ if (!nbitempassesReached)
+ {
+ nbItemsPasses++;
+ }
+ nbItemsTotauxDansCetteSession++;
+ if (eii == i)
+ {
+ nbitempassesReached = true;
+ }
+ }
+ }
+ int maxsession = jsonStructureScript.data.sessions.Count - 1;
+ int maxepreuve = jsonStructureScript.data.sessions[maxsession].epreuves.Count-1;
+ int maxitem = jsonStructureScript.data.sessions[maxsession].epreuves[maxepreuve].items.Count-1;
+
+
+
+ Debug.Log("nbItemsPasses = " + nbItemsPasses + " nbItemsTotauxDansCetteSession=" + nbItemsTotauxDansCetteSession + " i.id=" + i.id+" e.id="+e.id);
+ infoSessionItemEnCours.text += "\n\nQuestion\nN°" + nbItemsPasses.ToString() + "/" + nbItemsTotauxDansCetteSession.ToString();
+ if (i == jsonStructureScript.data.sessions[maxsession].epreuves[maxepreuve].items[maxitem])
+ {
+ infoSessionItemEnCours.text += "\n\nFIN";
+ }
boutonSessionEnCours.SetActive(true);
}
gameObjFin.SetActive(true);
@@ -663,7 +710,7 @@ public class mainManager : MonoBehaviour
{
int futuresession = currentSession + 1;
gestionProg.SauveProgression(futuresession);
- texteFinSession.text = "FIN DE SESSION / Envoi des traces au serveur en cours...";
+ texteFinSession.text = "Fin de session. Envoi des traces au serveur en cours...";
newSystemeDeTraces.sendThisUserTracesToHMPlugin(true);
}
@@ -672,8 +719,18 @@ public class mainManager : MonoBehaviour
Time.timeScale = 0.0f;
audioIsPaused = true;
mainAudioSource.Pause();
- newSystemeDeTraces.sendThisUserTracesToHMPlugin(false);
+ if (!toutessessionsacheves)
+ {
+ newSystemeDeTraces.sendThisUserTracesToHMPlugin(false);
+
+ }
+ else
+ {
+ boutonSessionEnCours.SetActive(false);
+ boutonDeconnexion.SetActive(true);
+ }
}
+
}
public void clicRetourSessionEnCOurs()
@@ -704,19 +761,22 @@ public class mainManager : MonoBehaviour
public void deconnexion()
{
Debug.Log("deconnexion");
- gestionProg.SauveProgression(currentSession);
- newSystemeDeTraces.sendThisUserTracesToHMPlugin(true);
+ //gestionProg.SauveProgression(currentSession);
+ //newSystemeDeTraces.sendThisUserTracesToHMPlugin(true);
boutonSessionSuivante.SetActive(false);
boutonSessionEnCours.SetActive(false);
boutonDeconnexion.SetActive(false);
- texteFinSession.text = "FIN DE SESSION / Envoi des traces au serveur en cours...";
+ StartCoroutine(terminateScene());
+ //texteFinSession.text = "FIN DE SESSION / Envoi des traces au serveur en cours...";
}
public IEnumerator terminateScene()
{
+ Time.timeScale = 1.0f;
+ Debug.Log("terminateScene");
yield return new WaitForSecondsRealtime(1.0f);
- SceneManager.LoadScene("Scenes/FinScreen");
+ SceneManager.LoadScene("Scenes/SplashScreen");
}
}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 28713ce9..cc0fa13d 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -27,10 +27,10 @@ EditorUserSettings:
value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
flags: 0
RecentlyUsedSceneGuid-7:
- value: 025701560657515e545d0926447508454e474f2f797820647b7d4c35e1b93661
+ value: 52045152560d5d025858542140750e44404f4d2b74797431292b1f66b1e5373c
flags: 0
RecentlyUsedSceneGuid-8:
- value: 52045152560d5d025858542140750e44404f4d2b74797431292b1f66b1e5373c
+ value: 025701560657515e545d0926447508454e474f2f797820647b7d4c35e1b93661
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt
index 3dba7eb9..56f4a54a 100644
--- a/UserSettings/Layouts/default-2022.dwlt
+++ b/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1536
height: 772.8
m_ShowMode: 4
- m_Title: Game
+ m_Title: Project
m_RootView: {fileID: 2}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -165,7 +165,7 @@ MonoBehaviour:
x: 0
y: 0
width: 1052.8
- height: 568.8
+ height: 304.8
m_MinSize: {x: 200, y: 50}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
@@ -188,7 +188,7 @@ MonoBehaviour:
x: 0
y: 0
width: 350.4
- height: 568.8
+ height: 304.8
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 13}
@@ -214,9 +214,9 @@ MonoBehaviour:
x: 350.4
y: 0
width: 702.4
- height: 568.8
- m_MinSize: {x: 202, y: 221}
- m_MaxSize: {x: 4002, y: 4021}
+ height: 304.8
+ m_MinSize: {x: 200, y: 200}
+ m_MaxSize: {x: 4000, y: 4000}
m_ActualView: {fileID: 12}
m_Panes:
- {fileID: 14}
@@ -233,23 +233,23 @@ 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:
serializedVersion: 2
x: 0
- y: 568.8
+ y: 304.8
width: 1052.8
- height: 154
- m_MinSize: {x: 101, y: 121}
- m_MaxSize: {x: 4001, y: 4021}
- m_ActualView: {fileID: 16}
+ height: 418
+ m_MinSize: {x: 231, y: 271}
+ m_MaxSize: {x: 10001, y: 10021}
+ m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
- {fileID: 16}
- m_Selected: 1
- m_LastSelected: 0
+ m_Selected: 0
+ m_LastSelected: 1
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -269,8 +269,8 @@ MonoBehaviour:
y: 0
width: 483.19995
height: 722.8
- 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}
@@ -299,7 +299,7 @@ MonoBehaviour:
x: 350.4
y: 73.6
width: 700.4
- height: 547.8
+ height: 283.8
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -316,7 +316,7 @@ MonoBehaviour:
m_ShowGizmos: 0
m_TargetDisplay: 0
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
- m_TargetSize: {x: 875.5, y: 658.5}
+ m_TargetSize: {x: 875.5, y: 328.5}
m_TextureFilterMode: 0
m_TextureHideFlags: 61
m_RenderIMGUI: 1
@@ -333,8 +333,8 @@ MonoBehaviour:
vZoomLockedByDefault: 0
m_HBaseRangeMin: -350.2
m_HBaseRangeMax: 350.2
- m_VBaseRangeMin: -263.4
- m_VBaseRangeMax: 263.4
+ m_VBaseRangeMin: -131.40001
+ m_VBaseRangeMax: 131.40001
m_HAllowExceedBaseRangeMin: 1
m_HAllowExceedBaseRangeMax: 1
m_VAllowExceedBaseRangeMin: 1
@@ -353,22 +353,22 @@ MonoBehaviour:
x: 0
y: 21
width: 700.4
- height: 526.8
- m_Scale: {x: 1, y: 1}
- m_Translation: {x: 350.2, y: 263.4}
+ height: 262.8
+ m_Scale: {x: 0.99999994, y: 0.9999999}
+ m_Translation: {x: 350.2, y: 131.4}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
- x: -350.2
- y: -263.4
- width: 700.4
- height: 526.8
+ x: -350.20004
+ y: -131.40001
+ width: 700.4001
+ height: 262.80002
m_MinimalGUI: 1
- m_defaultScale: 1
- m_LastWindowPixelSize: {x: 875.5, y: 684.75}
+ m_defaultScale: 0.9999999
+ m_LastWindowPixelSize: {x: 875.5, y: 354.75}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000000000000
@@ -397,7 +397,7 @@ MonoBehaviour:
x: 0
y: 73.6
width: 349.4
- height: 547.8
+ height: 283.8
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -411,23 +411,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 729b0000
+ m_SelectedIDs: 7e7c0000
m_LastClickedID: 0
- m_ExpandedIDs: 7ab7ffffe6e0ffff16fbffffd66d0000
+ m_ExpandedIDs: acf0ffff10f4ffff16fbffffec6200006aa60000
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: uploadTracesEvalulu_adeposerdansHM_sceneStart
- m_OriginalName: uploadTracesEvalulu_adeposerdansHM_sceneStart
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: -1260
+ m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 0
+ m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 8}
m_SearchString:
@@ -906,9 +906,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
- y: 442.4
+ y: 378.4
width: 1051.8
- height: 333
+ height: 397
m_SerializedDataModeController:
m_DataMode: 0
m_PreferredDataMode: 0
@@ -944,10 +944,10 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
- scrollPos: {x: 0, y: 60}
- m_SelectedIDs: aa9a0000
- m_LastClickedID: 39594
- m_ExpandedIDs: 00000000949a0000969a0000989a000000ca9a3bffffff7f
+ scrollPos: {x: 0, y: 79}
+ m_SelectedIDs: 347c0000
+ m_LastClickedID: 31796
+ m_ExpandedIDs: 000000001e7c0000207c0000227c000000ca9a3bffffff7f
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -975,7 +975,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000949a0000969a0000989a0000
+ m_ExpandedIDs: 000000001e7c0000207c0000227c0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1000,8 +1000,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
- m_SelectedInstanceIDs: 729b0000
- m_LastClickedInstanceID: 39794
+ m_SelectedInstanceIDs:
+ m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 1
m_ExpandedInstanceIDs: c6230000
m_RenameOverlay:
--
GitLab