Merged branch master into master

GGJ17/Assets/Script/Dialog/Dialog.cs

@@ -5,26 +5,59 @@
 public class Dialog : MonoBehaviour
 {
     public List<string> speeches;
+    public GameObject dialogLeft, dialogRight;
 
     // Use this for initialization
     void Start()
     {
+        IEnumerator t = Talk();
+        StartCoroutine(t);
     }
 
     // Update is called once per frame
     void Update()
     {
     }
 
-    public IEnumerator talk()
+    public IEnumerator Talk()
     {
-        foreach(string s in speeches)
+        for(int i = 0; i < speeches.Count; ++i)
         {
-            GameObject g = new GameObject();
-            g.transform.parent = this.gameObject.transform;
-            DialogBox d = new DialogBox();
+            GameObject box = null;
+            if(i%2 == 0)
+            {
+                box = Instantiate(dialogLeft);
+            }
+            else
+            {
+                box = Instantiate(dialogRight);
+            }
 
-            yield return new WaitForSeconds(2.0f);
+            Canvas canvas = FindObjectOfType<Canvas>();
+
+            box.transform.parent = canvas.transform;
+
+            RectTransform rect = box.GetComponent<RectTransform>();
+
+            rect.anchoredPosition = new Vector3(rect.rect.width / 2 + 17,
+                -(canvas.pixelRect.height + rect.rect.height / 2));
+
+            yield return StartCoroutine(MoveDialogBox(rect, 
+                new Vector3(rect.anchoredPosition.x, 
+                -rect.rect.height / 2 - (i * rect.rect.height) - 14)));
+
+            yield return StartCoroutine(box.GetComponent<DialogBox>().Speak(speeches[i]));
+        }
+    }
+
+    public IEnumerator MoveDialogBox(RectTransform rect, Vector3 target)
+    {
+        while(rect.anchoredPosition.y <= target.y)
+        {
+            rect.anchoredPosition += Vector2.up * 1000 * Time.deltaTime;
+            yield return null;
         }
     }
+
+
 }

GGJ17/Assets/Script/Dialog/DialogBox.cs

@@ -10,7 +10,7 @@ public class DialogBox : MonoBehaviour
     // Use this for initialization
     void Start()
     {
-        textbox = GetComponent<Text>();
+        textbox = GetComponentInChildren<Text>();
     }
 
     // Update is called once per frame
@@ -28,7 +28,7 @@ public IEnumerator Speak(string text)
         {
             textbox.text += text[i];
             ++i;
-            yield return new WaitForSeconds(.5f);
+            yield return new WaitForSeconds(.07f);
         }
     }
 }

GGJ17/Assets/Script/WorldScript.cs

@@ -12,11 +12,6 @@ public class WorldScript : MonoBehaviour {
     [HideInInspector]
     public AbstractBuildingBlock flag;
 
-    void Awake()
-    {
-        GenerateWorld();
-    }
-
     void Start()
     {
         Vector3 flagSpawn = blocks[(int)size.x / 2, (int)size.y / 2].transform.position;