LAPTOP-OM1V99U2\永远de小亡灵 пре 1 година
родитељ
комит
e27f0da429

+ 19 - 1
ActionTowerDefense/Assets/Resources/Prefab/FX/SmokeEffect.prefab

@@ -95,6 +95,7 @@ GameObject:
   - component: {fileID: 7473170563405908937}
   - component: {fileID: 5057362010940752532}
   - component: {fileID: 2039446804940946572}
+  - component: {fileID: 2198891557439504854}
   m_Layer: 0
   m_Name: SmokeEffect
   m_TagString: Untagged
@@ -145,4 +146,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   stayTime: 5
   time: 0
-  hitRate: 0
+  hitRate: 0.5
+  MissUI: {fileID: 6467251191553420251, guid: 9b37289f93ea76745ab2cefb79a93e3c, type: 3}
+--- !u!54 &2198891557439504854
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7473170563405908938}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 126
+  m_CollisionDetection: 0

+ 160 - 112
ActionTowerDefense/Assets/Resources/Prefab/FX/MissUI.prefab → ActionTowerDefense/Assets/Resources/Prefab/FX/missUI 1.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &594764649973960852
+--- !u!1 &2310204599161248874
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,158 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 92789474595810383}
-  - component: {fileID: 1789815133753474079}
-  - component: {fileID: 5820891414375789669}
+  - component: {fileID: 628417829899537910}
+  - component: {fileID: 5535552714310740448}
+  - component: {fileID: 8749957310071290871}
+  - component: {fileID: 7615439234807295199}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &628417829899537910
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 8776407069468589577}
+  m_Father: {fileID: 5535641789940809310}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 785.99994, y: 355.3333}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &5535552714310740448
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 1516060329
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &8749957310071290871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 1
+--- !u!114 &7615439234807295199
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2310204599161248874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &6467251191553420251
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5535641789940809310}
+  - component: {fileID: 2075992615353979807}
+  m_Layer: 0
+  m_Name: missUI 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5535641789940809310
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6467251191553420251}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 628417829899537910}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2075992615353979807
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6467251191553420251}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a190f6296dae6343a4814ec08eaada3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  stayTime: 2
+  time: 0
+  text: {fileID: 2900984280701609507}
+--- !u!1 &8125812590587871954
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8776407069468589577}
+  - component: {fileID: 6940921491709308505}
+  - component: {fileID: 2900984280701609507}
   m_Layer: 5
   m_Name: Text (TMP)
   m_TagString: Untagged
@@ -18,19 +167,19 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &92789474595810383
+--- !u!224 &8776407069468589577
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 594764649973960852}
+  m_GameObject: {fileID: 8125812590587871954}
   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_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8087689346542755760}
+  m_Father: {fileID: 628417829899537910}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -38,21 +187,21 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1789815133753474079
+--- !u!222 &6940921491709308505
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 594764649973960852}
+  m_GameObject: {fileID: 8125812590587871954}
   m_CullTransparentMesh: 1
---- !u!114 &5820891414375789669
+--- !u!114 &2900984280701609507
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 594764649973960852}
+  m_GameObject: {fileID: 8125812590587871954}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
@@ -135,104 +284,3 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &6380148097413123628
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8087689346542755760}
-  - component: {fileID: 3771645865911630758}
-  - component: {fileID: 138415197817334193}
-  - component: {fileID: 1237031469785398937}
-  m_Layer: 5
-  m_Name: MissUI
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8087689346542755760
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6380148097413123628}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
-  m_ConstrainProportionsScale: 1
-  m_Children:
-  - {fileID: 92789474595810383}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 12.200012, y: 2}
-  m_SizeDelta: {x: 785.99994, y: 355.3333}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &3771645865911630758
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6380148097413123628}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &138415197817334193
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6380148097413123628}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &1237031469785398937
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6380148097413123628}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/FX/MissUI.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/FX/missUI 1.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b0832b9907489bd44a617b760ccfd8c8
+guid: 9b37289f93ea76745ab2cefb79a93e3c
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 7 - 4
ActionTowerDefense/Assets/Scripts/AttackTrigger.cs

@@ -14,7 +14,7 @@ public class AttackTrigger : MonoBehaviour
     public GameObject spiritsAttackEffect;
     public int offsetY = 1;
     public float hitRate = 1;
-    public GameObject Miss;
+    [HideInInspector]public GameObject Miss;
     private void Awake()
     {
         owner = GetComponentInParent<Character>();
@@ -49,9 +49,11 @@ public class AttackTrigger : MonoBehaviour
                                 transform.position.y + offsetY, 0);
                         }
                     }
-
-
-
+                    else
+                    {
+                        GameObject miss = Instantiate(Miss);
+                        miss.transform.position = hitTrigger.transform.position + Vector3.up * 0.5f;
+                    }
                 }
             }
         }
@@ -59,6 +61,7 @@ public class AttackTrigger : MonoBehaviour
 
     private void OnEnable()
     {
+        hitRate = 1;
         trigedObjs.Clear();
     }
 }

+ 5 - 1
ActionTowerDefense/Assets/Scripts/Spirits/DestroyMiss.cs

@@ -1,16 +1,20 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using TMPro;
 
 public class DestroyMiss : MonoBehaviour
 {
     public float stayTime;
     [HideInInspector]
     public float time;
+    public TextMeshProUGUI text;
     private void Update()
     {
         time += Time.deltaTime;
-        if (time > stayTime)
+        transform.position += Vector3.up * Time.deltaTime;
+        text.color = new Color(1, 1, 1, 1 - time / 2);
+        if (time >= stayTime)
         {
             gameObject.SetActive(false);
         }

+ 3 - 9
ActionTowerDefense/Assets/Scripts/Spirits/SmokeDestroy.cs

@@ -8,6 +8,7 @@ public class SmokeDestroy : MonoBehaviour
     [HideInInspector]
     public float time;
     public float hitRate;
+    public GameObject MissUI;
     private void Update()
     {
         time += Time.deltaTime;
@@ -19,17 +20,10 @@ public class SmokeDestroy : MonoBehaviour
     private void OnTriggerEnter(Collider other)
     {
         AttackTrigger attackTrigger = other.GetComponent<AttackTrigger>();
-        if (attackTrigger != null)
+        if (attackTrigger != null && attackTrigger.transform.parent.gameObject.layer == 8)
         {
+            attackTrigger.Miss = MissUI;
             attackTrigger.hitRate = hitRate;
         }
     }
-    private void OnTriggerExit(Collider other)
-    {
-        AttackTrigger attackTrigger = other.GetComponent<AttackTrigger>();
-        if (attackTrigger != null)
-        {
-            attackTrigger.hitRate = 1;
-        }
-    }
 }