From 1f58fea1469a1fdf358956bb37d557b2810acc09 Mon Sep 17 00:00:00 2001 From: max89max Date: Sun, 8 Nov 2015 14:59:44 +0100 Subject: [PATCH] Briquet allumettes et autres pour le joueur --- Assets/Prefabs/FirstPerson.prefab | 437 +--------------------- Assets/Prefabs/FirstPerson.prefab.meta | 2 +- Assets/Scenes/maxScene.unity | 37 +- Assets/Scripts/FirstPersonController.cs | 13 + ProjectSettings/EditorBuildSettings.asset | 6 +- ProjectSettings/TagManager.asset | 2 + 6 files changed, 43 insertions(+), 454 deletions(-) diff --git a/Assets/Prefabs/FirstPerson.prefab b/Assets/Prefabs/FirstPerson.prefab index 5362c7c..a459af2 100644 --- a/Assets/Prefabs/FirstPerson.prefab +++ b/Assets/Prefabs/FirstPerson.prefab @@ -1,444 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &112876 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 434624} - - 20: {fileID: 2061712} - - 92: {fileID: 9239602} - - 124: {fileID: 12479126} - - 81: {fileID: 8101620} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &117402 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 426836} - - 114: {fileID: 11453604} - - 143: {fileID: 14323870} - - 54: {fileID: 5492406} - - 82: {fileID: 8283000} - m_Layer: 0 - m_Name: FirstPerson - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &167304 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 422960} - - 82: {fileID: 8225872} - m_Layer: 0 - m_Name: AudioSourceRespiration - m_TagString: AudioSourceBreath - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &422960 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 167304} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .487160414, y: -.242959023, z: -5.49911785} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 426836} - m_RootOrder: 0 ---- !u!4 &426836 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 117402} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -.469999999, y: 2.1099999, z: 2.48688507} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 422960} - - {fileID: 434624} - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!4 &434624 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 112876} - 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_Children: [] - m_Father: {fileID: 426836} - m_RootOrder: 1 ---- !u!20 &2061712 -Camera: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 112876} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: .300000012 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - 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: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 ---- !u!54 &5492406 -Rigidbody: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 117402} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: .0500000007 - m_UseGravity: 1 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!81 &8101620 -AudioListener: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 112876} - m_Enabled: 1 ---- !u!82 &8225872 -AudioSource: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 167304} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 ---- !u!82 &8283000 -AudioSource: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 117402} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 ---- !u!92 &9239602 -Behaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 112876} - m_Enabled: 1 ---- !u!114 &11453604 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 117402} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4bcce75dab8f540b797340354c772d8b, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsWalking: 0 - m_NbrAllumettes: 10 - m_Briquets: - - {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 - m_Stamina: 1000 - m_RunstepLenghten: .699999988 - m_JumpSpeed: 10 - m_StickToGroundForce: 10 - m_GravityMultiplier: 2 - m_MouseLook: - XSensitivity: 2 - YSensitivity: 2 - clampVerticalRotation: 1 - MinimumX: -90 - MaximumX: 90 - smooth: 0 - smoothTime: 5 - m_UseFovKick: 1 - m_FovKick: - Camera: {fileID: 0} - originalFov: 0 - FOVIncrease: 3 - TimeToIncrease: 1 - TimeToDecrease: 1 - IncreaseCurve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_UseHeadBob: 1 - m_HeadBob: - HorizontalBobRange: .100000001 - VerticalBobRange: .100000001 - Bobcurve: - serializedVersion: 2 - m_Curve: - - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: .5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 1.5 - value: -1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - - time: 2 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - VerticaltoHorizontalRatio: 1 - m_JumpBob: - BobDuration: .200000003 - BobAmount: .100000001 - m_StepInterval: 5 - m_FootstepSounds: - - {fileID: 8300000, guid: 42e65e088b3f4374e851b8dbd38f3df9, type: 3} - - {fileID: 8300000, guid: 8bc94ec6ed537e743b481638bdcd503d, type: 3} - m_JumpSound: {fileID: 8300000, guid: 5897aeed9b676024fbb8c694b421a861, type: 3} - m_LandSound: {fileID: 8300000, guid: 3b09d59f4499d45428baa7a21e954296, type: 3} - m_RespireSound: {fileID: 8300000, guid: 9645d3b6fddbdd44387c0d6996512b2a, type: 3} - m_NoStaminaSound: {fileID: 8300000, guid: 96ec8c58b35c5354e9d23061d25a23d6, type: 3} ---- !u!124 &12479126 -Behaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 112876} - m_Enabled: 1 ---- !u!143 &14323870 -CharacterController: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 117402} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 1.79999995 - m_Radius: .5 - m_SlopeLimit: 45 - m_StepOffset: .300000012 - m_SkinWidth: .0799999982 - m_MinMoveDistance: 0 - m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &100100000 Prefab: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 serializedVersion: 2 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} - - target: {fileID: 0} - propertyPath: m_RespireSound - value: - objectReference: {fileID: 8300000, guid: 9645d3b6fddbdd44387c0d6996512b2a, type: 3} + m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 117402} + m_RootGameObject: {fileID: 0} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/FirstPerson.prefab.meta b/Assets/Prefabs/FirstPerson.prefab.meta index 6a99ebd..812d7c6 100644 --- a/Assets/Prefabs/FirstPerson.prefab.meta +++ b/Assets/Prefabs/FirstPerson.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e180da7fedba0004086c3f44426d29c5 -timeCreated: 1447000680 +timeCreated: 1446990680 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Scenes/maxScene.unity b/Assets/Scenes/maxScene.unity index 87a28be..38a1b17 100644 --- a/Assets/Scenes/maxScene.unity +++ b/Assets/Scenes/maxScene.unity @@ -134,46 +134,47 @@ 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} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalPosition.x value: -.469999999 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalPosition.y - value: 2.1099999 + value: .977923334 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalPosition.z value: 2.48688507 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -.538770795 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_LocalRotation.w - value: 1 + value: .842452466 objectReference: {fileID: 0} - - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + - target: {fileID: 499080, guid: e180da7fedba0004086c3f44426d29c5, type: 2} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2} - propertyPath: m_Briquets.Array.data[3] - value: + - target: {fileID: 14356284, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_Height + value: 3.79999995 objectReference: {fileID: 0} + - target: {fileID: 11490072, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_Briquets.Array.data[0] + value: + objectReference: {fileID: 11418934, guid: 303650e9a23c68a42876df290e9d7537, + type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: e180da7fedba0004086c3f44426d29c5, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/FirstPersonController.cs b/Assets/Scripts/FirstPersonController.cs index ccd147a..273102a 100644 --- a/Assets/Scripts/FirstPersonController.cs +++ b/Assets/Scripts/FirstPersonController.cs @@ -37,6 +37,8 @@ namespace UnityStandardAssets.Characters.FirstPerson private Camera m_Camera; private bool m_Jump; private int indexBriquet; + private GameObject lighter; + private GameObject allumette; private bool canSprint; private float m_YRotation; private Vector2 m_Input; @@ -67,6 +69,10 @@ namespace UnityStandardAssets.Characters.FirstPerson m_AudioSource = GetComponent(); m_AudioSourceChild = GameObject.FindGameObjectWithTag("AudioSourceBreath").GetComponent(); m_MouseLook.Init(transform , m_Camera.transform); + lighter = GameObject.FindGameObjectWithTag (("Lighter")); + lighter.SetActive (false); + allumette = GameObject.FindGameObjectWithTag (("Allumette")); + allumette.SetActive (false); } @@ -179,16 +185,19 @@ namespace UnityStandardAssets.Characters.FirstPerson if(GameObject.FindGameObjectWithTag("Allumettes")!=null) { m_NbrAllumettes--; + allumette.SetActive (false); DestroyObject(GameObject.FindGameObjectWithTag("Allumettes")); } m_Briquets[indexBriquet].activer=true; m_Briquets[indexBriquet].enabled=true; + lighter.SetActive(true); } //Si le briquet est déja allumé else { m_Briquets[indexBriquet].activer=false; m_Briquets[indexBriquet].enabled=false; + lighter.SetActive(false); } } @@ -196,6 +205,7 @@ namespace UnityStandardAssets.Characters.FirstPerson if (m_Briquets[indexBriquet].m_Essence <= 0) { m_Briquets[indexBriquet].activer=false; + lighter.SetActive(false); DestroyObject(m_Briquets[indexBriquet].gameObject); indexBriquet++; } @@ -211,11 +221,13 @@ namespace UnityStandardAssets.Characters.FirstPerson { m_Briquets[indexBriquet].activer=false; m_Briquets[indexBriquet].enabled = false; + lighter.SetActive(false); } //Si il ny a pas d'allumettes déja allumé if(GameObject.FindGameObjectWithTag("Allumettes")==null) { Instantiate(m_Allumettes); + allumette.SetActive (true); GameObject.FindGameObjectWithTag("Allumettes").GetComponent().activer=true; } } @@ -225,6 +237,7 @@ namespace UnityStandardAssets.Characters.FirstPerson if(GameObject.FindGameObjectWithTag("Allumettes").GetComponent().m_Duree<=0) { m_NbrAllumettes--; + allumette.SetActive(false); DestroyObject(GameObject.FindGameObjectWithTag("Allumettes")); } if (m_CharacterController.isGrounded) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6dc24f7..0fc5159 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,4 +4,8 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Menu.unity + - enabled: 1 + path: Assets/Scenes/maxScene.unity diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a6bf378..d838191 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,8 @@ TagManager: - MilesStones - Allumettes - AudioSourceBreath + - Lighter + - Allumette layers: - Default - TransparentFX