Merge pull request #109 from pknu-wap/feature/Battle_VFX

Feature/battle vfx
pknu-wap · Jun 6, 2024 · def4dc6 · def4dc6
2 parents fe4b47f + 238011e
commit def4dc6
Show file tree

Hide file tree

Showing 20 changed files with 117,320 additions and 15,747 deletions.
diff --git a/Assets/01. Scenes/KDG/Battle VFX.unity b/Assets/01. Scenes/KDG/Battle VFX.unity
diff --git a/Assets/01. Scenes/KDG/Battle VFX.unity.meta b/Assets/01. Scenes/KDG/Battle VFX.unity.meta
diff --git a/Assets/02. Scripts/Battle/Cards/Card SO/Capture.asset b/Assets/02. Scripts/Battle/Cards/Card SO/Capture.asset
@@ -21,5 +21,5 @@ MonoBehaviour:
     target: 1
     amount: 0
     turnCount: 2
-    effectPrefeb: {fileID: 0}
+    effectPrefeb: {fileID: 5688369868303141963, guid: 2aea219a0297be045917372e0c19f84e, type: 3}
   cost: 3
diff --git a/Assets/02. Scripts/Battle/Cards/Card SO/Shield.asset b/Assets/02. Scripts/Battle/Cards/Card SO/Shield.asset
@@ -20,5 +20,5 @@ MonoBehaviour:
     target: 0
     amount: 5
     turnCount: 0
-    effectPrefeb: {fileID: 3675006101537835259, guid: 2e5ad2beaf55e9f4b9c3ebc4a7a2d823, type: 3}
+    effectPrefeb: {fileID: 599542041415541494, guid: 4e1c92e5f8f548d448d7de72aacbe3d8, type: 3}
   cost: 1
diff --git a/Assets/02. Scripts/Battle/Cards/Card SO/Stinger.asset b/Assets/02. Scripts/Battle/Cards/Card SO/Stinger.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
     target: 1
     amount: 5
     turnCount: 0
-    effectPrefeb: {fileID: 974780746110677456, guid: 4e92b19f1b631424ebacceaa2e68abeb, type: 3}
+    effectPrefeb: {fileID: 974780746110677456, guid: 15629367e0df1a444b54d0e1dfad4c0e, type: 3}
   - type: 6
     target: 1
     amount: 2

diff --git a/Assets/02. Scripts/Battle/UI/StatePanelOpener.cs b/Assets/02. Scripts/Battle/UI/StatePanelOpener.cs
@@ -6,19 +6,40 @@
 
 public class StatePanelOpener : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 {
+    // 스테이터스 패널
     [SerializeField] GameObject statePanel;
-    [SerializeField] Image statePanelImage;
+
+    // 타겟록
+    GameObject targetLock;
+    Image illust;
+
+    // 캔버스
     [SerializeField] protected Canvas uiCanvas;
+
+    // 마우스 이벤트 블로커
     public GameObject mouseEventBlocker;
 
+    // [SerializeField] Image statePanelImage;
+
     private void Awake()
     {
-        statePanel = transform.parent.GetChild(0).gameObject;
-        statePanelImage = statePanel.GetComponent<Image>();
         uiCanvas = transform.parent.GetComponent<Canvas>();
-        mouseEventBlocker = GameObject.Find("Mouse Event Blocker");
+
+        // 스테이터스 패널
+        statePanel = transform.parent.GetChild(0).gameObject;
+        // statePanelImage = statePanel.GetComponent<Image>();
 
         statePanel.SetActive(false);
+
+        uiCanvas = transform.parent.GetComponent<Canvas>();
+        targetLock = transform.parent.parent.GetChild(0).GetChild(2).gameObject;
+        illust = transform.parent.parent.GetChild(0).GetChild(0).GetComponent<Image>();
+        float width = illust.rectTransform.sizeDelta.x;
+        float height = illust.rectTransform.sizeDelta.y;
+
+        targetLock.SetActive(false);
+
+        mouseEventBlocker = GameObject.Find("Mouse Event Blocker");
     }
 
     public void OnPointerEnter(PointerEventData eventData)
@@ -39,6 +60,13 @@ public void OnPointerEnter(PointerEventData eventData)
             // 패널을 활성화 시킨다.
             statePanel.SetActive(true);
         }
+
+        // 타겟록
+        if (CardArrow.Instance.gameObject.activeSelf)
+        {
+            uiCanvas.sortingOrder = 10;
+            targetLock.SetActive(true);
+        }
     }
 
     public void OnPointerExit(PointerEventData eventData)
@@ -55,5 +83,8 @@ public void OnPointerExit(PointerEventData eventData)
         uiCanvas.sortingOrder = 0;
         // 패널을 비활성화 시킨다.
         statePanel.SetActive(false);
+
+        // 타겟록
+        targetLock.SetActive(false);
     }
 }
diff --git a/Assets/03. Prefebs/Battle/Cards/CardBack.prefab b/Assets/03. Prefebs/Battle/Cards/CardBack.prefab
@@ -27,7 +27,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 650, y: -300, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 2.5, y: 2.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}