Skip to content

Commit ac9a877

Browse files
committed
define use unity 2017
1 parent 0a645df commit ac9a877

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

KSFramework/Assets/Editor/KSFrameworkTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if UNITY_5
1+
#if UNITY_5 || UNITY_2017_1_OR_NEWER
22
using System.IO;
33
using KEngine;
44
using KSFramework;

KSFramework/Assets/Plugins/KSFramework/Editor/KSFrameworkEditor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using KEngine;
55
using KEngine.UI;
66
using UnityEditor;
7-
#if UNITY_5
7+
#if UNITY_5 || UNITY_2017_1_OR_NEWER
88
using UnityEditor.SceneManagement;
99
#endif
1010

@@ -61,7 +61,7 @@ public static void OpenLastScene()
6161
if (!string.IsNullOrEmpty(lastScene))
6262
{
6363

64-
#if UNITY_5
64+
#if UNITY_5 || UNITY_2017_1_OR_NEWER
6565
EditorSceneManager.OpenScene(lastScene);
6666
#else
6767
EditorApplication.OpenScene(lastScene);
@@ -77,7 +77,7 @@ public static void OpenLastScene()
7777
[MenuItem("KEngine/Open Main Scene %&i")]
7878
public static void OpenMainScene()
7979
{
80-
#if UNITY_5
80+
#if UNITY_5 || UNITY_2017_1_OR_NEWER
8181
var currentScene = EditorSceneManager.GetActiveScene().path;
8282
#else
8383
var currentScene = EditorApplication.currentScene;
@@ -87,7 +87,7 @@ public static void OpenMainScene()
8787
EditorPrefs.SetString(LastScenePrefKey, currentScene);
8888

8989
Log.Info("Open Main Game Scene!");
90-
#if UNITY_5
90+
#if UNITY_5 || UNITY_2017_1_OR_NEWER
9191
EditorSceneManager.OpenScene(mainScene);
9292
#else
9393
EditorApplication.OpenScene(mainScene);

KSFramework/Assets/Plugins/KSFramework/Modules/UI/UGUISLuaBridge.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public virtual void InitBridge()
1414
{
1515
EventSystem = new GameObject("EventSystem").AddComponent<EventSystem>();
1616
EventSystem.gameObject.AddComponent<StandaloneInputModule>();
17-
#if !UNITY_5
17+
#if UNITY_4
1818
EventSystem.gameObject.AddComponent<TouchInputModule>();
1919
#else
2020
EventSystem.gameObject.GetComponent<StandaloneInputModule>().forceModuleActive = true;

0 commit comments

Comments
 (0)