com.typhoon.unitysdk 1.0.18 → 1.0.20

package/Editor/ApplyTool.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
-using UnityEditor.VersionControl;
 using UnityEngine;
 
 namespace TyphoonUnitySDK
@@ -25,6 +23,8 @@ namespace TyphoonUnitySDK
         public static Dictionary<AppChannel, IApply> Applies = new Dictionary<AppChannel, IApply>()
         {
             { AppChannel.ChinaAndroid, new ApplyChinaAndroid() },
+            { AppChannel.Test, new ApplyTest() },
+            { AppChannel.WxMini, new ApplyWxMini() },
         };
 
 
@@ -64,13 +64,15 @@ namespace TyphoonUnitySDK
                         break;
                 }
 
+                //保存所有配置
+                setting.Save();
+                WxMiniConfig.Default.Save();
                 InvokeOnApplyStart(setting);
                 if (!Applies.TryGetValue(setting.Channel, out var match))
                 {
                     Debug.LogError($"未处理Apply:{setting.Channel}");
                     return;
                 }
-
                 match.Apply(setting);
                 InvokeOnApplyEnd(setting);
             }
@@ -294,8 +296,7 @@ namespace TyphoonUnitySDK
             }
         }
 
-
-        //引入模块
+        /*引入模块*/
         public static void ImportModule(string module)
         {
             var from = $"{UniEditor.PathRoot}/Sources~/{module}/Assets";
@@ -303,6 +304,7 @@ namespace TyphoonUnitySDK
         }
 
 
+        /*导入unity package*/
         public static void ImportUnityPackage(string package)
         {
             AssetDatabase.ImportPackage(package, false);
@@ -331,11 +333,14 @@ namespace TyphoonUnitySDK
         }
 
 
-        /// <summary>
-        /// 清理文件夹,保留文件
-        /// </summary>
+        /*清理文件夹,保留文件*/
         public static void ClearFilesInDirectory(string folder, HashSet<string> keep)
         {
+            if (keep == null)
+            {
+                keep = new HashSet<string>();
+            }
+
             if (Directory.Exists(folder))
             {
                 var files = Directory.GetFiles(folder, "*", SearchOption.AllDirectories);
@@ -352,6 +357,17 @@ namespace TyphoonUnitySDK
             }
         }
 
+        //可能出现的文件夹
+        public static string[] MaybeFolder = new[]
+        {
+            "Assets/Plugins/Android",
+            "Assets/Typhoon_Gen/TyphoonSDK/Runtime",
+            "Assets/WX-WASM-SDK-V2",
+            "Assets/WebGLTemplates",
+        };
+
+
+        /*应用ChinaAndroid*/
         public class ApplyChinaAndroid : IApply
         {
             public void Apply(PublishSetting setting)
@@ -362,8 +378,48 @@ namespace TyphoonUnitySDK
                 Debug.Log($"读取资源清单...{manifest_path}");
                 var manifest = ReadManifest(manifest_path);
                 Debug.Log($"清理多余文件...");
-                ClearFilesInDirectory("Assets/Plugins/Android", manifest);
-                ClearFilesInDirectory("Assets/Typhoon_Gen/TyphoonSDK/Runtime/ChinaAndroid", manifest);
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
+                AssetDatabase.Refresh();
+            }
+        }
+
+
+        /*应用Test*/
+        public class ApplyTest : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, default);
+                }
+
+                AssetDatabase.Refresh();
+            }
+        }
+
+
+        /*应用WxMini*/
+        public class ApplyWxMini : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                Debug.Log($"导入... {UniEditor.PackagePath_WxMini}");
+                ImportUnityPackage(UniEditor.PackagePath_WxMini);
+                var manifest_path = $"{UniEditor.PackagePath_WxMini}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
                 AssetDatabase.Refresh();
             }
         }

package/Editor/EditorIcons.cs

@@ -22,6 +22,10 @@ namespace TyphoonUnitySDK
         public static Texture icon_android =>
             __icon_android
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_android.png");
+        private static Texture __icon_arrow_right = null;
+        public static Texture icon_arrow_right =>
+            __icon_arrow_right
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_arrow_right.png");
         private static Texture __icon_douyin = null;
         public static Texture icon_douyin =>
             __icon_douyin
@@ -73,6 +77,10 @@ namespace TyphoonUnitySDK
         public static Texture icon_success =>
             __icon_success
             ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_success.png");
+        private static Texture __icon_variable = null;
+        public static Texture icon_variable =>
+            __icon_variable
+            ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_variable.png");
         private static Texture __icon_vivo = null;
         public static Texture icon_vivo =>
             __icon_vivo ?? AssetDatabase.LoadAssetAtPath<Texture>($"{FolderPath}/icon_vivo.png");

package/Editor/ExportModule.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Sirenix.Utilities.Editor;
 using UnityEditor;
 using UnityEngine;
 
@@ -14,9 +12,7 @@ namespace TyphoonUnitySDK
     /// </summary>
     public class ExportModule
     {
-        /// <summary>
-        /// 导出ChinaAndroid模块
-        /// </summary>
+        /*导出ChinaAndroid模块*/
         [MenuItem("TyphoonSDK/开发者/导出-ChinaAndroid.unitypackage")]
         public static void ExportChinaAndroid()
         {
@@ -42,6 +38,28 @@ namespace TyphoonUnitySDK
             ExportUnityPackage(manifest, UniEditor.PackagePath_ChinaAndroid, out var detail);
         }
 
+        /*导出ChinaAndroid模块*/
+        [MenuItem("TyphoonSDK/开发者/导出-WxMini.unitypackage")]
+        public static void ExportWxMini()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/WebGLTemplates",
+                "Assets/WX-WASM-SDK-V2",
+                "Assets/Typhoon_Gen/TyphoonSDK/Runtime/WxMini",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_WxMini, out var detail);
+        }
 
         /// <summary>
         /// 导出清单文件到模块
@@ -273,6 +291,7 @@ namespace TyphoonUnitySDK
             {
                 sb.AppendLine(element);
             }
+
             File.WriteAllText(manifestPath, sb.ToString());
             AssetDatabase.Refresh();
             if (File.Exists(savePath))
@@ -282,7 +301,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
         public static string ToUnityPath(string path)
         {
             return UniEditor.FullPathToAssetPath(path);

package/Editor/GUIDrawer.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using Object = UnityEngine.Object;
+
+namespace TyphoonUnitySDK
+{
+    /// <summary>
+    /// GUI绘制器
+    /// </summary>
+    public static class GUIDrawer
+    {
+        private static GUIStyle _styleTooltip = null;
+
+        private static GUIStyle StyleTooltip
+        {
+            get
+            {
+                if (_styleTooltip == null)
+                {
+                    _styleTooltip = new GUIStyle(Styles.rlabel_italic);
+                    _styleTooltip.normal.textColor = new Color(0.47f, 0.8f, 1f, 1f);
+                }
+
+                return _styleTooltip;
+            }
+        }
+
+
+        /// <summary>
+        /// 绘制GUI属性
+        /// </summary>
+        public static void DrawProperty(Object target, Func<string, bool> ignoreFunc)
+        {
+            var obj = new SerializedObject(target);
+            EditorGUI.BeginChangeCheck();
+            obj.UpdateIfRequiredOrScript();
+            SerializedProperty iterator = obj.GetIterator();
+            for (var enterChildren = true; iterator.NextVisible(enterChildren); enterChildren = false)
+            {
+                using (new EditorGUI.DisabledScope("m_Script" == iterator.propertyPath))
+                {
+                    var cover = ignoreFunc.Invoke(iterator.propertyPath);
+                    if (!cover)
+                    {
+                        EditorGUILayout.PropertyField(iterator, true);
+                    }
+                }
+            }
+
+            obj.ApplyModifiedProperties();
+            EditorGUI.EndChangeCheck();
+        }
+
+        /// <summary>
+        /// 绘制Foldout
+        /// </summary>
+        public static bool DrawFoldout(string content, bool foldout, params GUILayoutOption[] option)
+        {
+            var click = GUILayout.Button(
+                new GUIContent($"{content}", foldout ? EditorIcons.icon_drop_arrow : EditorIcons.icon_arrow_right),
+                Styles.rbutton_left, option);
+            if (click)
+            {
+                return !foldout;
+            }
+
+            return foldout;
+        }
+
+
+        /// <summary>
+        /// 绘制关键提示
+        /// </summary>
+        public static void DrawKeynotes(string content, params GUILayoutOption[] option)
+        {
+            GUILayout.TextArea(content, StyleTooltip, option);
+        }
+    }
+}

package/Editor/GUIDrawer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6caf85c5dfc56a848bb3cd09c967d9f6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/Preferences.cs

@@ -39,5 +39,8 @@ namespace TyphoonUnitySDK
         public bool CheckInstallAddressablePlug = true;
         
         [Header("gradle目录")] public string GradlePath = string.Empty;
+        
+        
+        
     }
 }

package/Editor/PreferencesWindow.cs

@@ -9,16 +9,12 @@ namespace TyphoonUnitySDK
 {
     public class PreferencesWindow : EditorWindow
     {
-        /// <summary>
-        /// 绑定重绘逻辑
-        /// </summary>
-        public static Dictionary<string, Func<Preferences, bool>> RedrawBinding =
-            new Dictionary<string, Func<Preferences, bool>>()
-            {
-                { "m_Script", (s) => true },
-                { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
-            };
+        private static bool _preferenceFoldout = false;
+
+        private static bool _wxMiniConfigFoldout = false;
+
 
+        private static Vector2 _scroll;
 
         [MenuItem("TyphoonSDK/选项", priority = 10000)]
         public static void Open()
@@ -29,60 +25,77 @@ namespace TyphoonUnitySDK
             win.Show();
         }
 
-        private Editor _editor;
 
-        public Editor Editor
+        protected void OnGUI()
         {
-            get
+            var rect = new Rect(0, 0, position.width, position.height);
+            var rectTitle = rect;
+            rectTitle.y += 4;
+            rectTitle.x += 4;
+            rectTitle.width -= 8;
+            rectTitle.height = 32;
+            EditorGUI.DrawRect(rectTitle, Skins.PublishWindowTitleBgColor);
+            GUI.Label(rectTitle, "选项", Styles.rbold_title);
+
+            var rectSave = rectTitle;
+            rectSave.width = 90;
+            rectSave.x = rectTitle.xMax - rectSave.width - 4;
+            var center = rectSave.center;
+            rectSave.height -= 8;
+            rectSave.center = center;
+            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save)))
             {
-                if (_editor != null && _editor.target != Preferences.Default)
-                {
-                    DestroyImmediate(_editor);
-                }
+                EditorUtility.SetDirty(Preferences.Default);
+                WxMiniConfig.Default.Save();
+                AssetDatabase.SaveAssets();
+                Debug.Log("保存完毕");
+            }
 
-                if (_editor == null)
-                {
-                    _editor = Editor.CreateEditor(Preferences.Default);
-                }
+            var area = rectTitle;
+            area.y = rectTitle.yMax;
+            area.y += 4;
+            area.width -= 8;
+            area.x += 4;
+            area.height = rect.yMax - area.yMin - 4;
+            GUILayout.BeginArea(area);
 
-                return _editor;
+            _scroll = GUILayout.BeginScrollView(_scroll);
+            _preferenceFoldout = GUIDrawer.DrawFoldout("偏好设置", _preferenceFoldout, GUILayout.Height(26));
+            if (_preferenceFoldout)
+            {
+                DrawPreferencesPropertyGUI(Preferences.Default);
             }
-        }
-
 
-        protected  void OnGUI()
-        {
-            var rect = new Rect(0, 0, position.width, position.height);
-            var area = rect;
-            area.height -= 8;
-            area.width -= 12;
-            area.center = rect.center;
-            GUILayout.BeginArea(area);
-            var rectSave = new Rect(0, 0, area.width, area.height);
-            rectSave.width = 100;
-            rectSave.height = 32;
-            rectSave.x = area.width - rectSave.width;
-            rectSave.x -= 4;
-            rectSave.y += 4;
-            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton))
+            GUILayout.Space(10);
+            _wxMiniConfigFoldout = GUIDrawer.DrawFoldout("微信小游戏", _wxMiniConfigFoldout, GUILayout.Height(26));
+            if (_wxMiniConfigFoldout)
             {
-                EditorUtility.SetDirty(Preferences.Default);
-                AssetDatabase.SaveAssets();
-                Debug.Log("保存完毕");
+                WxMiniConfigGUIDrawer.DrawWxMiniConfig();
             }
 
-            DrawPropertyGUI(Preferences.Default);
+            GUILayout.EndScrollView();
             GUILayout.EndArea();
             Repaint();
         }
 
 
+        #region 偏好设置
+
+        public static Dictionary<string, Func<Preferences, bool>> OverrideDrawGUIPreferences =
+            new Dictionary<string, Func<Preferences, bool>>()
+            {
+                { "m_Script", (s) => true },
+                { nameof(Preferences.CheckInstallAddressablePlug), DrawProperty_CheckInstallAddressablePlug },
+                { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
+            };
+
+
         /*绘制GUI*/
-        public static void DrawPropertyGUI(Preferences preferences)
+        public static void DrawPreferencesPropertyGUI(Preferences preferences)
         {
-            DrawProperty(preferences, (property) =>
+            GUIDrawer.DrawProperty(preferences, (property) =>
             {
-                if (RedrawBinding.TryGetValue(property, out var match))
+                if (OverrideDrawGUIPreferences.TryGetValue(property, out var match))
                 {
                     return match.Invoke(preferences);
                 }
@@ -91,60 +104,38 @@ namespace TyphoonUnitySDK
             });
         }
 
-
-        /*绘制属性*/
-        public static void DrawProperty(Object target, Func<string, bool> ignoreFunc)
+        private static bool DrawProperty_CheckInstallAddressablePlug(Preferences arg)
         {
-            var obj = new SerializedObject(target);
-            EditorGUI.BeginChangeCheck();
-            obj.UpdateIfRequiredOrScript();
-            SerializedProperty iterator = obj.GetIterator();
-            for (var enterChildren = true; iterator.NextVisible(enterChildren); enterChildren = false)
-            {
-                using (new EditorGUI.DisabledScope("m_Script" == iterator.propertyPath))
-                {
-                    var cover = ignoreFunc.Invoke(iterator.propertyPath);
-                    if (!cover)
-                    {
-                        EditorGUILayout.PropertyField(iterator, true);
-                    }
-                }
-            }
-
-            obj.ApplyModifiedProperties();
-            EditorGUI.EndChangeCheck();
+            arg.CheckInstallAddressablePlug =
+                GUILayout.Toggle(arg.CheckInstallAddressablePlug, "自动检查Addressabled Supoort");
+            return true;
         }
 
 
         private static bool DrawProperty_GradlePath(Preferences preferences)
         {
-            GUILayout.Space(10);
-            var error = false;
-            var color = GUI.color;
             if (!UniEditor.GradleIsMatch())
             {
+                GUILayout.BeginHorizontal();
                 GUILayout.Label(new GUIContent("未配置gradle路径", EditorIcons.icon_error), Styles.rbold_label,
-                    GUILayout.Height(24));
-                color = GUI.color;
-                GUI.color = Color.green;
-                GUILayout.TextArea(
-                    "目录选到bin的文件夹即可\n例如：C:\\Users\\Jan\\.gradle\\wrapper\\dists\\gradle-6.8-bin\\1jblhjyydfkclfzx1agp92nyl\\gradle-6.8\\bin");
-                GUI.color = color;
-                error = true;
+                    GUILayout.Height(22));
+                if (GUILayout.Button("指引", GUILayout.Width(60)))
+                {
+                    UniEditor.ShowMessageBox(
+                        "目录选到bin的文件夹即可\n例如：C:\\Users\\Jan\\.gradle\\wrapper\\dists\\gradle-6.8-bin\\1jblhjyydfkclfzx1agp92nyl\\gradle-6.8\\bin",
+                        null);
+                }
+
+                GUILayout.EndHorizontal();
             }
             else
             {
-                GUILayout.Label(new GUIContent("gradle路径", EditorIcons.icon_success), Styles.rbold_label,
-                    GUILayout.Height(24));
+                GUILayout.Label("gradle路径", Styles.rbold_label, GUILayout.Height(22));
             }
 
             GUILayout.BeginHorizontal();
-            GUILayout.Label("目录:", Styles.rbold_title, GUILayout.Width(40),GUILayout.Height(44));
-            color = GUI.color;
-            GUI.color = error ? Color.red*0.7f : color;
             preferences.GradlePath = GUILayout.TextArea(preferences.GradlePath, GUILayout.Height(44));
-            GUI.color = color;
-            if (GUILayout.Button("选择", GUILayout.Width(60),GUILayout.Height(44)))
+            if (GUILayout.Button("选择", GUILayout.Width(60), GUILayout.Height(44)))
             {
                 // 获取当前用户的 Windows 用户文件夹路径
                 var userFolder = UniEditor.GetWindowUserFolder();
@@ -159,12 +150,15 @@ namespace TyphoonUnitySDK
                 }
 
                 var select = EditorUtility.OpenFolderPanel("请选择Gradle目录", fastPath, "");
-                preferences.GradlePath = select;
-                EditorUtility.SetDirty(preferences);
-                var check = $"{select}/gradle";
-                if (!File.Exists(check))
+                if (!string.IsNullOrEmpty(select))
                 {
-                    UniEditor.ShowMessageBox($"gardle目录不匹配，找不到：{check}", null);
+                    preferences.GradlePath = select;
+                    EditorUtility.SetDirty(preferences);
+                    var check = $"{select}/gradle";
+                    if (!File.Exists(check))
+                    {
+                        UniEditor.ShowMessageBox($"gardle目录不匹配，找不到：{check}", null);
+                    }
                 }
 
                 GUI.FocusControl("");
@@ -173,5 +167,7 @@ namespace TyphoonUnitySDK
             GUILayout.EndHorizontal();
             return true;
         }
+
+        #endregion
     }
 }

package/Editor/PublishProcess.cs

@@ -9,5 +9,6 @@ namespace TyphoonUnitySDK
         IOS,
         Webgl,
         ChinaAndroidAAR,
+        WxMini, //微信
     }
 }

package/Editor/PublishResult.cs

@@ -13,5 +13,10 @@ namespace TyphoonUnitySDK
         /// 导出的android工程
         /// </summary>
         public string AndroidProj;
+
+        /// <summary>
+        /// 导出的微信工程
+        /// </summary>
+        public string WxMiniProj;
     }
 }

package/Editor/PublishSetting.cs

@@ -8,15 +8,15 @@ using UnityEngine.Serialization;
 namespace TyphoonUnitySDK
 {
     /// <summary>
-    /// aa 参数修改
+    /// 参数修改
     /// </summary>
     [Serializable]
-    public class AddressableVariableModify
+    public class VariableModify
     {
         public string VariableName;
         public string VariableValue;
 
-        public AddressableVariableModify(string variableName, string variableValue)
+        public VariableModify(string variableName, string variableValue)
         {
             VariableName = variableName;
             VariableValue = variableValue;
@@ -84,7 +84,14 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
         [FormerlySerializedAs("AddressableUseProfile")]
         public string AAUseProfile = "";
 
-        public List<AddressableVariableModify> AAVariableModify = new List<AddressableVariableModify>();
+        public List<VariableModify> AAVariableModify = new List<VariableModify>();
+
+        /*自定义参数修改*/
+        public bool PresetModifyEnable = false;
+        public List<VariableModify> PresetModify = new List<VariableModify>();
+
+        /*微信拓展配置*/
+        public bool WxMiniGUIFoldout = true;
 
 
         //使用配置
@@ -107,5 +114,12 @@ public AndroidSdkVersions MinApiVersion = AndroidSdkVersions.AndroidApiLevel22;
         {
             return UniEditor.HasAddressableSupport() & AASupportEnable;
         }
+
+        /*保存*/
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
     }
 }