생명석 안흔들리는거 고침. 조그마한 버그 수정

Assets/Prefabs/LifeStoneManager.prefab

@@ -69,6 +69,7 @@ MonoBehaviour:
   vibrationVariable: 0.1
   droppedLifeStonePrefab: {fileID: 1149595688849768, guid: 8255a117a93935941b32b4aed9b299a0,
     type: 2}
+  lifeStoneUI: {fileID: 0}
   frameBorder: 0.2
   popoutStrengthMultiplier: 9
   popoutTime: 0.1

Assets/Scripts/Characters/PlayerAttack.cs

@@ -97,8 +97,12 @@ public class PlayerAttack : MonoBehaviour {
     }
     IEnumerator ComboTextReset()
     {
-        yield return new WaitForSeconds(1.5f);
-        if(comboArray.Equals(""))
+        for(float timer = 0f; timer < 1.5f; timer += Time.deltaTime)
+        {
+            yield return null;
+            if (playingSkill) break;
+        }
+        if(comboArray.Equals("") && !playingSkill)
             SetComboText();
     }
     IEnumerator SkillEndCoroutine()

Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs

@@ -55,13 +55,15 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 
 	public GameObject droppedLifeStonePrefab;
 
+    public GameObject lifeStoneUI;
+
     public float frameBorder;
 
     public float popoutStrengthMultiplier;
     public float popoutTime;
 
     void Start () {
-        transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
+        lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
         frameSuper.GetComponent<LifeStoneFrame>().Init(frameSuper.transform, standardImage, lifeStoneRowNum, lifeStoneSize, sprites, frameBorder);
         lifeStoneArray = new int[50, 3];
 		lifeStoneUnit = new GameObject[50, 3];
@@ -588,10 +590,10 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 		while(vibration > lifeStoneSize * 0.005f)
 		{
 			Vector2 tmpVector = Random.insideUnitCircle;
-			transform.position = new Vector3(lifeStoneLocation.x + tmpVector.x * vibration * 0.3f, lifeStoneLocation.y + tmpVector.y * vibration, 0);
+			lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x + tmpVector.x * vibration * 0.3f, lifeStoneLocation.y + tmpVector.y * vibration, 0);
 			vibration *= 0.8f;
 			yield return null;
 		}
-		transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
+        lifeStoneUI.transform.position = new Vector3(lifeStoneLocation.x, lifeStoneLocation.y, 0);
 	}		
 }

ProjectSettings/TagManager.asset

@@ -51,6 +51,12 @@ TagManager:
   - name: UI
     uniqueID: 4254909397
     locked: 0
+  - name: ItemHighlight
+    uniqueID: 996861525
+    locked: 0
+  - name: Item
+    uniqueID: 2145601713
+    locked: 0
   - name: Wall
     uniqueID: 3278214247
     locked: 0
@@ -69,12 +75,6 @@ TagManager:
   - name: Spike
     uniqueID: 3612720217
     locked: 0
-  - name: ItemHighlight
-    uniqueID: 996861525
-    locked: 0
-  - name: Item
-    uniqueID: 2145601713
-    locked: 0
   - name: Door
     uniqueID: 343148499
     locked: 0