SZAND\msx_2 1 рік тому
батько
коміт
9b1db64d06

+ 1 - 18
ActionTowerDefense/Assets/Resources/Prefab/FX/CooksBird.prefab → ActionTowerDefense/Assets/Resources/Prefab/FX/BackDoor.prefab

@@ -94,9 +94,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5739536514358716996}
   - component: {fileID: 8736694251664551225}
-  - component: {fileID: 2361129339030397111}
   m_Layer: 0
-  m_Name: CooksBird
+  m_Name: BackDoor
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -131,19 +130,3 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 1.7852101, y: 1.3337144, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!54 &2361129339030397111
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6827689530009399248}
-  serializedVersion: 2
-  m_Mass: 0.1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0

+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/CooksBird.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/FX/BackDoor.prefab.meta


+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/鸟0_0(bird0_0)_爱给网_aigei_com.png → ActionTowerDefense/Assets/Resources/Textures/bird.png


+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/鸟0_0(bird0_0)_爱给网_aigei_com.png.meta → ActionTowerDefense/Assets/Resources/Textures/bird.png.meta


+ 19 - 0
ActionTowerDefense/Assets/Scripts/Spirits/BackDoor.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BackDoor : MonoBehaviour
+{
+    public GameObject door;
+    private Collider col;
+
+    private int times = 2;
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.gameObject.layer == 6)
+        {
+
+        }
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Spirits/BackDoor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 64db22f573a8bce45bffcb284c431f20
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 12 - 2
ActionTowerDefense/Assets/Scripts/Spirits/DashEffect.cs

@@ -90,8 +90,18 @@ public class DashEffect : MonoBehaviour
         {
             return;
         }
-        character.BeHit(attackInfo.damage,attackInfo.force * attackInfo.attackDir * offset, 
-            attackInfo.changeHurt,attackInfo.repelValue);
+        try
+        {
+            character.BeHit(attackInfo.damage, attackInfo.force * attackInfo.attackDir * offset,
+                attackInfo.changeHurt, attackInfo.repelValue);
+        }
+        catch
+        {
+            print(character.name);
+            print(attackInfo);
+        }
+            
+        
         GameObject effect = Instantiate(rushEffect);
         //effect.transform.position = new Vector3(character.transform.position.x,
         //    transform.position.y + targetY, 0);