Fixed 2d extras package

TSKsmiley · Apr 8, 2021 · bed91e3 · bed91e3
1 parent 554fe31
commit bed91e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Assets/Scripts/Dialogue/UIDialogueOption.cs b/Assets/Scripts/Dialogue/UIDialogueOption.cs
@@ -20,6 +20,5 @@ public void SelectOption()
     }
 
     public void OnSelect(BaseEventData eventData) => gameObject.transform.GetChild(0).gameObject.SetActive(true);
-
     public void OnDeselect(BaseEventData eventData) => gameObject.transform.GetChild(0).gameObject.SetActive(false);
 }
diff --git a/Assets/Scripts/Quest/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs
@@ -61,6 +61,7 @@ private void SetUI()
         {
             var questToDisplay = (dynamic)AllQuests[ActiveQuest];
 
+            Instantiate(questToDisplay.QuestIcon.gameObject, questToDisplay.NPC.transform.position + new Vector2(0,1.5F));
             QuestName.text = questToDisplay.Name;
             QuestObjective.text = $"Objective: {questToDisplay.Objective}";
             QuestDescription.text = questToDisplay.Description;

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -6,7 +6,7 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.spriteshape": "3.0.14",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.2d.tilemap.extras": "file:C:/Users/Benjamin/Desktop/DDU/_Eksamensprojekt/2D Extras/2d-extras-master",
+    "com.unity.2d.tilemap.extras": "https://github.com/Unity-Technologies/2d-extras.git",
     "com.unity.cinemachine": "2.6.3",
     "com.unity.collab-proxy": "1.2.16",
     "com.unity.ide.rider": "1.1.4",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -72,13 +72,14 @@
       "dependencies": {}
     },
     "com.unity.2d.tilemap.extras": {
-      "version": "file:C:/Users/Benjamin/Desktop/DDU/_Eksamensprojekt/2D Extras/2d-extras-master",
+      "version": "https://github.com/Unity-Technologies/2d-extras.git",
       "depth": 0,
-      "source": "local",
+      "source": "git",
       "dependencies": {
         "com.unity.modules.tilemap": "1.0.0",
         "com.unity.2d.tilemap": "1.0.0"
-      }
+      },
+      "hash": "07f70de285fc5c593ea6ce0d01455de496f743a8"
     },
     "com.unity.cinemachine": {
       "version": "2.6.3",
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,5 @@ public void SelectOption() @@
         }
         public void OnSelect(BaseEventData eventData) => gameObject.transform.GetChild(0).gameObject.SetActive(true);
         public void OnDeselect(BaseEventData eventData) => gameObject.transform.GetChild(0).gameObject.SetActive(false);
     }