0.0.2.24 fix:Is this support Unity 2017.3? #19

liangxiegame · Feb 24, 2018 · 5381bc8 · 5381bc8
1 parent b86a527
commit 5381bc8
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 55 deletions.
diff --git a/Assets/QFramework/17.ResKit/Editor/QAssetBundleTool.cs b/Assets/QFramework/17.ResKit/Editor/QAssetBundleTool.cs
@@ -160,9 +160,7 @@ public static void MarkHotUpdateZip(){
 			ResetQMark(path);
 		}
 
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem (Mark_HotUpdateFile)]
-		#endif
 		public static void MarkHotUpdateFile ()
 		{
 			string path = MouseSelector.GetSelectedPathOrFallback ();
@@ -271,9 +269,7 @@ public static void MarkQABDir ()
 			MarkQAB(path);
 		}
 
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem("Assets/ResSystem Mark/AssetBundleAllSubFolder")]
-		#endif
 		public static void MarkQABForAllSubFolder()
 		{
 			string path = MouseSelector.GetSelectedPathOrFallback ();
@@ -285,9 +281,7 @@ public static void MarkQABForAllSubFolder()
 			}
 		}
 
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem("Assets/ResSystem Mark/Un_AssetBundleAllSubFolder")]
-		#endif
 		public static void UnMarkQABForAllSubFolder()
 		{
 			string path = MouseSelector.GetSelectedPathOrFallback ();
@@ -317,9 +311,8 @@ public static void UnMarkQABForAllSubFolder()
 				ResetQMark(childpaths[i]);
 			}
 		}
-		#if QRESSYSTEM_SUPPORT
+
 		[MenuItem("Assets/ResSystem Mark/AssetBundleAllSubAssets")]
-		#endif
 		public static void MarkQABForAllSubAssets()
 		{
 			string path = MouseSelector.GetSelectedPathOrFallback ();
@@ -333,9 +326,7 @@ public static void MarkQABForAllSubAssets()
 				}
 			}
 		}
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem("Assets/ResSystem Mark/Un_AssetBundleAllSubAssets")]
-		#endif
 		public static void UnMarkQABForAllSubAssets()
 		{
 			string path = MouseSelector.GetSelectedPathOrFallback ();

diff --git a/Assets/QFramework/17.ResKit/Editor/ResSystemMenuItems.cs b/Assets/QFramework/17.ResKit/Editor/ResSystemMenuItems.cs
@@ -1,29 +1,29 @@
 /****************************************************************************
  * Copyright (c) 2017 wanzhenyu@putao.com
  * Copyright (c) 2017 liangxie
- * 
- * http://liangxiegame.com
- * https://github.com/liangxiegame/QFramework
- * https://github.com/liangxiegame/QSingleton
- * https://github.com/liangxiegame/QChain
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
+ * 
+ * http://liangxiegame.com
+ * https://github.com/liangxiegame/QFramework
+ * https://github.com/liangxiegame/QSingleton
+ * https://github.com/liangxiegame/QChain
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  ****************************************************************************/
 
 using UnityEditor;
@@ -34,17 +34,13 @@ public class ResSystemMenuItems
 	{
 		const string kSimulationMode = "QFramework/ResSystem/Simulation Mode";
 
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem(kSimulationMode)]
-		#endif
 		public static void ToggleSimulationMode ()
 		{
 			QResSystemMark.SimulateAssetBundleInEditor = !QResSystemMark.SimulateAssetBundleInEditor;
 		}
 
-		#if QRESSYSTEM_SUPPORT
 		[MenuItem(kSimulationMode, true)]
-		#endif
 		public static bool ToggleSimulationModeValidate ()
 		{
 			Menu.SetChecked(kSimulationMode, QResSystemMark.SimulateAssetBundleInEditor);

diff --git a/Assets/QFramework/20.UI/EasyEditor/PlatformUtils.cs b/Assets/QFramework/20.UI/EasyEditor/PlatformUtils.cs
@@ -34,14 +34,16 @@ public static string GetPlatformForAssetBundles(BuildTarget target)
 				return "iOS";
 			case BuildTarget.WebGL:
 				return "WebGL";
-			case BuildTarget.WebPlayer:
-				return "WebPlayer";
 			case BuildTarget.StandaloneWindows:
 			case BuildTarget.StandaloneWindows64:
 				return "Windows";
 			case BuildTarget.StandaloneOSXIntel:
 			case BuildTarget.StandaloneOSXIntel64:
-			case BuildTarget.StandaloneOSXUniversal:
+			#if UNITY_5 
+			case BuildTarget.StandaloneOSX:
+			#else
+			case BuildTarget.StandaloneOSX:
+			#endif
 				return "OSX";
 				// Add more build targets for your own.
 				// If you add more targets, don't forget to add the same platforms to GetPlatformForAssetBundles(RuntimePlatform) function.
@@ -61,9 +63,6 @@ static string GetPlatformForAssetBundles(RuntimePlatform platform)
 				return "iOS";
 			case RuntimePlatform.WebGLPlayer:
 				return "WebGL";
-			case RuntimePlatform.OSXWebPlayer:
-			case RuntimePlatform.WindowsWebPlayer:
-				return "WebPlayer";
 			case RuntimePlatform.WindowsPlayer:
 				return "Windows";
 			case RuntimePlatform.OSXPlayer:

diff --git a/Assets/QFramework/20.UI/UGUI/Script/QUIManager.cs b/Assets/QFramework/20.UI/UGUI/Script/QUIManager.cs
@@ -186,17 +186,13 @@ public GameObject CreateUIObj(string uiBehaviourName, int uiLevel)
 					break;
 			}
 
-
-
-#if NONE_LUA_SUPPORT
 			var uiGoRectTrans = ui.Transform as RectTransform;
 
 			uiGoRectTrans.offsetMin = UnityEngine.Vector2.zero;
 			uiGoRectTrans.offsetMax = UnityEngine.Vector2.zero;
 			uiGoRectTrans.anchoredPosition3D = Vector3.zero;
 			uiGoRectTrans.anchorMin = UnityEngine.Vector2.zero;
 			uiGoRectTrans.anchorMax = UnityEngine.Vector2.one;
-#endif
 
 			ui.Transform.LocalScaleIdentity();
 			ui.Transform.gameObject.name = uiBehaviourName;

diff --git a/Assets/QFramework/20.UI/UGUI/Script/Res/DefaultUIPanelLoader.cs b/Assets/QFramework/20.UI/UGUI/Script/Res/DefaultUIPanelLoader.cs
@@ -37,12 +37,7 @@ public class DefaultUIPanelLoader : IUIPanelLoader
         ResLoader mResLoader = ResLoader.Allocate();
 
         public GameObject LoadPanelPrefab(string panelName)
-        {
-            #if COCOS_SUPPORT
-            var retObj = mResLoader.LoadAsset<GameObject>(string.Format("Resources/{0}", panelName));
-            if (null != retObj) return retObj;
-            #endif
-
+        {   
             return mResLoader.LoadAsset<GameObject>(panelName);
         }
 

diff --git a/Assets/QFramework/9.EditorEx/Inspector/RectTransformInspector.cs b/Assets/QFramework/9.EditorEx/Inspector/RectTransformInspector.cs
@@ -3,6 +3,7 @@
 // Time: 22:20
 // Author: Karsion
 
+#if UNITY_5
 using QFramework;
 using UnityEditor;
 using UnityEditorInternal;
@@ -334,4 +335,5 @@ private class Contents
         public readonly GUIContent normalSizeDeltaContent = new GUIContent("N", "Change to normal sizeDelta mode");
         public readonly GUIContent readmeContent = new GUIContent("Readme", "Ctrl + ↑ move 1 pixel, and Shift 10 pixel");
     }
-}
+}
+#endif
diff --git a/Assets/QFramework/9.EditorEx/Inspector/TransformInspector.cs b/Assets/QFramework/9.EditorEx/Inspector/TransformInspector.cs
@@ -5,6 +5,9 @@
 // Time: 15:16
 // Author: Karsion
 
+
+#if UNITY_5
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -506,4 +509,5 @@ private class Contents
 
         public readonly string floatingPointWarning = LocalizationDatabase.GetLocalizedString("Due to floating-point precision limitations, it is recommended to bring the world coordinates of the GameObject within a smaller range.");
     }
-}
+}
+#endif