이제 LifeStoneManager.InstantiateDroppedLifeStone으로 원하는 위치에 생명석 만들 수 있음. 그리고 선택된 아이템과 생명석이 가장 앞으로 옴

Assets/Prefabs/UI/In-Game UI/InventoryUI/DroppedItem.prefab

@@ -209,9 +209,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 996861525
-  m_SortingLayer: 8
-  m_SortingOrder: 0
+  m_SortingLayerID: 2145601713
+  m_SortingLayer: 9
+  m_SortingOrder: -1
   m_Sprite: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/LifeUnitHighlight.prefab

@@ -72,9 +72,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 996861525
-  m_SortingLayer: 8
-  m_SortingOrder: 0
+  m_SortingLayerID: 2145601713
+  m_SortingLayer: 9
+  m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: aa7dc19ed61c9bd45b964e4bdf98b84b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0

Assets/Prefabs/UI/LifeStoneTestUI.prefab

@@ -145,7 +145,7 @@ GameObject:
   - component: {fileID: 114072708642970626}
   - component: {fileID: 114757692378018086}
   m_Layer: 5
-  m_Name: PushButton
+  m_Name: CreateButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scenes/PlayScene.unity

@@ -506,21 +506,6 @@ Prefab:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
-        type: 2}
-      propertyPath: m_LocalScale.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
-        type: 2}
-      propertyPath: m_LocalScale.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 224627740379736590, guid: 799f0e9cc16535e449586b399b37aa56,
-        type: 2}
-      propertyPath: m_LocalScale.z
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 114627791461826676, guid: 799f0e9cc16535e449586b399b37aa56,
         type: 2}
       propertyPath: ui

Assets/Scripts/Characters/PlayerController.cs

@@ -102,12 +102,11 @@ public class PlayerController : MonoBehaviour
 
         if (lastDropItem != null && interaction)
         {
-            print(lastDropItem.PushItem() + "냠냠");
+            lastDropItem.PushItem();
         }
         if (lastLifeStone != null && interaction)
         {
             lastLifeStone.ApplyLifeStone();
-            print("생명석 냠냠");
         }
     }
 

Assets/Scripts/Item/DroppedItem.cs

@@ -65,5 +65,7 @@ public class DroppedItem : MonoBehaviour
     public void HighlightSwitch(bool enabled)
     {
         highlight.SetActive(enabled);
+        highlight.GetComponent<SpriteRenderer>().sortingOrder = -1 + (enabled ? 2 : 0);
+        GetComponent<SpriteRenderer>().sortingOrder = (enabled ? 2 : 0);
     }
 }

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

@@ -32,7 +32,7 @@ public class DroppedLifeStone : MonoBehaviour
         unitObj = new GameObject[inSize.x * inSize.y];
         highObj = new GameObject[inSize.x * inSize.y];
 
-        transform.position = pos - new Vector3(inSize.x * unitSize, 0, 0);
+        transform.position = pos - new Vector3(inSize.x * unitSize / 2f, 0, 0);
 
         for (int i = 0; i < inSize.x * inSize.y; i++)
         {
@@ -44,7 +44,7 @@ public class DroppedLifeStone : MonoBehaviour
 
                 highObj[i] = Instantiate(highlightSprite, transform);
                 highObj[i].transform.localPosition = unitObj[i].transform.localPosition;
-                highObj[i].GetComponent<SpriteRenderer>().enabled = false;
+                highObj[i].SetActive(false);
             }
         }
         bc2D.offset = new Vector2(unitSize * inSize.x / 2f, unitSize * inSize.y / 2f);
@@ -52,7 +52,7 @@ public class DroppedLifeStone : MonoBehaviour
     }
     public void ApplyLifeStone()
     {
-        GameObject.Find("LifeStoneUI").GetComponent<LifeStoneManager>().PushLifeStone(info);
+        if(GameObject.Find("LifeStoneUI").GetComponent<LifeStoneManager>().PushLifeStone(info))
             Destroy(gameObject);
     }
     public void HighlightSwitch(bool enabled)
@@ -62,7 +62,12 @@ public class DroppedLifeStone : MonoBehaviour
         for (int i = 0; i < inSize.x * inSize.y; i++)
         {
             if (inFill[i] != ' ')
-                highObj[i].GetComponent<SpriteRenderer>().enabled = enabled;
+            {
+                highObj[i].SetActive(enabled);
+                highObj[i].GetComponent<SpriteRenderer>().sortingOrder = -1 + (enabled ? 2 : 0);
+                unitObj[i].GetComponent<SpriteRenderer>().sortingOrder = (enabled ? 2 : 0);
+            }
+                
         }
     }
 }
\ No newline at end of file

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

@@ -64,58 +64,59 @@ public class LifeStoneManager : MonoBehaviour {
 		lifeStoneUnit = new GameObject[50, 3];
         for (int i = 0; i < 50; i++) for (int j = 0; j < 3; j++) lifeStoneArray[i, j] = 0;
 		//StartCoroutine("TestEnumerator");
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 8), "AAAAAAAAAAAAAAAAAAAAAAAA"));
+        PushLifeStone(CreateLifeStoneInfo(new Vector2Int(3, 6), 0, 0));
     }
 	IEnumerator TestEnumerator()
 	{
         yield return null;
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 8), "AAAAAAAAAAAAAAAAAAAAAAAA"));
-        /*
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 1), "AAA"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 2), "AAAA A"));
-        yield return new WaitForSeconds(2);
-        /*PushLifeStone(CreateLifeStoneInfo(5, 0.2f, 3));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(CreateLifeStoneInfo(3, 0.2f, 0));
-        yield return new WaitForSeconds(2);
-        PushLifeStone(CreateLifeStoneInfo(4, 0.2f, 0));
-        yield return new WaitForSeconds(2);
-        InstantiateDroppedLifeStone(CreateLifeStoneInfo(4, 0.1f, 0), GameObject.Find("Player").transform.position + new Vector3(2,2,0));
-        yield return new WaitForSeconds(2);
-        ExpandRow(4);
-        PushLifeStone(new LifeStoneInfo(new Vector2Int(3, 8), "AAAAAAAAAAAAAAAAAAAAAAAA"));
-		PushLifeStone(new LifeStoneInfo(new Vector2Int(2, 5), " AAAABA A "));
-		yield return new WaitForSeconds(2);
-		PushLifeStone(new LifeStoneInfo(new Vector2Int(2, 3), " AAA A"));
-		yield return new WaitForSeconds(2);
-		ChangeFromNormal(2, 5);
-		yield return new WaitForSeconds(2);
-		ChangeToNormal(2, 3);
-		yield return new WaitForSeconds(2);
-		DestroyStone(3);*/
+
 
     }
+
+    /// <summary>
+    /// expand lifestoneframe row
+    /// </summary>
+    /// <param name="rowNum"></param>
     public void ExpandRow(int rowNum)
     {
         lifeStoneRowNum += rowNum;
         frameSuper.GetComponent<LifeStoneFrame>().AddRow(lifeStoneRowNum);
     }
+
+    /// <summary>
+    /// Instantiate Dropped LifeStone
+    /// </summary>
+    /// <param name="info"></param>
+    /// <param name="pos"></param>
+    public void InstantiateDroppedLifeStone(Vector2Int size, int num, float goldPer, int ameNum, Vector3 pos)
+    {
+        GameObject tmpObj = Instantiate(droppedLifeStonePrefab);
+        tmpObj.GetComponent<DroppedLifeStone>().Init(CreateLifeStoneInfo(size, num, goldPer, ameNum), pos);
+    }
+    public void InstantiateDroppedLifeStone(Vector2Int size, float goldPer, int ameNum, Vector3 pos)
+    {
+        GameObject tmpObj = Instantiate(droppedLifeStonePrefab);
+        tmpObj.GetComponent<DroppedLifeStone>().Init(CreateLifeStoneInfo(size, goldPer, ameNum), pos);
+    }
+    public void InstantiateDroppedLifeStone(int num, float goldPer, int ameNum, Vector3 pos)
+    {
+        GameObject tmpObj = Instantiate(droppedLifeStonePrefab);
+        tmpObj.GetComponent<DroppedLifeStone>().Init(CreateLifeStoneInfo(num, goldPer, ameNum), pos);
+    }
     public void InstantiateDroppedLifeStone(LifeStoneInfo info, Vector3 pos)
     {
         GameObject tmpObj = Instantiate(droppedLifeStonePrefab);
         tmpObj.GetComponent<DroppedLifeStone>().Init(info, pos);
     }
+
+    /// <summary>
+    /// Randomize LifeStone by size, num, gold probablity, number of ametyst 
+    /// </summary>
+    /// <param name="size"></param>
+    /// <param name="num"></param>
+    /// <param name="goldPer"></param>
+    /// <param name="ameNum"></param>
+    /// <returns></returns>
     public LifeStoneInfo CreateLifeStoneInfo(Vector2Int size, int num, float goldPer, int ameNum)
     {
         System.Random rnd = new System.Random();
@@ -228,7 +229,7 @@ public class LifeStoneManager : MonoBehaviour {
 	/// push LifeStone in LifeStoneFrame
 	/// </summary>
 	/// <param name="pushInfo"></param>
-	public void PushLifeStone(LifeStoneInfo pushInfo)
+	public bool PushLifeStone(LifeStoneInfo pushInfo)
 	{
 		System.Random rnd = new System.Random();
 		Vector2Int pSize = pushInfo.getSize();
@@ -259,6 +260,8 @@ public class LifeStoneManager : MonoBehaviour {
 		for (int i = 0; i <= 3 - pSize.x; i++)
 			if (minRow[i] < selectedRow) selectedRow = minRow[i];
 
+        if (selectedRow == lifeStoneRowNum) return false;
+
 		for (int i = 0; i <= 3 - pSize.x; i++)
 			if (minRow[i] == selectedRow) selColCand.Add(i);
 
@@ -319,10 +322,15 @@ public class LifeStoneManager : MonoBehaviour {
                 }
             }
         }
+        return true;
 	}
     
 
-
+    /// <summary>
+    /// count lifestoneunit in lifestoneframe by type
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
 	public int CountType(LifeStoneType type)
 	{
 		int count = 0;
@@ -332,7 +340,25 @@ public class LifeStoneManager : MonoBehaviour {
 					count++;
 		return count;
 	}
+    /// <summary>
+    /// count lifestoneunit in lifestoneframe
+    /// </summary>
+    /// <param name="type"></param>
+    /// <returns></returns>
+    public int CountType()
+    {
+        int count = 0;
+        for (int i = 0; i < 3; i++)
+            for (int j = 0; j < lifeStoneRowNum; j++)
+                if (lifeStoneArray[j, i] > 0)
+                    count++;
+        return count;
+    }
 
+    /// <summary>
+    /// destroy lifestone by number
+    /// </summary>
+    /// <param name="num"></param>
     public void DestroyStone(int num)
 	{
 		System.Random rnd = new System.Random();
@@ -361,6 +387,11 @@ public class LifeStoneManager : MonoBehaviour {
 		StartCoroutine(DestroyInPhase(candArray));
 	}
 
+    /// <summary>
+    /// make term among lifestone destroy
+    /// </summary>
+    /// <param name="candArray"></param>
+    /// <returns></returns>
 	IEnumerator DestroyInPhase(ArrayList candArray)
 	{
 		for (int i = 0; i < candArray.Count; i++)
@@ -372,6 +403,11 @@ public class LifeStoneManager : MonoBehaviour {
 		}
 	}
 
+    /// <summary>
+    /// change normal lifestone unit to type
+    /// </summary>
+    /// <param name="type"></param>
+    /// <param name="num"></param>
 	public void ChangeFromNormal(LifeStoneType type, int num)
 	{
 		System.Random rnd = new System.Random();
@@ -390,6 +426,11 @@ public class LifeStoneManager : MonoBehaviour {
 		StartCoroutine(ChangeInPhase(candArray,(int)type));
 	}
 
+    /// <summary>
+    /// change type lifestone unit to normal
+    /// </summary>
+    /// <param name="type"></param>
+    /// <param name="num"></param>
 	public void ChangeToNormal(LifeStoneType type, int num)
 	{
 		System.Random rnd = new System.Random();
@@ -408,6 +449,12 @@ public class LifeStoneManager : MonoBehaviour {
 		StartCoroutine(ChangeInPhase(candArray, 1));
 	}
 
+    /// <summary>
+    /// make term among changing
+    /// </summary>
+    /// <param name="candArray"></param>
+    /// <param name="type"></param>
+    /// <returns></returns>
 	IEnumerator ChangeInPhase(ArrayList candArray, int type)
 	{
 		System.Random rnd = new System.Random();
@@ -421,9 +468,14 @@ public class LifeStoneManager : MonoBehaviour {
 		}
 	}
 
+    /// <summary>
+    /// lifestoneframe vibration
+    /// </summary>
+    /// <param name="vibration">strength of vibration</param>
+    /// <returns></returns>
 	public IEnumerator VibrateEnumerator(float vibration)
 	{
-		while(vibration > lifeStoneSize * 0.05f)
+		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);

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

@@ -18,7 +18,7 @@ public class LifeStoneTest : MonoBehaviour {
 
     public void push()
     {
-        uii.PushLifeStone(uii.CreateLifeStoneInfo(Convert.ToInt32(numText.GetComponent<InputField>().text), Convert.ToSingle(goldPerText.GetComponent<InputField>().text), Convert.ToInt32(ameNumText.GetComponent<InputField>().text)));
+        uii.InstantiateDroppedLifeStone(Convert.ToInt32(numText.GetComponent<InputField>().text), Convert.ToSingle(goldPerText.GetComponent<InputField>().text), Convert.ToInt32(ameNumText.GetComponent<InputField>().text),GameObject.Find("Player").transform.position);
     }
     public void gold()
     {