Merge remote-tracking branch 'origin/main' into main

Assets/Scene 1 Assets/Dialogue.cs

@@ -6,6 +6,7 @@ using TMPro;
 public class Dialogue : MonoBehaviour
 {
     public Animator animator;
+    public RuntimeAnimatorController controller;
     public TMP_Text textbox;
     public TMP_Text arrow;
     public AudioManager audioManager;
@@ -31,6 +32,7 @@ public class Dialogue : MonoBehaviour
         {
             arrow.text = "";
         }
+        animator.runtimeAnimatorController = controller;
     }
 
     //Adds a page of text
@@ -72,7 +74,9 @@ public class Dialogue : MonoBehaviour
                         //exits the textbox
                         isOpen = false;
                         Movement.pause = false;
-                        textTest.SetActive(false);
+                        Destroy(textTest);
+                        cCount = 0;
+                        curPage = 0;
                     }
                     else
                     {

Assets/Scene 1 Assets/Interaction.cs

@@ -4,16 +4,34 @@ using UnityEngine;
 
 public class Interaction : MonoBehaviour
 {
+    public Transform detectionPoint;
     public float radius = 3f;
+    public LayerMask detectLayer;
     // Start is called before the first frame update
     void Start()
     {
         
     }
 
+
+    bool InteractInput() {
+        if(Input.GetKeyDown(KeyCode.E))
+            Debug.Log("input");
+        return true;
+    }
     // Update is called once per frame
     void Update()
     {
-        
+        if(DetectObject()) {
+            if(InteractInput()) {
+                Debug.Log("interacted");
+            }
+        }
+    }
+
+    bool DetectObject() {
+        if(Physics2D.OverlapCircle(detectionPoint.position, radius, detectLayer))
+            Debug.Log("detected");
+        return false;
     }
 }

Assets/Scene 1 Assets/Movement.cs

@@ -142,7 +142,12 @@ public class Movement : MonoBehaviour
 				m_Rigidbody2D.AddForce(new Vector2(0f, m_JumpForce));
 				dj = true;
 			}
-			}
+		}
+		else
+		{
+			m_Velocity = Vector3.zero;
+			m_Rigidbody2D.velocity = m_Velocity;
+		}
 	}
 
 

Assets/Scene 1 Assets/TextTrigger.cs

@@ -4,10 +4,29 @@ using UnityEngine;
 
 public class TextTrigger : Trigger
 {
-    public Dialogue TextBox;
+    public GameObject TextBox;
+    // public GameObject HeadBox;
+    public List<string> pages;
+    public List<int> emotes;
+    public RuntimeAnimatorController controller;
+    public Sprite startSprite;
+    public AudioManager audioManager;
+    public bool isTalking;
+    GameObject instance;
+    // GameObject instance;
+    // GameObject headInstance;
+    void Instant() {
+        instance = Instantiate(TextBox, TextBox.transform.position, Quaternion.identity);
+        instance.SetActive(true);
+        instance.GetComponent<Dialogue>().pages = pages;
+        instance.GetComponent<Dialogue>().emotes = emotes;
+        instance.GetComponent<Dialogue>().controller = controller;
+        instance.GetComponent<Dialogue>().audioManager = audioManager;
+        instance.GetComponent<Dialogue>().isOpen = true;
+        instance.GetComponent<Dialogue>().isTalking = isTalking;
+    }
     public override void Action()
     {
-        TextBox.gameObject.SetActive(true);
-        TextBox.GetComponent<Dialogue>().isOpen = true;
+        Instant();
     }
 }

Assets/Scene 1 Assets/Textbox.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 246, y: -178}
+  m_AnchoredPosition: {x: 195, y: -178}
   m_SizeDelta: {x: 400, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7318253488188377866
@@ -432,7 +432,7 @@ GameObject:
   - component: {fileID: 7479122399646608139}
   - component: {fileID: 6609646662535657406}
   - component: {fileID: 9064808559075345882}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Head Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -452,7 +452,7 @@ RectTransform:
   m_Children:
   - {fileID: 8637085924552831791}
   m_Father: {fileID: 7059772333487008124}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -520,72 +520,6 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!1 &7059772332122756754
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7059772332122756757}
-  - component: {fileID: 7059772332122756756}
-  - component: {fileID: 7059772332122756755}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7059772332122756757
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7059772332122756754}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 7059772333487008124}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &7059772332122756756
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7059772332122756754}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!114 &7059772332122756755
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7059772332122756754}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
 --- !u!1 &7059772332581294260
 GameObject:
   m_ObjectHideFlags: 0
@@ -696,12 +630,13 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7059772332581294260}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4098cb6d8f351b44ca98b3bb6311f330, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   animator: {fileID: 9032403516113401987}
+  controller: {fileID: 0}
   textbox: {fileID: 7059772333148747626}
   arrow: {fileID: 7395190149993767727}
   audioManager: {fileID: 0}
@@ -905,7 +840,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7059772333487008124}
-  m_Layer: 0
+  - component: {fileID: 9060944746453456260}
+  m_Layer: 5
   m_Name: Textbox
   m_TagString: Event
   m_Icon: {fileID: 0}
@@ -924,8 +860,29 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 7059772332581294261}
-  - {fileID: 7059772332122756757}
   - {fileID: 6897333980894040127}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9060944746453456260
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7059772333487008123}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4098cb6d8f351b44ca98b3bb6311f330, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animator: {fileID: 9032403516113401987}
+  controller: {fileID: 0}
+  textbox: {fileID: 7059772333148747626}
+  arrow: {fileID: 7395190149993767727}
+  audioManager: {fileID: 0}
+  pages: []
+  emotes: 
+  isOpen: 0
+  textTest: {fileID: 7059772333487008123}
+  isTalking: 0

Assets/Scene 1 Assets/Trigger.cs

@@ -22,6 +22,7 @@ public abstract class Trigger : MonoBehaviour
     //checks if player is in range of the trigger
     private void OnTriggerEnter2D(Collider2D other) {
         if(other.CompareTag("Player")) {
+            Debug.Log("entered");
             isActive = true;
         }
     }
@@ -29,6 +30,7 @@ public abstract class Trigger : MonoBehaviour
     private void OnTriggerExit2D(Collider2D other) {
         if(other.CompareTag("Player")) {
             isActive = false;
+            Debug.Log("exit");
         }
         if(forceInteract && repeatable) {
             hasOccurred = false;
@@ -37,6 +39,7 @@ public abstract class Trigger : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+        // Debug.Log("testr");
         //checks if conditions are right
         if(isActive && !hasOccurred) 
         {
@@ -51,6 +54,7 @@ public abstract class Trigger : MonoBehaviour
             else
             {
                 if(Input.GetKeyDown(KeyCode.E)) {
+                    Debug.Log("action");
                     Action();
                     if(!repeatable)
                     {