define use unity 2017

mr-kelly · Mar 29, 2018 · ac9a877 · ac9a877
1 parent 0a645df
commit ac9a877
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/KSFramework/Assets/Editor/KSFrameworkTests.cs b/KSFramework/Assets/Editor/KSFrameworkTests.cs
@@ -1,4 +1,4 @@
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
 using System.IO;
 using KEngine;
 using KSFramework;

diff --git a/KSFramework/Assets/Plugins/KSFramework/Editor/KSFrameworkEditor.cs b/KSFramework/Assets/Plugins/KSFramework/Editor/KSFrameworkEditor.cs
@@ -4,7 +4,7 @@
 using KEngine;
 using KEngine.UI;
 using UnityEditor;
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
 using UnityEditor.SceneManagement;
 #endif
 
@@ -61,7 +61,7 @@ public static void OpenLastScene()
             if (!string.IsNullOrEmpty(lastScene))
             {
 
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
                 EditorSceneManager.OpenScene(lastScene);
 #else
                 EditorApplication.OpenScene(lastScene);
@@ -77,7 +77,7 @@ public static void OpenLastScene()
         [MenuItem("KEngine/Open Main Scene %&i")]
         public static void OpenMainScene()
         {
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
             var currentScene = EditorSceneManager.GetActiveScene().path;
 #else
             var currentScene = EditorApplication.currentScene;
@@ -87,7 +87,7 @@ public static void OpenMainScene()
                 EditorPrefs.SetString(LastScenePrefKey, currentScene);
 
             Log.Info("Open Main Game Scene!");
-#if UNITY_5
+#if UNITY_5 || UNITY_2017_1_OR_NEWER
             EditorSceneManager.OpenScene(mainScene);
 #else
             EditorApplication.OpenScene(mainScene);

diff --git a/KSFramework/Assets/Plugins/KSFramework/Modules/UI/UGUISLuaBridge.cs b/KSFramework/Assets/Plugins/KSFramework/Modules/UI/UGUISLuaBridge.cs
@@ -14,7 +14,7 @@ public virtual void InitBridge()
         {
             EventSystem = new GameObject("EventSystem").AddComponent<EventSystem>();
             EventSystem.gameObject.AddComponent<StandaloneInputModule>();
-#if !UNITY_5
+#if UNITY_4
             EventSystem.gameObject.AddComponent<TouchInputModule>();
 #else
             EventSystem.gameObject.GetComponent<StandaloneInputModule>().forceModuleActive = true;