9 files changed, 110 insertions, 13 deletions
diff --git a/marching/Assets/Scripts/EntityBase.cs b/marching/Assets/Scripts/EntityBase.cs
index c1beb42..3470d3c 100644
--- a/marching/Assets/Scripts/EntityBase.cs
+++ b/marching/Assets/Scripts/EntityBase.cs
@@ -41,8 +41,11 @@ public class EntityBase : MonoBehaviour
     {
         if (m_Shadow != null)
         {
-            m_Shadow.sprite = m_SpriteRenderer.sprite;
-            m_Shadow.flipX = m_SpriteRenderer.flipX;
+            if (m_Shadow.sprite != m_SpriteRenderer.sprite)
+            {
+                //m_Shadow.sprite = m_SpriteRenderer.sprite;
+                //m_Shadow.flipX = m_SpriteRenderer.flipX;
+            }
         }
     }
 
diff --git a/marching/Assets/Scripts/Items/Item_Coin.cs b/marching/Assets/Scripts/Items/Item_Coin.cs
new file mode 100644
index 0000000..1549646
--- /dev/null
+++ b/marching/Assets/Scripts/Items/Item_Coin.cs
@@ -0,0 +1,30 @@
+using MH;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Rendering.Universal;
+
+public class Item_Coin : ItemBase
+{
+
+    protected override void Update()
+    {
+        base.Update();
+
+        UnitBase hero = UnitManager.hero;
+
+        Vector2 pos = transform.position;
+        Vector2 target = hero.transform.position;
+
+        if(Vector2.Distance(pos, target) <= 0.1f)
+        {
+            this.gameObject.SetActive(false);
+            Destroy(this.gameObject);
+            return;
+        }
+
+        Vector2 cur = Vector2.Lerp(pos, target, 0.01f);
+        transform.position = cur.ToVector3();
+    }
+
+}
+\ No newline at end of file
diff --git a/marching/Assets/Scripts/Items/Item_Coin.cs.meta b/marching/Assets/Scripts/Items/Item_Coin.cs.meta
new file mode 100644
index 0000000..9bc770a
--- /dev/null
+++ b/marching/Assets/Scripts/Items/Item_Coin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5979684bc57d8084d92d172dcf9f1080
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/marching/Assets/Scripts/Projectiles/BladeScript.cs b/marching/Assets/Scripts/Projectiles/BladeScript.cs
index 8a71c27..d7d601d 100644
--- a/marching/Assets/Scripts/Projectiles/BladeScript.cs
+++ b/marching/Assets/Scripts/Projectiles/BladeScript.cs
@@ -56,6 +56,8 @@ public class BladeScript : ProjectileBase
                 Vector2 dir = (heroPos - pos).normalized;
 
                 rig.AddForce(-dir * 100);
+
+                rig.GetComponent<SpiritScript>().Die();
             }
         }
     }
diff --git a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
index a271693..a93c293 100644
--- a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
+++ b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
@@ -69,7 +69,7 @@ namespace MH
                 }
             }
 
-            m_Attacking = Input.GetMouseButton(1);
+            m_Attacking = true;//Input.GetMouseButton(1);
 
             if (Input.GetMouseButton(0) || m_IsKeepMoving)
             {
diff --git a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs
index f38b354..388bfef 100644
--- a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs
+++ b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs
@@ -7,18 +7,28 @@ public class SpiritScript : UnitBase
 {
     public float speed = 10f;
 
-    protected override void Update()
+    public Item_Coin coinPrefab;
+
+    //protected override void Update()
+    //{
+    //    base.Update();
+    //    //UnitBase hero = UnitManager.hero;
+    //    //Vector2 pos = transform.position;
+    //    //Vector2 heroPos = hero.transform.position;
+    //    //Vector2 dir = (heroPos - pos).normalized;
+    //    //pos += dir * Time.deltaTime * speed;
+    //    //this.GetComponent<SpriteRenderer>().flipX = dir.x < 0;
+
+    //    //transform.position = pos;
+    //}
+
+    public void Die()
     {
-        base.Update();  
-        UnitBase hero = UnitManager.hero;
-        Vector2 pos = transform.position;
-        Vector2 heroPos = hero.transform.position; 
-        Vector2 dir = (heroPos - pos).normalized;
-        pos += dir * Time.deltaTime * speed;
-        this.GetComponent<SpriteRenderer>().flipX = dir.x < 0;
+        Item_Coin coin = Instantiate(coinPrefab) as Item_Coin;
+        coin.transform.position = this.transform.position;
 
-        transform.position = pos;   
+        this.gameObject.SetActive(false);
+        Destroy(this.gameObject);
     }
 
-
 }
diff --git a/marching/Assets/Scripts/Utils.meta b/marching/Assets/Scripts/Utils.meta
new file mode 100644
index 0000000..d4a02c5
--- /dev/null
+++ b/marching/Assets/Scripts/Utils.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 899e3f93ed14bfd4eb299d3ba068e350
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/marching/Assets/Scripts/Utils/Vector2Extension.cs b/marching/Assets/Scripts/Utils/Vector2Extension.cs
new file mode 100644
index 0000000..2fcaf60
--- /dev/null
+++ b/marching/Assets/Scripts/Utils/Vector2Extension.cs
@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+public static class Vector2Extension
+{
+
+    public static Vector3 ConvertToVector3(Vector2 src)
+    {
+        Vector3 dst = new Vector3();
+        dst.x = src.x;
+        dst.y = src.y;
+        dst.z = 0;
+        return dst;
+    }
+
+    public static Vector3 ToVector3(this Vector2 src)
+    {
+        return ConvertToVector3( src);
+    }
+}
diff --git a/marching/Assets/Scripts/Utils/Vector2Extension.cs.meta b/marching/Assets/Scripts/Utils/Vector2Extension.cs.meta
new file mode 100644
index 0000000..3acd9ed
--- /dev/null
+++ b/marching/Assets/Scripts/Utils/Vector2Extension.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4919fc0478a262544b3b7149ec7a331d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: