com.typhoon.unitysdk 1.0.31 → 1.0.33

package/Editor/AddressableSupport.cs

@@ -1,31 +1,77 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEditor;
-#if TYPHOON_ADDRESSABLE
-using UnityEditor.AddressableAssets.Build;
-using UnityEditor.AddressableAssets;
-using UnityEditor.AddressableAssets.Settings;
 using UnityEngine;
-using UnityEngine.AddressableAssets;
-#endif
 
 namespace TyphoonUnitySDK
 {
     /// <summary>
     /// addressable 支持
     /// </summary>
-    public partial class AddressableSupport
+    public class AddressableSupport
     {
+        public const string TYPE_NAME_ADDRESSABLE_ASSET_SETTINGS =
+            "UnityEditor.AddressableAssets.Settings.AddressableAssetSettings";
+
+        public const string TYPE_NAME_BUNDLED_ASSET_GROUP_SCHEMA =
+            "UnityEditor.AddressableAssets.Settings.GroupSchemas.BundledAssetGroupSchema";
+
+        private static string _addressableAssetSettingsDefaultObjectTypeName = null;
+
+        private static Type _addressableAssetSettingsDefaultObjectType = null;
+
+        public static Type AddressableAssetSettingsDefaultObjectType
+        {
+            get
+            {
+                if (_addressableAssetSettingsDefaultObjectTypeName == null)
+                {
+                    _addressableAssetSettingsDefaultObjectTypeName =
+                        "UnityEditor.AddressableAssets.AddressableAssetSettingsDefaultObject";
+                    _addressableAssetSettingsDefaultObjectType =
+                        GetType(_addressableAssetSettingsDefaultObjectTypeName);
+                }
+
+                return _addressableAssetSettingsDefaultObjectType;
+            }
+        }
+
+        //是否有addressable模块
+        public static bool HasAddressableModule()
+        {
+            return AddressableAssetSettingsDefaultObjectType != null;
+        }
+
+        //AddressableAssetSettingsDefaultObject.Settings
+        public static dynamic DefaultSettings
+        {
+            get
+            {
+                if (AddressableAssetSettingsDefaultObjectType != null)
+                {
+                    PropertyInfo propertyInfo =
+                        AddressableAssetSettingsDefaultObjectType.GetProperty("Settings",
+                            BindingFlags.Public | BindingFlags.Static);
+                    if (propertyInfo != null)
+                    {
+                        return propertyInfo.GetValue(null);
+                    }
+                }
+
+                return null;
+            }
+        }
+
         /// <summary>
         /// 弹出菜单，选择Profile
         /// </summary>
         public static void PopUpProfileSelectorMenu(PublishSetting publish)
         {
-#if TYPHOON_ADDRESSABLE
-            var settings = AddressableAssetSettingsDefaultObject.Settings;
+            var settings = DefaultSettings;
             if (settings == null)
             {
-                Debug.LogError("找不到Settings,请先初始化Addressables");
+                Debug.LogError("找不到Settings,请先初始化 Addressables");
                 return;
             }
 
@@ -42,7 +88,6 @@ namespace TyphoonUnitySDK
             }
 
             menu.ShowAsContext();
-#endif
         }
 
 
@@ -51,11 +96,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static bool HasDefaultSettings()
         {
-#if TYPHOON_ADDRESSABLE
-            var settings = AddressableAssetSettingsDefaultObject.Settings;
-            return settings != null;
-#endif
-            return false;
+            return DefaultSettings != null;
         }
 
         /// <summary>
@@ -73,13 +114,11 @@ namespace TyphoonUnitySDK
                 return;
             }
 
-#if TYPHOON_ADDRESSABLE
-            var settings = AddressableAssetSettingsDefaultObject.Settings;
+            var settings = DefaultSettings;
             //激活profile
             settings.activeProfileId =
                 settings.profileSettings.GetProfileId(publish.AAUseProfile);
             ModifyVariable(publish);
-#endif
         }
 
         /// <summary>
@@ -87,7 +126,6 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void SetVariable(PublishSetting publish, string variableName, string value, bool save = false)
         {
-#if TYPHOON_ADDRESSABLE
             if (string.IsNullOrEmpty(publish.AAUseProfile))
             {
                 Debug.LogError("未关联profile");
@@ -95,12 +133,11 @@ namespace TyphoonUnitySDK
             }
 
             var success = SetVariable(publish.AAUseProfile, variableName, value);
-            EditorUtility.SetDirty(AddressableAssetSettingsDefaultObject.Settings);
+            EditorUtility.SetDirty(DefaultSettings);
             if (save && success)
             {
                 AssetDatabase.SaveAssets();
             }
-#endif
         }
 
         /// <summary>
@@ -108,15 +145,13 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void ModifyVariable(PublishSetting publish)
         {
-#if TYPHOON_ADDRESSABLE
             var modifies = publish.AAVariableModify;
             foreach (var modify in modifies)
             {
                 SetVariable(publish.AAUseProfile, modify.VariableName, modify.VariableValue);
             }
 
-            EditorUtility.SetDirty(AddressableAssetSettingsDefaultObject.Settings);
-#endif
+            EditorUtility.SetDirty(DefaultSettings);
         }
 
         /// <summary>
@@ -124,10 +159,9 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static bool SetVariable(string profileName, string variableName, string value)
         {
-#if TYPHOON_ADDRESSABLE
             try
             {
-                var settings = AddressableAssetSettingsDefaultObject.Settings;
+                var settings = DefaultSettings;
                 var profileId = settings.profileSettings.GetProfileId(profileName);
                 settings.profileSettings.SetValue(profileId, variableName, value);
                 return true;
@@ -136,7 +170,7 @@ namespace TyphoonUnitySDK
             {
                 Debug.LogError($"设置aa参数失败，profile:{profileName} vaiableName:{variableName} value:{value}");
             }
-#endif
+
             return false;
         }
 
@@ -145,7 +179,6 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static bool ContainProfile(string profile)
         {
-#if TYPHOON_ADDRESSABLE
             try
             {
                 if (string.IsNullOrEmpty(profile))
@@ -153,15 +186,13 @@ namespace TyphoonUnitySDK
                     return false;
                 }
 
-                var settings = AddressableAssetSettingsDefaultObject.Settings;
+                var settings = DefaultSettings;
                 return settings.profileSettings.GetAllProfileNames().Contains(profile);
             }
             catch (Exception e)
             {
                 return false;
             }
-#endif
-            return false;
         }
 
         /// <summary>
@@ -169,14 +200,13 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void BuildAASource(PublishSetting publish)
         {
-#if TYPHOON_ADDRESSABLE
             if (!HasDefaultSettings())
             {
                 throw new Exception("未初始化Addresable");
             }
 
             //选择激活的参数
-            var settings = AddressableAssetSettingsDefaultObject.Settings;
+            var settings = DefaultSettings;
             var profileId = settings.activeProfileId;
             if (publish.AASupportEnable && ContainProfile(publish.AAUseProfile))
             {
@@ -192,13 +222,16 @@ namespace TyphoonUnitySDK
 
             foreach (var builder in settings.DataBuilders)
             {
-                AddressableAssetSettings.CleanPlayerContent(builder as IDataBuilder);
+                CallStaticMethod(TYPE_NAME_ADDRESSABLE_ASSET_SETTINGS,
+                    "CleanPlayerContent", BindingFlags.Static | BindingFlags.Public,
+                    new[] { builder });
+                // AddressableAssetSettings.CleanPlayerContent(builder as IDataBuilder);
             }
 
             Debug.Log($"profile:{settings.profileSettings.GetProfileName(profileId)}");
 
             //触发AA回调
-            var sub = UniEditor.GetSubClasTypes(typeof(OnBuildAAProcessor));
+            var sub = GetSubClassTypes(typeof(OnBuildAAProcessor));
             var match = new List<OnBuildAAProcessor>();
             foreach (var type in sub)
             {
@@ -211,26 +244,34 @@ namespace TyphoonUnitySDK
                 processor.OnBeforeBuild(publish);
             }
 
-            AddressableAssetSettings.BuildPlayerContent();
+            var method = GetMethod(TYPE_NAME_ADDRESSABLE_ASSET_SETTINGS,
+                "BuildPlayerContent", BindingFlags.Static | BindingFlags.Public, 1);
+            if (method != null)
+            {
+                var outResult = new object[] { null };
+                method.Invoke(null, outResult);
+            }
 
+            // CallStaticMethod(TYPE_NAME_ADDRESSABLE_ASSET_SETTINGS,
+            //     "BuildPlayerContent", BindingFlags.Static | BindingFlags.Public, null);
+            // AddressableAssetSettings.BuildPlayerContent();
             foreach (var processor in match)
             {
                 processor.OnAfterBuild(publish);
             }
-#endif
         }
 
         /// <summary>
-        /// 获取可能参数名
+        /// 获取参数名
         /// </summary>
         public static List<string> GetVariables()
         {
-#if TYPHOON_ADDRESSABLE
-            var settings = AddressableAssetSettingsDefaultObject.Settings;
-            if(settings!=null){
-                return settings.profileSettings.GetVariableNames();    
+            var settings = DefaultSettings;
+            if (settings != null)
+            {
+                return settings.profileSettings.GetVariableNames();
             }
-#endif
+
             var result = new List<string>();
             return result;
         }
@@ -241,31 +282,144 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string GetVariableValue(string variableName)
         {
-#if TYPHOON_ADDRESSABLE
             try
             {
-                var settings = AddressableAssetSettingsDefaultObject.Settings;
+                var settings = DefaultSettings;
                 return settings.profileSettings.GetValueByName(settings.activeProfileId, variableName);
             }
             finally
             {
             }
-#endif
+
             return string.Empty;
         }
 
-#if TYPHOON_ADDRESSABLE
         /// <summary>
         /// 快捷打开Addressable窗口
         /// </summary>
         [MenuItem("Window/Addressable Window", priority = 3)]
         public static void OpenAddressableWindow()
         {
-            var type = UniEditor.GetType("UnityEditor.AddressableAssets.GUI.AddressableAssetsWindow");
-            var window = UnityEditor.EditorWindow.GetWindow(type);
+            var type = GetType("UnityEditor.AddressableAssets.GUI.AddressableAssetsWindow");
+            var window = EditorWindow.GetWindow(type);
             window.titleContent = new GUIContent("Addressables Groups");
             window.Show();
         }
-#endif
+
+        [MenuItem("Window/Addressable Window", true)]
+        public static bool OpenAddressableWindowFunc()
+        {
+            return HasAddressableModule();
+        }
+
+        //执行静态方法
+        public static void CallStaticMethod(string typeName, string methodName, BindingFlags flags, object[] args,
+            int parameters = -1)
+        {
+            var type = GetType(typeName);
+            if (type != null)
+            {
+                MethodInfo method = null;
+                var methods = type.GetMethods();
+                if (parameters >= 0)
+                {
+                    foreach (var e in methods)
+                    {
+                        if (e.Name == methodName && parameters == e.GetParameters().Length)
+                        {
+                            method = e;
+                            break;
+                        }
+                    }
+                }
+                else
+                {
+                    method = type.GetMethod(methodName, flags);
+                }
+
+                if (method != null)
+                {
+                    method.Invoke(null, args);
+                }
+            }
+        }
+
+
+        //反射获取方法
+        public static MethodInfo GetMethod(string typeName, string methodName, BindingFlags flags,
+            int parameters = -1)
+        {
+            MethodInfo method = null;
+            var type = GetType(typeName);
+            if (type != null)
+            {
+                var methods = type.GetMethods();
+                if (parameters >= 0)
+                {
+                    foreach (var e in methods)
+                    {
+                        if (e.Name == methodName && parameters == e.GetParameters().Length)
+                        {
+                            method = e;
+                            return method;
+                        }
+                    }
+                }
+                else
+                {
+                    method = type.GetMethod(methodName, flags);
+                }
+            }
+
+            return method;
+        }
+
+
+        /// <summary>
+        /// 反射获取类型
+        /// </summary>
+        public static Type GetType(string typeName)
+        {
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (var element in assemblies)
+            {
+                var types = element.GetTypes();
+                foreach (var type in types)
+                {
+                    if (type.FullName == typeName)
+                    {
+                        return type;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// 反射获取子类类型
+        /// </summary>
+        public static List<Type> GetSubClassTypes(Type check)
+        {
+            var result = new List<Type>();
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (var element in assemblies)
+            {
+                var types = element.GetTypes();
+                foreach (var type in types)
+                {
+                    if (type == check)
+                    {
+                        continue;
+                    }
+                    else if (type.IsSubclassOf(check))
+                    {
+                        result.Add(type);
+                    }
+                }
+            }
+
+            return result;
+        }
     }
 }

package/Editor/ApplyTool.cs

@@ -273,7 +273,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void InvokeOnApplyStart(PublishSetting setting)
         {
-            var sub = UniEditor.GetSubClasTypes(typeof(OnApplyProcessor));
+            var sub = UniEditor.GetSubClassTypes(typeof(OnApplyProcessor));
             var match = new List<OnApplyProcessor>();
             foreach (var type in sub)
             {
@@ -292,7 +292,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void InvokeOnApplyEnd(PublishSetting setting)
         {
-            var sub = UniEditor.GetSubClasTypes(typeof(OnApplyProcessor));
+            var sub = UniEditor.GetSubClassTypes(typeof(OnApplyProcessor));
             var match = new List<OnApplyProcessor>();
             foreach (var type in sub)
             {

package/Editor/Preferences.cs

@@ -34,10 +34,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
-        public bool CheckAddressableSupport = true;
-
-
         [Header("gradle目录")] public string GradlePath = string.Empty;
     }
 }

package/Editor/PreferencesWindow.cs

@@ -65,24 +65,16 @@ namespace TyphoonUnitySDK
             new Dictionary<string, Func<Preferences, bool>>()
             {
                 { "m_Script", DrawProperty_mScript },
-                { nameof(Preferences.CheckAddressableSupport), DrawProperty_CheckAddressableSupport },
                 { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
             };
 
-        private static bool DrawProperty_CheckAddressableSupport(Preferences arg)
-        {
-            GUILayout.Space(10);
-            Preferences.Default.CheckAddressableSupport =
-                GUILayout.Toggle(Preferences.Default.CheckAddressableSupport, "检查Addressable支持");
-            return true;
-        }
 
         private static bool DrawProperty_mScript(Preferences arg)
         {
             var temEnable = GUI.enabled;
             GUI.enabled = true;
             GUIDrawer.DrawKeynotes("使用须知:");
-            GUIDrawer.DrawKeynotes("①工具对Addressable有支持,从菜单：'TyphoonSDK/安装拓展...' 中导入");
+            GUIDrawer.DrawKeynotes("①工具对Addressable有支持,导入即可开启额外设置");
             GUI.enabled = temEnable;
             return true;
         }

package/Editor/PublishTool.cs

@@ -71,7 +71,7 @@ namespace TyphoonUnitySDK
 
         public static void InvokeOnPublishStart(PublishSetting setting)
         {
-            var sub = UniEditor.GetSubClasTypes(typeof(OnPublicProcessor));
+            var sub = UniEditor.GetSubClassTypes(typeof(OnPublicProcessor));
             var match = new List<OnPublicProcessor>();
             foreach (var type in sub)
             {
@@ -90,7 +90,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static void InvokeOnPublishEnd(PublishSetting setting, PublishResult publishResult)
         {
-            var sub = UniEditor.GetSubClasTypes(typeof(OnPublicProcessor));
+            var sub = UniEditor.GetSubClassTypes(typeof(OnPublicProcessor));
             var match = new List<OnPublicProcessor>();
             foreach (var type in sub)
             {

package/Editor/PublishWindow.cs

@@ -83,9 +83,6 @@ namespace TyphoonUnitySDK
                     }
                 }
             }
-
-            //检查一些事情
-            UniEditor.CheckSomethingsOnPublishWindowShow();
         }
 
         protected void OnGUI()

package/Editor/UniEditor.cs

@@ -217,7 +217,7 @@ namespace TyphoonUnitySDK
         /// <summary>
         /// 反射获取子类类型
         /// </summary>
-        public static List<Type> GetSubClasTypes(Type check)
+        public static List<Type> GetSubClassTypes(Type check)
         {
             var result = new List<Type>();
             var assemblies = AppDomain.CurrentDomain.GetAssemblies();
@@ -240,60 +240,13 @@ namespace TyphoonUnitySDK
             return result;
         }
 
-        /// <summary>
-        /// 是否安装了Addressable
-        /// </summary>
-        public static bool HasAddressable()
-        {
-            return GetType("UnityEngine.AddressableAssets.Addressables") != null;
-        }
 
         /// <summary>
         /// 是否添加了addressable支持
         /// </summary>
         public static bool HasAddressableSupport()
         {
-#if TYPHOON_ADDRESSABLE
-            return true;
-#endif
-            return false;
-        }
-
-
-        [MenuItem("TyphoonSDK/安装拓展/Addressable 支持", priority = 100)]
-        public static void InstallAddressableSupport()
-        {
-            AppendScriptingDefineSymbol(DEFINE_TYPHOON_ADDRESSABLE_NAME);
-            AssetDatabase.Refresh();
-            AssetDatabase.SaveAssets();
-            Debug.Log("Addressable 支持,安装成功!");
-        }
-
-        [MenuItem("TyphoonSDK/安装拓展/Addressable 支持", true)]
-        public static bool InstallAddressableSupportValid()
-        {
-            return HasAddressable() && !HasAddressableSupport();
-        }
-
-        [MenuItem("TyphoonSDK/卸载/Addressable 支持", priority = 100)]
-        public static void UninstallAddressableSupport()
-        {
-            ShowMessageBox("卸载Addressable 支持,可能会导致一些配置丢失,请做好备份,仍然继续吗？", () =>
-            {
-                ClearScriptingDefineSymbol(DEFINE_TYPHOON_ADDRESSABLE_NAME);
-                AssetDatabase.Refresh();
-                AssetDatabase.SaveAssets();
-                Debug.Log("Addressable 支持,卸载完毕!");
-            });
-        }
-
-        [MenuItem("TyphoonSDK/卸载/Addressable 支持", true)]
-        public static bool UninstallAddressableSupportValid()
-        {
-#if TYPHOON_ADDRESSABLE
-            return true;
-#endif
-            return false;
+            return AddressableSupport.HasAddressableModule();
         }
 
         [MenuItem("TyphoonSDK/安装拓展/Toast模块", priority = 100)]
@@ -532,15 +485,5 @@ namespace TyphoonUnitySDK
 
             File.WriteAllText(path, sb.ToString());
         }
-
-
-        /*发布窗口打开时触发一些事情*/
-        public static void CheckSomethingsOnPublishWindowShow()
-        {
-            if (Preferences.Default.CheckAddressableSupport && HasAddressable() && !HasAddressableSupport())
-            {
-                ShowMessageBox("检查到Addressable,是否添加拓展[Addressable支持],可从选项中关闭", InstallAddressableSupport);
-            }
-        }
     }
 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.31","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.33","description":"","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}