Skip to content
Snippets Groups Projects
Commit 37b66658 authored by RAMIRES Antoine's avatar RAMIRES Antoine
Browse files

modif

parent 84e39ee3
No related branches found
No related tags found
No related merge requests found
Showing
with 760 additions and 462 deletions
......@@ -73,5 +73,5 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.2924528, g: 0.28300628, b: 0.26348343, a: 1}
- _Color: {r: 0.5, g: 0.48850235, b: 0.4693396, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
This diff is collapsed.
fileFormatVersion: 2
guid: 2c9a2d102910c7a4f85615a0c7e594f4
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
File moved
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
public class MamieCollider : MonoBehaviour
{
private bool isTriggered;
// Start is called before the first frame update
void Start()
{
isTriggered = false;
}
// Update is called once per frame
void Update()
{
}
public void OnTriggerEnter(Collider other)
{
if(other.gameObject.name == "Mamie")
{
isTriggered = true;
}
}
public void ResetTrigger()
{
isTriggered = false;
}
public bool GetTrigger()
{
return isTriggered;
}
}
fileFormatVersion: 2
guid: b3e4c73f50e276e4d8bd3093c8d0531e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -6,11 +6,14 @@ using UnityEngine;
public class ScenarioMamie : MonoBehaviour
{
Timer timer1;
private TextMeshPro text_timer1;
public TextMeshPro text1;
public TextMeshPro text_timer1;
// Start is called before the first frame update
void Start()
{
timer1 = new Timer(2);
timer1.
}
// Update is called once per frame
......@@ -19,9 +22,13 @@ public class ScenarioMamie : MonoBehaviour
if (Chrono.chrono > 10)
{
timer1 = new Timer(2);
text1.SetText("Aider la mamie à prendre son repas");
text_timer1 = timer1.getText();
}
}
}
......@@ -80,8 +80,18 @@ public class Timer : MonoBehaviour
text.SetText(ConvertTime(current_time));
}
public void StopTimer()
{
isStopped = true;
}
public int getTimer()
{
return timer_minutes;
}
public TextMeshPro getText()
{
return text;
}
}
......@@ -17,6 +17,36 @@ MonoBehaviour:
m_AutomaticRunning: 0
m_Loaders:
- {fileID: 11400000, guid: deeb7f1b3a919f048b5341a950ba6ebd, type: 2}
--- !u!114 &-4041326281619010970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
m_Name: Standalone Providers
m_EditorClassIdentifier:
m_RequiresSettingsUpdate: 0
m_AutomaticLoading: 0
m_AutomaticRunning: 0
m_Loaders: []
--- !u!114 &-1367110543019319323
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3}
m_Name: Standalone Settings
m_EditorClassIdentifier:
m_LoaderManagerInstance: {fileID: -4041326281619010970}
m_InitManagerOnStart: 1
--- !u!114 &-709485062231766531
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -43,6 +73,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
m_Name: XRGeneralSettings
m_EditorClassIdentifier:
Keys: 07000000
Keys: 0700000001000000
Values:
- {fileID: -709485062231766531}
- {fileID: -1367110543019319323}
......@@ -9,7 +9,7 @@
"com.unity.ugui": "1.0.0",
"com.unity.xr.interaction.toolkit": "0.10.0-preview.7",
"com.unity.xr.management": "3.2.15",
"com.unity.xr.oculus": "file:C:/Users/Juliette/Downloads/com.unity.xr.oculus@1.5.1_win64",
"com.unity.xr.oculus": "1.1.5",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
......
......@@ -21,7 +21,7 @@ EditorBuildSettings:
path:
guid: 00000000000000000000000000000000
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 1441f391c9e10d84296235f668cc9819,
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: ddeb287e1bb5c274f8415ecd2fe17d0f,
type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: f3781e32354d3d5498231f087a6085c9,
type: 2}
......@@ -450,8 +450,7 @@ PlayerSettings:
- m_BuildTarget: Standalone
m_Enabled: 0
m_Devices:
- Oculus
- OpenVR
- MockHMD
- m_BuildTarget: Android
m_Enabled: 0
m_Devices: []
......
{
"m_Settings": [
"RemoveLegacyInputHelpersForReload"
"RemoveLegacyInputHelpersForReload",
"ShouldQueryLegacyPackageRemoval"
]
}
\ No newline at end of file
{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
"VR Device User Alert",
"VR Device Transitioned Groups"
],
"m_SettingValues": [
"False",
"False"
"True",
"True",
"Standalone"
]
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment