diff --git a/Assets/Resources/VuforiaConfiguration.asset b/Assets/Resources/VuforiaConfiguration.asset index bd10775..aec1a6b 100644 --- a/Assets/Resources/VuforiaConfiguration.asset +++ b/Assets/Resources/VuforiaConfiguration.asset @@ -24,7 +24,7 @@ MonoBehaviour: shareRecordingsInITunes: 0 logLevel: 0 version: 10.17.4 - eulaAcceptedVersions: '{"Values":["10.15","10.17","0.0","10.18","9.8","10.20"]}' + eulaAcceptedVersions: '{"Values":["10.15","10.17","0.0","10.18","9.8","10.20","10.19"]}' database: disableModelExtraction: 0 shaders: diff --git a/Assets/Scripts/Quizz/LoadingManager.cs b/Assets/Scripts/Quizz/LoadingManager.cs index f0e8e9d..9feb8e8 100644 --- a/Assets/Scripts/Quizz/LoadingManager.cs +++ b/Assets/Scripts/Quizz/LoadingManager.cs @@ -6,12 +6,34 @@ public class LoadingManager : MonoBehaviour { public GameObject LoadingScreen; public GameObject TutorialScreen; + public GameObject GameScreen; + + private bool launched = false; + private bool game = false; void Start() { - LoadingScreen.GetComponent().enabled = false; + LoadingScreen.GetComponent().enabled = true; TutorialScreen.GetComponent().enabled = false; + GameScreen.GetComponent().enabled = false; } - void Update() { + public void LaunchTutorial() { + if (!launched) { + LoadingScreen.GetComponent().enabled = false; + TutorialScreen.GetComponent().enabled = true; + launched = true; + } + } + + public void LaunchGame() { + if (!game) { + TutorialScreen.GetComponent().enabled = false; + GameScreen.GetComponent().enabled = true; + game = true; + } + } + + public void LeaveApp() { + Application.Quit(); } } diff --git a/Assets/__Scenes/QuizzMode.unity b/Assets/__Scenes/QuizzMode.unity index b18ec6a..6e8bb81 100644 --- a/Assets/__Scenes/QuizzMode.unity +++ b/Assets/__Scenes/QuizzMode.unity @@ -1247,6 +1247,123 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &373374676 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 373374680} + - component: {fileID: 373374679} + - component: {fileID: 373374678} + - component: {fileID: 373374677} + m_Layer: 0 + m_Name: Ground Plane Stage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &373374677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373374676} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1308684972, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mObserverBehaviour: {fileID: 373374679} + mHiddenRoot: {fileID: 0} + mTargetName: + mDatasetName: + mCastedBehaviour: {fileID: 373374679} +--- !u!114 &373374678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373374676} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 886328de6a5c14cbb85854fdf1a5085b, type: 3} + m_Name: + m_EditorClassIdentifier: + StatusFilter: 2 + UsePoseSmoothing: 0 + AnimationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 3.3333333 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 3.3333333 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + OnTargetFound: + m_PersistentCalls: + m_Calls: [] + OnTargetLost: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &373374679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373374676} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 697333272, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + PreviewVisible: 1 + RuntimeOcclusion: 0 + RuntimeCollider: 0 + mTrackableName: + mInitializedInEditor: 0 + mSelectedStageType: 0 + mPlaneReference: {fileID: 0} + mMidAirReference: {fileID: 0} + mPreview: {fileID: 373374677} +--- !u!4 &373374680 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373374676} + 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: + - {fileID: 894846307} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &396731121 GameObject: m_ObjectHideFlags: 0 @@ -3295,6 +3412,111 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 879138331} m_CullTransparentMesh: 1 +--- !u!1 &894846306 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 894846307} + - component: {fileID: 894846310} + - component: {fileID: 894846309} + - component: {fileID: 894846308} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &894846307 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894846306} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.053, z: 0} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 373374680} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &894846308 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894846306} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &894846309 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894846306} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &894846310 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894846306} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &902532457 GameObject: m_ObjectHideFlags: 0 @@ -5756,6 +5978,7 @@ MonoBehaviour: m_EditorClassIdentifier: LoadingScreen: {fileID: 355216062} TutorialScreen: {fileID: 1103871392} + GameScreen: {fileID: 418204562} --- !u!1 &1894502054 GameObject: m_ObjectHideFlags: 0 @@ -6011,6 +6234,144 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1949909862} m_CullTransparentMesh: 1 +--- !u!1 &1997189619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1997189623} + - component: {fileID: 1997189622} + - component: {fileID: 1997189621} + - component: {fileID: 1997189620} + m_Layer: 0 + m_Name: Plane Finder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1997189620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997189619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 2020821747, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + AnchorStage: {fileID: 373374679} + DuplicateStage: 1 + OnContentPlaced: + m_PersistentCalls: + m_Calls: [] + mDisplayAdvanced: 0 +--- !u!114 &1997189621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997189619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 422107450, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + PlaneIndicator: {fileID: 1353731089078378, guid: b9ed12c68682d5b49bfa70ee9d71602d, type: 3} + Height: 1.4 + OnInteractiveHitTest: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1997189620} + m_TargetAssemblyTypeName: Vuforia.ContentPositioningBehaviour, Vuforia.Unity.Engine + m_MethodName: PositionContentAtPlaneAnchor + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1837724840} + m_TargetAssemblyTypeName: LoadingManager, Scripts + m_MethodName: LaunchGame + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + OnAutomaticHitTest: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1837724840} + m_TargetAssemblyTypeName: LoadingManager, Scripts + m_MethodName: LaunchTutorial + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + mDisplayAdvanced: 1 + mHitTestMode: 0 +--- !u!114 &1997189622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997189619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1027344429, guid: 8a9a760f95896c34689febc965510927, type: 3} + m_Name: + m_EditorClassIdentifier: + mDisplayAdvanced: 0 + OnInputReceivedEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1997189621} + m_TargetAssemblyTypeName: Vuforia.PlaneFinderBehaviour, Vuforia.Unity.Engine + m_MethodName: PerformHitTest + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!4 &1997189623 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1997189619} + 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 &2032574145 GameObject: m_ObjectHideFlags: 0 @@ -6334,6 +6695,8 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 482043701} + - {fileID: 1997189623} + - {fileID: 373374680} - {fileID: 1837724839} - {fileID: 355216066} - {fileID: 1799835074}