From 8c800b6b4f7a67070054163054e1bc1f9ecf5bf8 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Nov 2015 16:03:11 -0500 Subject: [PATCH] firstTrap prefab --- Assets/{Prefab.meta => Materials.meta} | 4 +- Assets/Materials/BladeTrapMaterial.mat | 138 ++++ Assets/Materials/BladeTrapMaterial.mat.meta | 8 + Assets/{Script.meta => Prefabs.meta} | 4 +- Assets/Prefabs/BladeTrap.prefab | 13 + Assets/Prefabs/BladeTrap.prefab.meta | 8 + Assets/Scenes/FrancisScene.unity | 606 ++++++++++++++++++ .../FrancisScene.unity.meta} | 5 +- Assets/Scripts/BladeTrapScript.cs | 56 ++ Assets/Scripts/BladeTrapScript.cs.meta | 12 + Assets/Scripts/BladeTrapTriggers.cs | 27 + Assets/Scripts/BladeTrapTriggers.cs.meta | 12 + Assets/Scripts/FirstPersonController.cs.meta | 12 + Assets/Scripts/monsterAI.cs.meta | 2 +- .../Characters/PhysicsMaterials.meta | 6 - 15 files changed, 899 insertions(+), 14 deletions(-) rename Assets/{Prefab.meta => Materials.meta} (67%) create mode 100644 Assets/Materials/BladeTrapMaterial.mat create mode 100644 Assets/Materials/BladeTrapMaterial.mat.meta rename Assets/{Script.meta => Prefabs.meta} (67%) create mode 100644 Assets/Prefabs/BladeTrap.prefab create mode 100644 Assets/Prefabs/BladeTrap.prefab.meta create mode 100644 Assets/Scenes/FrancisScene.unity rename Assets/{Sound.meta => Scenes/FrancisScene.unity.meta} (58%) create mode 100644 Assets/Scripts/BladeTrapScript.cs create mode 100644 Assets/Scripts/BladeTrapScript.cs.meta create mode 100644 Assets/Scripts/BladeTrapTriggers.cs create mode 100644 Assets/Scripts/BladeTrapTriggers.cs.meta create mode 100644 Assets/Scripts/FirstPersonController.cs.meta delete mode 100644 Assets/Standard Assets/Characters/PhysicsMaterials.meta diff --git a/Assets/Prefab.meta b/Assets/Materials.meta similarity index 67% rename from Assets/Prefab.meta rename to Assets/Materials.meta index 29c665d..dbb542d 100644 --- a/Assets/Prefab.meta +++ b/Assets/Materials.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2efb95ff6f96ef4449d122f4232f7823 +guid: 87714f7f73288694e9ec4117cacc2493 folderAsset: yes -timeCreated: 1446922465 +timeCreated: 1446925659 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Materials/BladeTrapMaterial.mat b/Assets/Materials/BladeTrapMaterial.mat new file mode 100644 index 0000000..d4f02bb --- /dev/null +++ b/Assets/Materials/BladeTrapMaterial.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: BladeTrapMaterial + 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: .808823526, g: .0713668019, b: .0713668019, a: 1} diff --git a/Assets/Materials/BladeTrapMaterial.mat.meta b/Assets/Materials/BladeTrapMaterial.mat.meta new file mode 100644 index 0000000..244f19c --- /dev/null +++ b/Assets/Materials/BladeTrapMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cad7fc84f4314964f87485777e6410c0 +timeCreated: 1446925710 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script.meta b/Assets/Prefabs.meta similarity index 67% rename from Assets/Script.meta rename to Assets/Prefabs.meta index 8a4d4f4..b07d50e 100644 --- a/Assets/Script.meta +++ b/Assets/Prefabs.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 76d6da14616ce77438d759af609d8368 +guid: 6e092e0d959c5e74e9f85a474ff76505 folderAsset: yes -timeCreated: 1446922454 +timeCreated: 1446929967 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Prefabs/BladeTrap.prefab b/Assets/Prefabs/BladeTrap.prefab new file mode 100644 index 0000000..a459af2 --- /dev/null +++ b/Assets/Prefabs/BladeTrap.prefab @@ -0,0 +1,13 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 0} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/BladeTrap.prefab.meta b/Assets/Prefabs/BladeTrap.prefab.meta new file mode 100644 index 0000000..30e8e4a --- /dev/null +++ b/Assets/Prefabs/BladeTrap.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed3c63e28f69853439e23037fe66bd7e +timeCreated: 1446929971 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FrancisScene.unity b/Assets/Scenes/FrancisScene.unity new file mode 100644 index 0000000..d9b2c96 --- /dev/null +++ b/Assets/Scenes/FrancisScene.unity @@ -0,0 +1,606 @@ +%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 &51161942 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 51161947} + - 33: {fileID: 51161946} + - 65: {fileID: 51161945} + - 23: {fileID: 51161944} + - 54: {fileID: 51161948} + - 114: {fileID: 51161943} + m_Layer: 0 + m_Name: Blade + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &51161943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36679b68705774b4db17d51844bbad63, type: 3} + m_Name: + m_EditorClassIdentifier: + trapSpeed: 2 + maxDistance: 5 +--- !u!23 &51161944 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: cad7fc84f4314964f87485777e6410c0, 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 &51161945 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + 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!33 &51161946 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &51161947 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + 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: 548158196} + m_RootOrder: 0 +--- !u!54 &51161948 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 51161942} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &334332187 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 334332191} + - 33: {fileID: 334332190} + - 65: {fileID: 334332189} + - 23: {fileID: 334332188} + - 54: {fileID: 334332192} + m_Layer: 0 + m_Name: Cube + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &334332188 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 334332187} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &334332189 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 334332187} + 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 &334332190 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 334332187} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &334332191 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 334332187} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: .5, z: 3.02999997} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 +--- !u!54 &334332192 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 334332187} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &417479667 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 417479672} + - 20: {fileID: 417479671} + - 92: {fileID: 417479670} + - 124: {fileID: 417479669} + - 81: {fileID: 417479668} + 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 &417479668 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 417479667} + m_Enabled: 1 +--- !u!124 &417479669 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 417479667} + m_Enabled: 1 +--- !u!92 &417479670 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 417479667} + m_Enabled: 1 +--- !u!20 &417479671 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 417479667} + 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 &417479672 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 417479667} + m_LocalRotation: {x: .305192173, y: .00523545872, z: -.00167789869, w: .952274919} + m_LocalPosition: {x: 0, y: 2, z: -3.21000004} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &548158195 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 548158196} + m_Layer: 0 + m_Name: BladeTrap + m_TagString: Trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &548158196 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 548158195} + 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: 51161947} + - {fileID: 1082245455} + m_Father: {fileID: 0} + m_RootOrder: 3 +--- !u!1 &835544711 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 835544713} + - 108: {fileID: 835544712} + 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 &835544712 +Light: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 835544711} + 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 &835544713 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 835544711} + m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} + m_LocalPosition: {x: -2.21000004, y: 3, z: -1.27999997} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1 &1082245454 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1082245455} + - 65: {fileID: 1082245457} + - 65: {fileID: 1082245456} + - 114: {fileID: 1082245458} + m_Layer: 0 + m_Name: trapTriggers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1082245455 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1082245454} + 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: 548158196} + m_RootOrder: 1 +--- !u!65 &1082245456 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1082245454} + 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 &1082245457 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1082245454} + 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: 1.79999995} +--- !u!114 &1082245458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1082245454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b53a2d97a11ef14182f5c127412647d, type: 3} + m_Name: + m_EditorClassIdentifier: + bladeTrap: {fileID: 51161942} +--- !u!1 &1736981967 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1736981971} + - 33: {fileID: 1736981970} + - 64: {fileID: 1736981969} + - 23: {fileID: 1736981968} + - 65: {fileID: 1736981972} + m_Layer: 0 + m_Name: Sol + m_TagString: Floor + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1736981968 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1736981967} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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!64 &1736981969 +MeshCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1736981967} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Convex: 0 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &1736981970 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1736981967} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1736981971 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1736981967} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 15, y: 15, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 +--- !u!65 &1736981972 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1736981967} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: .999999881, z: 6.12323294e-17} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Sound.meta b/Assets/Scenes/FrancisScene.unity.meta similarity index 58% rename from Assets/Sound.meta rename to Assets/Scenes/FrancisScene.unity.meta index 17aa381..9cf204c 100644 --- a/Assets/Sound.meta +++ b/Assets/Scenes/FrancisScene.unity.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: e2839cc8e19d8dc4098d710783dbac88 -folderAsset: yes -timeCreated: 1446922484 +guid: ba30469bc64939a468c3e69f58ac6f36 +timeCreated: 1446922387 licenseType: Free DefaultImporter: userData: diff --git a/Assets/Scripts/BladeTrapScript.cs b/Assets/Scripts/BladeTrapScript.cs new file mode 100644 index 0000000..5e2c355 --- /dev/null +++ b/Assets/Scripts/BladeTrapScript.cs @@ -0,0 +1,56 @@ +using UnityEngine; +using System.Collections; + +public class BladeTrapScript : MonoBehaviour { + public float trapSpeed; + public int maxDistance; + + private Rigidbody rb; + 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; + } + + // Update is called once per frame + void Update () { + if (isStarted) { + if (this.transform.position.y <= -0.5) { + goingUp = true; + } + if(this.transform.position.y >= 0.5) + { + goingUp = false; + } + if(goingUp) + this.transform.Translate(0, trapSpeed * Time.deltaTime, 0); + else + this.transform.Translate(0, -(trapSpeed * Time.deltaTime), 0); + } + + } + + void OnTriggerEnter(Collider other) { + if(other.tag == "Player") + { + //temporaire + Destroy(other.gameObject); + } + } + + public bool GetIsStarted() + { + return this.isStarted; + } + + public void SetIsStarted(bool isStarted) + { + this.isStarted = isStarted; + } + +} diff --git a/Assets/Scripts/BladeTrapScript.cs.meta b/Assets/Scripts/BladeTrapScript.cs.meta new file mode 100644 index 0000000..22d12d7 --- /dev/null +++ b/Assets/Scripts/BladeTrapScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 36679b68705774b4db17d51844bbad63 +timeCreated: 1446922796 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/BladeTrapTriggers.cs b/Assets/Scripts/BladeTrapTriggers.cs new file mode 100644 index 0000000..c35dd86 --- /dev/null +++ b/Assets/Scripts/BladeTrapTriggers.cs @@ -0,0 +1,27 @@ +using UnityEngine; +using System.Collections; + +public class BladeTrapTriggers : MonoBehaviour { + + public GameObject bladeTrap; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + void OnTriggerEnter(Collider other) + { + if(other.tag == "Player") + { + bladeTrap.GetComponent().SetIsStarted(true); + + } + + } +} diff --git a/Assets/Scripts/BladeTrapTriggers.cs.meta b/Assets/Scripts/BladeTrapTriggers.cs.meta new file mode 100644 index 0000000..b524f15 --- /dev/null +++ b/Assets/Scripts/BladeTrapTriggers.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 5b53a2d97a11ef14182f5c127412647d +timeCreated: 1446926458 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FirstPersonController.cs.meta b/Assets/Scripts/FirstPersonController.cs.meta new file mode 100644 index 0000000..e164ee0 --- /dev/null +++ b/Assets/Scripts/FirstPersonController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: e529ea3a225c2c8468d2027498d3cd74 +timeCreated: 1446927748 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/monsterAI.cs.meta b/Assets/Scripts/monsterAI.cs.meta index 8fff61f..9ef06cb 100644 --- a/Assets/Scripts/monsterAI.cs.meta +++ b/Assets/Scripts/monsterAI.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 10ca748d7d0094f16b50525c5401d788 -timeCreated: 1446922382 +timeCreated: 1446928178 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Standard Assets/Characters/PhysicsMaterials.meta b/Assets/Standard Assets/Characters/PhysicsMaterials.meta deleted file mode 100644 index 9c1c9e5..0000000 --- a/Assets/Standard Assets/Characters/PhysicsMaterials.meta +++ /dev/null @@ -1,6 +0,0 @@ -fileFormatVersion: 2 -guid: ea2a5216ffb8d4b319d09e8d7782120c -folderAsset: yes -DefaultImporter: - userData: - assetBundleName: