diff --git a/Assets/Materials/StoneSlab.mat b/Assets/Materials/StoneSlab.mat new file mode 100644 index 0000000..df86d18 --- /dev/null +++ b/Assets/Materials/StoneSlab.mat @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: StoneSlab + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + data: + first: + name: _SrcBlend + second: 1 + data: + first: + name: _DstBlend + second: 0 + data: + first: + name: _Cutoff + second: .5 + data: + first: + name: _Parallax + second: .0199999996 + data: + first: + name: _ZWrite + second: 1 + data: + first: + name: _Glossiness + second: .5 + data: + first: + name: _BumpScale + second: 1 + data: + first: + name: _OcclusionStrength + second: 1 + data: + first: + name: _DetailNormalMapScale + second: 1 + data: + first: + name: _UVSec + second: 0 + data: + first: + name: _Mode + second: 0 + data: + first: + name: _Metallic + second: 0 + m_Colors: + data: + first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} + data: + first: + name: _Color + second: {r: .367647052, g: .335207611, b: .335207611, a: 1} diff --git a/Assets/Materials/StoneSlab.mat.meta b/Assets/Materials/StoneSlab.mat.meta new file mode 100644 index 0000000..e714453 --- /dev/null +++ b/Assets/Materials/StoneSlab.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aed5f81755c105743acfb9adc27b8a35 +timeCreated: 1447002952 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BladeTrap.prefab b/Assets/Prefabs/BladeTrap.prefab index 6431f8f..68f8d4c 100644 --- a/Assets/Prefabs/BladeTrap.prefab +++ b/Assets/Prefabs/BladeTrap.prefab @@ -1,51 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &130446 +--- !u!1 &103196 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 412946} - - 65: {fileID: 6572816} - - 65: {fileID: 6538670} - - 114: {fileID: 11459534} - m_Layer: 0 - m_Name: trapTriggers - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &187640 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 466408} - - 33: {fileID: 3341506} - - 65: {fileID: 6511276} - - 23: {fileID: 2318638} - - 54: {fileID: 5432898} - - 114: {fileID: 11496062} - m_Layer: 0 - m_Name: Blade - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &195288 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 498798} + - 4: {fileID: 416822} m_Layer: 0 m_Name: BladeTrap m_TagString: Trap @@ -53,50 +15,151 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &412946 +--- !u!1 &113774 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 402734} + - 33: {fileID: 3354996} + - 65: {fileID: 6531904} + - 23: {fileID: 2389056} + m_Layer: 0 + m_Name: StoneSlab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &154466 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 486900} + - 33: {fileID: 3309082} + - 65: {fileID: 6537042} + - 23: {fileID: 2355834} + m_Layer: 0 + m_Name: StoneSlab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &178234 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 483294} + - 65: {fileID: 6599962} + - 65: {fileID: 6509366} + - 114: {fileID: 11419876} + - 82: {fileID: 8231454} + m_Layer: 0 + m_Name: trapTriggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &179872 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 451298} + - 33: {fileID: 3389622} + - 65: {fileID: 6583628} + - 23: {fileID: 2301134} + - 54: {fileID: 5416446} + - 114: {fileID: 11406646} + m_Layer: 0 + m_Name: Blade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &402734 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 130446} + m_GameObject: {fileID: 113774} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: .5, z: .610000014} - m_LocalScale: {x: 1, y: 1, z: -.689999998} + m_LocalPosition: {x: .0500000007, y: 0, z: .959999979} + m_LocalScale: {x: 1, y: .119999997, z: .649999976} m_Children: [] - m_Father: {fileID: 498798} - m_RootOrder: 1 ---- !u!4 &466408 + m_Father: {fileID: 416822} + m_RootOrder: 2 +--- !u!4 &416822 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -.600000024, z: 0} - m_LocalScale: {x: 1, y: 1, z: .150000006} - m_Children: [] - m_Father: {fileID: 498798} - m_RootOrder: 0 ---- !u!4 &498798 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 195288} + m_GameObject: {fileID: 103196} 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: - - {fileID: 466408} - - {fileID: 412946} + - {fileID: 451298} + - {fileID: 483294} + - {fileID: 402734} + - {fileID: 486900} m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!23 &2318638 +--- !u!4 &451298 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -.600000024, z: 0} + m_LocalScale: {x: 1, y: 1, z: .150000006} + m_Children: [] + m_Father: {fileID: 416822} + m_RootOrder: 0 +--- !u!4 &483294 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 178234} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: .5, z: .610000014} + m_LocalScale: {x: 1, y: 1, z: -.689999998} + m_Children: [] + m_Father: {fileID: 416822} + m_RootOrder: 1 +--- !u!4 &486900 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 154466} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .0499999523, y: 0, z: -1.05999994} + m_LocalScale: {x: 1, y: .119999997, z: .649999976} + m_Children: [] + m_Father: {fileID: 416822} + m_RootOrder: 3 +--- !u!23 &2301134 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} + m_GameObject: {fileID: 179872} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -115,19 +178,81 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &3341506 +--- !u!23 &2355834 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 154466} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: aed5f81755c105743acfb9adc27b8a35, 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!23 &2389056 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 113774} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: aed5f81755c105743acfb9adc27b8a35, 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!33 &3309082 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} + m_GameObject: {fileID: 154466} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!54 &5432898 +--- !u!33 &3354996 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 113774} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &3389622 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179872} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5416446 Rigidbody: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} + m_GameObject: {fileID: 179872} serializedVersion: 2 m_Mass: 1 m_Drag: 0 @@ -137,60 +262,142 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!65 &6511276 +--- !u!65 &6509366 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} + m_GameObject: {fileID: 178234} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &6538670 +--- !u!65 &6531904 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 130446} + m_GameObject: {fileID: 113774} + 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!65 &6537042 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 154466} + 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!65 &6583628 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 179872} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &6572816 +--- !u!65 &6599962 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 130446} + m_GameObject: {fileID: 178234} m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 1.79999995} ---- !u!114 &11459534 -MonoBehaviour: +--- !u!82 &8231454 +AudioSource: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 130446} + m_GameObject: {fileID: 178234} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5b53a2d97a11ef14182f5c127412647d, type: 3} - m_Name: - m_EditorClassIdentifier: - bladeTrap: {fileID: 187640} ---- !u!114 &11496062 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: f763a8771ca1fb446af1fdf498edf097, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + Priority: 57 + 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!114 &11406646 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 187640} + m_GameObject: {fileID: 179872} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 36679b68705774b4db17d51844bbad63, type: 3} @@ -198,6 +405,18 @@ MonoBehaviour: m_EditorClassIdentifier: trapSpeed: 2 maxDistance: 5 +--- !u!114 &11419876 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 178234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b53a2d97a11ef14182f5c127412647d, type: 3} + m_Name: + m_EditorClassIdentifier: + bladeTrap: {fileID: 179872} --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 @@ -207,5 +426,5 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 195288} + m_RootGameObject: {fileID: 103196} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/BladeTrap.prefab.meta b/Assets/Prefabs/BladeTrap.prefab.meta index 30e8e4a..98d9d28 100644 --- a/Assets/Prefabs/BladeTrap.prefab.meta +++ b/Assets/Prefabs/BladeTrap.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ed3c63e28f69853439e23037fe66bd7e -timeCreated: 1446929971 +timeCreated: 1447004175 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Scenes/FrancisScene.unity b/Assets/Scenes/FrancisScene.unity index 22a5c5d..2876eb9 100644 --- a/Assets/Scenes/FrancisScene.unity +++ b/Assets/Scenes/FrancisScene.unity @@ -85,301 +85,6 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &169022797 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100002, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 169022798} - - 20: {fileID: 169022800} - - 81: {fileID: 169022799} - m_Layer: 0 - m_Name: FirstPersonCharacter - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &169022798 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400002, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 169022797} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: .800000012, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 267648291} - m_RootOrder: 0 ---- !u!81 &169022799 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8100000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 169022797} - m_Enabled: 1 ---- !u!20 &169022800 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 2000000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 169022797} - 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: 0 - 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!1 &267648286 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 267648291} - - 143: {fileID: 267648290} - - 114: {fileID: 267648289} - - 54: {fileID: 267648288} - - 82: {fileID: 267648287} - m_Layer: 0 - m_Name: FPSController - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!82 &267648287 -AudioSource: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 8200000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 267648286} - 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: 1 - 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!54 &267648288 -Rigidbody: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 5400000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 267648286} - 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!114 &267648289 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 267648286} - 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} - m_Allumettes: {fileID: 11455286, guid: bdd994d2c872c9e4d8601100f973be0d, type: 2} - m_WalkSpeed: 5 - m_RunSpeed: 10 - m_Stamina: 1000 - m_RunstepLenghten: 0 - m_JumpSpeed: 0 - m_StickToGroundForce: 0 - m_GravityMultiplier: 0 - m_MouseLook: - XSensitivity: 2 - YSensitivity: 2 - clampVerticalRotation: 1 - MinimumX: -90 - MaximumX: 90 - smooth: 0 - smoothTime: 5 - m_UseFovKick: 0 - 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: 0 - m_HeadBob: - HorizontalBobRange: .330000013 - VerticalBobRange: .330000013 - 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: 0 - BobAmount: 0 - m_StepInterval: 0 - m_FootstepSounds: [] - m_JumpSound: {fileID: 0} - m_LandSound: {fileID: 0} ---- !u!143 &267648290 -CharacterController: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 14300000, guid: 5e9e851c0e142814dac026a256ba2ac0, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 267648286} - 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!4 &267648291 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400000, guid: 5e9e851c0e142814dac026a256ba2ac0, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 267648286} - 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: - - {fileID: 169022798} - m_Father: {fileID: 0} - m_RootOrder: 5 --- !u!1 &334332187 GameObject: m_ObjectHideFlags: 0 @@ -398,7 +103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!23 &334332188 MeshRenderer: m_ObjectHideFlags: 0 @@ -487,7 +192,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!81 &417479668 AudioListener: m_ObjectHideFlags: 0 @@ -555,6 +260,110 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1001 &474641136 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalPosition.x + value: -3.08999991 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalPosition.y + value: .0500000007 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalRotation.x + value: .707106829 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_LocalRotation.w + value: .707106709 + objectReference: {fileID: 0} + - target: {fileID: 440746, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 115744, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: m_Name + value: Trou (1) + objectReference: {fileID: 0} + - target: {fileID: 11414590, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + propertyPath: floor + value: + objectReference: {fileID: 1736981967} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1dae59e9c032b8c4fa7c221a7dd1352e, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &669271891 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalPosition.x + value: -.469999999 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalPosition.y + value: 2.1099999 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalPosition.z + value: 2.48688507 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 426836, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 117402, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 11453604, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_RespireSound + value: + objectReference: {fileID: 0} + - target: {fileID: 5492406, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + propertyPath: m_IsKinematic + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: e180da7fedba0004086c3f44426d29c5, type: 2} + m_IsPrefabParent: 0 --- !u!1 &835544711 GameObject: m_ObjectHideFlags: 0 @@ -624,7 +433,7 @@ Prefab: m_Modifications: - target: {fileID: 464732, guid: 3135019c33394eb4f917b222e3ecbddb, type: 2} propertyPath: m_LocalPosition.x - value: -7.19999981 + value: -13.6300001 objectReference: {fileID: 0} - target: {fileID: 464732, guid: 3135019c33394eb4f917b222e3ecbddb, type: 2} propertyPath: m_LocalPosition.y @@ -772,6 +581,48 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: .999999881, z: 6.12323294e-17} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &1942539860 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 416822, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &2125693481 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BladeTrapScript.cs b/Assets/Scripts/BladeTrapScript.cs index 5e2c355..e8e5ca8 100644 --- a/Assets/Scripts/BladeTrapScript.cs +++ b/Assets/Scripts/BladeTrapScript.cs @@ -9,10 +9,12 @@ public class BladeTrapScript : MonoBehaviour { private Vector3 trapPosition; private bool goingUp; private bool isStarted; + // Use this for initialization void Start () { isStarted = false; rb = this.GetComponent(); + trapPosition = this.transform.position; goingUp = true; } diff --git a/Assets/Scripts/BladeTrapTriggers.cs b/Assets/Scripts/BladeTrapTriggers.cs index c35dd86..b1ee40b 100644 --- a/Assets/Scripts/BladeTrapTriggers.cs +++ b/Assets/Scripts/BladeTrapTriggers.cs @@ -4,11 +4,12 @@ using System.Collections; public class BladeTrapTriggers : MonoBehaviour { public GameObject bladeTrap; - - // Use this for initialization - void Start () { - - } + //pris sur soundBible + private AudioSource ac; + // Use this for initialization + void Start () { + ac = this.GetComponent(); + } // Update is called once per frame void Update () { @@ -19,6 +20,7 @@ public class BladeTrapTriggers : MonoBehaviour { { if(other.tag == "Player") { + ac.Play(); bladeTrap.GetComponent().SetIsStarted(true); } diff --git a/Assets/Scripts/HoleScript.cs b/Assets/Scripts/HoleScript.cs index 78e5b90..93495d0 100644 --- a/Assets/Scripts/HoleScript.cs +++ b/Assets/Scripts/HoleScript.cs @@ -18,6 +18,7 @@ public class HoleScript : MonoBehaviour { if(other.tag == "Player") { print("floor ded"); + other.GetComponent().AddForce(0, 50, 0); floor.GetComponent().enabled = false; } } diff --git a/Assets/SideMovingTrap.cs b/Assets/SideMovingTrap.cs index 5a443c6..9507f2c 100644 --- a/Assets/SideMovingTrap.cs +++ b/Assets/SideMovingTrap.cs @@ -5,13 +5,11 @@ public class SideMovingTrap : MonoBehaviour { public float force; private Rigidbody rb; - //bool addLeft = false; - private Transform cyl; + // Use this for initialization void Start () { rb = this.GetComponent(); //rb.AddForce(100, 0, 0); - cyl = this.transform.parent; } // Update is called once per frame diff --git a/Assets/Sound/Click2-Sebastian-759472264.mp3 b/Assets/Sound/Click2-Sebastian-759472264.mp3 new file mode 100644 index 0000000..3d972bc Binary files /dev/null and b/Assets/Sound/Click2-Sebastian-759472264.mp3 differ diff --git a/Assets/Sound/Click2-Sebastian-759472264.mp3.meta b/Assets/Sound/Click2-Sebastian-759472264.mp3.meta new file mode 100644 index 0000000..b837d7b --- /dev/null +++ b/Assets/Sound/Click2-Sebastian-759472264.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f763a8771ca1fb446af1fdf498edf097 +timeCreated: 1447003921 +licenseType: Free +AudioImporter: + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Standard Assets/Characters/PhysicsMaterials.meta b/Assets/Standard Assets/Characters/PhysicsMaterials.meta deleted file mode 100644 index b7766b3..0000000 --- a/Assets/Standard Assets/Characters/PhysicsMaterials.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ea2a5216ffb8d4b319d09e8d7782120c -folderAsset: yes -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: