com.typhoon.unitysdk 1.1.20 → 1.1.22

package/CHANGELOG.md

@@ -1,7 +1,20 @@
 # 更新日志
+## [1.1.22] - 2025-10-25
+
+### 优化
+* 优化gradle路径获取，取preference的gradle路径
+* 优化发布名称使其更有意义
+
+
+## [1.1.21] - 2025-10-25
+
+### 新增
+* 调整发布名称
+
+
 ## [1.1.20] - 2025-10-25
 
-### 新增
+### 新增
 * 更新google play sdk
 
 

package/Editor/Preferences.cs

@@ -35,8 +35,10 @@ namespace TyphoonUnitySDK
             }
         }
 
-        [Header("gradle目录")] public string GradlePath = string.Empty;
-        [LabelOverride("有重大更新时提醒我")] public bool CheckMajor = true;
-        [LabelOverride("自定检查更新")] public bool CheckUpdate = true;
+        // [Header("gradle目录")] public string GradlePath = string.Empty;
+        [LabelOverride("有重大更新时提醒我")]
+        public bool CheckMajor = true;
+        [LabelOverride("自定检查更新")]
+        public bool CheckUpdate = true;
     }
 }

package/Editor/PreferencesWindow.cs

@@ -64,7 +64,7 @@ namespace TyphoonUnitySDK
             new Dictionary<string, Func<Preferences, bool>>()
             {
                 { "m_Script", DrawProperty_mScript },
-                { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
+                // { nameof(Preferences.GradlePath), DrawProperty_GradlePath },
             };
 
 
@@ -93,62 +93,62 @@ namespace TyphoonUnitySDK
             });
         }
 
-        private static bool DrawProperty_GradlePath(Preferences preferences)
-        {
-            GUILayout.Space(5);
-            if (!UniEditor.GradleIsMatch())
-            {
-                GUILayout.BeginHorizontal();
-                GUILayout.Label(new GUIContent("未配置gradle路径", EditorIcons.icon_error), Styles.BoldLabel,
-                    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("gradle路径", Styles.BoldLabel, GUILayout.Height(22));
-            }
-
-            GUILayout.BeginHorizontal();
-            preferences.GradlePath = GUILayout.TextArea(preferences.GradlePath, GUILayout.Height(44));
-            if (GUILayout.Button("选择", GUILayout.Width(60), GUILayout.Height(44)))
-            {
-                // 获取当前用户的 Windows 用户文件夹路径
-                var userFolder = UniEditor.GetWindowUserFolder();
-                var fastPath = "";
-                if (Directory.Exists(userFolder))
-                {
-                    var maybe = $"{userFolder}/.gradle/wrapper/dists";
-                    if (Directory.Exists(maybe))
-                    {
-                        fastPath = maybe;
-                    }
-                }
-
-                var select = EditorUtility.OpenFolderPanel("请选择Gradle目录", fastPath, "");
-                if (!string.IsNullOrEmpty(select))
-                {
-                    preferences.GradlePath = select;
-                    EditorUtility.SetDirty(preferences);
-                    var check = $"{select}/gradle";
-                    if (!File.Exists(check))
-                    {
-                        UniEditor.ShowMessageBox($"gardle目录不匹配，找不到：{check}", null);
-                    }
-                }
-
-                GUI.FocusControl("");
-            }
-
-            GUILayout.EndHorizontal();
-            return true;
-        }
+        // private static bool DrawProperty_GradlePath(Preferences preferences)
+        // {
+        //     GUILayout.Space(5);
+        //     if (!UniEditor.GradleIsMatch())
+        //     {
+        //         GUILayout.BeginHorizontal();
+        //         GUILayout.Label(new GUIContent("未配置gradle路径", EditorIcons.icon_error), Styles.BoldLabel,
+        //             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("gradle路径", Styles.BoldLabel, GUILayout.Height(22));
+        //     }
+        //
+        //     GUILayout.BeginHorizontal();
+        //     preferences.GradlePath = GUILayout.TextArea(preferences.GradlePath, GUILayout.Height(44));
+        //     if (GUILayout.Button("选择", GUILayout.Width(60), GUILayout.Height(44)))
+        //     {
+        //         // 获取当前用户的 Windows 用户文件夹路径
+        //         var userFolder = UniEditor.GetWindowUserFolder();
+        //         var fastPath = "";
+        //         if (Directory.Exists(userFolder))
+        //         {
+        //             var maybe = $"{userFolder}/.gradle/wrapper/dists";
+        //             if (Directory.Exists(maybe))
+        //             {
+        //                 fastPath = maybe;
+        //             }
+        //         }
+        //
+        //         var select = EditorUtility.OpenFolderPanel("请选择Gradle目录", fastPath, "");
+        //         if (!string.IsNullOrEmpty(select))
+        //         {
+        //             preferences.GradlePath = select;
+        //             EditorUtility.SetDirty(preferences);
+        //             var check = $"{select}/gradle";
+        //             if (!File.Exists(check))
+        //             {
+        //                 UniEditor.ShowMessageBox($"gardle目录不匹配，找不到：{check}", null);
+        //             }
+        //         }
+        //
+        //         GUI.FocusControl("");
+        //     }
+        //
+        //     GUILayout.EndHorizontal();
+        //     return true;
+        // }
 
         #endregion
     }

package/Editor/PublishTool.cs

@@ -21,6 +21,7 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static Dictionary<PublishProcess, string> PublicClasses = new Dictionary<PublishProcess, string>()
         {
+            { PublishProcess.Apk, "TyphoonUnitySDK.PublishUnityDefaultApk" },
             { PublishProcess.ChinaAndroidAAR, "TyphoonUnitySDK.PublishChinaAndroidAAR" },
             { PublishProcess.WxMini, "TyphoonUnitySDK.PublishWxMini" },
             { PublishProcess.DouyinAndroid, "TyphoonUnitySDK.PublishDouyinAndroid" },

package/Editor/PublishUnityDefaultApk.cs

@@ -0,0 +1,44 @@
+using System;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+namespace TyphoonUnitySDK
+{
+    public class PublishUnityDefaultApk : IPublish
+    {
+        public void Publish(PublishSetting setting)
+        {
+            PublishResult result = new PublishResult();
+            var dateString = DateTime.Now.ToString("yyyyMMdd_HHmmss");
+            var path = string.IsNullOrEmpty(setting.PackageName)
+                ? $".typhoonoutput/android_{dateString}.apk"
+                : $".typhoonoutput/{setting.PackageName}_{dateString}.apk";
+            if (!UniEditor.IsAsciiPath(path))
+            {
+                UniEditor.ShowMessageBox($"路径不符合要求，不支持中文路径：\n当前：{path}", null);
+                return;
+            }
+
+            PublishTool.InvokeOnPublishStart(setting);
+            //设置android打包为apk模式，非export project
+            EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
+            EditorUserBuildSettings.buildAppBundle = false;
+            EditorUserBuildSettings.androidBuildSystem = AndroidBuildSystem.Gradle;
+            BuildPipeline.BuildPlayer(EditorBuildSettings.scenes, path, BuildTarget.Android, BuildOptions.None);
+            if (File.Exists(path))
+            {
+                EditorUtility.RevealInFinder(path);
+                result.IsSuccess = true;
+                result.AndroidApk = path;
+                Debug.Log($"发布成功：{path}");
+            }
+            else
+            {
+                throw new Exception($"发布失败，生成apk失败，找不到文件：{path}");
+            }
+
+            PublishTool.InvokeOnPublishEnd(setting, result);
+        }
+    }
+}

package/Editor/PublishUnityDefaultApk.cs.meta

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

package/Editor/UniEditor.cs

@@ -85,12 +85,12 @@ namespace TyphoonUnitySDK
         /// </summary>
         public static string PackagePath_XiZhongYou = $"{PathRoot}/Sources~/Package/XiZhongYou.unitypackage";
 
-        
+
         /// <summary>
         /// 华为鸿蒙 资源包
         /// </summary>
         public static string PackagePath_HuaweiHarmony = $"{PathRoot}/Sources~/Package/HuaweiHarmony.unitypackage";
-        
+
 
         /// <summary>
         /// Toast模块
@@ -561,13 +561,32 @@ namespace TyphoonUnitySDK
         /// gradle是否设置成功
         /// </summary>
         /// <returns></returns>
-        public static bool GradleIsMatch()
+        public static bool GradleIsMatch(out string error)
         {
-            return !string.IsNullOrEmpty(Preferences.Default.GradlePath) &&
-                   File.Exists($"{Preferences.Default.GradlePath}/gradle");
+            error = string.Empty;
+            var gradlePath = EditorPrefs.GetString("GradlePath");
+            if (string.IsNullOrEmpty(gradlePath))
+            {
+                error = "未配置gradle\n注意：请不要使用unity自带的gradle，改为自定义gradle路径";
+                return false;
+            }
+
+            var gradleFile = ($"{gradlePath}/bin/gradle");
+            if (!File.Exists(gradleFile))
+            {
+                error =
+                    $"{gradlePath} 不是一个有效的gradle路径，缺少:{Path.GetFullPath(gradleFile)}\n注意：请不要使用unity自带的gradle，改为自定义gradle路径";
+            }
+
+            return true;
         }
 
 
+        public static string GetGradlePath()
+        {
+            return EditorPrefs.GetString("GradlePath");
+        }
+
         /// <summary>
         /// 写入Txt
         /// </summary>
@@ -1172,5 +1191,11 @@ namespace TyphoonUnitySDK
 
             return false;
         }
+
+        public static void OpenUnityPreferencesExternalTool()
+        {
+            // 打开 Preferences 窗口并定位到 External Tools 页面
+            SettingsService.OpenUserPreferences("Preferences/External Tools");
+        }
     }
 }

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.20","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"}],"version_log":"## [1.1.20] - 2025-10-25\r\n\r\n### 新增\n* 更新google play sdk\r\n\r\n","major_flag":false,"write_time_stamp":1761377702000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.1.22","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"}],"version_log":"## [1.1.22] - 2025-10-25\r\n\r\n### 优化\n* 优化gradle路径获取，取preference的gradle路径\r\n* 优化发布名称使其更有意义\r\n\r\n","major_flag":false,"write_time_stamp":1761400545000,"others":{"items":[]},"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}