diff --git a/Assets/BtnJouer.cs b/Assets/BtnJouer.cs new file mode 100644 index 0000000..4df4427 --- /dev/null +++ b/Assets/BtnJouer.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +public class BtnJouer : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + if (Input.GetButton ("Fire1")) + Application.LoadLevel(1); + if (Input.GetButton ("Quit")) + Application.Quit(); + } +} diff --git a/Assets/BtnJouer.cs.meta b/Assets/BtnJouer.cs.meta new file mode 100644 index 0000000..0f5c14e --- /dev/null +++ b/Assets/BtnJouer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9d4aef7e8a8528f4e9b2ee351507b681 +timeCreated: 1446987384 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/FirstPerson.prefab b/Assets/Prefabs/FirstPerson.prefab index 9684a25..5362c7c 100644 --- a/Assets/Prefabs/FirstPerson.prefab +++ b/Assets/Prefabs/FirstPerson.prefab @@ -385,7 +385,7 @@ MonoBehaviour: - {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: 6336350fc2bc6e74185163c95a6485dc, type: 3} + m_RespireSound: {fileID: 8300000, guid: 9645d3b6fddbdd44387c0d6996512b2a, type: 3} m_NoStaminaSound: {fileID: 8300000, guid: 96ec8c58b35c5354e9d23061d25a23d6, type: 3} --- !u!124 &12479126 Behaviour: @@ -434,6 +434,10 @@ Prefab: propertyPath: m_NbrAllumettes value: 10 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RespireSound + value: + objectReference: {fileID: 8300000, guid: 9645d3b6fddbdd44387c0d6996512b2a, type: 3} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 117402} diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity new file mode 100644 index 0000000..cb661a2 --- /dev/null +++ b/Assets/Scenes/Menu.unity @@ -0,0 +1,369 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: .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} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_GIWorkflowMode: 0 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666672 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &388461130 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 388461132} + - 108: {fileID: 388461131} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &388461131 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 388461130} + m_Enabled: 1 + serializedVersion: 6 + m_Type: 1 + m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_Strength: 1 + m_Bias: .0500000007 + m_NormalBias: .400000006 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_BounceIntensity: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_AreaSize: {x: 1, y: 1} +--- !u!4 &388461132 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 388461130} + m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1 &621029721 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 621029723} + - 132: {fileID: 621029722} + - 114: {fileID: 621029724} + m_Layer: 0 + m_Name: btnJouer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!132 &621029722 +GUIText: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 621029721} + m_Enabled: 1 + serializedVersion: 3 + m_Text: Jouer + m_Anchor: 4 + m_Alignment: 1 + m_PixelOffset: {x: 0, y: 0} + m_LineSpacing: 1 + m_TabSize: 4 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Material: {fileID: 0} + m_FontSize: 75 + m_FontStyle: 1 + m_Color: + serializedVersion: 2 + rgba: 4278190080 + m_PixelCorrect: 1 + m_RichText: 1 +--- !u!4 &621029723 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 621029721} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .5, y: .699999988, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 +--- !u!114 &621029724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 621029721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d4aef7e8a8528f4e9b2ee351507b681, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &753426994 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 753426998} + - 33: {fileID: 753426997} + - 65: {fileID: 753426996} + - 23: {fileID: 753426995} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &753426995 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 753426994} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: a2b8ed7ffc61443499cb5f833e54a6b1, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!65 &753426996 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 753426994} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &753426997 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 753426994} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &753426998 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 753426994} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 9.27971268, y: 9.27971363, z: 9.27971363} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 +--- !u!1 &887833354 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 887833359} + - 20: {fileID: 887833358} + - 92: {fileID: 887833357} + - 124: {fileID: 887833356} + - 81: {fileID: 887833355} + 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 &887833355 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 887833354} + m_Enabled: 1 +--- !u!124 &887833356 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 887833354} + m_Enabled: 1 +--- !u!92 &887833357 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 887833354} + m_Enabled: 1 +--- !u!20 &887833358 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 887833354} + 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!4 &887833359 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 887833354} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 diff --git a/Assets/Scenes/Menu.unity.meta b/Assets/Scenes/Menu.unity.meta new file mode 100644 index 0000000..dc8c590 --- /dev/null +++ b/Assets/Scenes/Menu.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcabc459a3eaab44fa6e18cbab512c6f +timeCreated: 1447005350 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FirstPersonController.cs b/Assets/Scripts/FirstPersonController.cs index ba6fbe2..ccd147a 100644 --- a/Assets/Scripts/FirstPersonController.cs +++ b/Assets/Scripts/FirstPersonController.cs @@ -118,26 +118,27 @@ namespace UnityStandardAssets.Characters.FirstPerson { //Repiration sounds m_AudioSourceChild.volume += 0.3f; - if(m_AudioSourceChild.volume >1) - m_AudioSourceChild.volume=1; + if(m_AudioSourceChild.volume >0.5f) + m_AudioSourceChild.volume=0.5f; } if(m_Stamina < 100) - { - if(m_AudioSourceChild.clip == m_NoStaminaSound) - changeSound=false; - else - changeSound=true; - - m_AudioSourceChild.clip = m_NoStaminaSound; - } - else { if(m_AudioSourceChild.clip == m_RespireSound) changeSound=false; else changeSound=true; + m_AudioSourceChild.clip = m_RespireSound; } + else + { + if(m_AudioSourceChild.clip == m_NoStaminaSound) + changeSound=false; + else + changeSound=true; + m_AudioSourceChild.clip = m_NoStaminaSound; + } + if(changeSound || !m_AudioSourceChild.isPlaying) m_AudioSourceChild.Play(); m_NextStep = m_StepCycle + .5f; diff --git a/Assets/Standard Assets/Characters/PhysicsMaterials.meta b/Assets/Standard Assets/Characters/PhysicsMaterials.meta new file mode 100644 index 0000000..b7766b3 --- /dev/null +++ b/Assets/Standard Assets/Characters/PhysicsMaterials.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ea2a5216ffb8d4b319d09e8d7782120c +folderAsset: yes +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 89fcf42..3283e91 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -42,7 +42,7 @@ InputManager: descriptiveName: descriptiveNegativeName: negativeButton: - positiveButton: left ctrl + positiveButton: enter altNegativeButton: altPositiveButton: mouse 0 gravity: 1000 @@ -278,7 +278,7 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 - m_Name: Cancel + m_Name: Quit descriptiveName: descriptiveNegativeName: negativeButton: