fixed some null checks in 2019

MephestoKhaan · Sep 10, 2019 · 881a655 · 881a655
1 parent 41d50a7
commit 881a655
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 3 deletions.
diff --git a/Assets/EventVisualizer/Editor/EventsGraphGUI.cs b/Assets/EventVisualizer/Editor/EventsGraphGUI.cs
@@ -100,7 +100,10 @@ private void UpdateSelection()
                 int[] selectedIds = new int[selection.Count];
                 for (int i = 0; i < selection.Count; i++)
                 {
-                    selectedIds[i] = int.Parse(selection[i].name);
+					if(selection[i] != null)
+					{
+						selectedIds[i] = int.Parse(selection[i].name);
+					}
                 }
                 Selection.instanceIDs = selectedIds;
             }

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,7 +1,22 @@
 {
   "dependencies": {
-    "com.unity.package-manager-ui": "2.0.3",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "2.0.8",
+    "com.unity.analytics": "3.3.2",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ext.nunit": "1.0.0",
+    "com.unity.ide.rider": "1.1.0",
+    "com.unity.ide.vscode": "1.1.0",
+    "com.unity.package-manager-ui": "2.2.0",
+    "com.unity.purchasing": "2.0.6",
+    "com.unity.test-framework": "1.0.13",
+    "com.unity.textmeshpro": "2.0.1",
+    "com.unity.timeline": "1.1.0",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.0.2",
     "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.audio": "1.0.0",

diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1,2 @@
-m_EditorVersion: 5.6.3f1
+m_EditorVersion: 2019.2.4f1
+m_EditorVersionWithRevision: 2019.2.4f1 (c63b2af89a85)
diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset
diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset
@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}