com.typhoon.unitysdk 1.0.19 → 1.0.21

package/Editor/ApplyTool.cs

@@ -23,6 +23,9 @@ namespace TyphoonUnitySDK
         public static Dictionary<AppChannel, IApply> Applies = new Dictionary<AppChannel, IApply>()
         {
             { AppChannel.ChinaAndroid, new ApplyChinaAndroid() },
+            { AppChannel.Test, new ApplyTest() },
+            { AppChannel.WxMini, new ApplyWxMini() },
+            { AppChannel.DouyinAndroid, new ApplyDouyinAndroid() },
         };
 
 
@@ -62,6 +65,9 @@ namespace TyphoonUnitySDK
                         break;
                 }
 
+                //保存所有配置
+                setting.Save();
+                WxMiniConfig.Default.Save();
                 InvokeOnApplyStart(setting);
                 if (!Applies.TryGetValue(setting.Channel, out var match))
                 {
@@ -244,6 +250,12 @@ namespace TyphoonUnitySDK
             AppConfigAsset.Instance.Version = setting.VersionString;
             AppConfigAsset.Instance.VersionType = setting.VersionType;
             AppConfigAsset.Instance.PublishTime = DateTime.Now.ToString("yyyyMMddHHmmss");
+
+            //写入抖音小游戏参数
+            AppConfigAsset.Instance.DouyinVideoId = DouyinConfig.Default.VideoId;
+            AppConfigAsset.Instance.DouyinIntersId = DouyinConfig.Default.IntersId;
+            AppConfigAsset.Instance.DouyinBannerId = DouyinConfig.Default.BannerId;
+            
             EditorUtility.SetDirty(AppConfigAsset.Instance);
             AssetDatabase.SaveAssets();
         }
@@ -292,8 +304,7 @@ namespace TyphoonUnitySDK
             }
         }
 
-
-        //引入模块
+        /*引入模块*/
         public static void ImportModule(string module)
         {
             var from = $"{UniEditor.PathRoot}/Sources~/{module}/Assets";
@@ -301,6 +312,7 @@ namespace TyphoonUnitySDK
         }
 
 
+        /*导入unity package*/
         public static void ImportUnityPackage(string package)
         {
             AssetDatabase.ImportPackage(package, false);
@@ -329,11 +341,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);
@@ -350,6 +365,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)
@@ -360,8 +386,68 @@ 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();
+            }
+        }
+
+        /*抖音android*/
+        public class ApplyDouyinAndroid : IApply
+        {
+            public void Apply(PublishSetting setting)
+            {
+                Debug.Log($"导入... {UniEditor.PackagePath_Douyin}");
+                ImportUnityPackage(UniEditor.PackagePath_Douyin);
+                var manifest_path = $"{UniEditor.PackagePath_Douyin}.manifest";
+                Debug.Log($"读取资源清单...{manifest_path}");
+                var manifest = ReadManifest(manifest_path);
+                Debug.Log($"清理多余文件...");
+                foreach (var folder in MaybeFolder)
+                {
+                    ClearFilesInDirectory(folder, manifest);
+                }
+
                 AssetDatabase.Refresh();
             }
         }

package/Editor/DouyinConfig.cs

@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace TyphoonUnitySDK
+{
+    /*抖音小游戏配置GUI绘制*/
+    public static class DouyinConfigGUIDrawer
+    {
+        public static Dictionary<string, Func<DouyinConfig, bool>> OverrideDrawGUIFunc =
+            new Dictionary<string, Func<DouyinConfig, bool>>()
+            {
+                { "m_Script", DrawProperty_m_Script },
+                { nameof(DouyinConfig.AppId), DrawProperty_AppId },
+                { nameof(DouyinConfig.VideoId), DrawProperty_VideoId },
+                { nameof(DouyinConfig.IntersId), DrawProperty_IntersId },
+                { nameof(DouyinConfig.ApkName), DrawProperty_ApkName },
+            };
+
+
+        private static bool DrawProperty_ApkName(DouyinConfig arg)
+        {
+            arg.ApkName = EditorGUILayout.TextField("apk文件名", arg.ApkName);
+            return true;
+        }
+
+
+        private static bool DrawProperty_IntersId(DouyinConfig arg)
+        {
+            arg.IntersId = EditorGUILayout.TextField("插页广告ID", arg.IntersId);
+            return true;
+        }
+
+        private static bool DrawProperty_VideoId(DouyinConfig arg)
+        {
+            arg.VideoId = EditorGUILayout.TextField("视频广告ID", arg.VideoId);
+            return true;
+        }
+
+        private static bool DrawProperty_AppId(DouyinConfig arg)
+        {
+            arg.AppId = EditorGUILayout.TextField("AppId", arg.AppId);
+            return true;
+        }
+
+
+        private static bool DrawProperty_m_Script(DouyinConfig arg)
+        {
+            var tmpEnable = GUI.enabled;
+            GUI.enabled = true;
+            GUILayout.Space(6);
+            GUIDrawer.DrawKeynotes("①仅支持Unity版本：2019.4.35，2021.3.14（最优，支持ASTC压缩，可减少Webgl运行消耗）");
+            GUIDrawer.DrawKeynotes("    详细以官方文档地址为准,链接如下：");
+            var url = "https://bytedance.feishu.cn/docx/doxcnTTjZHp8J6HzdrSbWu1aK5b";
+            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
+            GUIDrawer.DrawKeynotes("②需要接入录屏分享功能");
+            GUIDrawer.DrawKeynotes("③使用指定广告图标，链接如下:");
+            url = "https://developer.open-douyin.com/docs/resource/zh-CN/mini-game/operation1/advertise/norms";
+            GUIDrawer.DrawUrlLink($"        {url}", () => Application.OpenURL(url));
+            GUILayout.Space(6);
+            GUI.enabled = tmpEnable;
+            return true;
+        }
+
+
+        /*绘制GUI*/
+        public static void DrawGUI()
+        {
+            var config = DouyinConfig.Default;
+            GUIDrawer.DrawProperty(config, (property) =>
+            {
+                if (OverrideDrawGUIFunc.TryGetValue(property, out var match))
+                {
+                    return match.Invoke(config);
+                }
+
+                return false;
+            });
+        }
+    }
+
+    /// <summary>
+    /// 抖音小游戏配置
+    /// </summary>
+    public class DouyinConfig : ScriptableObject
+    {
+        private static string ConfigPath = "Assets/Typhoon_Gen/TyphoonSDK/Editor/DouyinConfig.asset";
+
+        private static DouyinConfig _instance = null;
+
+        public static DouyinConfig Default
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = AssetDatabase.LoadAssetAtPath<DouyinConfig>(ConfigPath);
+                }
+
+                if (_instance == null)
+                {
+                    _instance = CreateInstance<DouyinConfig>();
+                    var folder = Path.GetDirectoryName(ConfigPath);
+                    if (!Directory.Exists(folder))
+                    {
+                        Directory.CreateDirectory(folder);
+                        AssetDatabase.Refresh();
+                    }
+
+                    AssetDatabase.CreateAsset(_instance, ConfigPath);
+                }
+
+                return _instance;
+            }
+        }
+
+        public string AppId;
+        public string IntersId;
+        public string VideoId;
+        public string BannerId;
+        public string ApkName;
+
+        public void Save()
+        {
+            EditorUtility.SetDirty(this);
+            AssetDatabase.SaveAssets();
+        }
+    }
+}

package/Editor/DouyinConfig.cs.meta

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

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

@@ -12,9 +12,7 @@ namespace TyphoonUnitySDK
     /// </summary>
     public class ExportModule
     {
-        /// <summary>
-        /// 导出ChinaAndroid模块
-        /// </summary>
+        /*导出ChinaAndroid模块*/
         [MenuItem("TyphoonSDK/开发者/导出-ChinaAndroid.unitypackage")]
         public static void ExportChinaAndroid()
         {
@@ -40,6 +38,49 @@ 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);
+        }
+
+        [MenuItem("TyphoonSDK/开发者/导出-Douyin.unitypackage")]
+        public static void ExportDouyin()
+        {
+            var manifest = new List<string>()
+            {
+                "Assets/Plugins/ByteGame",
+                "Assets/Typhoon_Gen/TyphoonSDK/Runtime/Douyin",
+            };
+            if (!MakeSureExport(manifest))
+            {
+                return;
+            }
+
+            if (!CheckMissFiles(manifest))
+            {
+                return;
+            }
+
+            ExportUnityPackage(manifest, UniEditor.PackagePath_Douyin, out var detail);
+        }
 
         /// <summary>
         /// 导出清单文件到模块
@@ -271,6 +312,7 @@ namespace TyphoonUnitySDK
             {
                 sb.AppendLine(element);
             }
+
             File.WriteAllText(manifestPath, sb.ToString());
             AssetDatabase.Refresh();
             if (File.Exists(savePath))
@@ -280,7 +322,6 @@ namespace TyphoonUnitySDK
             }
         }
 
-
         public static string ToUnityPath(string path)
         {
             return UniEditor.FullPathToAssetPath(path);

package/Editor/GUIDrawer.cs

@@ -0,0 +1,113 @@
+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;
+            }
+        }
+
+
+        private static GUIStyle _linkstyle = null;
+
+        private static GUIStyle LinkStyle
+        {
+            get
+            {
+                if (_linkstyle == null)
+                {
+                    _linkstyle = new GUIStyle(Styles.rlabel_italic);
+                    _linkstyle.normal.textColor = new Color(0.02f, 0.49f, 0.84f, 1f);
+                }
+
+                return _linkstyle;
+            }
+        }
+
+
+        /// <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)
+        {
+            StyleTooltip.normal.textColor = EditorGUIUtility.isProSkin
+                ? new Color(0.47f, 0.8f, 1f, 1f)
+                : new Color(0.04f, 0.31f, 0.57f, 1f);
+            GUILayout.TextArea(content, StyleTooltip, option);
+        }
+
+        /// <summary>
+        /// 绘制关键提示
+        /// </summary>
+        public static void DrawUrlLink(string content, Action handler, params GUILayoutOption[] option)
+        {
+            if (GUILayout.Button(new GUIContent(content, "跳转..."), LinkStyle, option))
+            {
+                handler?.Invoke();
+            }
+        }
+    }
+}

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;
+        
+        
+        
     }
 }