Upgrade for 2018.2

AIE-Seattle-Prog · Apr 12, 2019 · 182746c · 182746c
1 parent f0198d4
commit 182746c
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 27 deletions.
diff --git a/Assets/SurvivalShooter/PostProcessing/Editor/Utils/CurveEditor.cs b/Assets/SurvivalShooter/PostProcessing/Editor/Utils/CurveEditor.cs
@@ -376,7 +376,7 @@ void OnCurveGUI(Rect rect, SerializedProperty curve, CurveState state)
                 // Draw
                 if (state.showNonEditableHandles)
                 {
-                    if (e.type == EventType.repaint)
+                    if (e.type == EventType.Repaint)
                     {
                         var selectedColor = (isCurrentlySelectedCurve && isCurrentlySelectedKeyframe)
                             ? settings.selectionColor
@@ -422,7 +422,7 @@ void OnCurveGUI(Rect rect, SerializedProperty curve, CurveState state)
                     }
 
                     // Keyframe selection & context menu
-                    if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition))
+                    if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
                     {
                         if (hitRect.Contains(e.mousePosition))
                         {
@@ -453,7 +453,7 @@ void OnCurveGUI(Rect rect, SerializedProperty curve, CurveState state)
                     }
 
                     // Tangent selection & edit mode
-                    if (e.type == EventType.mouseDown && rect.Contains(e.mousePosition))
+                    if (e.type == EventType.MouseDown && rect.Contains(e.mousePosition))
                     {
                         if (inTangentHitRect.Contains(e.mousePosition) && (k > 0 || state.loopInBounds))
                         {
@@ -499,7 +499,7 @@ void OnGeneralUI(Rect rect)
             var e = Event.current;
 
             // Selection
-            if (e.type == EventType.mouseDown)
+            if (e.type == EventType.MouseDown)
             {
                 GUI.FocusControl(null);
                 m_SelectedCurve = null;
@@ -582,7 +582,7 @@ void OnGeneralUI(Rect rect)
             }
 
             // Delete selected key(s)
-            if (e.type == EventType.keyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace))
+            if (e.type == EventType.KeyDown && (e.keyCode == KeyCode.Delete || e.keyCode == KeyCode.Backspace))
             {
                 if (m_SelectedKeyframeIndex != -1 && m_SelectedCurve != null)
                 {

diff --git a/Assets/SurvivalShooter/TutorialInfo.meta b/Assets/SurvivalShooter/TutorialInfo.meta
diff --git a/Assets/SurvivalShooter/_Complete-Game/LightingData.asset b/Assets/SurvivalShooter/_Complete-Game/LightingData.asset
diff --git a/Assets/SurvivalShooter/_Complete-Game/LightingData.asset.meta b/Assets/SurvivalShooter/_Complete-Game/LightingData.asset.meta
diff --git a/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-0.exr b/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-0.exr
diff --git a/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-0.exr.meta b/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-0.exr.meta
diff --git a/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-1.exr b/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-1.exr
diff --git a/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-1.exr.meta b/Assets/SurvivalShooter/_Complete-Game/ReflectionProbe-1.exr.meta
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -0,0 +1,39 @@
+{
+  "dependencies": {
+    "com.unity.ads": "2.0.8",
+    "com.unity.analytics": "2.0.16",
+    "com.unity.package-manager-ui": "1.9.11",
+    "com.unity.purchasing": "2.0.3",
+    "com.unity.textmeshpro": "1.2.4",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}
diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset
@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  m_DefaultList: []
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f3
+m_EditorVersion: 2018.2.12f1