From 45e0719d679a0a804740617270276a379cbbe802 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 7 Nov 2015 18:49:21 -0500 Subject: [PATCH] trou et debut de travail sur 3eme trap --- Assets/Materials/HoleMaterial.mat | 138 +++++++++ Assets/Materials/HoleMaterial.mat.meta | 8 + Assets/Prefabs/BladeTrap.prefab | 202 ++++++++++++- Assets/Prefabs/Trou.prefab | 13 + Assets/Prefabs/Trou.prefab.meta | 8 + Assets/Scenes/FrancisScene.unity | 378 ++++++++++++------------- Assets/Scripts/HoleScript.cs | 25 ++ Assets/Scripts/HoleScript.cs.meta | 12 + Assets/SideMovingTrap.cs | 34 +++ Assets/SideMovingTrap.cs.meta | 12 + 10 files changed, 633 insertions(+), 197 deletions(-) create mode 100644 Assets/Materials/HoleMaterial.mat create mode 100644 Assets/Materials/HoleMaterial.mat.meta create mode 100644 Assets/Prefabs/Trou.prefab create mode 100644 Assets/Prefabs/Trou.prefab.meta create mode 100644 Assets/Scripts/HoleScript.cs create mode 100644 Assets/Scripts/HoleScript.cs.meta create mode 100644 Assets/SideMovingTrap.cs create mode 100644 Assets/SideMovingTrap.cs.meta diff --git a/Assets/Materials/HoleMaterial.mat b/Assets/Materials/HoleMaterial.mat new file mode 100644 index 0000000..f721dcd --- /dev/null +++ b/Assets/Materials/HoleMaterial.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: HoleMaterial + 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: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/HoleMaterial.mat.meta b/Assets/Materials/HoleMaterial.mat.meta new file mode 100644 index 0000000..153a076 --- /dev/null +++ b/Assets/Materials/HoleMaterial.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0a9add2e606d92459d74fc9ee7aaa3b +timeCreated: 1446931587 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/BladeTrap.prefab b/Assets/Prefabs/BladeTrap.prefab index a459af2..6431f8f 100644 --- a/Assets/Prefabs/BladeTrap.prefab +++ b/Assets/Prefabs/BladeTrap.prefab @@ -1,13 +1,211 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &130446 +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} + m_Layer: 0 + m_Name: BladeTrap + m_TagString: Trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &412946 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130446} + 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: 498798} + m_RootOrder: 1 +--- !u!4 &466408 +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_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} + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!23 &2318638 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187640} + 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!33 &3341506 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187640} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5432898 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187640} + 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!65 &6511276 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187640} + 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 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130446} + 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 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130446} + 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: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130446} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5b53a2d97a11ef14182f5c127412647d, type: 3} + m_Name: + m_EditorClassIdentifier: + bladeTrap: {fileID: 187640} +--- !u!114 &11496062 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 187640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 36679b68705774b4db17d51844bbad63, type: 3} + m_Name: + m_EditorClassIdentifier: + trapSpeed: 2 + maxDistance: 5 --- !u!1001 &100100000 Prefab: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 1 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 0} + m_RootGameObject: {fileID: 195288} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Trou.prefab b/Assets/Prefabs/Trou.prefab new file mode 100644 index 0000000..a459af2 --- /dev/null +++ b/Assets/Prefabs/Trou.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/Trou.prefab.meta b/Assets/Prefabs/Trou.prefab.meta new file mode 100644 index 0000000..ebe2853 --- /dev/null +++ b/Assets/Prefabs/Trou.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1dae59e9c032b8c4fa7c221a7dd1352e +timeCreated: 1446940126 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FrancisScene.unity b/Assets/Scenes/FrancisScene.unity index d9b2c96..6cc5575 100644 --- a/Assets/Scenes/FrancisScene.unity +++ b/Assets/Scenes/FrancisScene.unity @@ -85,109 +85,6 @@ NavMeshSettings: 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 @@ -257,11 +154,11 @@ Transform: 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_LocalPosition: {x: 4.55999994, y: 1.5, z: 1.80999994} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!54 &334332192 Rigidbody: m_ObjectHideFlags: 0 @@ -357,41 +254,12 @@ Transform: 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_LocalRotation: {x: .592106938, y: -.00464686193, z: .0127979796, w: .80574441} + m_LocalPosition: {x: 0, y: 9.97000027, z: -5.13999987} 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 @@ -452,72 +320,163 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 ---- !u!1 &1082245454 +--- !u!1 &1175907386 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} + - 4: {fileID: 1175907391} + - 33: {fileID: 1175907390} + - 23: {fileID: 1175907389} + - 65: {fileID: 1175907388} + - 82: {fileID: 1175907392} + - 114: {fileID: 1175907387} m_Layer: 0 - m_Name: trapTriggers + m_Name: Trou 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 +--- !u!114 &1175907387 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1082245454} + m_GameObject: {fileID: 1175907386} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5b53a2d97a11ef14182f5c127412647d, type: 3} + m_Script: {fileID: 11500000, guid: c6c736764832d314b9e5dce78ec77732, type: 3} m_Name: m_EditorClassIdentifier: - bladeTrap: {fileID: 51161942} + floor: {fileID: 1736981967} +--- !u!65 &1175907388 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175907386} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: .880916476, y: .869007707, z: .409999996} + m_Center: {x: 2.38418579e-07, y: -2.98023188e-08, z: 1.11758736e-08} +--- !u!23 &1175907389 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175907386} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: f0a9add2e606d92459d74fc9ee7aaa3b, 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 &1175907390 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175907386} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1175907391 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175907386} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 3.86999989, y: .0500000007, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 +--- !u!82 &1175907392 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175907386} + 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!1 &1736981967 GameObject: m_ObjectHideFlags: 0 @@ -527,7 +486,6 @@ GameObject: m_Component: - 4: {fileID: 1736981971} - 33: {fileID: 1736981970} - - 64: {fileID: 1736981969} - 23: {fileID: 1736981968} - 65: {fileID: 1736981972} m_Layer: 0 @@ -561,18 +519,6 @@ MeshRenderer: 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 @@ -604,3 +550,45 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: .999999881, z: 6.12323294e-17} m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &1758579522 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 498798, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: ed3c63e28f69853439e23037fe66bd7e, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/Scripts/HoleScript.cs b/Assets/Scripts/HoleScript.cs new file mode 100644 index 0000000..78e5b90 --- /dev/null +++ b/Assets/Scripts/HoleScript.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using System.Collections; + +public class HoleScript : MonoBehaviour { + public GameObject floor; + // Use this for initialization + private GameObject player; + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + void OnTriggerEnter(Collider other) { + if(other.tag == "Player") + { + print("floor ded"); + floor.GetComponent().enabled = false; + } + } + +} diff --git a/Assets/Scripts/HoleScript.cs.meta b/Assets/Scripts/HoleScript.cs.meta new file mode 100644 index 0000000..acf6fcd --- /dev/null +++ b/Assets/Scripts/HoleScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c6c736764832d314b9e5dce78ec77732 +timeCreated: 1446930907 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SideMovingTrap.cs b/Assets/SideMovingTrap.cs new file mode 100644 index 0000000..70356c4 --- /dev/null +++ b/Assets/SideMovingTrap.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using System.Collections; + +public class SideMovingTrap : MonoBehaviour { + + public float force; + private Rigidbody rb; + bool addLeft = false; + + // Use this for initialization + void Start () { + rb = this.GetComponent(); + rb.AddForce(100, 0, 0); + } + + // Update is called once per frame + void Update () { + + } + + void FixedUpdate() + { + Vector3 vel = rb.velocity; + print(vel.magnitude); + + + + } + + void pushTheShit() + { + + } +} diff --git a/Assets/SideMovingTrap.cs.meta b/Assets/SideMovingTrap.cs.meta new file mode 100644 index 0000000..50d3359 --- /dev/null +++ b/Assets/SideMovingTrap.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 13f97f640b493d6428a929dc3e64b111 +timeCreated: 1446935748 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: