Conjure/EscapeTheRoom
6
0
Fork 0
mirror of https://github.com/ConjureETS/EscapeTheRoom.git synced 2026-03-24 01:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

FirstPerson

Browse Source
This commit is contained in:
max89max 2015-11-08 18:40:46 +01:00
parent fd83088183
commit 61dcacb734
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/Prefabs/FirstPerson.prefab
View File

@ -312,6 +312,7 @@ MonoBehaviour:
- {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
- {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
- {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, type: 2}
- {fileID: 0}
m_Allumettes: {fileID: 11455286, guid: bdd994d2c872c9e4d8601100f973be0d, type: 2}
m_WalkSpeed: 3
m_RunSpeed: 10
@ -417,10 +418,22 @@ Prefab:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 0}
propertyPath: m_Briquets.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_TagString
value: AudioSourceBreath
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_Briquets.Array.data[3]
value:
objectReference: {fileID: 0}
- target: {fileID: 0}
propertyPath: m_NbrAllumettes
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 117402}

8
Assets/Scenes/maxScene.unity
View File

@ -134,6 +134,10 @@ Prefab:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
propertyPath: m_Briquets.Array.size
value: 4
objectReference: {fileID: 0}
- target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
propertyPath: m_LocalPosition.x
value: -.469999999
@ -166,6 +170,10 @@ Prefab:
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
propertyPath: m_Briquets.Array.data[3]
value:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: e180da7fedba0004086c3f44426d29c5, type: 2}
m_IsPrefabParent: 0

23
Assets/Scripts/FirstPersonController.cs
View File

@ -160,10 +160,10 @@ namespace UnityStandardAssets.Characters.FirstPerson
PlayRespireSound();
//Actions joueur
if(Input.GetButton("Briquet"))
if(m_Briquets[indexBriquet]!=null)
{
//allumerBriquet
if(m_Briquets[indexBriquet]!=null)
if(Input.GetButton("Briquet"))
{
//Si un briquet n'est pas déja allumé
if(!m_Briquets[indexBriquet].activer)
@ -181,22 +181,23 @@ namespace UnityStandardAssets.Characters.FirstPerson
DestroyObject(GameObject.FindGameObjectWithTag("Allumettes"));
}
m_Briquets[indexBriquet].activer=true;
m_Briquets[indexBriquet].enabled = true;
m_Briquets[indexBriquet].enabled=true;
}
//Si le briquet est déja allumé
else
{
m_Briquets[indexBriquet].activer=false;
m_Briquets[indexBriquet].enabled = false;
m_Briquets[indexBriquet].enabled=false;
}
}
//Si le briquet est vide, le jeté
if (m_Briquets[indexBriquet].m_Essence <= 0)
{
m_Briquets[indexBriquet].activer=false;
DestroyObject(m_Briquets[indexBriquet].gameObject);
indexBriquet++;
}
}
//Si le briquet est vide, le jeté
if (m_Briquets[indexBriquet].m_Essence <= 0)
{
m_Briquets[indexBriquet].activer=false;
DestroyObject(m_Briquets[indexBriquet].gameObject);
indexBriquet++;
}
if(Input.GetButton("Alumettes"))