touch hazard?

4 years ago · 1c42ecb9f1
parent 2c2c53a3e3
commit 1c42ecb9f1
9 changed files with 816 additions and 1448 deletions
--- a/Assets/Materials/TouchHazard.mat
+++ b/Assets/Materials/TouchHazard.mat
@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: TouchHazard
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 0.9831909, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
--- a/Assets/Materials/TouchHazard.mat.meta
+++ b/Assets/Materials/TouchHazard.mat.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cfe83c3bf8499d742b0903ab7c97d4e2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/TouchHazard.prefab
+++ b/Assets/Prefabs/TouchHazard.prefab
@ -0,0 +1,121 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &514178461475775486
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5509617959259891562}
+  - component: {fileID: 3434148988169924119}
+  - component: {fileID: 3308651302778791220}
+  - component: {fileID: 2621347461924576989}
+  - component: {fileID: 8618276481035816493}
+  m_Layer: 10
+  m_Name: TouchHazard
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5509617959259891562
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514178461475775486}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 60, y: -1.5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3434148988169924119
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514178461475775486}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3308651302778791220
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514178461475775486}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: cfe83c3bf8499d742b0903ab7c97d4e2, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!114 &2621347461924576989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514178461475775486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 175d3fbe69c7a134b9f19b51de837bed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!61 &8618276481035816493
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 514178461475775486}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
--- a/Assets/Prefabs/TouchHazard.prefab.meta
+++ b/Assets/Prefabs/TouchHazard.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1f7cf6c8c7369c047a6343428bfb6a78
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
--- a/Assets/Scripts/MoveController.cs
+++ b/Assets/Scripts/MoveController.cs
@ -53,13 +53,9 @@ public class MoveController : MonoBehaviour
            RaycastHit2D hit = Physics2D.Raycast(rayOrigin, Vector2.up * directionY, rayLength, collisionMask);
            if (hit) {
                if (directionY > 0) {
-                    collisions.above = true;
+                    collisions.above = hit.collider;
                } else {
-                    collisions.below = true;
-                    Crumble crumble = hit.collider.gameObject.GetComponent<Crumble>();
-                    if (crumble) {
-                        crumble.Hit();
-                    }
+                    collisions.below = hit.collider;
                }
                velocity.y = (hit.distance - skinWidth) * directionY;
                rayLength = hit.distance;
@ -79,9 +75,9 @@ public class MoveController : MonoBehaviour
            RaycastHit2D hit = Physics2D.Raycast(rayOrigin, Vector2.right * directionX, rayLength, collisionMask);
            if (hit) {
                if (directionX > 0) {
-                    collisions.right = true;
+                    collisions.right = hit.collider;
                } else {
-                    collisions.left = true;
+                    collisions.left = hit.collider;
                }
                velocity.x = (hit.distance - skinWidth) * directionX;
                rayLength = hit.distance;
@ -122,16 +118,16 @@ public class MoveController : MonoBehaviour
    }

    public struct CollisionInfo {
-        public bool above;
-        public bool below;
-        public bool left;
-        public bool right;
+        public Collider2D above;
+        public Collider2D below;
+        public Collider2D left;
+        public Collider2D right;

        public void Reset() {
-            above = false;
-            below = false;
-            left = false;
-            right = false;
+            above = null;
+            below = null;
+            left = null;
+            right = null;
        }
    }
 }
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@ -309,6 +309,34 @@ public class PlayerController : MonoBehaviour {
            setJumpState(JumpState.Grounded);
        }
        wasHoldingJump = Input.GetButton("Jump");
+
+        CheckCollisions();
+    }
+
+    void CheckCollisions() {
+        CollideWith(moveController.collisions.above);
+        CollideWith(moveController.collisions.below);
+        CollideWith(moveController.collisions.left);
+        CollideWith(moveController.collisions.right);
+    }
+
+    void CollideWith(Collider2D other) {
+        if (other == null) {
+            return;
+        }
+        Crumble crumble = other.GetComponent<Crumble>();
+        if (crumble) {
+            crumble.Hit();
+        }
+
+        TouchHazard hazard = other.GetComponent<TouchHazard>();
+        if (hazard) {
+            if (jumpState == JumpState.Dash) {
+                Destroy(hazard.gameObject);
+            } else {
+                Destroy(gameObject);
+            }
+        }
    }

    void OnDestroy() {
--- a/Assets/Scripts/TouchHazard.cs
+++ b/Assets/Scripts/TouchHazard.cs
@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TouchHazard : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
--- a/Assets/Scripts/TouchHazard.cs.meta
+++ b/Assets/Scripts/TouchHazard.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 175d3fbe69c7a134b9f19b51de837bed
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: