Merge pull request #5 from ashblue/develop

Release
ashblue · Nov 28, 2021 · 611306c · 611306c
2 parents cbd65aa + d039aa0
commit 611306c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 23 deletions.
diff --git a/Assets/com.fluid.quest-journal/Runtime/Scripts/Quests/Definitions/QuestDefinitionBase.cs b/Assets/com.fluid.quest-journal/Runtime/Scripts/Quests/Definitions/QuestDefinitionBase.cs
@@ -5,7 +5,15 @@
 using UnityEngine;
 
 namespace CleverCrow.Fluid.QuestJournals.Quests {
-    public abstract class QuestDefinitionBase : ScriptableObject, IQuestDefinition, ISetupEditor {
+    public abstract class QuestDefinitionBase :
+        ScriptableObject,
+#if UNITY_EDITOR
+        IQuestDefinition,
+        ISetupEditor
+#else
+        IQuestDefinition
+#endif
+    {
         [HideInInspector]
         [SerializeField]
         private string _id;

diff --git a/Assets/com.fluid.quest-journal/Runtime/Scripts/Tasks/Definitions/TaskDefinitionBase.cs b/Assets/com.fluid.quest-journal/Runtime/Scripts/Tasks/Definitions/TaskDefinitionBase.cs
@@ -5,7 +5,15 @@
 using CleverCrow.Fluid.QuestJournals.Utilities;
 
 namespace CleverCrow.Fluid.QuestJournals.Tasks {
-    public abstract class TaskDefinitionBase : ScriptableObject, ITaskDefinition, ISetupEditor {
+    public abstract class TaskDefinitionBase :
+        ScriptableObject,
+#if UNITY_EDITOR
+        ITaskDefinition,
+        ISetupEditor
+#else
+        ITaskDefinition
+#endif
+    {
         [ReadOnly]
         [SerializeField]
         private string _id;

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -14,11 +14,11 @@
     "com.fluid.adnc-utilities": "1.0.0",
     "com.fluid.simple-settings": "1.0.1",
     "com.fluid.simple-singleton": "1.0.0",
-    "com.unity.collab-proxy": "1.7.1",
+    "com.unity.collab-proxy": "1.9.0",
     "com.unity.ide.rider": "3.0.7",
-    "com.unity.ide.visualstudio": "2.0.9",
-    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.test-framework": "1.1.27",
+    "com.unity.ide.visualstudio": "2.0.11",
+    "com.unity.ide.vscode": "1.2.4",
+    "com.unity.test-framework": "1.1.29",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.5.6",
     "com.unity.ugui": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -29,12 +29,10 @@
       "url": "https://registry.npmjs.org"
     },
     "com.unity.collab-proxy": {
-      "version": "1.7.1",
+      "version": "1.9.0",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.0"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
@@ -54,7 +52,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.9",
+      "version": "2.0.11",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -63,21 +61,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.test-framework": {
-      "version": "1.1.27",
+      "version": "1.1.29",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Examples/QuickStart/QuestJournalQuickStart.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
   m_configObjects: {}
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.1.16f1
-m_EditorVersionWithRevision: 2021.1.16f1 (5fa502fca597)
+m_EditorVersion: 2021.1.21f1
+m_EditorVersionWithRevision: 2021.1.21f1 (f2d5d3c59f8c)